smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: fixes #7949 Fixup groupboxes for settings dialog make settings dialog a fixed height

Browse source
This commit is contained in:
sithlord48 2024-12-05 08:52:05 -05:00 committed by Chris Rizzitello
parent 53b9c0908e
commit 0c26893706
2 changed files with 67 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gui/src/dialogs/SettingsDialog.cpp
View file

@ -39,7 +39,7 @@ using namespace deskflow::gui;
SettingsDialog::SettingsDialog( SettingsDialog::SettingsDialog(
QWidget *parent, AppConfig &appConfig, const IServerConfig &serverConfig, const CoreProcess &coreProcess QWidget *parent, AppConfig &appConfig, const IServerConfig &serverConfig, const CoreProcess &coreProcess
) )
: QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint), : QDialog(parent),
ui{std::make_unique<Ui::SettingsDialog>()}, ui{std::make_unique<Ui::SettingsDialog>()},
m_appConfig(appConfig), m_appConfig(appConfig),
m_serverConfig(serverConfig), m_serverConfig(serverConfig),
@ -82,6 +82,10 @@ SettingsDialog::SettingsDialog(
#ifdef DESKFLOW_GUI_HOOK_SETTINGS #ifdef DESKFLOW_GUI_HOOK_SETTINGS
DESKFLOW_GUI_HOOK_SETTINGS DESKFLOW_GUI_HOOK_SETTINGS
#endif #endif
adjustSize();
qApp->processEvents();
setFixedHeight(height());
setWindowFlags((windowFlags() | Qt::CustomizeWindowHint) & ~Qt::WindowMinMaxButtonsHint);
} }
// //

86
src/gui/src/dialogs/SettingsDialog.ui
View file

@ -7,19 +7,19 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>550</width> <width>550</width>
<height>615</height> <height>625</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Preferences</string> <string>Preferences</string>
</property> </property>
<property name="modal">
<bool>true</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7"> <layout class="QVBoxLayout" name="verticalLayout_7">
<property name="spacing">
<number>20</number>
</property>
<item> <item>
<widget class="QTabWidget" name="m_pTabWidget"> <widget class="QTabWidget" name="m_pTabWidget">
<property name="tabPosition"> <property name="tabPosition">
@ -29,12 +29,27 @@
<number>0</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="m_pTabRegular"> <widget class="QWidget" name="m_pTabRegular">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<attribute name="title"> <attribute name="title">
<string>&amp;Regular</string> <string>&amp;Regular</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing">
<number>15</number>
</property>
<item> <item>
<widget class="QGroupBox" name="m_pGroupBasics"> <widget class="QGroupBox" name="m_pGroupBasics">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title"> <property name="title">
<string>Basics</string> <string>Basics</string>
</property> </property>
@ -114,6 +129,12 @@
</item> </item>
<item> <item>
<widget class="QGroupBox" name="m_pGroupApp"> <widget class="QGroupBox" name="m_pGroupApp">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title"> <property name="title">
<string>App</string> <string>App</string>
</property> </property>
@ -144,6 +165,12 @@
</item> </item>
<item> <item>
<widget class="QGroupBox" name="m_pGroupSecurity"> <widget class="QGroupBox" name="m_pGroupSecurity">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title"> <property name="title">
<string>Security</string> <string>Security</string>
</property> </property>
@ -314,12 +341,27 @@
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="m_pTabAdvanced"> <widget class="QWidget" name="m_pTabAdvanced">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<attribute name="title"> <attribute name="title">
<string>&amp;Advanced</string> <string>&amp;Advanced</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout_6"> <layout class="QVBoxLayout" name="verticalLayout_6">
<property name="spacing">
<number>15</number>
</property>
<item> <item>
<widget class="QGroupBox" name="m_pGroupNetworking"> <widget class="QGroupBox" name="m_pGroupNetworking">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title"> <property name="title">
<string>Networking</string> <string>Networking</string>
</property> </property>
@ -395,6 +437,12 @@
</item> </item>
<item> <item>
<widget class="QGroupBox" name="m_pGroupLogs"> <widget class="QGroupBox" name="m_pGroupLogs">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title"> <property name="title">
<string>Logs</string> <string>Logs</string>
</property> </property>
@ -545,7 +593,7 @@
<item> <item>
<widget class="QGroupBox" name="m_pGroupService"> <widget class="QGroupBox" name="m_pGroupService">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding"> <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -647,6 +695,12 @@
</item> </item>
<item> <item>
<widget class="QGroupBox" name="m_pGroupScope"> <widget class="QGroupBox" name="m_pGroupScope">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title"> <property name="title">
<string>Use settings profile from</string> <string>Use settings profile from</string>
</property> </property>
@ -678,22 +732,6 @@
</widget> </widget>
</widget> </widget>
</item> </item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item> <item>
<widget class="QDialogButtonBox" name="m_pButtonBox"> <widget class="QDialogButtonBox" name="m_pButtonBox">
<property name="orientation"> <property name="orientation">