From 7c5ae46b28ac8c70486553c58b82b492b7055580 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 6 Oct 2015 18:33:09 +0200
Subject: [printergui] Add paper size option

---
 src/maingui/printergui.ui | 104 +++++++++++++++++++++++++++++-----------------
 1 file changed, 65 insertions(+), 39 deletions(-)

(limited to 'src/maingui/printergui.ui')

diff --git a/src/maingui/printergui.ui b/src/maingui/printergui.ui
index dd13d0a..0b4849f 100644
--- a/src/maingui/printergui.ui
+++ b/src/maingui/printergui.ui
@@ -46,42 +46,6 @@
         <item row="3" column="1">
          <widget class="QComboBox" name="comboBoxSides"/>
         </item>
-        <item row="3" column="3">
-         <layout class="QHBoxLayout" name="horizontalLayoutButtons">
-          <item>
-           <widget class="QPushButton" name="buttonCancel">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="autoFillBackground">
-             <bool>false</bool>
-            </property>
-            <property name="text">
-             <string>Abbrechen</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QPushButton" name="buttonPrint">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>Drucken</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
         <item row="2" column="3">
          <layout class="QHBoxLayout" name="horizontalLayoutCopies">
           <item>
@@ -121,7 +85,7 @@
              </size>
             </property>
             <property name="inputMask">
-             <string>00</string>
+             <string>00; </string>
             </property>
             <property name="text">
              <string>1</string>
@@ -165,7 +129,7 @@
         <item row="2" column="0">
          <widget class="QLabel" name="label_color">
           <property name="text">
-           <string>Farbe:</string>
+           <string>Farbe</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -175,13 +139,75 @@
         <item row="3" column="0">
          <widget class="QLabel" name="label_duplex">
           <property name="text">
-           <string>Duplex:</string>
+           <string>Duplex</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
          </widget>
         </item>
+        <item row="4" column="0">
+         <widget class="QLabel" name="lblPaperSize">
+          <property name="text">
+           <string>Papierformat</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="1">
+         <widget class="QComboBox" name="cboPaperSize"/>
+        </item>
+        <item row="4" column="2">
+         <spacer name="horizontalSpacer_3">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="4" column="3">
+         <layout class="QHBoxLayout" name="horizontalLayoutButtons">
+          <item>
+           <widget class="QPushButton" name="buttonCancel">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="autoFillBackground">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string>Abbrechen</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="buttonPrint">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>Drucken</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
        </layout>
       </item>
      </layout>
-- 
cgit v1.2.3-55-g7522