remove some frames in group of settings to simplify layouts

Signed-off-by: Matthieu Gallien <[email protected]>
nextcloud · Aug 28, 2024 · 9fabb12 · 9fabb12
1 parent 5b08c7a
commit 9fabb12
Show file tree

Hide file tree

Showing 3 changed files with 299 additions and 277 deletions.
diff --git a/src/gui/generalsettings.ui b/src/gui/generalsettings.ui
@@ -19,6 +19,9 @@
      <property name="title">
       <string>Advanced</string>
      </property>
+     <property name="flat">
+      <bool>true</bool>
+     </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
        <layout class="QVBoxLayout" name="verticalLayout_4">
@@ -40,10 +43,10 @@
           <item>
            <spacer name="horizontalSpacer">
             <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+             <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
+             <enum>QSizePolicy::Policy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -77,10 +80,10 @@
           <item>
            <spacer name="horizontalSpacer_3">
             <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+             <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
+             <enum>QSizePolicy::Policy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -104,10 +107,10 @@
           <item>
            <spacer name="horizontalSpacer_5">
             <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+             <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
+             <enum>QSizePolicy::Policy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -197,7 +200,7 @@
         <item>
          <spacer name="horizontalSpacer_4">
           <property name="orientation">
-           <enum>Qt::Horizontal</enum>
+           <enum>Qt::Orientation::Horizontal</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -217,6 +220,9 @@
      <property name="title">
       <string>Info</string>
      </property>
+     <property name="flat">
+      <bool>true</bool>
+     </property>
      <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
        <widget class="QLabel" name="infoAndUpdatesLabel">
@@ -321,7 +327,7 @@
            <item>
             <spacer name="horizontalSpacer_6">
              <property name="orientation">
-              <enum>Qt::Horizontal</enum>
+              <enum>Qt::Orientation::Horizontal</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
@@ -355,7 +361,7 @@
         <item>
          <spacer name="horizontalSpacer_2">
           <property name="orientation">
-           <enum>Qt::Horizontal</enum>
+           <enum>Qt::Orientation::Horizontal</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -373,7 +379,7 @@
    <item row="4" column="0">
     <spacer name="verticalSpacer">
      <property name="orientation">
-      <enum>Qt::Vertical</enum>
+      <enum>Qt::Orientation::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
@@ -388,6 +394,9 @@
      <property name="title">
       <string>General Settings</string>
      </property>
+     <property name="flat">
+      <bool>true</bool>
+     </property>
      <layout class="QGridLayout" name="gridLayout_2">
       <item row="1" column="0">
        <widget class="QCheckBox" name="monoIconsCheckBox">

diff --git a/src/gui/networksettings.cpp b/src/gui/networksettings.cpp
@@ -38,7 +38,7 @@ NetworkSettings::NetworkSettings(const AccountPtr &account, QWidget *parent)
 
     _ui->manualSettings->setVisible(_ui->manualProxyRadioButton->isChecked());
 
-    _ui->proxyGroupBox->setVisible(!Theme::instance()->doNotUseProxy());
+    _ui->proxyFrame->setVisible(!Theme::instance()->doNotUseProxy());
 
     if (!account) {
         _ui->globalProxySettingsRadioButton->setVisible(false);
@@ -120,7 +120,7 @@ void NetworkSettings::loadProxySettings()
 {
     if (Theme::instance()->forceSystemNetworkProxy()) {
         _ui->systemProxyRadioButton->setChecked(true);
-        _ui->proxyGroupBox->setEnabled(false);
+        _ui->proxyFrame->setEnabled(false);
         return;
     }