Fix bug 3800: Relabel old Adapt Output button and fix resulting problem with spacing.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18650 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/ui/PrefPrinterUi.ui b/src/frontends/qt4/ui/PrefPrinterUi.ui
index e77fb9237209d50cdbcce2b32abad628ac167a82..561ec566fe654f3fa012245942814c9e99cd2fa9 100644 (file)
--- a/src/frontends/qt4/ui/PrefPrinterUi.ui
+++ b/src/frontends/qt4/ui/PrefPrinterUi.ui
@@ -1,15 +1,12 @@
 <ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
  <class>QPrefPrinterUi</class>
  <widget class="QWidget" name="QPrefPrinterUi" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>385</width>
-    <height>386</height>
+    <width>459</width>
+    <height>472</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -22,43 +19,46 @@
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item rowspan="3" row="0" column="2" >
+   <item row="1" column="1" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
      <property name="sizeHint" >
       <size>
-       <width>184</width>
-       <height>83</height>
+       <width>40</width>
+       <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item row="2" column="1" >
-    <widget class="QLineEdit" name="printerCommandED" />
-   </item>
-   <item row="0" column="1" >
-    <widget class="QLineEdit" name="printerNameED" >
-     <property name="toolTip" >
-      <string>Name of the default printer</string>
-     </property>
-    </widget>
-   </item>
    <item row="1" column="0" >
     <widget class="QCheckBox" name="printerAdaptCB" >
      <property name="toolTip" >
-      <string>Use printer name explicitely</string>
+      <string>Adjusts dvips output for a particular printer. (Note: dvips must be pre-configured for that printer.)</string>
      </property>
      <property name="text" >
-      <string>Adapt outp&amp;ut</string>
+      <string>Use -P&lt;printer> parameter with dvips</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="0" colspan="3" >
+   <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>
@@ -275,48 +275,58 @@
      </layout>
     </widget>
    </item>
-   <item row="4" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
+   <item row="0" column="0" colspan="2" >
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
      </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
+     <property name="spacing" >
+      <number>6</number>
      </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
+     <item>
+      <widget class="QLabel" name="printerNameLA" >
+       <property name="text" >
+        <string>Printer &amp;name:</string>
+       </property>
+       <property name="buddy" >
+        <cstring>printerNameED</cstring>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="printerNameED" >
+       <property name="toolTip" >
+        <string>Name of the default printer</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
-   <item row="2" column="0" >
-    <widget class="QLabel" name="printerCommandLA" >
-     <property name="text" >
-      <string>Printer co&amp;mmand:</string>
+   <item row="2" column="0" colspan="2" >
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
      </property>
-     <property name="buddy" >
-      <cstring>printerCommandED</cstring>
+     <property name="spacing" >
+      <number>6</number>
      </property>
-    </widget>
-   </item>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="printerNameLA" >
-     <property name="text" >
-      <string>Printer &amp;name:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>printerNameED</cstring>
-     </property>
-    </widget>
+     <item>
+      <widget class="QLabel" name="printerCommandLA" >
+       <property name="text" >
+        <string>Printer co&amp;mmand:</string>
+       </property>
+       <property name="buddy" >
+        <cstring>printerCommandED</cstring>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="printerCommandED" />
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
- <includes>
-  <include location="local" >qt_helpers.h</include>
- </includes>
  <tabstops>
   <tabstop>printerNameED</tabstop>
   <tabstop>printerAdaptCB</tabstop>
@@ -337,6 +347,9 @@
   <tabstop>printerSpoolPrefixED</tabstop>
   <tabstop>printerPaperSizeED</tabstop>
  </tabstops>
+ <includes>
+  <include location="local" >qt_helpers.h</include>
+ </includes>
  <resources/>
  <connections/>
 </ui>