Fixed layout issue on lower resolution screens.

introlab · Feb 4, 2021 · 5e360f5 · 5e360f5
1 parent 4f1c67e
commit 5e360f5
Show file tree

Hide file tree

Showing 6 changed files with 366 additions and 253 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,7 +13,7 @@ cmake_policy(SET CMP0043 NEW)
 # Software version
 SET(CPACK_PACKAGE_VERSION_MAJOR "1")
 SET(CPACK_PACKAGE_VERSION_MINOR "0")
-SET(CPACK_PACKAGE_VERSION_PATCH "1")
+SET(CPACK_PACKAGE_VERSION_PATCH "2")
 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}" )

diff --git a/client/resources/stylesheet.qss b/client/resources/stylesheet.qss
@@ -630,6 +630,21 @@ QFrame#frameInvitees{
     background-color: rgba(0,0,100,50%);
 }
 
+/* Customizations for ParticipantWidget */
+QPushButton#btnFilterSessionsTypes:checked{
+    color:white;
+    background-color: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 rgb(100,100,100), stop: 0.2 black, stop:1 rgb(100,100,100));
+    border: 2px solid rgb(145, 145, 145);
+    border-radius: 5px;
+}
+
+QPushButton#btnFilterSessionsTypes[checkable=true]:!checked{
+    color:white;
+    background-color: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 black, stop: 0.2  rgb(100,100,100), stop:1 black);
+    border: 1px solid rgb(96, 96, 96);
+    border-radius: 5px;
+}
+
 /* Customizations for SessionInviteWidget */
 QPushButton#btnManageInvitees:checked, QPushButton#btnShowOnlineParticipants:checked, QPushButton#btnShowOnlineUsers:checked, QPushButton#btnShowOnlineDevices:checked,
 QPushButton#btnAdvancedConfig:checked{

diff --git a/client/src/MainWindow.ui b/client/src/MainWindow.ui
@@ -210,7 +210,7 @@ QLabel#lblLogo, QLabel#lblVersion, QLabel#lblUser{background-color:transparent;}
    </property>
    <property name="minimumSize">
     <size>
-     <width>1689</width>
+     <width>0</width>
      <height>50</height>
     </size>
    </property>

diff --git a/client/src/editors/ParticipantWidget.cpp b/client/src/editors/ParticipantWidget.cpp
@@ -68,6 +68,7 @@ ParticipantWidget::ParticipantWidget(ComManager *comMan, const TeraData *data, Q
     // Default display
     ui->tabNav->setCurrentIndex(0);
     ui->tabInfos->setCurrentIndex(0);
+    ui->frameFilterSessionTypes->hide();
 }
 
 ParticipantWidget::~ParticipantWidget()
@@ -1356,3 +1357,8 @@ void ParticipantWidget::on_cmbSessionType_currentIndexChanged(int index)
     }
 
 }
+
+void ParticipantWidget::on_btnFilterSessionsTypes_clicked()
+{
+    ui->frameFilterSessionTypes->setVisible(ui->btnFilterSessionsTypes->isChecked());
+}
diff --git a/client/src/editors/ParticipantWidget.h b/client/src/editors/ParticipantWidget.h
@@ -121,6 +121,7 @@ private slots:
     void on_cmbServices_currentIndexChanged(int index);
     void on_btnEmailWeb_clicked();
     void on_cmbSessionType_currentIndexChanged(int index);
+    void on_btnFilterSessionsTypes_clicked();
 };
 
 #endif // PARTICIPANTWIDGET_H