From kde-commits  Tue Jun 11 13:16:27 2013
From: Anne-Marie Mahfouf <annma () kde ! org>
Date: Tue, 11 Jun 2013 13:16:27 +0000
To: kde-commits
Subject: [kdelibs/frameworks] kdeui/dialogs: Port kcupsoptionspageswidget.ui to QGroupBox
Message-Id: <20130611131627.24FA9A605A () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=137095659809753

Git commit 9cc34ffb60c71f49dec8c7eb54d8d81db8322989 by Anne-Marie Mahfouf.
Committed on 11/06/2013 at 14:58.
Pushed by annma into branch 'frameworks'.

Port kcupsoptionspageswidget.ui to QGroupBox

M  +123  -128  kdeui/dialogs/kcupsoptionspageswidget.ui

http://commits.kde.org/kdelibs/9cc34ffb60c71f49dec8c7eb54d8d81db8322989

diff --git a/kdeui/dialogs/kcupsoptionspageswidget.ui b/kdeui/dialogs/kcups=
optionspageswidget.ui
index d2494c7..a68865d 100644
--- a/kdeui/dialogs/kcupsoptionspageswidget.ui
+++ b/kdeui/dialogs/kcupsoptionspageswidget.ui
@@ -1,7 +1,8 @@
-<ui version=3D"4.0" >
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<ui version=3D"4.0">
  <class>KCupsOptionsPagesWidget</class>
- <widget class=3D"QWidget" name=3D"KCupsOptionsPagesWidget" >
-  <property name=3D"geometry" >
+ <widget class=3D"QWidget" name=3D"KCupsOptionsPagesWidget">
+  <property name=3D"geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,73 +10,45 @@
     <height>319</height>
    </rect>
   </property>
-  <property name=3D"windowTitle" >
+  <property name=3D"windowTitle">
    <string>Pages</string>
   </property>
-  <layout class=3D"QGridLayout" name=3D"gridLayout_7" >
-   <item rowspan=3D"2" row=3D"0" column=3D"0" >
-    <widget class=3D"KButtonGroup" name=3D"pagesPerSheetButtonGroup" >
-     <property name=3D"title" >
-      <string>Pages Per Sheet</string>
+  <layout class=3D"QGridLayout" name=3D"gridLayout_7">
+   <item row=3D"0" column=3D"1">
+    <widget class=3D"QGroupBox" name=3D"bannerPagesGroupBox">
+     <property name=3D"title">
+      <string>Banner Pages</string>
      </property>
-     <layout class=3D"QGridLayout" name=3D"gridLayout" >
-      <item row=3D"0" column=3D"0" >
-       <widget class=3D"QRadioButton" name=3D"oneUpRadioButton" >
-        <property name=3D"text" >
-         <string>1</string>
-        </property>
-        <property name=3D"checked" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row=3D"0" column=3D"1" >
-       <widget class=3D"QRadioButton" name=3D"sixUpRadioButton" >
-        <property name=3D"text" >
-         <string>6</string>
-        </property>
-       </widget>
-      </item>
-      <item row=3D"1" column=3D"0" >
-       <widget class=3D"QRadioButton" name=3D"twoUpRadioButton" >
-        <property name=3D"text" >
-         <string>2</string>
+     <layout class=3D"QGridLayout" name=3D"gridLayout_3">
+      <item row=3D"0" column=3D"0">
+       <widget class=3D"QLabel" name=3D"startBannerLabel">
+        <property name=3D"text">
+         <string comment=3D"Banner page at start">Start</string>
         </property>
        </widget>
       </item>
-      <item row=3D"1" column=3D"1" >
-       <widget class=3D"QRadioButton" name=3D"nineUpRadioButton" >
-        <property name=3D"text" >
-         <string>9</string>
-        </property>
-       </widget>
+      <item row=3D"0" column=3D"1">
+       <widget class=3D"KComboBox" name=3D"startBannerPageCombo"/>
       </item>
-      <item row=3D"2" column=3D"0" >
-       <widget class=3D"QRadioButton" name=3D"fourUpRadioButton" >
-        <property name=3D"text" >
-         <string>4</string>
-        </property>
-       </widget>
-      </item>
-      <item row=3D"2" column=3D"1" >
-       <widget class=3D"QRadioButton" name=3D"sixteenUpRadioButton" >
-        <property name=3D"text" >
-         <string>16</string>
+      <item row=3D"1" column=3D"0">
+       <widget class=3D"QLabel" name=3D"endBannerLabel">
+        <property name=3D"text">
+         <string comment=3D"Banner page at end">End</string>
         </property>
        </widget>
       </item>
-      <item row=3D"3" column=3D"0" colspan=3D"2" >
-       <widget class=3D"KComboBox" name=3D"pagesPerSheetLayoutCombo" />
+      <item row=3D"1" column=3D"1">
+       <widget class=3D"KComboBox" name=3D"endBannerPageCombo"/>
       </item>
-      <item row=3D"4" column=3D"0" colspan=3D"2" >
-       <spacer name=3D"verticalSpacer_2" >
-        <property name=3D"orientation" >
+      <item row=3D"2" column=3D"0" colspan=3D"2">
+       <spacer name=3D"verticalSpacer">
+        <property name=3D"orientation">
          <enum>Qt::Vertical</enum>
         </property>
-        <property name=3D"sizeHint" stdset=3D"0" >
+        <property name=3D"sizeHint" stdset=3D"0">
          <size>
           <width>20</width>
-          <height>25</height>
+          <height>33</height>
          </size>
         </property>
        </spacer>
@@ -83,41 +56,24 @@
      </layout>
     </widget>
    </item>
-   <item row=3D"0" column=3D"1" >
-    <widget class=3D"QGroupBox" name=3D"bannerPagesGroupBox" >
-     <property name=3D"title" >
-      <string>Banner Pages</string>
+   <item row=3D"1" column=3D"1">
+    <widget class=3D"QGroupBox" name=3D"pageLabelGroupBox">
+     <property name=3D"title">
+      <string>Page Label</string>
      </property>
-     <layout class=3D"QGridLayout" name=3D"gridLayout_3" >
-      <item row=3D"0" column=3D"0" >
-       <widget class=3D"QLabel" name=3D"startBannerLabel" >
-        <property name=3D"text" >
-         <string comment=3D"Banner page at start">Start</string>
-        </property>
-       </widget>
+     <layout class=3D"QGridLayout" name=3D"gridLayout_6">
+      <item row=3D"0" column=3D"0">
+       <widget class=3D"KLineEdit" name=3D"pageLabelLineEdit"/>
       </item>
-      <item row=3D"0" column=3D"1" >
-       <widget class=3D"KComboBox" name=3D"startBannerPageCombo" />
-      </item>
-      <item row=3D"1" column=3D"0" >
-       <widget class=3D"QLabel" name=3D"endBannerLabel" >
-        <property name=3D"text" >
-         <string comment=3D"Banner page at end">End</string>
-        </property>
-       </widget>
-      </item>
-      <item row=3D"1" column=3D"1" >
-       <widget class=3D"KComboBox" name=3D"endBannerPageCombo" />
-      </item>
-      <item row=3D"2" column=3D"0" colspan=3D"2" >
-       <spacer name=3D"verticalSpacer" >
-        <property name=3D"orientation" >
+      <item row=3D"1" column=3D"0">
+       <spacer name=3D"verticalSpacer_5">
+        <property name=3D"orientation">
          <enum>Qt::Vertical</enum>
         </property>
-        <property name=3D"sizeHint" stdset=3D"0" >
+        <property name=3D"sizeHint" stdset=3D"0">
          <size>
           <width>20</width>
-          <height>33</height>
+          <height>11</height>
          </size>
         </property>
        </spacer>
@@ -125,24 +81,24 @@
      </layout>
     </widget>
    </item>
-   <item row=3D"1" column=3D"1" >
-    <widget class=3D"QGroupBox" name=3D"pageLabelGroupBox" >
-     <property name=3D"title" >
-      <string>Page Label</string>
+   <item row=3D"2" column=3D"0">
+    <widget class=3D"QGroupBox" name=3D"groupBox">
+     <property name=3D"title">
+      <string>Page Border</string>
      </property>
-     <layout class=3D"QGridLayout" name=3D"gridLayout_6" >
-      <item row=3D"0" column=3D"0" >
-       <widget class=3D"KLineEdit" name=3D"pageLabelLineEdit" />
+     <layout class=3D"QGridLayout" name=3D"gridLayout_5">
+      <item row=3D"0" column=3D"0">
+       <widget class=3D"KComboBox" name=3D"pageBorderCombo"/>
       </item>
-      <item row=3D"1" column=3D"0" >
-       <spacer name=3D"verticalSpacer_5" >
-        <property name=3D"orientation" >
+      <item row=3D"1" column=3D"0">
+       <spacer name=3D"verticalSpacer_4">
+        <property name=3D"orientation">
          <enum>Qt::Vertical</enum>
         </property>
-        <property name=3D"sizeHint" stdset=3D"0" >
+        <property name=3D"sizeHint" stdset=3D"0">
          <size>
           <width>20</width>
-          <height>11</height>
+          <height>2</height>
          </size>
         </property>
        </spacer>
@@ -150,24 +106,28 @@
      </layout>
     </widget>
    </item>
-   <item row=3D"2" column=3D"0" >
-    <widget class=3D"QGroupBox" name=3D"groupBox" >
-     <property name=3D"title" >
-      <string>Page Border</string>
+   <item row=3D"2" column=3D"1">
+    <widget class=3D"QGroupBox" name=3D"mirrorPagesGroupBox">
+     <property name=3D"title">
+      <string>Mirror Pages</string>
      </property>
-     <layout class=3D"QGridLayout" name=3D"gridLayout_5" >
-      <item row=3D"0" column=3D"0" >
-       <widget class=3D"KComboBox" name=3D"pageBorderCombo" />
+     <layout class=3D"QGridLayout" name=3D"gridLayout_4">
+      <item row=3D"0" column=3D"0">
+       <widget class=3D"QCheckBox" name=3D"mirrorPagesCheckBox">
+        <property name=3D"text">
+         <string>Mirror pages along vertical axis</string>
+        </property>
+       </widget>
       </item>
-      <item row=3D"1" column=3D"0" >
-       <spacer name=3D"verticalSpacer_4" >
-        <property name=3D"orientation" >
+      <item row=3D"1" column=3D"0">
+       <spacer name=3D"verticalSpacer_3">
+        <property name=3D"orientation">
          <enum>Qt::Vertical</enum>
         </property>
-        <property name=3D"sizeHint" stdset=3D"0" >
+        <property name=3D"sizeHint" stdset=3D"0">
          <size>
           <width>20</width>
-          <height>2</height>
+          <height>14</height>
          </size>
         </property>
        </spacer>
@@ -175,28 +135,69 @@
      </layout>
     </widget>
    </item>
-   <item row=3D"2" column=3D"1" >
-    <widget class=3D"QGroupBox" name=3D"mirrorPagesGroupBox" >
-     <property name=3D"title" >
-      <string>Mirror Pages</string>
+   <item row=3D"0" column=3D"0" rowspan=3D"2">
+    <widget class=3D"QGroupBox" name=3D"pagesPerSheetButtonGroup">
+     <property name=3D"title">
+      <string>Pages Per Sheet</string>
      </property>
-     <layout class=3D"QGridLayout" name=3D"gridLayout_4" >
-      <item row=3D"0" column=3D"0" >
-       <widget class=3D"QCheckBox" name=3D"mirrorPagesCheckBox" >
-        <property name=3D"text" >
-         <string>Mirror pages along vertical axis</string>
+     <layout class=3D"QGridLayout" name=3D"gridLayout">
+      <item row=3D"0" column=3D"0">
+       <widget class=3D"QRadioButton" name=3D"oneUpRadioButton">
+        <property name=3D"text">
+         <string>&amp;1</string>
+        </property>
+        <property name=3D"checked">
+         <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row=3D"1" column=3D"0" >
-       <spacer name=3D"verticalSpacer_3" >
-        <property name=3D"orientation" >
+      <item row=3D"0" column=3D"1">
+       <widget class=3D"QRadioButton" name=3D"sixUpRadioButton">
+        <property name=3D"text">
+         <string>&amp;6</string>
+        </property>
+       </widget>
+      </item>
+      <item row=3D"1" column=3D"0">
+       <widget class=3D"QRadioButton" name=3D"twoUpRadioButton">
+        <property name=3D"text">
+         <string>&amp;2</string>
+        </property>
+       </widget>
+      </item>
+      <item row=3D"1" column=3D"1">
+       <widget class=3D"QRadioButton" name=3D"nineUpRadioButton">
+        <property name=3D"text">
+         <string>&amp;9</string>
+        </property>
+       </widget>
+      </item>
+      <item row=3D"2" column=3D"0">
+       <widget class=3D"QRadioButton" name=3D"fourUpRadioButton">
+        <property name=3D"text">
+         <string>&amp;4</string>
+        </property>
+       </widget>
+      </item>
+      <item row=3D"2" column=3D"1">
+       <widget class=3D"QRadioButton" name=3D"sixteenUpRadioButton">
+        <property name=3D"text">
+         <string>16</string>
+        </property>
+       </widget>
+      </item>
+      <item row=3D"3" column=3D"0" colspan=3D"2">
+       <widget class=3D"KComboBox" name=3D"pagesPerSheetLayoutCombo"/>
+      </item>
+      <item row=3D"4" column=3D"0" colspan=3D"2">
+       <spacer name=3D"verticalSpacer_2">
+        <property name=3D"orientation">
          <enum>Qt::Vertical</enum>
         </property>
-        <property name=3D"sizeHint" stdset=3D"0" >
+        <property name=3D"sizeHint" stdset=3D"0">
          <size>
           <width>20</width>
-          <height>14</height>
+          <height>25</height>
          </size>
         </property>
        </spacer>
@@ -208,12 +209,6 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>KButtonGroup</class>
-   <extends>QGroupBox</extends>
-   <header>kbuttongroup.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
    <header>kcombobox.h</header>