[Marble-commits] branches/KDE/4.3/kdeedu/marble/src/lib

[Torsten Rahn]

SVN commit 995569 by rahn:

- Backporting 995568



 M  +71 -55    MarbleCacheSettingsWidget.ui  


--- branches/KDE/4.3/kdeedu/marble/src/lib/MarbleCacheSettingsWidget.ui #995568:995569
@@ -241,69 +241,53 @@
        </spacer>
       </item>
       <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
-        <item>
+       <layout class="QGridLayout" name="proxyGridLayout">
+        <item row="0" column="1">
          <widget class="QLabel" name="label_proxyType">
           <property name="text">
            <string>Proxy type:</string>
           </property>
          </widget>
         </item>
-        <item>
-         <widget class="QComboBox" name="kcfg_proxyType">
+        <item row="0" column="2">
+         <layout class="QHBoxLayout" name="horizontalLayout_2">
           <item>
-           <property name="text">
-            <string>Http</string>
-           </property>
+           <widget class="QComboBox" name="kcfg_proxyType">
+            <item>
+             <property name="text">
+              <string>Http</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Socks5</string>
+             </property>
+            </item>
+           </widget>
           </item>
           <item>
-           <property name="text">
-            <string>Socks5</string>
-           </property>
+           <spacer name="horizontalSpacer">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
           </item>
-         </widget>
+         </layout>
         </item>
-        <item>
-         <spacer name="horizontalSpacer">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
+        <item row="2" column="0" colspan="3">
+         <widget class="QCheckBox" name="kcfg_proxyAuth">
+          <property name="text">
+           <string>Requires authentication</string>
           </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
+         </widget>
         </item>
-       </layout>
-      </item>
-      <item>
-       <spacer name="verticalSpacer_3">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>10</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="kcfg_proxyAuth">
-        <property name="text">
-         <string>Requires authentication</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <layout class="QGridLayout" name="gridLayout">
-        <item row="0" column="0">
+        <item row="3" column="0">
          <spacer name="horizontalSpacer_2">
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
@@ -319,7 +303,7 @@
           </property>
          </spacer>
         </item>
-        <item row="0" column="1">
+        <item row="3" column="1">
          <widget class="QLabel" name="label_username">
           <property name="text">
            <string>U&amp;sername:</string>
@@ -329,14 +313,14 @@
           </property>
          </widget>
         </item>
-        <item row="0" column="2">
+        <item row="3" column="2">
          <widget class="QLineEdit" name="kcfg_proxyUser">
           <property name="enabled">
            <bool>false</bool>
           </property>
          </widget>
         </item>
-        <item row="1" column="0">
+        <item row="4" column="0">
          <spacer name="horizontalSpacer_3">
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
@@ -352,7 +336,7 @@
           </property>
          </spacer>
         </item>
-        <item row="1" column="1">
+        <item row="4" column="1">
          <widget class="QLabel" name="label_password">
           <property name="text">
            <string>&amp;Password:</string>
@@ -362,13 +346,45 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="2">
+        <item row="4" column="2">
          <widget class="QLineEdit" name="kcfg_proxyPass">
           <property name="enabled">
            <bool>false</bool>
           </property>
          </widget>
         </item>
+        <item row="1" column="2">
+         <spacer name="verticalSpacer_3">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Fixed</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>10</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="0" column="0">
+         <spacer name="horizontalSpacer_4">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Fixed</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
        </layout>
       </item>
      </layout>