From a83a999c726a9b2d7255a64946edc49b4bbcec52 Mon Sep 17 00:00:00 2001
From: Richard Heck <rgheck@comcast.net>
Date: Tue, 5 Jun 2007 15:19:13 +0000
Subject: [PATCH] Updates to printer preference dialog.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18678 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/ui/PrefPrinterUi.ui | 440 +++++++++++++++-----------
 1 file changed, 248 insertions(+), 192 deletions(-)

diff --git a/src/frontends/qt4/ui/PrefPrinterUi.ui b/src/frontends/qt4/ui/PrefPrinterUi.ui
index 561ec566fe..cef792f206 100644
--- a/src/frontends/qt4/ui/PrefPrinterUi.ui
+++ b/src/frontends/qt4/ui/PrefPrinterUi.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>459</width>
-    <height>472</height>
+    <width>567</width>
+    <height>466</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -19,208 +19,52 @@
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item row="1" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="1" column="0" >
-    <widget class="QCheckBox" name="printerAdaptCB" >
-     <property name="toolTip" >
-      <string>Adjusts dvips output for a particular printer. (Note: dvips must be pre-configured for that printer.)</string>
-     </property>
-     <property name="text" >
-      <string>Use -P&lt;printer> parameter with dvips</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
    <item row="3" column="0" colspan="2" >
     <widget class="QGroupBox" name="GroupBox1" >
      <property name="title" >
-      <string>Command Options</string>
+      <string>Printer Command Options</string>
      </property>
      <layout class="QGridLayout" >
       <property name="margin" >
-       <number>11</number>
+       <number>9</number>
       </property>
       <property name="spacing" >
        <number>6</number>
       </property>
-      <item row="4" column="0" >
-       <widget class="QLabel" name="printerReverseLA" >
-        <property name="text" >
-         <string>Re&amp;verse:</string>
-        </property>
-        <property name="buddy" >
-         <cstring>printerReverseED</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="3" >
-       <widget class="QLineEdit" name="printerCollatedED" />
-      </item>
-      <item row="4" column="1" >
-       <widget class="QLineEdit" name="printerReverseED" />
-      </item>
-      <item row="5" column="0" >
-       <widget class="QLabel" name="printerToPrinterLA" >
-        <property name="text" >
-         <string>To p&amp;rinter:</string>
-        </property>
-        <property name="buddy" >
-         <cstring>printerToPrinterED</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="7" column="2" >
-       <widget class="QLabel" name="printerPaperSizeLA" >
-        <property name="text" >
-         <string>Paper si&amp;ze:</string>
-        </property>
-        <property name="buddy" >
-         <cstring>printerPaperSizeED</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="3" >
-       <widget class="QLineEdit" name="printerOddED" />
-      </item>
-      <item row="7" column="3" >
-       <widget class="QLineEdit" name="printerPaperSizeED" />
-      </item>
-      <item row="4" column="2" >
-       <widget class="QLabel" name="printerToFileLA" >
-        <property name="text" >
-         <string>To &amp;file:</string>
-        </property>
-        <property name="buddy" >
-         <cstring>printerToFileED</cstring>
+      <item row="5" column="1" >
+       <widget class="QLineEdit" name="printerPaperTypeED" >
+        <property name="toolTip" >
+         <string/>
         </property>
        </widget>
       </item>
       <item row="6" column="1" >
-       <widget class="QLineEdit" name="printerExtensionED" />
-      </item>
-      <item row="5" column="3" >
        <widget class="QLineEdit" name="printerExtraED" />
       </item>
-      <item row="7" column="1" >
-       <widget class="QLineEdit" name="printerSpoolCommandED" />
-      </item>
-      <item row="7" column="0" >
-       <widget class="QLabel" name="printerSpoolCommandLA" >
-        <property name="text" >
-         <string>Spool &amp;command:</string>
+      <item row="6" column="2" colspan="2" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
         </property>
-        <property name="buddy" >
-         <cstring>printerSpoolCommandED</cstring>
+        <property name="sizeHint" >
+         <size>
+          <width>231</width>
+          <height>20</height>
+         </size>
         </property>
-       </widget>
+       </spacer>
       </item>
-      <item row="6" column="3" >
-       <widget class="QLineEdit" name="printerSpoolPrefixED" />
-      </item>
-      <item row="3" column="1" >
-       <widget class="QLineEdit" name="printerCopiesED" />
-      </item>
-      <item row="1" column="2" >
-       <widget class="QLabel" name="printerOddLA" >
-        <property name="text" >
-         <string>&amp;Odd pages:</string>
-        </property>
-        <property name="buddy" >
-         <cstring>printerOddED</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="3" >
-       <widget class="QLineEdit" name="printerToFileED" />
-      </item>
-      <item row="8" column="0" >
-       <widget class="QLabel" name="printerPaperTypeLA" >
-        <property name="text" >
-         <string>Paper t&amp;ype:</string>
-        </property>
-        <property name="buddy" >
-         <cstring>printerPaperTypeED</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="8" column="1" >
-       <widget class="QLineEdit" name="printerPaperTypeED" />
-      </item>
-      <item row="5" column="2" >
-       <widget class="QLabel" name="printerExtraLA" >
-        <property name="text" >
-         <string>E&amp;xtra options:</string>
-        </property>
-        <property name="buddy" >
-         <cstring>printerExtraED</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="2" >
-       <widget class="QLabel" name="printerSpoolPrefixLA" >
-        <property name="text" >
-         <string>Spool pref&amp;ix:</string>
-        </property>
-        <property name="buddy" >
-         <cstring>printerSpoolPrefixED</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="1" >
+      <item row="3" column="3" >
        <widget class="QLineEdit" name="printerToPrinterED" />
       </item>
-      <item row="2" column="2" >
-       <widget class="QLabel" name="printerCollatedLA" >
-        <property name="text" >
-         <string>Co&amp;llated:</string>
-        </property>
-        <property name="buddy" >
-         <cstring>printerCollatedED</cstring>
-        </property>
-       </widget>
+      <item row="4" column="3" >
+       <widget class="QLineEdit" name="printerExtensionED" />
       </item>
-      <item row="2" column="1" >
-       <widget class="QLineEdit" name="printerPageRangeED" />
-      </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="printerEvenLA" >
-        <property name="text" >
-         <string>&amp;Even pages:</string>
-        </property>
-        <property name="buddy" >
-         <cstring>printerEvenED</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="0" >
+      <item row="4" column="2" >
        <widget class="QLabel" name="printerExtensionLA" >
+        <property name="toolTip" >
+         <string>Extension to be used when printing to file.</string>
+        </property>
         <property name="text" >
          <string>File ex&amp;tension:</string>
         </property>
@@ -229,10 +73,94 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="3" >
-       <widget class="QLineEdit" name="printerLandscapeED" />
+      <item row="4" column="1" >
+       <widget class="QLineEdit" name="printerToFileED" />
+      </item>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="printerToFileLA" >
+        <property name="toolTip" >
+         <string>Option used to print to a file.</string>
+        </property>
+        <property name="text" >
+         <string>Print to &amp;file:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>printerToFileED</cstring>
+        </property>
+       </widget>
       </item>
       <item row="3" column="2" >
+       <widget class="QLabel" name="printerToPrinterLA" >
+        <property name="toolTip" >
+         <string>Option used to print to non-default printer.</string>
+        </property>
+        <property name="text" >
+         <string>Set p&amp;rinter:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>printerToPrinterED</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="8" column="3" >
+       <widget class="QLineEdit" name="printerSpoolPrefixED" />
+      </item>
+      <item row="8" column="2" >
+       <widget class="QLabel" name="printerSpoolPrefixLA" >
+        <property name="toolTip" >
+         <string>Option used with spool command to set printer.</string>
+        </property>
+        <property name="text" >
+         <string>Spool pr&amp;inter:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>printerSpoolPrefixED</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="8" column="1" >
+       <widget class="QLineEdit" name="printerSpoolCommandED" />
+      </item>
+      <item row="8" column="0" >
+       <widget class="QLabel" name="printerSpoolCommandLA" >
+        <property name="toolTip" >
+         <string>Setting causes printer command to print to file and then use this actually to print.</string>
+        </property>
+        <property name="whatsThis" >
+         <string/>
+        </property>
+        <property name="text" >
+         <string>Spool &amp;command:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>printerSpoolCommandED</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="7" column="0" colspan="4" >
+       <widget class="Line" name="line" >
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="printerReverseLA" >
+        <property name="toolTip" >
+         <string>Option used to reverse page order.</string>
+        </property>
+        <property name="text" >
+         <string>Re&amp;verse pages:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>printerReverseED</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" >
+       <widget class="QLineEdit" name="printerReverseED" />
+      </item>
+      <item row="2" column="2" >
        <widget class="QLabel" name="printerLandscapeLA" >
         <property name="text" >
          <string>Lan&amp;dscape:</string>
@@ -242,20 +170,44 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="1" >
-       <widget class="QLineEdit" name="printerEvenED" />
+      <item row="2" column="3" >
+       <widget class="QLineEdit" name="printerLandscapeED" />
       </item>
-      <item row="3" column="0" >
+      <item row="2" column="0" >
        <widget class="QLabel" name="printerCopiesLA" >
         <property name="text" >
-         <string>Co&amp;pies:</string>
+         <string>Number of Co&amp;pies:</string>
         </property>
         <property name="buddy" >
          <cstring>printerCopiesED</cstring>
         </property>
        </widget>
       </item>
-      <item row="2" column="0" >
+      <item row="2" column="1" >
+       <widget class="QLineEdit" name="printerCopiesED" >
+        <property name="toolTip" >
+         <string>Option used to set number of copies.</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QLineEdit" name="printerPageRangeED" >
+        <property name="toolTip" >
+         <string>Option used to print a range of pages.</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2" >
+       <widget class="QLabel" name="printerCollatedLA" >
+        <property name="text" >
+         <string>Co&amp;llated:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>printerCollatedED</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
        <widget class="QLabel" name="printerPageRangeLA" >
         <property name="text" >
          <string>Pa&amp;ge range:</string>
@@ -265,16 +217,104 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="0" colspan="4" >
-       <widget class="QLabel" name="TextLabel1" >
+      <item row="1" column="3" >
+       <widget class="QLineEdit" name="printerCollatedED" >
+        <property name="toolTip" >
+         <string>Option used to collate multiple copies.</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLabel" name="printerOddLA" >
         <property name="text" >
-         <string>Specify the command option names for your printer command</string>
+         <string>&amp;Odd pages:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>printerOddED</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3" >
+       <widget class="QLineEdit" name="printerOddED" />
+      </item>
+      <item row="0" column="1" >
+       <widget class="QLineEdit" name="printerEvenED" />
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="printerEvenLA" >
+        <property name="text" >
+         <string>&amp;Even pages:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>printerEvenED</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" >
+       <widget class="QLabel" name="printerPaperTypeLA" >
+        <property name="text" >
+         <string>Paper t&amp;ype:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>printerPaperTypeED</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="2" >
+       <widget class="QLabel" name="printerPaperSizeLA" >
+        <property name="text" >
+         <string>Paper si&amp;ze:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>printerPaperSizeED</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="3" >
+       <widget class="QLineEdit" name="printerPaperSizeED" />
+      </item>
+      <item row="6" column="0" >
+       <widget class="QLabel" name="printerExtraLA" >
+        <property name="toolTip" >
+         <string>Any other options you'd like to use with the printer command.</string>
+        </property>
+        <property name="text" >
+         <string>E&amp;xtra options:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>printerExtraED</cstring>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
+   <item row="1" column="1" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>361</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QCheckBox" name="printerAdaptCB" >
+     <property name="toolTip" >
+      <string>Customizes output to a given printer. Expert option.</string>
+     </property>
+     <property name="whatsThis" >
+      <string>Normally, this needs to be checked only if you are using dvips as your printer command and you have config.&lt;printer> files installed for all your printers.</string>
+     </property>
+     <property name="text" >
+      <string>Adapt output to printer</string>
+     </property>
+    </widget>
+   </item>
    <item row="0" column="0" colspan="2" >
     <layout class="QHBoxLayout" >
      <property name="margin" >
@@ -286,7 +326,7 @@
      <item>
       <widget class="QLabel" name="printerNameLA" >
        <property name="text" >
-        <string>Printer &amp;name:</string>
+        <string>Default &amp;printer:</string>
        </property>
        <property name="buddy" >
         <cstring>printerNameED</cstring>
@@ -325,6 +365,22 @@
      </item>
     </layout>
    </item>
+   <item row="4" column="1" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>31</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <tabstops>