From 5e360f57dfee0b8c59ea48fc0aeb8f057d5bf9b5 Mon Sep 17 00:00:00 2001 From: Simon Briere Date: Thu, 4 Feb 2021 17:23:58 -0500 Subject: [PATCH] Fixed layout issue on lower resolution screens. --- CMakeLists.txt | 2 +- client/resources/stylesheet.qss | 15 + client/src/MainWindow.ui | 2 +- client/src/editors/ParticipantWidget.cpp | 6 + client/src/editors/ParticipantWidget.h | 1 + client/src/editors/ParticipantWidget.ui | 593 +++++++++++++---------- 6 files changed, 366 insertions(+), 253 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 700dac00..70d99955 100755 --- 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 index 097384ee..3d702b37 100644 --- 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 index 77de0ce8..e7e58fcf 100755 --- a/client/src/MainWindow.ui +++ b/client/src/MainWindow.ui @@ -210,7 +210,7 @@ QLabel#lblLogo, QLabel#lblVersion, QLabel#lblUser{background-color:transparent;} - 1689 + 0 50 diff --git a/client/src/editors/ParticipantWidget.cpp b/client/src/editors/ParticipantWidget.cpp index 47e05492..21cf23ed 100644 --- 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 index bdc3d2b3..ec6a01ce 100644 --- 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 diff --git a/client/src/editors/ParticipantWidget.ui b/client/src/editors/ParticipantWidget.ui index e0a15e28..29aaeeed 100644 --- a/client/src/editors/ParticipantWidget.ui +++ b/client/src/editors/ParticipantWidget.ui @@ -6,7 +6,7 @@ 0 0 - 949 + 1018 831 @@ -354,6 +354,12 @@ QCalendarWidget QSpinBox::down-arrow { width:16px; height:16px; } 0 + + + 0 + 140 + + 0 @@ -362,8 +368,8 @@ QCalendarWidget QSpinBox::down-arrow { width:16px; height:16px; } 0 0 - 909 - 140 + 978 + 99 @@ -376,6 +382,15 @@ QCalendarWidget QSpinBox::down-arrow { width:16px; height:16px; } Informations + + 2 + + + 2 + + + 2 + @@ -395,6 +410,9 @@ QCalendarWidget QSpinBox::down-arrow { width:16px; height:16px; } QFrame::Raised + + 2 + 0 @@ -409,6 +427,9 @@ QCalendarWidget QSpinBox::down-arrow { width:16px; height:16px; } + + 6 + QLayout::SetDefaultConstraint @@ -446,6 +467,18 @@ QCalendarWidget QSpinBox::down-arrow { width:16px; height:16px; } QLayout::SetMinAndMaxSize + + 0 + + + 0 + + + 0 + + + 0 + @@ -622,6 +655,9 @@ QCalendarWidget QSpinBox::down-arrow { width:16px; height:16px; } + + 6 + @@ -770,14 +806,20 @@ QCalendarWidget QSpinBox::down-arrow { width:16px; height:16px; } - + - + 0 0 + + + 16777215 + 240 + + 0 @@ -786,8 +828,8 @@ QCalendarWidget QSpinBox::down-arrow { width:16px; height:16px; } 0 0 - 909 - 415 + 978 + 213 @@ -806,10 +848,10 @@ QCalendarWidget QSpinBox::down-arrow { width:16px; height:16px; } 0 - + - + 0 0 @@ -830,7 +872,10 @@ QCalendarWidget QSpinBox::down-arrow { width:16px; height:16px; } Qt::ScrollBarAlwaysOff - Qt::ScrollBarAlwaysOff + Qt::ScrollBarAsNeeded + + + QAbstractScrollArea::AdjustIgnored true @@ -840,11 +885,20 @@ QCalendarWidget QSpinBox::down-arrow { width:16px; height:16px; } 0 0 - 907 + 976 198 + + 2 + + + 2 + + + 2 + @@ -875,10 +929,10 @@ QCalendarWidget QSpinBox::down-arrow { width:16px; height:16px; } 3 - + - + 0 0 @@ -906,7 +960,7 @@ QCalendarWidget QSpinBox::down-arrow { width:16px; height:16px; } true - + 0 0 @@ -970,10 +1024,13 @@ QCalendarWidget QSpinBox::down-arrow { width:16px; height:16px; } 3 - + + QLayout::SetDefaultConstraint + + - + 0 0 @@ -989,14 +1046,14 @@ QCalendarWidget QSpinBox::down-arrow { width:16px; height:16px; } - + 0 0 - 5000 + 16777215 175 @@ -1027,10 +1084,10 @@ QCalendarWidget QSpinBox::down-arrow { width:16px; height:16px; } 3 - + - + 0 0 @@ -1046,14 +1103,14 @@ QCalendarWidget QSpinBox::down-arrow { width:16px; height:16px; } - + 0 0 - 5000 + 16777215 175 @@ -1099,162 +1156,6 @@ QCalendarWidget QSpinBox::down-arrow { width:16px; height:16px; } - - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 24 - 24 - - - - PointingHandCursor - - - Tout cocher - - - ... - - - - :/controls/check2_on.png:/controls/check2_on.png - - - - 24 - 24 - - - - - - - - - 24 - 24 - - - - PointingHandCursor - - - Tout décocher - - - ... - - - - :/controls/check2_off.png:/controls/check2_off.png - - - - 24 - 24 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - - 10 - - - - QAbstractItemView::NoEditTriggers - - - false - - - QAbstractItemView::NoSelection - - - QAbstractItemView::SelectRows - - - QListView::Static - - - QListView::TopToBottom - - - QListView::SinglePass - - - 3 - - - true - - - - - @@ -1274,90 +1175,251 @@ QCalendarWidget QSpinBox::down-arrow { width:16px; height:16px; } - - - - QAbstractItemView::NoEditTriggers - - - QAbstractItemView::ExtendedSelection - - - QAbstractItemView::SelectRows - - - - 20 - 20 - - - - true - - - 75 - - - 100 - - - true - - - false - - - - Séance + + + + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 24 + 24 + + + + PointingHandCursor + + + Tout cocher + + + ... + + + + :/controls/check2_on.png:/controls/check2_on.png + + + + 24 + 24 + + + + + + + + + 24 + 24 + + + + PointingHandCursor + + + Tout décocher + + + ... + + + + :/controls/check2_off.png:/controls/check2_off.png + + + + 24 + 24 + + + + + + + + + + + + 0 + 0 + - - - - Date + + + 0 + 0 + - - AlignCenter + + + 150 + 16777215 + - - - - Type + + + 10 + - - AlignCenter + + Qt::ScrollBarAsNeeded - - - - État + + QAbstractScrollArea::AdjustIgnored - - AlignCenter + + QAbstractItemView::NoEditTriggers - - - - Durée + + false - - AlignCenter + + QAbstractItemView::NoSelection - - - - Responsable + + QAbstractItemView::SelectRows - - - - Actions + + QListView::Static - - - - - - + + QListView::TopToBottom + + + QListView::SinglePass + + + 3 + + + true + + + + + + + + + + + 0 + 0 + + + + QAbstractItemView::NoEditTriggers + + + QAbstractItemView::ExtendedSelection + + + QAbstractItemView::SelectRows + + + + 20 + 20 + + + + true + + + 75 + + + 100 + + + false + + + false + + + + Séance + + + + + Date + + + AlignCenter + + + + + Type + + + AlignCenter + + + + + État + + + AlignCenter + + + + + Durée + + + AlignCenter + + + + + Responsable + + + + + Actions + + + + + @@ -1654,6 +1716,35 @@ QCalendarWidget QSpinBox::down-arrow { width:16px; height:16px; } + + + + + 125 + 40 + + + + PointingHandCursor + + + Filtrer les séances + + + + :/icons/filter.png:/icons/filter.png + + + + 24 + 24 + + + + true + + +