From 676989e51a78ba08ed068e3184cfe1bd796ac4c1 Mon Sep 17 00:00:00 2001
From: Manuel Schneider
Date: Wed, 3 Dec 2014 17:44:04 +0100
Subject: Make color and duplex options whitelisted. [NEEDS TESTING]

---
 src/maingui/printergui.ui | 77 +++++++++++++++++++++--------------------------
 1 file changed, 35 insertions(+), 42 deletions(-)

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

diff --git a/src/maingui/printergui.ui b/src/maingui/printergui.ui
index 8fafd23..dd13d0a 100644
--- a/src/maingui/printergui.ui
+++ b/src/maingui/printergui.ui
@@ -40,46 +40,13 @@
       </item>
       <item>
        <layout class="QGridLayout" name="gridLayout_2">
-        <item row="2" column="0">
-         <widget class="QComboBox" name="comboBoxColor">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <item>
-           <property name="text">
-            <string>Graustufen</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>Farbe</string>
-           </property>
-          </item>
-         </widget>
+        <item row="2" column="1">
+         <widget class="QComboBox" name="comboBoxColor"/>
         </item>
-        <item row="3" column="0">
-         <widget class="QComboBox" name="comboBoxSides">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <item>
-           <property name="text">
-            <string>Simplex</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>Duplex, Long Edge</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>Duplex, Short Edge</string>
-           </property>
-          </item>
-         </widget>
+        <item row="3" column="1">
+         <widget class="QComboBox" name="comboBoxSides"/>
         </item>
-        <item row="3" column="2">
+        <item row="3" column="3">
          <layout class="QHBoxLayout" name="horizontalLayoutButtons">
           <item>
            <widget class="QPushButton" name="buttonCancel">
@@ -115,7 +82,7 @@
           </item>
          </layout>
         </item>
-        <item row="2" column="2">
+        <item row="2" column="3">
          <layout class="QHBoxLayout" name="horizontalLayoutCopies">
           <item>
            <widget class="QLabel" name="labelCopies">
@@ -141,6 +108,12 @@
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>26</height>
+             </size>
+            </property>
             <property name="maximumSize">
              <size>
               <width>40</width>
@@ -148,7 +121,7 @@
              </size>
             </property>
             <property name="inputMask">
-             <string>00; </string>
+             <string>00</string>
             </property>
             <property name="text">
              <string>1</string>
@@ -163,7 +136,7 @@
           </item>
          </layout>
         </item>
-        <item row="2" column="1">
+        <item row="2" column="2">
          <spacer name="horizontalSpacer">
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
@@ -176,7 +149,7 @@
           </property>
          </spacer>
         </item>
-        <item row="3" column="1">
+        <item row="3" column="2">
          <spacer name="horizontalSpacer_2">
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
@@ -189,6 +162,26 @@
           </property>
          </spacer>
         </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="label_color">
+          <property name="text">
+           <string>Farbe:</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0">
+         <widget class="QLabel" name="label_duplex">
+          <property name="text">
+           <string>Duplex:</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
        </layout>
       </item>
      </layout>
-- 
cgit v1.2.3-55-g7522