Merge pull request #101 from introlab/dev

Main merge for 1.3.0 release

Author: SBriere

.github/workflows/build_on_pull_request.yml

@@ -15,7 +15,7 @@ jobs:
     - name: Install Qt
       uses: jurplel/install-qt-action@v3.3.0
       with:
-        version: '6.5.3'
+        version: '6.7.3'
         host: 'windows'
         target: 'desktop'
         arch: 'win64_msvc2019_64'

.gitignore

@@ -1,9 +1,8 @@
 /client/resources/translations/*.qm
 deploy
-/build-*
+/build
 *.user
 
-html
 venv
 doctrees
 CMakeLists.txt.user

CMakeLists.txt

@@ -1,3 +1,6 @@
+#Look for minimum cmake version
+cmake_minimum_required(VERSION 3.21)
+
 if (APPLE)
     set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "Minimum OS X deployment version")
 endif(APPLE)
@@ -8,15 +11,13 @@ project(OpenTeraPlus)
 #enable_testing()
 #include(CheckFunctionExists)
 
-#Look for minimum cmake version
-cmake_minimum_required(VERSION 3.21)
-
 #DEFINITIONS POLICY, NEW SINCE 3.0.2
 cmake_policy(SET CMP0043 NEW)
+cmake_policy(SET CMP0007 NEW)
 
 # Software version
 SET(CPACK_PACKAGE_VERSION_MAJOR "1")
-SET(CPACK_PACKAGE_VERSION_MINOR "2")
+SET(CPACK_PACKAGE_VERSION_MINOR "3")
 SET(CPACK_PACKAGE_VERSION_PATCH "0")
 SET(CPACK_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
 add_definitions(-DOPENTERAPLUS_VERSION="${CPACK_PACKAGE_VERSION}" )

client/resources/CMakeLists.txt

@@ -1 +1,8 @@
 set(TERACLIENT_RES_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "doc string")
+
+set(translations
+    translations/openteraplus_en.ts
+    translations/openteraplus_fr.ts
+)
+
+add_custom_target(translation_files SOURCES ${translations})

client/resources/stylesheet.qss

@@ -286,21 +286,31 @@ QTreeWidget::branch:open:has-children:has-siblings   {
 /*
     QLineEdit
 */
-QLineEdit, QSpinBox, QTextEdit, QDateTimeEdit, QTimeEdit{
-    background-color: rgba(255,255,255,50%);
+QLineEdit, QSpinBox, QTextEdit, QDateTimeEdit, QTimeEdit, QDateEdit{
+    background-color: rgba(255,255,255,70%);
     color:black;
     min-height: 25px;
     padding-left: 5px;
 }
 
-QLineEdit:!enabled, QSpinBox:!enabled, QTextEdit:!enabled, QDateTimeEdit:!enabled, QTimeEdit:!enabled{
+QLineEdit:!enabled, QSpinBox:!enabled, QDateTimeEdit:!enabled, QTimeEdit:!enabled, QDateEdit:!enabled{
     background-color: rgba(0,0,0,0%);
     color:rgba(255,255,255,80%);
     padding-left: 0px;
 }
 
+QTextEdit:!enabled{
+    background-color: rgba(255,255,255,70%);
+    color: black;
+    padding-left: 0px;
+}
+
+QTextEdit:enabled{
+    background-color: rgba(255,255,255,100%);
+}
 
-QDateTimeEdit::down-arrow:!enabled, QDateTimeEdit::up-arrow:!enabled {
+
+QDateTimeEdit::down-arrow:!enabled, QDateTimeEdit::up-arrow:!enabled, QDateEdit::down-arrow:!enabled, QDateEdit::up-arrow:!enabled {
     image: none;
 }
 
@@ -309,7 +319,12 @@ QDateTimeEdit::down-arrow:!enabled, QDateTimeEdit::up-arrow:!enabled {
     QPlainTextEdit
 */
 QPlainTextEdit {
-    background-color: rgba(255,255,255,50%);
+    background-color: rgba(255,255,255,70%);
+    color: black;
+}
+
+QPlainTextEdit:!enabled{
+    background-color: rgba(255,255,255,10%);
     color: white;
 }
 
@@ -346,7 +361,7 @@ QListView::item:hover {
 QComboBox {
     background-color: rgba(255,255,255,50%);
     selection-background-color: rgba(90,90,90,100%);
-    selection-color: white;
+    selection-color: cyan;
     border: 1px solid gray;
     border-radius: 3px;
     padding: 0px 0px 0px 0px;
@@ -368,11 +383,13 @@ QComboBox::down-arrow:!enabled {
 
 QComboBox QAbstractItemView {
     /*background-color: rgba(255,255,255,50%);*/
+    background-color: rgba(0,0,0,100%);
     padding-left: 5px;
+    border: 1px solid gray;
 }
 
 QComboBox QAbstractItemView::item {
-    /*background-color: rgba(255,255,255,50%);*/
+    background-color: rgba(0,0,0,100%);
     min-height: 25px;
 }
 
@@ -398,6 +415,7 @@ QPushButton:hover{
     background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #295d80, stop: 1 #173448);/*qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #173448, stop: 0.2  rgb(200,200,200), stop:1 #173448);*/
     border: 2px solid #3286bf /*rgb(186, 186, 186)*/;
     border-radius: 5px;
+    font-weight: bold;
 }
 
 QPushButton:!enabled{
@@ -653,18 +671,19 @@ QLabel#lblTitle{
     color: cyan;
 }
 
-QLabel#lblWarning, QLabel#lblWarning2{
+QLabel#lblWarning, QLabel#lblWarning2, QLabel#lblDeviceRegisterKeyValue{
     font-weight: bold;
     font-size: 14px;
     color: orange;
 }
 
 
-/* Customizations for LoginDialog */
+/* Customizations for LoginDialog / WebLoginDialog */
 QFrame#frameLogos{background-color:rgba(200,200,200,100%);}
 QLabel#lblMessage{color:white;}
 QFrame#frameMessage{background-color: transparent;}
-QFrame#frameButtons{background-color:rgba(29,29,29,50%);}
+QFrame#frameButtons,QFrame#frameLoginMessages{background-color:rgba(29,29,29,50%);}
+QLabel#lblError{color: orange;}
 
 /* Customizations for MainWindow */
 QMainWindow{background-image: url(://TeRA_Background.png); background-color: #2c3338;}
@@ -720,6 +739,7 @@ QPushButton#btnEditUser,QPushButton#btnConfig {
     background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 rgba(100,100,100,100%), stop: 1 rgba(148,148,148,100%));
     border: 1px solid rgba(148,148,148,100%);
     min-width: 0px;
+    color: black;
 }
 
 QPushButton#btnEditUser:hover,QPushButton#btnConfig:hover{
@@ -734,7 +754,7 @@ QToolButton#btnVideo:!checked, QToolButton#btnLog:!checked, QToolButton#btnFilte
     border-radius: 5px;
 }
 
-QToolButton#btnLog:!checked, QToolButton#btnInSessionInfos:!checked, QToolButton#btnPause:!checked{
+QToolButton#btnLog:!checked, QToolButton#btnInSessionInfos:!checked, QToolButton#btnPause:!checked, QToolButton#btnEdit:!checked{
     color:white;
     background-color: transparent;
     border: 0px;
@@ -923,3 +943,9 @@ QPushButton#btnDefaultPath, QPushButton#btnBrowseSavePath{
 QWidget#line{
     background-color: #808080;
 }
+
+QTextEdit#txtDefinition{
+    background-color: rgba(255,255,255,30%);
+    color: black;
+}
+