From 4147409762a27abf1c08eee35d66466d6bd13362 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Mon, 31 Oct 2016 18:56:55 +0100
Subject: [PATCH] Fixed: Layout of some interfaces in Ryzom Configuration

---
 .../ui/client_config_dialog.ui                |   9 +-
 .../ui/display_settings_details_widget.ui     | 243 +++++-------------
 .../ui/display_settings_widget.ui             |  15 +-
 .../ui/sound_settings_widget.ui               |  28 +-
 .../ui/sys_info_opengl_widget.ui              |  15 +-
 5 files changed, 94 insertions(+), 216 deletions(-)

diff --git a/code/ryzom/tools/client/client_config_qt/ui/client_config_dialog.ui b/code/ryzom/tools/client/client_config_qt/ui/client_config_dialog.ui
index 03f4234a6..177c9a143 100644
--- a/code/ryzom/tools/client/client_config_qt/ui/client_config_dialog.ui
+++ b/code/ryzom/tools/client/client_config_qt/ui/client_config_dialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>941</width>
-    <height>567</height>
+    <height>558</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -31,7 +31,7 @@
         <string/>
        </property>
        <property name="pixmap">
-        <pixmap resource="resources.qrc">:/resources/left_bitmap_0.png</pixmap>
+        <pixmap resource="../resources/resources.qrc">:/resources/left_bitmap_0.png</pixmap>
        </property>
       </widget>
      </item>
@@ -51,7 +51,7 @@
     </layout>
    </item>
    <item>
-    <layout class="QVBoxLayout" name="verticalLayout_3">
+    <layout class="QVBoxLayout" name="verticalLayout_3" stretch="0,1">
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout_3">
        <item>
@@ -60,7 +60,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="resources.qrc">:/resources/general_icon.png</pixmap>
+          <pixmap resource="../resources/resources.qrc">:/resources/general_icon.png</pixmap>
          </property>
         </widget>
        </item>
@@ -269,6 +269,7 @@
   </layout>
  </widget>
  <resources>
+  <include location="../resources/resources.qrc"/>
   <include location="resources.qrc"/>
  </resources>
  <connections/>
diff --git a/code/ryzom/tools/client/client_config_qt/ui/display_settings_details_widget.ui b/code/ryzom/tools/client/client_config_qt/ui/display_settings_details_widget.ui
index 9a3e3052f..99babbebc 100644
--- a/code/ryzom/tools/client/client_config_qt/ui/display_settings_details_widget.ui
+++ b/code/ryzom/tools/client/client_config_qt/ui/display_settings_details_widget.ui
@@ -6,46 +6,29 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>391</width>
-    <height>429</height>
+    <width>530</width>
+    <height>573</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Display details</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_9">
+  <layout class="QVBoxLayout" name="verticalLayout_5">
    <item>
-    <widget class="QGroupBox" name="groupBox">
+    <widget class="QGroupBox" name="landscapeGroupBox">
      <property name="title">
       <string>Landscape</string>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-       <layout class="QVBoxLayout" name="verticalLayout">
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout">
-          <item>
-           <widget class="QLabel" name="label">
-            <property name="text">
-             <string>Level of detail</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <spacer name="horizontalSpacer">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>98</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </item>
+       <widget class="QLabel" name="landscapeLabel">
+        <property name="text">
+         <string>Level of detail</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="landscapeHorizontalLayout" stretch="1,0">
         <item>
          <widget class="QSlider" name="landscapeSlider">
           <property name="sizePolicy">
@@ -65,25 +48,8 @@
           </property>
          </widget>
         </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QVBoxLayout" name="verticalLayout_5">
         <item>
-         <spacer name="horizontalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>78</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QLabel" name="landscapeLabel">
+         <widget class="QLabel" name="landscapeValLabel">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
             <horstretch>0</horstretch>
@@ -101,37 +67,20 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox_2">
+    <widget class="QGroupBox" name="charactersGroupBox">
      <property name="title">
       <string>Characters</string>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_6">
+     <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
-       <layout class="QVBoxLayout" name="verticalLayout_2">
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_3">
-          <item>
-           <widget class="QLabel" name="label_3">
-            <property name="text">
-             <string>Level of detail</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <spacer name="horizontalSpacer_3">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>98</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </item>
+       <widget class="QLabel" name="charactersLabel">
+        <property name="text">
+         <string>Level of detail</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="charactersHorizontalLayout" stretch="1,0">
         <item>
          <widget class="QSlider" name="charactersSlider">
           <property name="sizePolicy">
@@ -151,25 +100,8 @@
           </property>
          </widget>
         </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QVBoxLayout" name="verticalLayout_6">
         <item>
-         <spacer name="horizontalSpacer_6">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>78</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QLabel" name="characterLabel">
+         <widget class="QLabel" name="characterValLabel">
           <property name="text">
            <string>Low</string>
           </property>
@@ -181,37 +113,20 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox_3">
+    <widget class="QGroupBox" name="fxGroupBox">
      <property name="title">
       <string>FX</string>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_7">
+     <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
-       <layout class="QVBoxLayout" name="verticalLayout_3">
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_4">
-          <item>
-           <widget class="QLabel" name="label_5">
-            <property name="text">
-             <string>Level of detail</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <spacer name="horizontalSpacer_4">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>98</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </item>
+       <widget class="QLabel" name="fxLabel">
+        <property name="text">
+         <string>Level of detail</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="fxHorizontalLayout" stretch="1,0">
         <item>
          <widget class="QSlider" name="fxSlider">
           <property name="sizePolicy">
@@ -231,25 +146,8 @@
           </property>
          </widget>
         </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QVBoxLayout" name="verticalLayout_7">
         <item>
-         <spacer name="horizontalSpacer_7">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>78</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QLabel" name="fxLabel">
+         <widget class="QLabel" name="fxValLabel">
           <property name="text">
            <string>Low</string>
           </property>
@@ -261,37 +159,20 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox_4">
+    <widget class="QGroupBox" name="texturesGroupBox">
      <property name="title">
       <string>Textures</string>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_8">
+     <layout class="QVBoxLayout" name="verticalLayout_4">
       <item>
-       <layout class="QVBoxLayout" name="verticalLayout_4">
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_5">
-          <item>
-           <widget class="QLabel" name="label_7">
-            <property name="text">
-             <string>Level of detail</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <spacer name="horizontalSpacer_5">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>98</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </item>
+       <widget class="QLabel" name="texturesLabel">
+        <property name="text">
+         <string>Level of detail</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="texturesHorizontalLayout" stretch="1,0">
         <item>
          <widget class="QSlider" name="texturesSlider">
           <property name="sizePolicy">
@@ -311,25 +192,8 @@
           </property>
          </widget>
         </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QVBoxLayout" name="verticalLayout_8">
         <item>
-         <spacer name="horizontalSpacer_8">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>78</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QLabel" name="textureLabel">
+         <widget class="QLabel" name="texturesValLabel">
           <property name="text">
            <string>Low</string>
           </property>
@@ -340,6 +204,19 @@
      </layout>
     </widget>
    </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>224</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/code/ryzom/tools/client/client_config_qt/ui/display_settings_widget.ui b/code/ryzom/tools/client/client_config_qt/ui/display_settings_widget.ui
index f5b5c2e48..a17beac88 100644
--- a/code/ryzom/tools/client/client_config_qt/ui/display_settings_widget.ui
+++ b/code/ryzom/tools/client/client_config_qt/ui/display_settings_widget.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>391</width>
-    <height>388</height>
+    <height>467</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -135,6 +135,19 @@
      </layout>
     </widget>
    </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/code/ryzom/tools/client/client_config_qt/ui/sound_settings_widget.ui b/code/ryzom/tools/client/client_config_qt/ui/sound_settings_widget.ui
index 37a9b0b92..35ec96b89 100644
--- a/code/ryzom/tools/client/client_config_qt/ui/sound_settings_widget.ui
+++ b/code/ryzom/tools/client/client_config_qt/ui/sound_settings_widget.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>294</width>
-    <height>317</height>
+    <height>415</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -125,22 +125,22 @@
         </item>
        </layout>
       </item>
-      <item>
-       <spacer name="verticalSpacer">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>40</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
      </layout>
     </widget>
    </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/code/ryzom/tools/client/client_config_qt/ui/sys_info_opengl_widget.ui b/code/ryzom/tools/client/client_config_qt/ui/sys_info_opengl_widget.ui
index b533772cc..cbef5ee0b 100644
--- a/code/ryzom/tools/client/client_config_qt/ui/sys_info_opengl_widget.ui
+++ b/code/ryzom/tools/client/client_config_qt/ui/sys_info_opengl_widget.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>391</width>
-    <height>429</height>
+    <height>463</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -129,19 +129,6 @@
         </item>
        </layout>
       </item>
-      <item>
-       <spacer name="verticalSpacer">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>99</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
       <item>
        <widget class="QLabel" name="label_7">
         <property name="text">