Merge pull request #85 from introlab/dev

Main merge for 1.1.3 release

CMakeLists.txt

@@ -17,7 +17,7 @@ cmake_policy(SET CMP0043 NEW)
 # Software version
 SET(CPACK_PACKAGE_VERSION_MAJOR "1")
 SET(CPACK_PACKAGE_VERSION_MINOR "1")
-SET(CPACK_PACKAGE_VERSION_PATCH "2")
+SET(CPACK_PACKAGE_VERSION_PATCH "3")
 SET(CPACK_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
 add_definitions(-DOPENTERAPLUS_VERSION="${CPACK_PACKAGE_VERSION}" )
 add_definitions(-DOPENTERAPLUS_VERSION_MAJOR="${CPACK_PACKAGE_VERSION_MAJOR}" )

README.md

@@ -7,6 +7,8 @@ OpenTeraPlus is a client that works with [OpenTera Server](https://github.com/in
 
 * Simon Brière, ing. M.Sc.A., Research Center on Aging, CIUSSS de l'Estrie-CHUS (@sbriere)
 * Dominic Létourneau, ing. M.Sc.A., IntRoLab, Université de Sherbrooke (@doumdi)
+* François Michaud, ing. Ph.D., IntRoLab, Université de Sherbrooke
+* Michel Tousignant, pht, Ph.D., CDRV, Université de Sherbrooke
 
 ## Publication(s)
 

client/resources/TeraClient.qrc

@@ -134,5 +134,19 @@
         <file>translations/openteraplus_fr.qm</file>
         <file>icons/test_type.png</file>
         <file>icons/qr.png</file>
+        <file>icons/log_icon.png</file>
+        <file>icons/logs/certificate.png</file>
+        <file>icons/logs/password.png</file>
+        <file>icons/logs/token.png</file>
+        <file>icons/question.png</file>
+        <file>icons/logs/browser_chrome.png</file>
+        <file>icons/logs/browser_firefox.png</file>
+        <file>icons/logs/browser_safari.png</file>
+        <file>icons/logs/os_android.png</file>
+        <file>icons/logs/os_ios.png</file>
+        <file>icons/logs/os_linux.png</file>
+        <file>icons/logs/os_mac.png</file>
+        <file>icons/logs/os_windows.png</file>
+        <file>icons/pause.png</file>
     </qresource>
 </RCC>

client/resources/icons.txt

@@ -0,0 +1,3 @@
+<a href="https://www.flaticon.com/free-icons/logos" title="logos icons">Logos icons created by Pixel perfect - Flaticon</a>
+<a href="https://www.flaticon.com/free-icons/logotype" title="logotype icons">Logotype icons created by Freepik - Flaticon</a>
+<a href="https://www.flaticon.com/free-icons/chrome" title="chrome icons">Chrome icons created by Pixel perfect - Flaticon</a>

client/resources/stylesheet.qss

@@ -121,7 +121,7 @@ QGroupBox {
     border-color: gray;
     margin-top: 27px;
     font-size: 12px;
-        font-weight: bold;
+    font-weight: bold;
     border-bottom-left-radius: 15px;
     border-bottom-right-radius: 15px;
 }
@@ -131,9 +131,11 @@ QGroupBox::title {
     subcontrol-position: top left;
     border-top-left-radius: 15px;
     border-top-right-radius: 15px;
-    padding: 5px 150px;
+    padding: 5px; /* 150px;*/
     background-color: #FF17365D;
     color: rgb(255, 255, 255);
+    text-align: center;
+    min-width: 250px;
 }
 
 /*
@@ -145,10 +147,17 @@ QToolBox{
 }
 
 QToolBox::tab {
-    background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 rgba(0,5,45,50%), stop: 0.2 rgba(0,64,128,50%), stop:1 rgba(0,5,45,50%));
+    /*background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 rgba(0,5,45,50%), stop: 0.2 rgba(0,64,128,50%), stop:1 rgba(0,5,45,50%));
     border-radius: 5px;
-    color: darkgray;
+    color: darkgray;*/
+    border-top-left-radius: 15px;
+    border-top-right-radius: 15px;
+    padding: 5px;
+    background-color: #FF17365D;
+    color: rgb(255, 255, 255);
     height: 40px;
+    font-size: 12px;
+    text-align: center;
 }
 
 QToolBox::tab:selected {
@@ -157,10 +166,20 @@ QToolBox::tab:selected {
 }
 
 QToolBox::tab:!selected {
-    background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 rgba(0,64,128,50%), stop: 0.2 rgba(0,5,45,50%), stop:1 rgba(0,64,128,50%));
+    /*background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 rgba(0,64,128,50%), stop: 0.2 rgba(0,5,45,50%), stop:1 rgba(0,64,128,50%));*/
+    background-color: rgba(0,64,128,50%);
     color: white;
 }
 
+/*QToolBox::tab:only-one {
+    background-color: transparent;
+    color: transparent;
+    height: 0px;
+    icon-size: 0px;
+    margin: 0px;
+    padding: 0px;
+}*/
+
 /*
     QDialog.
 */
@@ -183,7 +202,7 @@ QLabel {
 */
 QTreeWidget, QTableWidget{
     selection-background-color: rgba(255,255,255,50%);/*rgba(0,5,45,50%)*/;
-    selection-color: lightblue;
+    selection-color: black/*lightblue*/;
 }
 
 QTreeWidget#treeNavigator {
@@ -617,13 +636,13 @@ QToolButton#btnVideo:!checked, QToolButton#btnLog:!checked, QToolButton#btnFilte
     border-radius: 5px;
 }
 
-QToolButton#btnLog:!checked, QToolButton#btnInSessionInfos:!checked{
+QToolButton#btnLog:!checked, QToolButton#btnInSessionInfos:!checked, QToolButton#btnPause:!checked{
     color:white;
     background-color: transparent;
     border: 0px;
 }
 
-QToolButton#btnVideo:checked, QToolButton#btnLog:checked, QToolButton#btnInSessionInfos:checked, QToolButton#btnSearch:checked, QToolButton#btnFilterActive:checked{
+QToolButton#btnVideo:checked, QToolButton#btnLog:checked, QToolButton#btnInSessionInfos:checked, QToolButton#btnSearch:checked, QToolButton#btnFilterActive:checked, QToolButton#btnPause:checked{
     color:black;
     background-color: gray;
     /*border: 2px solid white;*/
@@ -796,3 +815,8 @@ QTreeWidget#treeAssets {
     selection-color: lightblue;
 }
 
+/* Customizations for InSessionWidget */
+QPushButton#btnDefaultPath, QPushButton#btnBrowseSavePath{
+        max-width: 80px;
+        min-width: 80px;
+}