many little layout tweaks

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

diff --git a/src/frontends/qt4/ui/CitationUi.ui b/src/frontends/qt4/ui/CitationUi.ui
index 62416181ea8cbdbe7ccdd18fb18f5dfdb9b8bb66..7481995a4339ad81ef1da47ace692a1dcaa4c1d4 100644 (file)
--- a/src/frontends/qt4/ui/CitationUi.ui
+++ b/src/frontends/qt4/ui/CitationUi.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>622</width>
-    <height>696</height>
+    <width>449</width>
+    <height>487</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -160,6 +160,72 @@
      </property>
     </widget>
    </item>
+   <item row="9" column="0" colspan="3">
+    <layout class="QHBoxLayout">
+     <property name="spacing">
+      <number>6</number>
+     </property>
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QPushButton" name="restorePB">
+       <property name="text">
+        <string>&amp;Restore</string>
+       </property>
+       <property name="autoDefault">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <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>
+      <widget class="QPushButton" name="okPB">
+       <property name="text">
+        <string>&amp;OK</string>
+       </property>
+       <property name="autoDefault">
+        <bool>false</bool>
+       </property>
+       <property name="default">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="applyPB">
+       <property name="text">
+        <string>App&amp;ly</string>
+       </property>
+       <property name="autoDefault">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancelPB">
+       <property name="text">
+        <string>&amp;Cancel</string>
+       </property>
+       <property name="autoDefault">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
    <item row="6" column="0" colspan="3">
     <widget class="QTextEdit" name="infoML">
      <property name="acceptDrops">
@@ -170,6 +236,112 @@
      </property>
     </widget>
    </item>
+   <item row="8" column="0" colspan="3">
+    <widget class="QGroupBox" name="styleGB">
+     <property name="title">
+      <string>Formatting</string>
+     </property>
+     <property name="flat">
+      <bool>true</bool>
+     </property>
+     <layout class="QGridLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="citationStyleLA">
+        <property name="text">
+         <string>Citation st&amp;yle:</string>
+        </property>
+        <property name="buddy">
+         <cstring>citationStyleCO</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" colspan="3">
+       <widget class="QComboBox" name="citationStyleCO">
+        <property name="toolTip">
+         <string>Natbib citation style to use</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="textBeforeLA">
+        <property name="text">
+         <string>Text &amp;before:</string>
+        </property>
+        <property name="buddy">
+         <cstring>textBeforeED</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="textBeforeED">
+        <property name="toolTip">
+         <string>Text to place before citation</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QLabel" name="textAfterLA">
+        <property name="text">
+         <string>Text a&amp;fter:</string>
+        </property>
+        <property name="buddy">
+         <cstring>textAfterED</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="3">
+       <widget class="QLineEdit" name="textAfterED">
+        <property name="toolTip">
+         <string>Text to place after citation</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" colspan="4">
+       <layout class="QHBoxLayout">
+        <property name="spacing">
+         <number>6</number>
+        </property>
+        <property name="margin">
+         <number>0</number>
+        </property>
+        <item>
+         <spacer>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>21</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="fulllistCB">
+          <property name="toolTip">
+           <string>List all authors</string>
+          </property>
+          <property name="text">
+           <string>Full aut&amp;hor list</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="forceuppercaseCB">
+          <property name="toolTip">
+           <string>Force upper case in citation</string>
+          </property>
+          <property name="text">
+           <string>Force u&amp;pper case</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item row="7" column="0" colspan="3">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
@@ -327,179 +499,13 @@
      </layout>
     </widget>
    </item>
-   <item row="8" column="0" colspan="3">
-    <widget class="QGroupBox" name="styleGB">
-     <property name="title">
-      <string>Formatting</string>
-     </property>
-     <property name="flat">
-      <bool>true</bool>
-     </property>
-     <layout class="QGridLayout">
-      <item row="0" column="0">
-       <widget class="QLabel" name="citationStyleLA">
-        <property name="text">
-         <string>Citation st&amp;yle:</string>
-        </property>
-        <property name="buddy">
-         <cstring>citationStyleCO</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" colspan="3">
-       <widget class="QComboBox" name="citationStyleCO">
-        <property name="toolTip">
-         <string>Natbib citation style to use</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="textBeforeLA">
-        <property name="text">
-         <string>Text &amp;before:</string>
-        </property>
-        <property name="buddy">
-         <cstring>textBeforeED</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QLineEdit" name="textBeforeED">
-        <property name="toolTip">
-         <string>Text to place before citation</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="QLabel" name="textAfterLA">
-        <property name="text">
-         <string>Text a&amp;fter:</string>
-        </property>
-        <property name="buddy">
-         <cstring>textAfterED</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="3">
-       <widget class="QLineEdit" name="textAfterED">
-        <property name="toolTip">
-         <string>Text to place after citation</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0" colspan="4">
-       <layout class="QHBoxLayout">
-        <property name="spacing">
-         <number>6</number>
-        </property>
-        <property name="margin">
-         <number>0</number>
-        </property>
-        <item>
-         <spacer>
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>21</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QCheckBox" name="fulllistCB">
-          <property name="toolTip">
-           <string>List all authors</string>
-          </property>
-          <property name="text">
-           <string>Full aut&amp;hor list</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QCheckBox" name="forceuppercaseCB">
-          <property name="toolTip">
-           <string>Force upper case in citation</string>
-          </property>
-          <property name="text">
-           <string>Force u&amp;pper case</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="9" column="0" colspan="3">
-    <layout class="QHBoxLayout">
-     <property name="spacing">
-      <number>6</number>
-     </property>
-     <property name="margin">
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="QPushButton" name="restorePB">
-       <property name="text">
-        <string>&amp;Restore</string>
-       </property>
-       <property name="autoDefault">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <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>
-      <widget class="QPushButton" name="okPB">
-       <property name="text">
-        <string>&amp;OK</string>
-       </property>
-       <property name="autoDefault">
-        <bool>false</bool>
-       </property>
-       <property name="default">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="applyPB">
-       <property name="text">
-        <string>App&amp;ly</string>
-       </property>
-       <property name="autoDefault">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="cancelPB">
-       <property name="text">
-        <string>&amp;Cancel</string>
-       </property>
-       <property name="autoDefault">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
   </layout>
+  <zorder>availableLV</zorder>
+  <zorder>addPB</zorder>
+  <zorder>selectedLV</zorder>
+  <zorder>deletePB</zorder>
+  <zorder>upPB</zorder>
+  <zorder>downPB</zorder>
   <zorder>infoML</zorder>
   <zorder>styleGB</zorder>
   <zorder>groupBox</zorder>

diff --git a/src/frontends/qt4/ui/CompareUi.ui b/src/frontends/qt4/ui/CompareUi.ui
index 32748a0185984ecfa0bbd36980509b37769467d3..31139e6f71f1b4bede2d8f43800acd59020854cd 100644 (file)
--- a/src/frontends/qt4/ui/CompareUi.ui
+++ b/src/frontends/qt4/ui/CompareUi.ui
@@ -5,242 +5,175 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>495</width>
-    <height>302</height>
+    <width>450</width>
+    <height>246</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string/>
   </property>
-  <property name="sizeGripEnabled">
-   <bool>true</bool>
-  </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>0</number>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="bottomMargin">
+    <number>3</number>
    </property>
    <item row="0" column="0">
-    <layout class="QGridLayout">
-     <property name="margin">
-      <number>9</number>
+    <widget class="QLabel" name="newFileLA">
+     <property name="text">
+      <string>&amp;New Document:</string>
+     </property>
+     <property name="buddy">
+      <cstring>newFileCB</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QComboBox" name="newFileCB">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="editable">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QPushButton" name="newFilePB">
+     <property name="text">
+      <string>&amp;Browse...</string>
+     </property>
+     <property name="autoDefault">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="oldFileLA">
+     <property name="text">
+      <string>&amp;Old Document:</string>
+     </property>
+     <property name="buddy">
+      <cstring>oldFileCB</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QComboBox" name="oldFileCB">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="editable">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <widget class="QPushButton" name="oldFilePB">
+     <property name="text">
+      <string>Bro&amp;wse...</string>
+     </property>
+     <property name="autoDefault">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0">
+    <widget class="QGroupBox" name="groupBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title">
+      <string>Copy Document Settings from:</string>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <widget class="QRadioButton" name="newSettingsRB">
+        <property name="text">
+         <string>N&amp;ew Document</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="oldSettingsRB">
+        <property name="text">
+         <string>Ol&amp;d Document</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="5" column="0" colspan="2">
+    <widget class="QProgressBar" name="progressBar">
+     <property name="value">
+      <number>24</number>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
      </property>
+    </widget>
+   </item>
+   <item row="6" column="0" colspan="2">
+    <layout class="QHBoxLayout">
      <property name="spacing">
       <number>6</number>
      </property>
-     <item row="0" column="0">
-      <widget class="QLabel" name="newFileLA">
-       <property name="text">
-        <string>&amp;New Document:</string>
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
        </property>
-       <property name="buddy">
-        <cstring>newFileCB</cstring>
+       <property name="sizeType">
+        <enum>QSizePolicy::Expanding</enum>
        </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <layout class="QHBoxLayout">
-       <item>
-        <widget class="QComboBox" name="newFileCB">
-         <property name="sizePolicy">
-          <sizepolicy>
-           <hsizetype>7</hsizetype>
-           <vsizetype>0</vsizetype>
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="editable">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="newFilePB">
-         <property name="sizePolicy">
-          <sizepolicy>
-           <hsizetype>5</hsizetype>
-           <vsizetype>0</vsizetype>
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>&amp;Browse...</string>
-         </property>
-         <property name="autoDefault">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
      </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="oldFileLA">
+     <item>
+      <widget class="QPushButton" name="okPB">
+       <property name="toolTip">
+        <string/>
+       </property>
        <property name="text">
-        <string>&amp;Old Document:</string>
+        <string>&amp;OK</string>
        </property>
-       <property name="buddy">
-        <cstring>oldFileCB</cstring>
+       <property name="default">
+        <bool>true</bool>
        </property>
       </widget>
      </item>
-     <item row="3" column="0">
-      <layout class="QHBoxLayout">
-       <item>
-        <widget class="QComboBox" name="oldFileCB">
-         <property name="sizePolicy">
-          <sizepolicy>
-           <hsizetype>7</hsizetype>
-           <vsizetype>0</vsizetype>
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="editable">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="oldFilePB">
-         <property name="sizePolicy">
-          <sizepolicy>
-           <hsizetype>5</hsizetype>
-           <vsizetype>0</vsizetype>
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>Bro&amp;wse...</string>
-         </property>
-         <property name="autoDefault">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item row="4" column="0">
-      <widget class="QGroupBox" name="groupBox">
-       <property name="sizePolicy">
-        <sizepolicy>
-         <hsizetype>7</hsizetype>
-         <vsizetype>0</vsizetype>
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="title">
-        <string>Options</string>
+     <item>
+      <widget class="QPushButton" name="closePB">
+       <property name="text">
+        <string>&amp;Close</string>
        </property>
-       <layout class="QGridLayout">
-        <property name="margin"> 
-         <number>9</number>
-        </property>
-        <property name="spacing">
-         <number>6</number>
-        </property>
-        <item row="0" column="0">
-         <widget class="QLabel" name="label">
-          <property name="sizePolicy">
-           <sizepolicy>
-            <hsizetype>0</hsizetype>
-            <vsizetype>0</vsizetype>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>Copy Document Settings from:</string>
-          </property>
-          <property name="scaledContents">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="QRadioButton" name="newSettingsRB">
-          <property name="text">
-           <string>N&amp;ew Document</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="0">
-         <widget class="QRadioButton" name="oldSettingsRB">
-          <property name="text">
-           <string>Ol&amp;d Document</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
-     <item row="5" column="0">
-      <widget class="QProgressBar" name="progressBar">
-       <property name="value">
-        <number>24</number>
+       <property name="autoDefault">
+        <bool>false</bool>
        </property>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+       <property name="default">
+        <bool>false</bool>
        </property>
       </widget>
      </item>
-     <item row="6" column="0" >
-      <layout class="QHBoxLayout">
-       <property name="spacing">
-        <number>6</number>
-       </property>
-       <property name="margin">
-        <number>0</number>
-       </property>
-       <item>
-        <spacer>
-         <property name="orientation">
-          <enum>Qt::Horizontal</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>
-        <widget class="QPushButton" name="okPB">
-         <property name="toolTip">
-          <string/>
-         </property>
-         <property name="text">
-          <string>&amp;OK</string>
-         </property>
-         <property name="default">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="closePB">
-         <property name="text">
-          <string>&amp;Close</string>
-         </property>
-         <property name="autoDefault">
-          <bool>false</bool>
-         </property>
-         <property name="default">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
     </layout>
    </item>
-   <item row="1" column="0" >
+   <item row="7" column="0" colspan="2">
     <widget class="QStatusBar" name="statusBar"/>
    </item>
   </layout>
@@ -251,4 +184,3 @@
  <resources/>
  <connections/>
 </ui>
-

diff --git a/src/frontends/qt4/ui/FindAndReplaceUi.ui b/src/frontends/qt4/ui/FindAndReplaceUi.ui
index 4cc98a7491fd4594f12e80f2aca88833ed1d24d7..b19382a607aa7d50012e025c10d659ddf52590ec 100644 (file)
--- a/src/frontends/qt4/ui/FindAndReplaceUi.ui
+++ b/src/frontends/qt4/ui/FindAndReplaceUi.ui
@@ -15,7 +15,7 @@
   <property name="toolTip">
    <string/>
   </property>
-  <layout class="QGridLayout" name="gridLayout_3">
+  <layout class="QGridLayout" name="gridLayout_4">
    <item row="0" column="0">
     <widget class="QTabWidget" name="tabWidget">
      <property name="focusPolicy">
@@ -245,18 +245,12 @@
       <attribute name="title">
        <string>&amp;Advanced</string>
       </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
+      <layout class="QGridLayout" name="gridLayout_3">
+       <item row="0" column="0" colspan="2">
         <widget class="QGroupBox" name="groupBox_2">
          <property name="enabled">
           <bool>true</bool>
          </property>
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
          <property name="minimumSize">
           <size>
            <width>0</width>
@@ -275,24 +269,12 @@
          <property name="flat">
           <bool>false</bool>
          </property>
-         <layout class="QGridLayout" name="gridLayout_4">
-          <property name="margin">
-           <number>3</number>
-          </property>
-          <property name="spacing">
-           <number>0</number>
-          </property>
-          <item row="0" column="0">
+         <layout class="QVBoxLayout" name="verticalLayout">
+          <item>
            <widget class="QRadioButton" name="CurrentParagraph">
             <property name="enabled">
              <bool>false</bool>
             </property>
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
             <property name="toolTip">
              <string>Current paragraph</string>
             </property>
@@ -304,17 +286,11 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="0">
+          <item>
            <widget class="QRadioButton" name="CurrentDocument">
             <property name="enabled">
              <bool>true</bool>
             </property>
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
             <property name="text">
              <string>Current &amp;document</string>
             </property>
@@ -323,7 +299,7 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="0">
+          <item>
            <widget class="QRadioButton" name="MasterDocument">
             <property name="enabled">
              <bool>true</bool>
@@ -342,17 +318,11 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="0">
+          <item>
            <widget class="QRadioButton" name="OpenDocuments">
             <property name="enabled">
              <bool>true</bool>
             </property>
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
             <property name="toolTip">
              <string>All open documents</string>
             </property>
@@ -361,17 +331,11 @@
             </property>
            </widget>
           </item>
-          <item row="4" column="0">
+          <item>
            <widget class="QRadioButton" name="AllManualsRB">
             <property name="enabled">
              <bool>true</bool>
             </property>
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
             <property name="text">
              <string>All ma&amp;nuals</string>
             </property>
@@ -380,17 +344,11 @@
          </layout>
         </widget>
        </item>
-       <item>
+       <item row="1" column="0">
         <widget class="QCheckBox" name="ignoreFormatCB">
          <property name="enabled">
           <bool>true</bool>
          </property>
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
          <property name="toolTip">
           <string>If unchecked, the search will be limited to occurrences of the selected text and paragraph style</string>
          </property>
@@ -402,14 +360,8 @@
          </property>
         </widget>
        </item>
-       <item>
+       <item row="2" column="0" colspan="2">
         <widget class="QCheckBox" name="keepCaseCB">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
-           <horstretch>1</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
          <property name="toolTip">
           <string>Keep the case of the replacement's first letter as in each matching text first letter</string>
          </property>
@@ -418,23 +370,17 @@
          </property>
         </widget>
        </item>
-       <item>
+       <item row="3" column="0">
         <widget class="QCheckBox" name="expandMacrosCB">
          <property name="enabled">
           <bool>false</bool>
          </property>
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
          <property name="text">
           <string>&amp;Expand macros</string>
          </property>
         </widget>
        </item>
-       <item>
+       <item row="4" column="1">
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>

diff --git a/src/frontends/qt4/ui/FontUi.ui b/src/frontends/qt4/ui/FontUi.ui
index da45733d7fbfc7bf32862923f29a87072ebc2d71..e5066f952e0af1387fe703ec2347129386ddfd39 100644 (file)
--- a/src/frontends/qt4/ui/FontUi.ui
+++ b/src/frontends/qt4/ui/FontUi.ui
@@ -1,270 +1,222 @@
-<ui version="4.0" >
+<ui version="4.0">
  <class>FontUi</class>
- <widget class="QWidget" name="FontUi" >
-  <property name="geometry" >
+ <widget class="QWidget" name="FontUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>543</width>
-    <height>341</height>
+    <width>404</width>
+    <height>349</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>FontUi</string>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="1" column="2" >
-    <widget class="QComboBox" name="fontencCO" />
-   </item>
-   <item row="1" column="0" colspan="2" >
-    <widget class="QLabel" name="fontencLA" >
-     <property name="text" >
-      <string>LaTe&amp;X font encoding:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>fontencCO</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="3" colspan="2" >
-    <widget class="QLineEdit" name="fontencLE" >
-     <property name="toolTip" >
-      <string>Specify the font encoding (e.g., T1).</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="fontsDefaultLA" >
-     <property name="text" >
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QLabel" name="fontsDefaultLA">
+     <property name="text">
       <string>&amp;Default Family:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>fontsDefaultCO</cstring>
      </property>
     </widget>
    </item>
-   <item row="0" column="1" colspan="2" >
-    <widget class="QComboBox" name="fontsDefaultCO" >
-     <property name="toolTip" >
+   <item row="0" column="1">
+    <widget class="QComboBox" name="fontsDefaultCO">
+     <property name="toolTip">
       <string>Select the default family for the document</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="4" >
-    <widget class="QComboBox" name="fontsizeCO" >
-     <property name="toolTip" >
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="3" >
-    <widget class="QLabel" name="TextLabel2_2" >
-     <property name="text" >
+   <item row="0" column="2">
+    <widget class="QLabel" name="TextLabel2_2">
+     <property name="text">
       <string>&amp;Base Size:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>fontsizeCO</cstring>
      </property>
     </widget>
    </item>
-   <item row="9" column="0" colspan="5" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
+   <item row="0" column="3">
+    <widget class="QComboBox" name="fontsizeCO">
+     <property name="toolTip">
+      <string/>
      </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="fontencLA">
+     <property name="text">
+      <string>LaTe&amp;X font encoding:</string>
      </property>
-     <property name="sizeHint" >
-      <size>
-       <width>525</width>
-       <height>41</height>
-      </size>
+     <property name="buddy">
+      <cstring>fontencCO</cstring>
      </property>
-    </spacer>
+    </widget>
    </item>
-   <item row="2" column="1" colspan="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>182</width>
-       <height>16</height>
-      </size>
+   <item row="1" column="1">
+    <widget class="QComboBox" name="fontencCO"/>
+   </item>
+   <item row="1" column="2" colspan="2">
+    <widget class="QLineEdit" name="fontencLE">
+     <property name="toolTip">
+      <string>Specify the font encoding (e.g., T1).</string>
      </property>
-    </spacer>
+    </widget>
    </item>
-   <item row="3" column="0" >
-    <widget class="QLabel" name="fontsRomanLA" >
-     <property name="text" >
+   <item row="2" column="0">
+    <widget class="QLabel" name="fontsRomanLA">
+     <property name="text">
       <string>&amp;Roman:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>fontsRomanCO</cstring>
      </property>
     </widget>
    </item>
-   <item row="3" column="1" colspan="2" >
-    <widget class="QComboBox" name="fontsRomanCO" >
-     <property name="toolTip" >
+   <item row="2" column="1">
+    <widget class="QComboBox" name="fontsRomanCO">
+     <property name="toolTip">
       <string>Select the roman (serif) typeface</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="3" colspan="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>131</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="4" column="0" >
-    <widget class="QLabel" name="fontsSansLA" >
-     <property name="text" >
+   <item row="3" column="0">
+    <widget class="QLabel" name="fontsSansLA">
+     <property name="text">
       <string>&amp;Sans Serif:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>fontsSansCO</cstring>
      </property>
     </widget>
    </item>
-   <item row="4" column="1" colspan="2" >
-    <widget class="QComboBox" name="fontsSansCO" >
-     <property name="toolTip" >
+   <item row="3" column="1">
+    <widget class="QComboBox" name="fontsSansCO">
+     <property name="toolTip">
       <string>Select the Sans Serif (grotesque) typeface</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="3" >
-    <widget class="QLabel" name="scaleSansLA" >
-     <property name="text" >
+   <item row="3" column="2">
+    <widget class="QLabel" name="scaleSansLA">
+     <property name="text">
       <string>S&amp;cale (%):</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>scaleSansSB</cstring>
      </property>
     </widget>
    </item>
-   <item row="4" column="4" >
-    <widget class="QSpinBox" name="scaleSansSB" >
-     <property name="toolTip" >
+   <item row="3" column="3">
+    <widget class="QSpinBox" name="scaleSansSB">
+     <property name="toolTip">
       <string>Scale the Sans Serif font to match the base font's dimensions</string>
      </property>
-     <property name="maximum" >
-      <number>200</number>
-     </property>
-     <property name="minimum" >
+     <property name="minimum">
       <number>10</number>
      </property>
+     <property name="maximum">
+      <number>200</number>
+     </property>
     </widget>
    </item>
-   <item row="5" column="0" >
-    <widget class="QLabel" name="fontsTypewriterLA" >
-     <property name="text" >
+   <item row="4" column="0">
+    <widget class="QLabel" name="fontsTypewriterLA">
+     <property name="text">
       <string>&amp;Typewriter:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>fontsTypewriterCO</cstring>
      </property>
     </widget>
    </item>
-   <item row="5" column="1" colspan="2" >
-    <widget class="QComboBox" name="fontsTypewriterCO" >
-     <property name="toolTip" >
+   <item row="4" column="1">
+    <widget class="QComboBox" name="fontsTypewriterCO">
+     <property name="toolTip">
       <string>Select the typewriter (monospaced) typeface</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="3" >
-    <widget class="QLabel" name="scaleTypewriterLA" >
-     <property name="text" >
+   <item row="4" column="2">
+    <widget class="QLabel" name="scaleTypewriterLA">
+     <property name="text">
       <string>Sc&amp;ale (%):</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>scaleTypewriterSB</cstring>
      </property>
     </widget>
    </item>
-   <item row="5" column="4" >
-    <widget class="QSpinBox" name="scaleTypewriterSB" >
-     <property name="toolTip" >
+   <item row="4" column="3">
+    <widget class="QSpinBox" name="scaleTypewriterSB">
+     <property name="toolTip">
       <string>Scale the Typewriter font to match the base font's dimensions</string>
      </property>
-     <property name="maximum" >
-      <number>200</number>
-     </property>
-     <property name="minimum" >
+     <property name="minimum">
       <number>10</number>
      </property>
+     <property name="maximum">
+      <number>200</number>
+     </property>
     </widget>
    </item>
-   <item row="6" column="0" >
-    <widget class="QLabel" name="cjkFontLA" >
-     <property name="text" >
+   <item row="5" column="0">
+    <widget class="QLabel" name="cjkFontLA">
+     <property name="text">
       <string>C&amp;JK:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>cjkFontLE</cstring>
      </property>
     </widget>
    </item>
-   <item row="6" column="1" colspan="2" >
-    <widget class="QLineEdit" name="cjkFontLE" >
-     <property name="toolTip" >
+   <item row="5" column="1">
+    <widget class="QLineEdit" name="cjkFontLE">
+     <property name="toolTip">
       <string>Input the font to be used for Chinese, Japanese or Korean (CJK) script</string>
      </property>
     </widget>
    </item>
-   <item row="6" column="3" colspan="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>151</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="7" column="1" colspan="2" >
-    <widget class="QCheckBox" name="fontScCB" >
-     <property name="toolTip" >
+   <item row="6" column="1">
+    <widget class="QCheckBox" name="fontScCB">
+     <property name="toolTip">
       <string>Use a real small caps shape, if the font provides one</string>
      </property>
-     <property name="text" >
+     <property name="text">
       <string>Use true S&amp;mall Caps</string>
      </property>
     </widget>
    </item>
-   <item row="8" column="1" colspan="2" >
-    <widget class="QCheckBox" name="fontOsfCB" >
-     <property name="toolTip" >
+   <item row="7" column="1">
+    <widget class="QCheckBox" name="fontOsfCB">
+     <property name="toolTip">
       <string>Use old style instead of lining figures</string>
      </property>
-     <property name="text" >
+     <property name="text">
       <string>Use &amp;Old Style Figures</string>
      </property>
     </widget>
    </item>
+   <item row="8" column="1">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>126</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
  <tabstops>
   <tabstop>fontsDefaultCO</tabstop>
   <tabstop>fontsizeCO</tabstop>
@@ -277,7 +229,7 @@
   <tabstop>fontOsfCB</tabstop>
  </tabstops>
  <includes>
-  <include location="local" >qt_i18n.h</include>
+  <include location="local">qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>

diff --git a/src/frontends/qt4/ui/HyperlinkUi.ui b/src/frontends/qt4/ui/HyperlinkUi.ui
index f5f19ac87b86c86b4bf06a3873fa10c649c1adea..4a33ecf248698ec6f66e95f23fe6a6082a3f2abc 100644 (file)
--- a/src/frontends/qt4/ui/HyperlinkUi.ui
+++ b/src/frontends/qt4/ui/HyperlinkUi.ui
@@ -1,68 +1,102 @@
-<ui version="4.0" >
+<ui version="4.0">
  <class>HyperlinkUi</class>
- <widget class="QDialog" name="HyperlinkUi" >
-  <property name="geometry" >
+ <widget class="QDialog" name="HyperlinkUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>426</width>
-    <height>177</height>
+    <width>302</width>
+    <height>151</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <property name="sizeGripEnabled" >
+  <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="2" column="1" >
-    <widget class="QGroupBox" name="typeGB" >
-     <property name="toolTip" >
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QLabel" name="targetLA">
+     <property name="toolTip">
+      <string>URL</string>
+     </property>
+     <property name="text">
+      <string>&amp;Target:</string>
+     </property>
+     <property name="buddy">
+      <cstring>targetED</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QLineEdit" name="targetED">
+     <property name="toolTip">
+      <string>URL</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="nameLA">
+     <property name="toolTip">
+      <string>Name associated with the URL</string>
+     </property>
+     <property name="text">
+      <string>&amp;Name:</string>
+     </property>
+     <property name="buddy">
+      <cstring>nameED</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QLineEdit" name="nameED">
+     <property name="toolTip">
+      <string>Name associated with the URL</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QGroupBox" name="typeGB">
+     <property name="toolTip">
       <string>Specify the link target</string>
      </property>
-     <property name="title" >
+     <property name="title">
       <string>Link type</string>
      </property>
-     <layout class="QHBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
+     <layout class="QHBoxLayout">
+      <property name="spacing">
        <number>6</number>
       </property>
+      <property name="margin">
+       <number>9</number>
+      </property>
       <item>
-       <widget class="QRadioButton" name="webRB" >
-        <property name="toolTip" >
+       <widget class="QRadioButton" name="webRB">
+        <property name="toolTip">
          <string>Link to the web or to every other target</string>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>&amp;Web</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QRadioButton" name="emailRB" >
-        <property name="toolTip" >
+       <widget class="QRadioButton" name="emailRB">
+        <property name="toolTip">
          <string>Link to an email address</string>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>&amp;Email</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QRadioButton" name="fileRB" >
-        <property name="toolTip" >
+       <widget class="QRadioButton" name="fileRB">
+        <property name="toolTip">
          <string>Link to a file</string>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>&amp;File</string>
         </property>
        </widget>
@@ -70,63 +104,23 @@
      </layout>
     </widget>
    </item>
-   <item row="0" column="1" >
-    <widget class="QLineEdit" name="targetED" >
-     <property name="toolTip" >
-      <string>URL</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1" >
-    <widget class="QLineEdit" name="nameED" >
-     <property name="toolTip" >
-      <string>Name associated with the URL</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="targetLA" >
-     <property name="toolTip" >
-      <string>URL</string>
-     </property>
-     <property name="text" >
-      <string>&amp;Target:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>targetED</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" >
-    <widget class="QLabel" name="nameLA" >
-     <property name="toolTip" >
-      <string>Name associated with the URL</string>
-     </property>
-     <property name="text" >
-      <string>&amp;Name:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>nameED</cstring>
+   <item row="3" column="0" colspan="2">
+    <layout class="QHBoxLayout">
+     <property name="spacing">
+      <number>6</number>
      </property>
-    </widget>
-   </item>
-   <item row="3" column="0" colspan="2" >
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
+     <property name="margin">
       <number>0</number>
      </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeType" >
+       <property name="sizeType">
         <enum>QSizePolicy::Expanding</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
          <height>20</height>
@@ -135,24 +129,24 @@
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="okPB" >
-       <property name="text" >
+      <widget class="QPushButton" name="okPB">
+       <property name="text">
         <string>&amp;OK</string>
        </property>
-       <property name="autoDefault" >
+       <property name="autoDefault">
         <bool>true</bool>
        </property>
-       <property name="default" >
+       <property name="default">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="closePB" >
-       <property name="text" >
+      <widget class="QPushButton" name="closePB">
+       <property name="text">
         <string>&amp;Close</string>
        </property>
-       <property name="autoDefault" >
+       <property name="autoDefault">
         <bool>false</bool>
        </property>
       </widget>
@@ -171,7 +165,7 @@
   <tabstop>closePB</tabstop>
  </tabstops>
  <includes>
-  <include location="local" >qt_i18n.h</include>
+  <include location="local">qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>

diff --git a/src/frontends/qt4/ui/InsetParamsUi.ui b/src/frontends/qt4/ui/InsetParamsUi.ui
index b9e139f523f8be410a633f86cb7f7b5c03580f84..c603d2dcebed6c727c54ae9d73ce544e0a626a33 100644 (file)
--- a/src/frontends/qt4/ui/InsetParamsUi.ui
+++ b/src/frontends/qt4/ui/InsetParamsUi.ui
@@ -5,8 +5,8 @@
    <rect>\r
     <x>0</x>\r
     <y>0</y>\r
-    <width>464</width>\r
-    <height>225</height>\r
+    <width>425</width>\r
+    <height>106</height>\r
    </rect>\r
   </property>\r
   <property name="focusPolicy">\r
@@ -15,14 +15,17 @@
   <property name="windowTitle">\r
    <string>Inset Parameter Configuration</string>\r
   </property>\r
-  <layout class="QGridLayout">\r
-   <property name="margin">\r
-    <number>9</number>\r
-   </property>\r
-   <property name="spacing">\r
-    <number>6</number>\r
-   </property>\r
-   <item row="2" column="0" colspan="2">\r
+  <layout class="QGridLayout" name="gridLayout">\r
+   <item row="0" column="0" colspan="2">\r
+    <widget class="QStackedWidget" name="stackedWidget">\r
+     <property name="currentIndex">\r
+      <number>0</number>\r
+     </property>\r
+     <widget class="QWidget" name="page"/>\r
+     <widget class="QWidget" name="page_2"/>\r
+    </widget>\r
+   </item>\r
+   <item row="1" column="0">\r
     <spacer>\r
      <property name="orientation">\r
       <enum>Qt::Horizontal</enum>\r
@@ -35,7 +38,7 @@
      </property>\r
     </spacer>\r
    </item>\r
-   <item row="2" column="2">\r
+   <item row="1" column="1">\r
     <widget class="QCheckBox" name="synchronizedViewCB">\r
      <property name="layoutDirection">\r
       <enum>Qt::LeftToRight</enum>\r
@@ -45,7 +48,7 @@
      </property>\r
     </widget>\r
    </item>\r
-   <item row="3" column="0" colspan="3">\r
+   <item row="2" column="0" colspan="2">\r
     <layout class="QHBoxLayout">\r
      <property name="spacing">\r
       <number>6</number>\r
@@ -118,28 +121,6 @@
      </item>\r
     </layout>\r
    </item>\r
-   <item row="1" column="0" colspan="3">\r
-    <spacer>\r
-     <property name="orientation">\r
-      <enum>Qt::Vertical</enum>\r
-     </property>\r
-     <property name="sizeHint" stdset="0">\r
-      <size>\r
-       <width>351</width>\r
-       <height>16</height>\r
-      </size>\r
-     </property>\r
-    </spacer>\r
-   </item>\r
-   <item row="0" column="0" colspan="3">\r
-    <widget class="QStackedWidget" name="stackedWidget">\r
-     <property name="currentIndex">\r
-      <number>1</number>\r
-     </property>\r
-     <widget class="QWidget" name="page"/>\r
-     <widget class="QWidget" name="page_2"/>\r
-    </widget>\r
-   </item>\r
   </layout>\r
  </widget>\r
  <tabstops>\r

diff --git a/src/frontends/qt4/ui/LaTeXUi.ui b/src/frontends/qt4/ui/LaTeXUi.ui
index d068a7963d48739ceb171e322c4dad7cce918f5e..5f37f586ff02711839e66549c6d56f4421bb7546 100644 (file)
--- a/src/frontends/qt4/ui/LaTeXUi.ui
+++ b/src/frontends/qt4/ui/LaTeXUi.ui
@@ -12,8 +12,8 @@
   <property name="windowTitle">
    <string/>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0" colspan="3">
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="0" column="0" colspan="4">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Document &amp;class</string>
@@ -51,41 +51,12 @@
      </layout>
     </widget>
    </item>
-   <item row="1" column="0" colspan="3">
+   <item row="1" column="0" colspan="4">
     <widget class="QGroupBox" name="optionsGB">
      <property name="title">
       <string>Class options</string>
      </property>
-     <layout class="QGridLayout">
-      <property name="margin">
-       <number>9</number>
-      </property>
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <item row="0" column="1" rowspan="2">
-       <layout class="QVBoxLayout">
-        <property name="spacing">
-         <number>6</number>
-        </property>
-        <property name="margin">
-         <number>0</number>
-        </property>
-        <item>
-         <widget class="QLineEdit" name="defaultOptionsLE">
-          <property name="toolTip">
-           <string>The options that are predefined in the layout file. Click to the left to select/deselect.</string>
-          </property>
-          <property name="readOnly">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="optionsLE"/>
-        </item>
-       </layout>
-      </item>
+     <layout class="QGridLayout" name="gridLayout">
       <item row="0" column="0">
        <widget class="QCheckBox" name="defaultOptionsCB">
         <property name="toolTip">
@@ -96,6 +67,16 @@
         </property>
        </widget>
       </item>
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="defaultOptionsLE">
+        <property name="toolTip">
+         <string>The options that are predefined in the layout file. Click to the left to select/deselect.</string>
+        </property>
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
       <item row="1" column="0">
        <widget class="QLabel" name="optionsL">
         <property name="text">
@@ -106,6 +87,9 @@
         </property>
        </widget>
       </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="optionsLE"/>
+      </item>
      </layout>
     </widget>
    </item>

diff --git a/src/frontends/qt4/ui/PrefEditUi.ui b/src/frontends/qt4/ui/PrefEditUi.ui
index c349935d68c84ae7d00c437a27f5a6f16d7e8d82..223ba7758297df9f8dac3e329d66624f2ada4b58 100644 (file)
--- a/src/frontends/qt4/ui/PrefEditUi.ui
+++ b/src/frontends/qt4/ui/PrefEditUi.ui
@@ -1,230 +1,218 @@
-<ui version="4.0" >
+<ui version="4.0">
  <class>PrefEditUi</class>
- <widget class="QWidget" name="PrefEditUi" >
-  <property name="geometry" >
+ <widget class="QWidget" name="PrefEditUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>459</width>
-    <height>406</height>
+    <width>382</width>
+    <height>361</height>
    </rect>
   </property>
-  <property name="sizePolicy" >
-   <sizepolicy>
-    <hsizetype>0</hsizetype>
-    <vsizetype>0</vsizetype>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QGroupBox" name="scrollGB" >
-     <property name="title" >
+    <widget class="QGroupBox" name="scrollGB">
+     <property name="title">
       <string>Editing</string>
      </property>
-     <property name="alignment" >
+     <property name="alignment">
       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
      </property>
-     <property name="flat" >
+     <property name="flat">
       <bool>true</bool>
      </property>
-     <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item>
-       <widget class="QCheckBox" name="cursorFollowsCB" >
-        <property name="text" >
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="cursorFollowsCB">
+        <property name="text">
          <string>Cursor &amp;follows scrollbar</string>
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QCheckBox" name="scrollBelowCB" >
-        <property name="text" >
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="scrollBelowCB">
+        <property name="text">
          <string>Scroll &amp;below end of document</string>
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QCheckBox" name="sortEnvironmentsCB" >
-        <property name="text" >
+      <item row="2" column="0">
+       <widget class="QCheckBox" name="sortEnvironmentsCB">
+        <property name="text">
          <string>Sort &amp;environments alphabetically</string>
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QCheckBox" name="groupEnvironmentsCB" >
-        <property name="text" >
+      <item row="3" column="0">
+       <widget class="QCheckBox" name="groupEnvironmentsCB">
+        <property name="text">
          <string>&amp;Group environments by their category</string>
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QComboBox" name="macroEditStyleCO" >
+      <item row="4" column="0">
+       <widget class="QComboBox" name="macroEditStyleCO">
         <item>
-         <property name="text" >
+         <property name="text">
           <string>Edit Math Macros inline with a box around</string>
          </property>
         </item>
         <item>
-         <property name="text" >
+         <property name="text">
           <string>Edit Math Macros inline with the name in the status bar</string>
          </property>
         </item>
         <item>
-         <property name="text" >
+         <property name="text">
           <string>Edit Math Macros with a parameter list (like in LyX &lt; 1.6)</string>
          </property>
         </item>
        </widget>
       </item>
+      <item row="4" column="1">
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      </layout>
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="fullscreenGB" >
-     <property name="title" >
+    <widget class="QGroupBox" name="fullscreenGB">
+     <property name="title">
       <string>Fullscreen</string>
      </property>
-     <property name="alignment" >
+     <property name="alignment">
       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
      </property>
-     <property name="flat" >
+     <property name="flat">
       <bool>true</bool>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item rowspan="3" row="0" column="2" >
-       <widget class="QGroupBox" name="fullscreenLimitGB" >
-        <property name="title" >
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="toggleToolbarsCB">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>&amp;Hide toolbars</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="toggleScrollbarCB">
+        <property name="text">
+         <string>Hide scr&amp;ollbar</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QCheckBox" name="toggleTabbarCB">
+        <property name="text">
+         <string>Hide &amp;tabbar</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QCheckBox" name="toggleMenubarCB">
+        <property name="text">
+         <string>Hide &amp;menubar</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0">
+       <widget class="QGroupBox" name="fullscreenLimitGB">
+        <property name="title">
          <string>&amp;Limit text width</string>
         </property>
-        <property name="checkable" >
+        <property name="flat">
          <bool>true</bool>
         </property>
-        <layout class="QGridLayout" >
-         <property name="margin" >
-          <number>9</number>
-         </property>
-         <property name="spacing" >
-          <number>6</number>
-         </property>
-         <item row="0" column="1" >
-          <widget class="QSpinBox" name="fullscreenWidthSB" >
-           <property name="maximum" >
-            <number>10000</number>
+        <property name="checkable">
+         <bool>true</bool>
+        </property>
+        <layout class="QGridLayout" name="gridLayout_3">
+         <item row="0" column="0">
+          <widget class="QLabel" name="label_2">
+           <property name="text">
+            <string>Screen used (&amp;pixels):</string>
+           </property>
+           <property name="buddy">
+            <cstring>fullscreenWidthSB</cstring>
            </property>
-           <property name="minimum" >
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QSpinBox" name="fullscreenWidthSB">
+           <property name="minimum">
             <number>0</number>
            </property>
-           <property name="singleStep" >
+           <property name="maximum">
+            <number>10000</number>
+           </property>
+           <property name="singleStep">
             <number>10</number>
            </property>
-           <property name="value" >
+           <property name="value">
             <number>700</number>
            </property>
           </widget>
          </item>
-         <item row="0" column="0" >
-          <widget class="QLabel" name="label_2" >
-           <property name="text" >
-            <string>Screen used (&amp;pixels):</string>
-           </property>
-           <property name="buddy" >
-            <cstring>fullscreenWidthSB</cstring>
-           </property>
-          </widget>
-         </item>
         </layout>
        </widget>
       </item>
-      <item row="1" column="1" >
-       <spacer>
-        <property name="orientation" >
+      <item row="4" column="1">
+       <spacer name="horizontalSpacer_2">
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeHint" >
+        <property name="sizeHint" stdset="0">
          <size>
-          <width>40</width>
+          <width>157</width>
           <height>20</height>
          </size>
         </property>
        </spacer>
       </item>
-      <item row="3" column="0" >
-       <widget class="QCheckBox" name="toggleMenubarCB" >
-        <property name="text" >
-         <string>Hide &amp;menubar</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0" >
-       <widget class="QCheckBox" name="toggleTabbarCB" >
-        <property name="text" >
-         <string>Hide &amp;tabbar</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" >
-       <widget class="QCheckBox" name="toggleScrollbarCB" >
-        <property name="text" >
-         <string>Hide scr&amp;ollbar</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" >
-       <widget class="QCheckBox" name="toggleToolbarsCB" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>&amp;Hide toolbars</string>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
    <item>
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
-       <width>395</width>
-       <height>16</height>
+       <width>0</width>
+       <height>0</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="4" margin="9" />
+ <layoutdefault spacing="4" margin="9"/>
  <tabstops>
   <tabstop>cursorFollowsCB</tabstop>
   <tabstop>scrollBelowCB</tabstop>
@@ -233,7 +221,7 @@
   <tabstop>macroEditStyleCO</tabstop>
  </tabstops>
  <includes>
-  <include location="local" >qt_i18n.h</include>
+  <include location="local">qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>

diff --git a/src/frontends/qt4/ui/PrefFileformatsUi.ui b/src/frontends/qt4/ui/PrefFileformatsUi.ui
index 63d3dd6ee4a5511e19ff9365aee291c8dda14ce0..77e62368700c5e0d3e591a49dbcfa3f54def308f 100644 (file)
--- a/src/frontends/qt4/ui/PrefFileformatsUi.ui
+++ b/src/frontends/qt4/ui/PrefFileformatsUi.ui
@@ -1,7 +1,7 @@
-<ui version="4.0" >
+<ui version="4.0">
  <class>PrefFileformatsUi</class>
- <widget class="QWidget" name="PrefFileformatsUi" >
-  <property name="geometry" >
+ <widget class="QWidget" name="PrefFileformatsUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,247 +9,210 @@
     <height>381</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="4" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QLabel" name="formatsLA">
+     <property name="text">
+      <string>&amp;Format:</string>
      </property>
-     <property name="sizeHint" >
-      <size>
-       <width>124</width>
-       <height>21</height>
-      </size>
+     <property name="buddy">
+      <cstring>formatsCB</cstring>
      </property>
-    </spacer>
+    </widget>
    </item>
-   <item row="3" column="0" colspan="4" >
-    <layout class="QGridLayout" >
-     <property name="margin" >
-      <number>0</number>
+   <item row="0" column="1" colspan="2">
+    <widget class="QComboBox" name="formatsCB">
+     <property name="editable">
+      <bool>true</bool>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="maxVisibleItems">
+      <number>20</number>
      </property>
-     <item row="1" column="1" >
-      <widget class="QLineEdit" name="extensionED" />
-     </item>
-     <item row="3" column="0" >
-      <widget class="QLabel" name="editorLA" >
-       <property name="text" >
-        <string>Ed&amp;itor:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>editorCO</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="0" >
-      <widget class="QLabel" name="label" >
-       <property name="text" >
-        <string>Co&amp;pier:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>copierED</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="0" >
-      <widget class="QLabel" name="shortcutLA" >
-       <property name="text" >
-        <string>Shortc&amp;ut:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>shortcutED</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="0" >
-      <widget class="QLabel" name="formatLA" >
-       <property name="text" >
-        <string>S&amp;hort Name:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>formatED</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1" >
-      <widget class="QLineEdit" name="shortcutED" />
-     </item>
-     <item row="5" column="1" >
-      <widget class="QLineEdit" name="copierED" />
-     </item>
-     <item row="4" column="0" >
-      <widget class="QLabel" name="viewerLA" >
-       <property name="text" >
-        <string>&amp;Viewer:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>viewerCO</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0" >
-      <widget class="QLabel" name="extensionLA" >
-       <property name="text" >
-        <string>E&amp;xtension:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>extensionED</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="1" >
-      <layout class="QHBoxLayout" >
-       <property name="margin" >
-        <number>0</number>
-       </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <item>
-        <widget class="QComboBox" name="viewerCO" >
-         <property name="sizeAdjustPolicy" >
-          <enum>QComboBox::AdjustToContents</enum>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLineEdit" name="viewerED" />
-       </item>
-      </layout>
-     </item>
-     <item row="0" column="1" >
-      <widget class="QLineEdit" name="formatED" />
-     </item>
-     <item row="3" column="1" >
-      <layout class="QHBoxLayout" >
-       <property name="margin" >
-        <number>0</number>
-       </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <item>
-        <widget class="QComboBox" name="editorCO" >
-         <property name="sizeAdjustPolicy" >
-          <enum>QComboBox::AdjustToContents</enum>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLineEdit" name="editorED" />
-       </item>
-      </layout>
-     </item>
-    </layout>
+     <property name="insertPolicy">
+      <enum>QComboBox::InsertAtCurrent</enum>
+     </property>
+     <property name="minimumContentsLength">
+      <number>1</number>
+     </property>
+    </widget>
    </item>
-   <item row="5" column="0" colspan="3" >
-    <widget class="QGroupBox" name="defaultFormatGB" >
-     <property name="toolTip" >
-      <string>Specify the default output format when using (PDF)LaTeX</string>
+   <item row="0" column="3">
+    <widget class="QPushButton" name="formatNewPB">
+     <property name="text">
+      <string>&amp;New...</string>
      </property>
-     <property name="title" >
-      <string>Default Format</string>
+    </widget>
+   </item>
+   <item row="0" column="4">
+    <widget class="QPushButton" name="formatRemovePB">
+     <property name="text">
+      <string>Re&amp;move</string>
      </property>
-     <property name="flat" >
-      <bool>true</bool>
+    </widget>
+   </item>
+   <item row="1" column="1" colspan="2">
+    <widget class="QCheckBox" name="documentCB">
+     <property name="text">
+      <string>&amp;Document format</string>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="defaultFormatLA" >
-        <property name="text" >
-         <string>De&amp;fault Output Format:</string>
-        </property>
-        <property name="buddy" >
-         <cstring>defaultFormatCB</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" >
-       <widget class="QComboBox" name="defaultFormatCB" />
-      </item>
-     </layout>
     </widget>
    </item>
-   <item row="2" column="1" colspan="2" >
-    <widget class="QCheckBox" name="vectorCB" >
-     <property name="text" >
+   <item row="2" column="1" colspan="2">
+    <widget class="QCheckBox" name="vectorCB">
+     <property name="text">
       <string>Vector &amp;graphics format</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="1" colspan="2" >
-    <widget class="QCheckBox" name="documentCB" >
-     <property name="text" >
-      <string>&amp;Document format</string>
+   <item row="3" column="0">
+    <widget class="QLabel" name="formatLA">
+     <property name="text">
+      <string>S&amp;hort Name:</string>
+     </property>
+     <property name="buddy">
+      <cstring>formatED</cstring>
      </property>
     </widget>
    </item>
-   <item row="0" column="3" >
-    <widget class="QPushButton" name="formatRemovePB" >
-     <property name="text" >
-      <string>Re&amp;move</string>
+   <item row="3" column="1" colspan="2">
+    <widget class="QLineEdit" name="formatED"/>
+   </item>
+   <item row="4" column="0">
+    <widget class="QLabel" name="extensionLA">
+     <property name="text">
+      <string>E&amp;xtension:</string>
+     </property>
+     <property name="buddy">
+      <cstring>extensionED</cstring>
      </property>
     </widget>
    </item>
-   <item row="0" column="2" >
-    <widget class="QPushButton" name="formatNewPB" >
-     <property name="text" >
-      <string>&amp;New...</string>
+   <item row="4" column="1" colspan="2">
+    <widget class="QLineEdit" name="extensionED"/>
+   </item>
+   <item row="5" column="0">
+    <widget class="QLabel" name="shortcutLA">
+     <property name="text">
+      <string>Shortc&amp;ut:</string>
+     </property>
+     <property name="buddy">
+      <cstring>shortcutED</cstring>
      </property>
     </widget>
    </item>
-   <item row="0" column="1" >
-    <widget class="QComboBox" name="formatsCB" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>0</hsizetype>
-       <vsizetype>0</vsizetype>
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+   <item row="5" column="1" colspan="2">
+    <widget class="QLineEdit" name="shortcutED"/>
+   </item>
+   <item row="6" column="0">
+    <widget class="QLabel" name="editorLA">
+     <property name="text">
+      <string>Ed&amp;itor:</string>
      </property>
-     <property name="editable" >
-      <bool>true</bool>
+     <property name="buddy">
+      <cstring>editorCO</cstring>
      </property>
-     <property name="maxVisibleItems" >
-      <number>20</number>
+    </widget>
+   </item>
+   <item row="6" column="1">
+    <widget class="QComboBox" name="editorCO">
+     <property name="sizeAdjustPolicy">
+      <enum>QComboBox::AdjustToContents</enum>
      </property>
-     <property name="insertPolicy" >
-      <enum>QComboBox::InsertAtCurrent</enum>
+    </widget>
+   </item>
+   <item row="6" column="2" colspan="2">
+    <widget class="QLineEdit" name="editorED"/>
+   </item>
+   <item row="7" column="0">
+    <widget class="QLabel" name="viewerLA">
+     <property name="text">
+      <string>&amp;Viewer:</string>
      </property>
-     <property name="minimumContentsLength" >
-      <number>1</number>
+     <property name="buddy">
+      <cstring>viewerCO</cstring>
      </property>
     </widget>
    </item>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="formatsLA" >
-     <property name="text" >
-      <string>&amp;Format:</string>
+   <item row="7" column="1">
+    <widget class="QComboBox" name="viewerCO">
+     <property name="sizeAdjustPolicy">
+      <enum>QComboBox::AdjustToContents</enum>
      </property>
-     <property name="buddy" >
-      <cstring>formatsCB</cstring>
+    </widget>
+   </item>
+   <item row="7" column="2" colspan="2">
+    <widget class="QLineEdit" name="viewerED"/>
+   </item>
+   <item row="8" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Co&amp;pier:</string>
+     </property>
+     <property name="buddy">
+      <cstring>copierED</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="1" colspan="2">
+    <widget class="QLineEdit" name="copierED"/>
+   </item>
+   <item row="9" column="0" colspan="5">
+    <widget class="QGroupBox" name="defaultFormatGB">
+     <property name="toolTip">
+      <string>Specify the default output format when using (PDF)LaTeX</string>
+     </property>
+     <property name="title">
+      <string>Default Format</string>
+     </property>
+     <property name="flat">
+      <bool>true</bool>
      </property>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <widget class="QLabel" name="defaultFormatLA">
+        <property name="text">
+         <string>De&amp;fault Output Format:</string>
+        </property>
+        <property name="buddy">
+         <cstring>defaultFormatCB</cstring>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QComboBox" name="defaultFormatCB"/>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>148</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
     </widget>
    </item>
+   <item row="10" column="1" colspan="2">
+    <spacer>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>124</width>
+       <height>21</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <tabstops>
@@ -266,7 +229,7 @@
   <tabstop>copierED</tabstop>
  </tabstops>
  <includes>
-  <include location="local" >qt_i18n.h</include>
+  <include location="local">qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>

diff --git a/src/frontends/qt4/ui/PrefInputUi.ui b/src/frontends/qt4/ui/PrefInputUi.ui
index 66749673e75d124c55f5661ec73a8a442c83267f..4edeb96610d13211bd6cfd1aeaf66f9cceb14a35 100644 (file)
--- a/src/frontends/qt4/ui/PrefInputUi.ui
+++ b/src/frontends/qt4/ui/PrefInputUi.ui
@@ -1,114 +1,115 @@
-<ui version="4.0" >
+<ui version="4.0">
  <class>PrefInputUi</class>
- <widget class="QWidget" name="PrefInputUi" >
-  <property name="geometry" >
+ <widget class="QWidget" name="PrefInputUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>480</width>
-    <height>228</height>
+    <width>426</width>
+    <height>227</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QGroupBox" name="keyboardGB" >
-     <property name="title" >
+    <widget class="QGroupBox" name="keyboardGB">
+     <property name="title">
       <string>Keyboard</string>
      </property>
-     <property name="alignment" >
+     <property name="alignment">
       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
      </property>
-     <property name="flat" >
+     <property name="flat">
       <bool>true</bool>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="0" column="0" colspan="3" >
-       <widget class="QCheckBox" name="keymapCB" >
-        <property name="text" >
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0" colspan="2">
+       <widget class="QCheckBox" name="keymapCB">
+        <property name="text">
          <string>Use &amp;keyboard map</string>
         </property>
-        <property name="checked" >
+        <property name="checked">
          <bool>false</bool>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="firstKeymapLA" >
-        <property name="enabled" >
+      <item row="1" column="0">
+       <widget class="QLabel" name="firstKeymapLA">
+        <property name="enabled">
          <bool>false</bool>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>&amp;First:</string>
         </property>
-        <property name="buddy" >
+        <property name="buddy">
          <cstring>firstKeymapED</cstring>
         </property>
        </widget>
       </item>
-      <item row="1" column="1" >
-       <widget class="QLineEdit" name="firstKeymapED" >
-        <property name="enabled" >
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="firstKeymapED">
+        <property name="enabled">
          <bool>false</bool>
         </property>
        </widget>
       </item>
-      <item row="1" column="2" >
-       <widget class="QPushButton" name="firstKeymapPB" >
-        <property name="enabled" >
+      <item row="1" column="2">
+       <widget class="QPushButton" name="firstKeymapPB">
+        <property name="enabled">
          <bool>false</bool>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>Br&amp;owse...</string>
         </property>
-        <property name="autoDefault" >
+        <property name="autoDefault">
          <bool>false</bool>
         </property>
        </widget>
       </item>
-      <item row="2" column="0" >
-       <widget class="QLabel" name="secondKeymapLA" >
-        <property name="enabled" >
+      <item row="1" column="3" rowspan="2">
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>120</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="secondKeymapLA">
+        <property name="enabled">
          <bool>false</bool>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>S&amp;econd:</string>
         </property>
-        <property name="buddy" >
+        <property name="buddy">
          <cstring>secondKeymapED</cstring>
         </property>
        </widget>
       </item>
-      <item row="2" column="1" >
-       <widget class="QLineEdit" name="secondKeymapED" >
-        <property name="enabled" >
+      <item row="2" column="1">
+       <widget class="QLineEdit" name="secondKeymapED">
+        <property name="enabled">
          <bool>false</bool>
         </property>
        </widget>
       </item>
-      <item row="2" column="2" >
-       <widget class="QPushButton" name="secondKeymapPB" >
-        <property name="enabled" >
+      <item row="2" column="2">
+       <widget class="QPushButton" name="secondKeymapPB">
+        <property name="enabled">
          <bool>false</bool>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>&amp;Browse...</string>
         </property>
-        <property name="autoDefault" >
+        <property name="autoDefault">
          <bool>false</bool>
         </property>
        </widget>
@@ -117,61 +118,55 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="mouseGB" >
-     <property name="title" >
+    <widget class="QGroupBox" name="mouseGB">
+     <property name="title">
       <string>Mouse</string>
      </property>
-     <property name="alignment" >
+     <property name="alignment">
       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
      </property>
-     <property name="flat" >
+     <property name="flat">
       <bool>true</bool>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="scrollingSpeedLA" >
-        <property name="text" >
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <widget class="QLabel" name="scrollingSpeedLA">
+        <property name="text">
          <string>&amp;Wheel scrolling speed:</string>
         </property>
-        <property name="buddy" >
+        <property name="buddy">
          <cstring>mouseWheelSpeedSB</cstring>
         </property>
        </widget>
       </item>
-      <item row="0" column="1" >
-       <widget class="QDoubleSpinBox" name="mouseWheelSpeedSB" >
-        <property name="toolTip" >
+      <item>
+       <widget class="QDoubleSpinBox" name="mouseWheelSpeedSB">
+        <property name="toolTip">
          <string>1.0 is the standard scrolling speed with the mouse wheel. Higher values will speed it up, low values slow it down.</string>
         </property>
-        <property name="decimals" >
+        <property name="decimals">
          <number>1</number>
         </property>
-        <property name="maximum" >
-         <double>10.000000000000000</double>
-        </property>
-        <property name="minimum" >
+        <property name="minimum">
          <double>0.100000000000000</double>
         </property>
-        <property name="singleStep" >
+        <property name="maximum">
+         <double>10.000000000000000</double>
+        </property>
+        <property name="singleStep">
          <double>0.100000000000000</double>
         </property>
-        <property name="value" >
+        <property name="value">
          <double>1.100000000000000</double>
         </property>
        </widget>
       </item>
-      <item row="0" column="2" >
+      <item>
        <spacer>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeHint" >
+        <property name="sizeHint" stdset="0">
          <size>
           <width>40</width>
           <height>20</height>
@@ -184,13 +179,13 @@
    </item>
    <item>
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeType" >
+     <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>408</width>
        <height>16</height>
@@ -209,7 +204,7 @@
   <tabstop>mouseWheelSpeedSB</tabstop>
  </tabstops>
  <includes>
-  <include location="local" >qt_i18n.h</include>
+  <include location="local">qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>

diff --git a/src/frontends/qt4/ui/PrefLanguageUi.ui b/src/frontends/qt4/ui/PrefLanguageUi.ui
index 9372f5080ed823fd95086ccd58c71016c58c36c3..2305eb09969422fce0b3434df7048e876d7abf4a 100644 (file)
--- a/src/frontends/qt4/ui/PrefLanguageUi.ui
+++ b/src/frontends/qt4/ui/PrefLanguageUi.ui
@@ -1,254 +1,239 @@
-<ui version="4.0" >
+<ui version="4.0">
  <class>PrefLanguageUi</class>
- <widget class="QWidget" name="PrefLanguageUi" >
-  <property name="geometry" >
+ <widget class="QWidget" name="PrefLanguageUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>326</width>
+    <width>387</width>
     <height>411</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="0" column="0" colspan="2" >
-    <widget class="QLabel" name="uiLanguageLA" >
-     <property name="text" >
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="0" column="0" colspan="2">
+    <widget class="QLabel" name="uiLanguageLA">
+     <property name="text">
       <string>User &amp;interface language:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>uiLanguageCO</cstring>
      </property>
     </widget>
    </item>
-   <item row="0" column="2" >
-    <widget class="QComboBox" name="uiLanguageCO" >
-     <property name="toolTip" >
+   <item row="0" column="2">
+    <widget class="QComboBox" name="uiLanguageCO">
+     <property name="toolTip">
       <string>Select the language of the user interface (menus, dialogs, etc.)</string>
      </property>
-     <property name="maxVisibleItems" >
+     <property name="maxVisibleItems">
       <number>20</number>
      </property>
     </widget>
    </item>
-   <item row="1" column="0" colspan="2" >
-    <widget class="QLabel" name="languagePackageLA" >
-     <property name="text" >
+   <item row="1" column="0" colspan="2">
+    <widget class="QLabel" name="languagePackageLA">
+     <property name="text">
       <string>Language pac&amp;kage:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>languagePackageED</cstring>
      </property>
     </widget>
    </item>
-   <item row="1" column="2" >
-    <widget class="QLineEdit" name="languagePackageED" >
-     <property name="toolTip" >
+   <item row="1" column="2" rowspan="2">
+    <widget class="QLineEdit" name="languagePackageED">
+     <property name="toolTip">
       <string>Enter the command to load the language package (default: babel)</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="0" colspan="2" >
-    <widget class="QLabel" name="startCommandLA" >
-     <property name="text" >
+   <item row="2" column="3" rowspan="2">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>102</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="3" column="0" colspan="2">
+    <widget class="QLabel" name="startCommandLA">
+     <property name="text">
       <string>Command s&amp;tart:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>startCommandED</cstring>
      </property>
     </widget>
    </item>
-   <item row="2" column="2" >
-    <widget class="QLineEdit" name="startCommandED" >
-     <property name="toolTip" >
+   <item row="3" column="2">
+    <widget class="QLineEdit" name="startCommandED">
+     <property name="toolTip">
       <string>The LaTeX command that starts a switch to a foreign language</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2" >
-    <widget class="QLabel" name="endCommandLA" >
-     <property name="text" >
+   <item row="4" column="0" colspan="2">
+    <widget class="QLabel" name="endCommandLA">
+     <property name="text">
       <string>Command e&amp;nd:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>endCommandED</cstring>
      </property>
     </widget>
    </item>
-   <item row="3" column="2" >
-    <widget class="QLineEdit" name="endCommandED" >
-     <property name="toolTip" >
+   <item row="4" column="2">
+    <widget class="QLineEdit" name="endCommandED">
+     <property name="toolTip">
       <string>The LaTeX command that ends a switch to a foreign language</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="0" colspan="3" >
-    <widget class="QCheckBox" name="useBabelCB" >
-     <property name="toolTip" >
+   <item row="5" column="0" colspan="2">
+    <widget class="QCheckBox" name="useBabelCB">
+     <property name="toolTip">
       <string>Use the babel package for multilingual support</string>
      </property>
-     <property name="text" >
+     <property name="text">
       <string>&amp;Use babel</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="0" colspan="3" >
-    <widget class="QCheckBox" name="globalCB" >
-     <property name="toolTip" >
+   <item row="6" column="0">
+    <widget class="QCheckBox" name="globalCB">
+     <property name="toolTip">
       <string>Check to pass the language globally (to the document class), not locally (to the language package)</string>
      </property>
-     <property name="text" >
+     <property name="text">
       <string>&amp;Global</string>
      </property>
     </widget>
    </item>
-   <item row="6" column="0" colspan="3" >
-    <widget class="QCheckBox" name="autoBeginCB" >
-     <property name="toolTip" >
+   <item row="7" column="0" colspan="2">
+    <widget class="QCheckBox" name="autoBeginCB">
+     <property name="toolTip">
       <string>If checked, the document language is not explicitly set by a language switch command</string>
      </property>
-     <property name="text" >
+     <property name="text">
       <string>Auto &amp;begin</string>
      </property>
     </widget>
    </item>
-   <item row="7" column="0" colspan="3" >
-    <widget class="QCheckBox" name="autoEndCB" >
-     <property name="toolTip" >
+   <item row="8" column="0" colspan="2">
+    <widget class="QCheckBox" name="autoEndCB">
+     <property name="toolTip">
       <string>If checked, the document language is not explicitly closed by a language switch command</string>
      </property>
-     <property name="text" >
+     <property name="text">
       <string>Auto &amp;end</string>
      </property>
     </widget>
    </item>
-   <item row="8" column="0" colspan="3" >
-    <widget class="QCheckBox" name="markForeignCB" >
-     <property name="toolTip" >
+   <item row="9" column="0" colspan="3">
+    <widget class="QCheckBox" name="markForeignCB">
+     <property name="toolTip">
       <string>Check to highlight foreign languages visually in the work area</string>
      </property>
-     <property name="text" >
+     <property name="text">
       <string>Mark &amp;foreign languages</string>
      </property>
     </widget>
    </item>
-   <item row="9" column="0" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>16</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="10" column="0" colspan="3" >
-    <widget class="QGroupBox" name="rtlGB2" >
-     <property name="toolTip" >
+   <item row="10" column="0" colspan="4">
+    <widget class="QGroupBox" name="rtlGB2">
+     <property name="toolTip">
       <string/>
      </property>
-     <property name="title" >
+     <property name="title">
       <string>Right-to-left language support</string>
      </property>
-     <property name="flat" >
+     <property name="flat">
       <bool>true</bool>
      </property>
-     <property name="checkable" >
+     <property name="checkable">
       <bool>false</bool>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="0" column="0" >
-       <widget class="QCheckBox" name="rtlGB" >
-        <property name="toolTip" >
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="rtlGB">
+        <property name="toolTip">
          <string>Select to enable support of right-to-left languages (e.g. Hebrew, Arabic).</string>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>Enable RTL su&amp;pport</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1" >
-       <spacer>
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" >
-         <size>
-          <width>101</width>
-          <height>20</height>
-         </size>
+      <item row="1" column="0">
+       <layout class="QHBoxLayout">
+        <property name="spacing">
+         <number>6</number>
         </property>
-       </spacer>
-      </item>
-      <item row="1" column="0" >
-       <layout class="QHBoxLayout" >
-        <property name="margin" >
+        <property name="margin">
          <number>0</number>
         </property>
-        <property name="spacing" >
-         <number>6</number>
-        </property>
         <item>
-         <widget class="QLabel" name="cursorMovementLA" >
-          <property name="text" >
+         <widget class="QLabel" name="cursorMovementLA">
+          <property name="text">
            <string>Cursor movement:</string>
           </property>
-          <property name="scaledContents" >
+          <property name="scaledContents">
            <bool>false</bool>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="logicalCursorRB" >
-          <property name="text" >
+         <widget class="QRadioButton" name="logicalCursorRB">
+          <property name="text">
            <string>&amp;Logical</string>
           </property>
-          <property name="checked" >
+          <property name="checked">
            <bool>true</bool>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="visualCursorRB" >
-          <property name="text" >
+         <widget class="QRadioButton" name="visualCursorRB">
+          <property name="text">
            <string>&amp;Visual</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
+      <item row="1" column="1">
+       <spacer>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>101</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      </layout>
     </widget>
    </item>
-   <item row="11" column="1" >
+   <item row="11" column="1">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeType" >
+     <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>20</height>
@@ -269,7 +254,7 @@
   <tabstop>markForeignCB</tabstop>
  </tabstops>
  <includes>
-  <include location="local" >qt_i18n.h</include>
+  <include location="local">qt_i18n.h</include>
  </includes>
  <resources/>
  <connections>
@@ -279,11 +264,11 @@
    <receiver>logicalCursorRB</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>139</x>
      <y>317</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>162</x>
      <y>348</y>
     </hint>
@@ -295,11 +280,11 @@
    <receiver>visualCursorRB</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>139</x>
      <y>317</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>228</x>
      <y>348</y>
     </hint>
@@ -311,11 +296,11 @@
    <receiver>cursorMovementLA</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>139</x>
      <y>317</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>72</x>
      <y>348</y>
     </hint>

diff --git a/src/frontends/qt4/ui/PrefLatexUi.ui b/src/frontends/qt4/ui/PrefLatexUi.ui
index f327288e1d8c9234106b0a4f0e48389eeb1ab87b..826226a1cc65b66d5ba8e4a078420c089c369289 100644 (file)
--- a/src/frontends/qt4/ui/PrefLatexUi.ui
+++ b/src/frontends/qt4/ui/PrefLatexUi.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>374</width>
-    <height>399</height>
+    <width>355</width>
+    <height>402</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -111,7 +111,20 @@
      </item>
     </layout>
    </item>
-   <item row="1" column="0">
+   <item row="0" column="1">
+    <spacer name="horizontalSpacer_4">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>33</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="0" colspan="2">
     <widget class="QGroupBox" name="bibtexGB">
      <property name="title">
       <string>Bibliography generation</string>
@@ -156,6 +169,19 @@
         </property>
        </widget>
       </item>
+      <item row="1" column="2">
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>52</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
       <item row="2" column="0">
        <widget class="QLabel" name="latexJBibtexLA">
         <property name="text">
@@ -176,7 +202,7 @@
      </layout>
     </widget>
    </item>
-   <item row="2" column="0">
+   <item row="2" column="0" colspan="2">
     <widget class="QGroupBox" name="indexGB">
      <property name="title">
       <string>Index generation</string>
@@ -204,6 +230,19 @@
       <item row="0" column="1">
        <widget class="QComboBox" name="latexIndexCO"/>
       </item>
+      <item row="0" column="2" rowspan="2">
+       <spacer name="horizontalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>52</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
       <item row="1" column="0">
        <widget class="QLabel" name="latexIndexOptionsLA">
         <property name="text">
@@ -241,7 +280,7 @@
      </layout>
     </widget>
    </item>
-   <item row="3" column="0">
+   <item row="3" column="0" colspan="2">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string/>
@@ -250,8 +289,11 @@
       <bool>true</bool>
      </property>
      <layout class="QGridLayout" name="gridLayout_3">
+      <property name="topMargin">
+       <number>3</number>
+      </property>
       <property name="bottomMargin">
-       <number>0</number>
+       <number>3</number>
       </property>
       <item row="0" column="0">
        <widget class="QLabel" name="latexNomenclLA">
@@ -287,6 +329,19 @@
         </property>
        </widget>
       </item>
+      <item row="1" column="2">
+       <spacer name="horizontalSpacer_3">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>51</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
       <item row="2" column="0" colspan="2">
        <widget class="QCheckBox" name="pathCB">
         <property name="enabled">
@@ -306,7 +361,7 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="0" colspan="2">
+      <item row="3" column="0" colspan="3">
        <widget class="QCheckBox" name="latexAutoresetCB">
         <property name="toolTip">
          <string>Set class options to default on class change</string>

diff --git a/src/frontends/qt4/ui/PrefScreenFontsUi.ui b/src/frontends/qt4/ui/PrefScreenFontsUi.ui
index 6bb13813c5a2af2069670546bf5f458487fd672f..df7bdead0accba56ba37704453b92f3f821f4eb8 100644 (file)
--- a/src/frontends/qt4/ui/PrefScreenFontsUi.ui
+++ b/src/frontends/qt4/ui/PrefScreenFontsUi.ui
@@ -1,61 +1,53 @@
-<ui version="4.0" >
+<ui version="4.0">
  <class>PrefScreenFontsUi</class>
- <widget class="QWidget" name="PrefScreenFontsUi" >
-  <property name="geometry" >
+ <widget class="QWidget" name="PrefScreenFontsUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>371</width>
-    <height>482</height>
+    <width>288</width>
+    <height>355</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>11</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item>
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <property name="spacing" >
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <layout class="QHBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
+     <property name="margin">
+      <number>0</number>
+     </property>
      <item>
-      <layout class="QGridLayout" >
-       <property name="margin" >
+      <layout class="QGridLayout">
+       <property name="margin">
         <number>0</number>
        </property>
-       <property name="spacing" >
+       <property name="spacing">
         <number>6</number>
        </property>
-       <item row="1" column="1" >
-        <widget class="QComboBox" name="screenSansCO" >
-         <property name="maxVisibleItems" >
+       <item row="1" column="1">
+        <widget class="QComboBox" name="screenSansCO">
+         <property name="maxVisibleItems">
           <number>20</number>
          </property>
-         <property name="duplicatesEnabled" >
+         <property name="duplicatesEnabled">
           <bool>false</bool>
          </property>
         </widget>
        </item>
-       <item row="1" column="2" >
-        <widget class="GuiFontExample" native="1" name="screenSansFE" >
-         <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>3</hsizetype>
-           <vsizetype>5</vsizetype>
+       <item row="1" column="2">
+        <widget class="GuiFontExample" name="screenSansFE" native="true">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="minimumSize" >
+         <property name="minimumSize">
           <size>
            <width>60</width>
            <height>0</height>
@@ -63,27 +55,25 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="0" >
-        <widget class="QLabel" name="screenSansLA" >
-         <property name="text" >
+       <item row="1" column="0">
+        <widget class="QLabel" name="screenSansLA">
+         <property name="text">
           <string>Sans Seri&amp;f:</string>
          </property>
-         <property name="buddy" >
+         <property name="buddy">
           <cstring>screenSansCO</cstring>
          </property>
         </widget>
        </item>
-       <item row="0" column="2" >
-        <widget class="GuiFontExample" native="1" name="screenRomanFE" >
-         <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>3</hsizetype>
-           <vsizetype>5</vsizetype>
+       <item row="0" column="2">
+        <widget class="GuiFontExample" name="screenRomanFE" native="true">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="minimumSize" >
+         <property name="minimumSize">
           <size>
            <width>60</width>
            <height>0</height>
@@ -91,54 +81,52 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="1" >
-        <widget class="QComboBox" name="screenRomanCO" >
-         <property name="maxVisibleItems" >
+       <item row="0" column="1">
+        <widget class="QComboBox" name="screenRomanCO">
+         <property name="maxVisibleItems">
           <number>20</number>
          </property>
-         <property name="duplicatesEnabled" >
+         <property name="duplicatesEnabled">
           <bool>false</bool>
          </property>
         </widget>
        </item>
-       <item row="2" column="0" >
-        <widget class="QLabel" name="screenTypewriterLA" >
-         <property name="text" >
+       <item row="2" column="0">
+        <widget class="QLabel" name="screenTypewriterLA">
+         <property name="text">
           <string>T&amp;ypewriter:</string>
          </property>
-         <property name="buddy" >
+         <property name="buddy">
           <cstring>screenTypewriterCO</cstring>
          </property>
         </widget>
        </item>
-       <item row="0" column="0" >
-        <widget class="QLabel" name="screenRomanLA" >
-         <property name="text" >
+       <item row="0" column="0">
+        <widget class="QLabel" name="screenRomanLA">
+         <property name="text">
           <string>R&amp;oman:</string>
          </property>
-         <property name="buddy" >
+         <property name="buddy">
           <cstring>screenRomanCO</cstring>
          </property>
         </widget>
        </item>
-       <item row="2" column="2" >
-        <widget class="GuiFontExample" native="1" name="screenTypewriterFE" >
-         <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>3</hsizetype>
-           <vsizetype>5</vsizetype>
+       <item row="2" column="2">
+        <widget class="GuiFontExample" name="screenTypewriterFE" native="true">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
         </widget>
        </item>
-       <item row="2" column="1" >
-        <widget class="QComboBox" name="screenTypewriterCO" >
-         <property name="maxVisibleItems" >
+       <item row="2" column="1">
+        <widget class="QComboBox" name="screenTypewriterCO">
+         <property name="maxVisibleItems">
           <number>20</number>
          </property>
-         <property name="duplicatesEnabled" >
+         <property name="duplicatesEnabled">
           <bool>false</bool>
          </property>
         </widget>
@@ -147,52 +135,52 @@
      </item>
     </layout>
    </item>
-   <item>
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <property name="spacing" >
+   <item row="1" column="0">
+    <layout class="QHBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
+     <property name="margin">
+      <number>0</number>
+     </property>
      <item>
-      <layout class="QGridLayout" >
-       <property name="margin" >
+      <layout class="QGridLayout">
+       <property name="margin">
         <number>0</number>
        </property>
-       <property name="spacing" >
+       <property name="spacing">
         <number>6</number>
        </property>
-       <item row="1" column="0" >
-        <widget class="QLabel" name="scrrenDpiLA" >
-         <property name="text" >
+       <item row="1" column="0">
+        <widget class="QLabel" name="scrrenDpiLA">
+         <property name="text">
           <string>Screen &amp;DPI:</string>
          </property>
-         <property name="buddy" >
+         <property name="buddy">
           <cstring>screenDpiSB</cstring>
          </property>
         </widget>
        </item>
-       <item row="1" column="1" >
-        <widget class="QSpinBox" name="screenDpiSB" >
-         <property name="maximum" >
+       <item row="1" column="1">
+        <widget class="QSpinBox" name="screenDpiSB">
+         <property name="maximum">
           <number>999</number>
          </property>
         </widget>
        </item>
-       <item row="0" column="0" >
-        <widget class="QLabel" name="screenZoomLA" >
-         <property name="text" >
+       <item row="0" column="0">
+        <widget class="QLabel" name="screenZoomLA">
+         <property name="text">
           <string>&amp;Zoom %:</string>
          </property>
-         <property name="buddy" >
+         <property name="buddy">
           <cstring>screenZoomSB</cstring>
          </property>
         </widget>
        </item>
-       <item row="0" column="1" >
-        <widget class="QSpinBox" name="screenZoomSB" >
-         <property name="maximum" >
+       <item row="0" column="1">
+        <widget class="QSpinBox" name="screenZoomSB">
+         <property name="maximum">
           <number>999</number>
          </property>
         </widget>
@@ -201,13 +189,13 @@
      </item>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeType" >
+       <property name="sizeType">
         <enum>QSizePolicy::Expanding</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
          <height>20</height>
@@ -217,144 +205,144 @@
      </item>
     </layout>
    </item>
-   <item>
-    <widget class="QGroupBox" name="GroupBox3" >
-     <property name="title" >
+   <item row="2" column="0">
+    <widget class="QGroupBox" name="GroupBox3">
+     <property name="title">
       <string>Font Sizes</string>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
+     <layout class="QGridLayout">
+      <property name="margin">
        <number>11</number>
       </property>
-      <property name="spacing" >
+      <property name="spacing">
        <number>6</number>
       </property>
-      <item row="0" column="1" >
-       <widget class="QLineEdit" name="screenTinyED" />
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="screenTinyED"/>
       </item>
-      <item row="4" column="3" >
-       <widget class="QLineEdit" name="screenHugerED" />
+      <item row="4" column="3">
+       <widget class="QLineEdit" name="screenHugerED"/>
       </item>
-      <item row="1" column="1" >
-       <widget class="QLineEdit" name="screenSmallestED" />
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="screenSmallestED"/>
       </item>
-      <item row="2" column="1" >
-       <widget class="QLineEdit" name="screenSmallerED" />
+      <item row="2" column="1">
+       <widget class="QLineEdit" name="screenSmallerED"/>
       </item>
-      <item row="3" column="1" >
-       <widget class="QLineEdit" name="screenSmallED" />
+      <item row="3" column="1">
+       <widget class="QLineEdit" name="screenSmallED"/>
       </item>
-      <item row="4" column="1" >
-       <widget class="QLineEdit" name="screenNormalED" />
+      <item row="4" column="1">
+       <widget class="QLineEdit" name="screenNormalED"/>
       </item>
-      <item row="0" column="3" >
-       <widget class="QLineEdit" name="screenLargeED" />
+      <item row="0" column="3">
+       <widget class="QLineEdit" name="screenLargeED"/>
       </item>
-      <item row="1" column="3" >
-       <widget class="QLineEdit" name="screenLargerED" />
+      <item row="1" column="3">
+       <widget class="QLineEdit" name="screenLargerED"/>
       </item>
-      <item row="2" column="3" >
-       <widget class="QLineEdit" name="screenLargestED" />
+      <item row="2" column="3">
+       <widget class="QLineEdit" name="screenLargestED"/>
       </item>
-      <item row="0" column="2" >
-       <widget class="QLabel" name="screenLargeLA" >
-        <property name="text" >
+      <item row="0" column="2">
+       <widget class="QLabel" name="screenLargeLA">
+        <property name="text">
          <string>&amp;Large:</string>
         </property>
-        <property name="buddy" >
+        <property name="buddy">
          <cstring>screenLargeED</cstring>
         </property>
        </widget>
       </item>
-      <item row="1" column="2" >
-       <widget class="QLabel" name="screenLargerLA" >
-        <property name="text" >
+      <item row="1" column="2">
+       <widget class="QLabel" name="screenLargerLA">
+        <property name="text">
          <string>&amp;Larger:</string>
         </property>
-        <property name="buddy" >
+        <property name="buddy">
          <cstring>screenLargerED</cstring>
         </property>
        </widget>
       </item>
-      <item row="2" column="2" >
-       <widget class="QLabel" name="screenLargestLA" >
-        <property name="text" >
+      <item row="2" column="2">
+       <widget class="QLabel" name="screenLargestLA">
+        <property name="text">
          <string>&amp;Largest:</string>
         </property>
-        <property name="buddy" >
+        <property name="buddy">
          <cstring>screenLargestED</cstring>
         </property>
        </widget>
       </item>
-      <item row="3" column="3" >
-       <widget class="QLineEdit" name="screenHugeED" />
+      <item row="3" column="3">
+       <widget class="QLineEdit" name="screenHugeED"/>
       </item>
-      <item row="3" column="2" >
-       <widget class="QLabel" name="screenHugeLA" >
-        <property name="text" >
+      <item row="3" column="2">
+       <widget class="QLabel" name="screenHugeLA">
+        <property name="text">
          <string>&amp;Huge:</string>
         </property>
-        <property name="buddy" >
+        <property name="buddy">
          <cstring>screenHugeED</cstring>
         </property>
        </widget>
       </item>
-      <item row="4" column="2" >
-       <widget class="QLabel" name="screenHugestLA" >
-        <property name="text" >
+      <item row="4" column="2">
+       <widget class="QLabel" name="screenHugestLA">
+        <property name="text">
          <string>&amp;Hugest:</string>
         </property>
-        <property name="buddy" >
+        <property name="buddy">
          <cstring>screenHugerED</cstring>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="screenSmallestLA" >
-        <property name="text" >
+      <item row="1" column="0">
+       <widget class="QLabel" name="screenSmallestLA">
+        <property name="text">
          <string>S&amp;mallest:</string>
         </property>
-        <property name="buddy" >
+        <property name="buddy">
          <cstring>screenSmallestED</cstring>
         </property>
        </widget>
       </item>
-      <item row="2" column="0" >
-       <widget class="QLabel" name="screenSmallerLA" >
-        <property name="text" >
+      <item row="2" column="0">
+       <widget class="QLabel" name="screenSmallerLA">
+        <property name="text">
          <string>S&amp;maller:</string>
         </property>
-        <property name="buddy" >
+        <property name="buddy">
          <cstring>screenSmallerED</cstring>
         </property>
        </widget>
       </item>
-      <item row="3" column="0" >
-       <widget class="QLabel" name="screenSmallLA" >
-        <property name="text" >
+      <item row="3" column="0">
+       <widget class="QLabel" name="screenSmallLA">
+        <property name="text">
          <string>S&amp;mall:</string>
         </property>
-        <property name="buddy" >
+        <property name="buddy">
          <cstring>screenSmallED</cstring>
         </property>
        </widget>
       </item>
-      <item row="4" column="0" >
-       <widget class="QLabel" name="screenNormalLA" >
-        <property name="text" >
+      <item row="4" column="0">
+       <widget class="QLabel" name="screenNormalLA">
+        <property name="text">
          <string>&amp;Normal:</string>
         </property>
-        <property name="buddy" >
+        <property name="buddy">
          <cstring>screenNormalED</cstring>
         </property>
        </widget>
       </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="screenTinyLA" >
-        <property name="text" >
+      <item row="0" column="0">
+       <widget class="QLabel" name="screenTinyLA">
+        <property name="text">
          <string>&amp;Tiny:</string>
         </property>
-        <property name="buddy" >
+        <property name="buddy">
          <cstring>screenTinyED</cstring>
         </property>
        </widget>
@@ -362,28 +350,38 @@
      </layout>
     </widget>
    </item>
-   <item>
-    <widget class="QCheckBox" name="pixmapCacheCB" >
-     <property name="toolTip" >
+   <item row="2" column="1">
+    <spacer name="horizontalSpacer">
+     <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="3" column="0">
+    <widget class="QCheckBox" name="pixmapCacheCB">
+     <property name="toolTip">
       <string>Checking this improves performance, but might decrease the on-screen quality of fonts</string>
      </property>
-     <property name="text" >
+     <property name="text">
       <string>&amp;Use pixmap cache to speed up font rendering</string>
      </property>
     </widget>
    </item>
-   <item>
-    <spacer>
-     <property name="orientation" >
+   <item row="4" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
-       <height>20</height>
+       <height>6</height>
       </size>
      </property>
     </spacer>
@@ -415,7 +413,7 @@
   <tabstop>screenHugerED</tabstop>
  </tabstops>
  <includes>
-  <include location="local" >qt_i18n.h</include>
+  <include location="local">qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>

diff --git a/src/frontends/qt4/ui/PrefUi.ui b/src/frontends/qt4/ui/PrefUi.ui
index 08818760c3092419214fa250541b1a1788acfd6a..c06d76c822cd24c6c8ae69796d72ced1e47fcbdd 100644 (file)
--- a/src/frontends/qt4/ui/PrefUi.ui
+++ b/src/frontends/qt4/ui/PrefUi.ui
@@ -1,152 +1,193 @@
-<ui version="4.0" >
+<ui version="4.0">
  <class>PrefUi</class>
- <widget class="QWidget" name="PrefUi" >
-  <property name="geometry" >
+ <widget class="QWidget" name="PrefUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>459</width>
-    <height>459</height>
+    <width>413</width>
+    <height>408</height>
    </rect>
   </property>
-  <property name="sizePolicy" >
-   <sizepolicy>
-    <hsizetype>0</hsizetype>
-    <vsizetype>0</vsizetype>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="2" column="0" colspan="3" >
-    <widget class="QGroupBox" name="GeometryGB" >
-     <property name="title" >
-      <string>Session</string>
+  <layout class="QGridLayout" name="gridLayout_3">
+   <item row="0" column="0">
+    <widget class="QLabel" name="uiFileLA">
+     <property name="text">
+      <string>&amp;User interface file:</string>
+     </property>
+     <property name="buddy">
+      <cstring>uiFileED</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QLineEdit" name="uiFileED"/>
+   </item>
+   <item row="0" column="2">
+    <widget class="QPushButton" name="uiFilePB">
+     <property name="text">
+      <string>Bro&amp;wse...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="3">
+    <spacer name="horizontalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>77</width>
+       <height>20</height>
+      </size>
      </property>
-     <property name="flat" >
+    </spacer>
+   </item>
+   <item row="1" column="0" colspan="4">
+    <widget class="QGroupBox" name="pixmapCacheGB_2">
+     <property name="title">
+      <string>Automatic help</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
+     <property name="flat">
       <bool>true</bool>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
+     <layout class="QGridLayout">
+      <property name="margin">
        <number>9</number>
       </property>
-      <property name="spacing" >
+      <property name="spacing">
        <number>4</number>
       </property>
-      <item row="0" column="0" >
-       <widget class="QCheckBox" name="allowGeometrySessionCB" >
-        <property name="enabled" >
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="tooltipCB">
+        <property name="toolTip">
+         <string>Checking this allow the automatic display of helpful comments for insets in the main work area of an edited document</string>
+        </property>
+        <property name="text">
+         <string>&amp;Enable tool tips in main work area</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="4">
+    <widget class="QGroupBox" name="GeometryGB">
+     <property name="title">
+      <string>Session</string>
+     </property>
+     <property name="flat">
+      <bool>true</bool>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0" colspan="2">
+       <widget class="QCheckBox" name="allowGeometrySessionCB">
+        <property name="enabled">
          <bool>true</bool>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>Restore window layouts and &amp;geometries</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" >
-       <widget class="QCheckBox" name="restoreCursorCB" >
-        <property name="toolTip" >
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="restoreCursorCB">
+        <property name="toolTip">
          <string>Restore to the cursor position when the file was last closed</string>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>Restore cursor &amp;positions</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="0" >
-       <widget class="QCheckBox" name="loadSessionCB" >
-        <property name="text" >
+      <item row="2" column="0" colspan="2">
+       <widget class="QCheckBox" name="loadSessionCB">
+        <property name="text">
          <string>&amp;Load opened files from last session</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="0" >
-       <widget class="QPushButton" name="clearSessionPB" >
-        <property name="text" >
+      <item row="3" column="0">
+       <widget class="QPushButton" name="clearSessionPB">
+        <property name="text">
          <string>Clear all session &amp;information</string>
         </property>
        </widget>
       </item>
+      <item row="3" column="1">
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>225</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      </layout>
     </widget>
    </item>
-   <item row="3" column="0" colspan="3" >
-    <widget class="QGroupBox" name="documentsGB" >
-     <property name="title" >
+   <item row="3" column="0" colspan="4">
+    <widget class="QGroupBox" name="documentsGB">
+     <property name="title">
       <string>Documents</string>
      </property>
-     <property name="flat" >
+     <property name="flat">
       <bool>true</bool>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="2" column="0" colspan="4" >
-       <layout class="QHBoxLayout" >
-        <property name="spacing" >
-         <number>6</number>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="0" column="0" colspan="5">
+       <widget class="QCheckBox" name="backupCB">
+        <property name="text">
+         <string>Backup original documents when saving</string>
         </property>
-        <property name="margin" >
-         <number>0</number>
+       </widget>
+      </item>
+      <item row="1" column="0" colspan="3">
+       <widget class="QCheckBox" name="autoSaveCB">
+        <property name="text">
+         <string>&amp;Backup documents, every</string>
         </property>
-        <item>
-         <widget class="QLabel" name="lastfilesLA" >
-          <property name="text" >
-           <string>&amp;Maximum last files:</string>
-          </property>
-          <property name="buddy" >
-           <cstring>lastfilesSB</cstring>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QSpinBox" name="lastfilesSB" >
-          <property name="maximum" >
-           <number>9</number>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0" >
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
+       </widget>
       </item>
-      <item row="0" column="0" colspan="4">
-      <widget class="QCheckBox" name="backupCB">
-      <property name="text">
-      <string>Backup original documents when saving</string>
-      </property>
-      </widget>
+      <item row="1" column="3">
+       <widget class="QSpinBox" name="autoSaveSB">
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>300</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="4">
+       <widget class="QLabel" name="TextLabel1">
+        <property name="text">
+         <string>minutes</string>
+        </property>
+       </widget>
       </item>
-      <item row="1" column="3" >
+      <item row="1" column="5">
        <spacer>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeHint" stdset="0" >
+        <property name="sizeHint" stdset="0">
          <size>
           <width>61</width>
           <height>21</height>
@@ -154,43 +195,49 @@
         </property>
        </spacer>
       </item>
-      <item row="1" column="2" >
-       <widget class="QLabel" name="TextLabel1" >
-        <property name="text" >
-         <string>minutes</string>
+      <item row="2" column="0">
+       <widget class="QLabel" name="lastfilesLA">
+        <property name="text">
+         <string>&amp;Maximum last files:</string>
+        </property>
+        <property name="buddy">
+         <cstring>lastfilesSB</cstring>
         </property>
        </widget>
       </item>
-      <item row="1" column="1" >
-       <widget class="QSpinBox" name="autoSaveSB" >
-        <property name="minimum" >
-         <number>1</number>
-        </property>
-        <property name="maximum" >
-         <number>300</number>
+      <item row="2" column="1">
+       <widget class="QSpinBox" name="lastfilesSB">
+        <property name="maximum">
+         <number>9</number>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" >
-       <widget class="QCheckBox" name="autoSaveCB" >
-        <property name="text" >
-         <string>&amp;Backup documents, every</string>
+      <item row="2" column="2" colspan="2">
+       <spacer>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
         </property>
-       </widget>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>48</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
       </item>
-      <item row="3" column="0" colspan="4" >
-       <widget class="QCheckBox" name="openDocumentsInTabsCB" >
-        <property name="text" >
+      <item row="3" column="0" colspan="2">
+       <widget class="QCheckBox" name="openDocumentsInTabsCB">
+        <property name="text">
          <string>&amp;Open documents in tabs</string>
         </property>
        </widget>
       </item>
-      <item row="5" column="0" >
-       <widget class="QCheckBox" name="singleCloseTabButtonCB" >
-        <property name="toolTip" >
+      <item row="4" column="0" colspan="2">
+       <widget class="QCheckBox" name="singleCloseTabButtonCB">
+        <property name="toolTip">
          <string>Whether to place close button on each tab or only one in the top left.</string>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>&amp;Single close-tab button</string>
         </property>
        </widget>
@@ -198,12 +245,12 @@
      </layout>
     </widget>
    </item>
-   <item row="6" column="0" colspan="3" >
+   <item row="4" column="0" colspan="4">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>395</width>
        <height>16</height>
@@ -211,60 +258,9 @@
      </property>
     </spacer>
    </item>
-   <item row="1" column="0" colspan="3" >
-    <widget class="QGroupBox" name="pixmapCacheGB_2" >
-     <property name="title" >
-      <string>Automatic help</string>
-     </property>
-     <property name="alignment" >
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-     </property>
-     <property name="flat" >
-      <bool>true</bool>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>4</number>
-      </property>
-      <item row="0" column="0" >
-       <widget class="QCheckBox" name="tooltipCB" >
-        <property name="toolTip" >
-         <string>Checking this allow the automatic display of helpful comments for insets in the main work area of an edited document</string>
-        </property>
-        <property name="text" >
-         <string>&amp;Enable tool tips in main work area</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="0" column="2" >
-    <widget class="QPushButton" name="uiFilePB" >
-     <property name="text" >
-      <string>Bro&amp;wse...</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1" >
-    <widget class="QLineEdit" name="uiFileED" />
-   </item>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="uiFileLA" >
-     <property name="text" >
-      <string>&amp;User interface file:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>uiFileED</cstring>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
- <layoutdefault spacing="4" margin="9" />
+ <layoutdefault spacing="4" margin="9"/>
  <tabstops>
   <tabstop>uiFileED</tabstop>
   <tabstop>uiFilePB</tabstop>
@@ -278,7 +274,7 @@
   <tabstop>openDocumentsInTabsCB</tabstop>
  </tabstops>
  <includes>
-  <include location="local" >qt_i18n.h</include>
+  <include location="local">qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>

diff --git a/src/frontends/qt4/ui/PrintNomenclUi.ui b/src/frontends/qt4/ui/PrintNomenclUi.ui
index 76b4b12f7b2edb64522a6a7d52e275e8ea22efb5..b352270a78f57245084ba2805ffc5c090a541be7 100644 (file)
--- a/src/frontends/qt4/ui/PrintNomenclUi.ui
+++ b/src/frontends/qt4/ui/PrintNomenclUi.ui
@@ -17,55 +17,47 @@
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0" colspan="2">
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <widget class="QLabel" name="setWidthLA">
-       <property name="toolTip">
-        <string>Define hanging indentation/label length for the nomenclature list.</string>
-       </property>
-       <property name="text">
-        <string>&amp;List Indentation:</string>
-       </property>
-       <property name="buddy">
-        <cstring>setWidthCO</cstring>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QComboBox" name="setWidthCO">
-       <property name="toolTip">
-        <string>Define hanging indentation/label length for the nomenclature list.</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    <widget class="QLabel" name="setWidthLA">
+     <property name="toolTip">
+      <string>Define hanging indentation/label length for the nomenclature list.</string>
+     </property>
+     <property name="text">
+      <string>&amp;List Indentation:</string>
+     </property>
+     <property name="buddy">
+      <cstring>setWidthCO</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="2" colspan="2">
+    <widget class="QComboBox" name="setWidthCO">
+     <property name="toolTip">
+      <string>Define hanging indentation/label length for the nomenclature list.</string>
+     </property>
+    </widget>
    </item>
    <item row="1" column="0" colspan="2">
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QLabel" name="valueLA">
-       <property name="text">
-        <string>Custom &amp;Width:</string>
-       </property>
-       <property name="buddy">
-        <cstring>valueLE</cstring>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="valueLE">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="toolTip">
-        <string>Custom value. &quot;List Indentation&quot; needs to be set to &quot;Custom&quot;.</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="LengthCombo" name="unitLC"/>
-     </item>
-    </layout>
+    <widget class="QLabel" name="valueLA">
+     <property name="text">
+      <string>Custom &amp;Width:</string>
+     </property>
+     <property name="buddy">
+      <cstring>valueLE</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2">
+    <widget class="QLineEdit" name="valueLE">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="toolTip">
+      <string>Custom value. &quot;List Indentation&quot; needs to be set to &quot;Custom&quot;.</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="3">
+    <widget class="LengthCombo" name="unitLC"/>
    </item>
    <item row="2" column="0">
     <spacer name="horizontalSpacer">
@@ -80,7 +72,7 @@
      </property>
     </spacer>
    </item>
-   <item row="2" column="1">
+   <item row="2" column="1" colspan="3">
     <layout class="QHBoxLayout">
      <item>
       <widget class="QPushButton" name="okPB">

diff --git a/src/frontends/qt4/ui/SpellcheckerUi.ui b/src/frontends/qt4/ui/SpellcheckerUi.ui
index dd07aebe195500847102a84c88b5e67f53dfe387..359686dd4c7f1e8afe799b659cfe85b9027de28e 100644 (file)
--- a/src/frontends/qt4/ui/SpellcheckerUi.ui
+++ b/src/frontends/qt4/ui/SpellcheckerUi.ui
@@ -1,171 +1,190 @@
-<ui version="4.0" >
+<ui version="4.0">
  <class>SpellcheckerUi</class>
- <widget class="QDockWidget" name="SpellcheckerUi" >
-  <property name="geometry" >
+ <widget class="QDockWidget" name="SpellcheckerUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>259</width>
-    <height>528</height>
+    <width>264</width>
+    <height>388</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>DockWidget</string>
   </property>
-  <widget class="QWidget" name="dockWidgetContents" >
-   <layout class="QGridLayout" >
-    <property name="margin" >
-     <number>9</number>
-    </property>
-    <property name="spacing" >
-     <number>6</number>
-    </property>
-    <item row="0" column="0" >
-     <widget class="QLabel" name="languageLA" >
-      <property name="text" >
-       <string>&amp;Language:</string>
-      </property>
-      <property name="buddy" >
-       <cstring>languageCO</cstring>
+  <widget class="QWidget" name="dockWidgetContents">
+   <layout class="QGridLayout" name="gridLayout">
+    <item row="0" column="0" colspan="2">
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <widget class="QLabel" name="languageLA">
+        <property name="text">
+         <string>&amp;Language:</string>
+        </property>
+        <property name="buddy">
+         <cstring>languageCO</cstring>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QComboBox" name="languageCO">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="toolTip">
+         <string>The checked language. Switching this alters the language of the checked word.</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+    <item row="1" column="0" colspan="2">
+     <widget class="Line" name="line">
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
       </property>
      </widget>
     </item>
-    <item row="0" column="1" colspan="2" >
-     <widget class="QComboBox" name="languageCO" >
-      <property name="toolTip" >
-       <string>The checked language. Switching this alters the language of the checked word.</string>
+    <item row="2" column="0">
+     <widget class="QLabel" name="TextLabel3">
+      <property name="text">
+       <string>Unknown word:</string>
+      </property>
+      <property name="buddy">
+       <cstring>wordED</cstring>
       </property>
      </widget>
     </item>
-    <item row="3" column="0" colspan="2" >
-     <widget class="QLineEdit" name="wordED" >
-      <property name="toolTip" >
+    <item row="3" column="0">
+     <widget class="QLineEdit" name="wordED">
+      <property name="toolTip">
        <string>Current word</string>
       </property>
      </widget>
     </item>
-    <item row="3" column="2" >
-     <widget class="QPushButton" name="findNextPB" >
-      <property name="toolTip" >
+    <item row="3" column="1">
+     <widget class="QPushButton" name="findNextPB">
+      <property name="toolTip">
        <string>Replace word with current choice</string>
       </property>
-      <property name="text" >
+      <property name="text">
        <string>&amp;Find Next</string>
       </property>
      </widget>
     </item>
-    <item row="4" column="0" colspan="2" >
-     <widget class="QLabel" name="TextLabel1" >
-      <property name="text" >
+    <item row="4" column="0">
+     <widget class="QLabel" name="TextLabel1">
+      <property name="text">
        <string>Re&amp;placement:</string>
       </property>
-      <property name="buddy" >
+      <property name="buddy">
        <cstring>replaceCO</cstring>
       </property>
      </widget>
     </item>
-    <item row="5" column="0" colspan="2" >
-     <widget class="QComboBox" name="replaceCO" >
-      <property name="sizePolicy" >
-       <sizepolicy>
-        <hsizetype>3</hsizetype>
-        <vsizetype>0</vsizetype>
+    <item row="5" column="0">
+     <widget class="QComboBox" name="replaceCO">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
-      <property name="focusPolicy" >
+      <property name="focusPolicy">
        <enum>Qt::StrongFocus</enum>
       </property>
-      <property name="toolTip" >
+      <property name="toolTip">
        <string>Replace with selected word</string>
       </property>
-      <property name="editable" >
+      <property name="editable">
        <bool>true</bool>
       </property>
-      <property name="insertPolicy" >
+      <property name="insertPolicy">
        <enum>QComboBox::InsertAtTop</enum>
       </property>
-      <property name="autoCompletion" >
+      <property name="autoCompletion">
        <bool>true</bool>
       </property>
-      <property name="duplicatesEnabled" >
+      <property name="duplicatesEnabled">
        <bool>false</bool>
       </property>
      </widget>
     </item>
-    <item row="5" column="2" >
-     <widget class="QPushButton" name="replacePB" >
-      <property name="toolTip" >
+    <item row="5" column="1">
+     <widget class="QPushButton" name="replacePB">
+      <property name="toolTip">
        <string>Replace word with current choice</string>
       </property>
-      <property name="text" >
+      <property name="text">
        <string>&amp;Replace</string>
       </property>
      </widget>
     </item>
-    <item row="6" column="0" colspan="2" >
-     <widget class="QLabel" name="TextLabel2" >
-      <property name="text" >
+    <item row="6" column="0">
+     <widget class="QLabel" name="TextLabel2">
+      <property name="text">
        <string>S&amp;uggestions:</string>
       </property>
-      <property name="buddy" >
+      <property name="buddy">
        <cstring>suggestionsLW</cstring>
       </property>
      </widget>
     </item>
-    <item row="6" column="2" >
-     <widget class="QPushButton" name="replaceAllPB" >
-      <property name="toolTip" >
+    <item row="6" column="1">
+     <widget class="QPushButton" name="replaceAllPB">
+      <property name="toolTip">
        <string>Replace word with current choice</string>
       </property>
-      <property name="text" >
+      <property name="text">
        <string>Replace &amp;All</string>
       </property>
      </widget>
     </item>
-    <item rowspan="4" row="7" column="0" colspan="2" >
-     <widget class="QListWidget" name="suggestionsLW" />
+    <item row="7" column="0" rowspan="4">
+     <widget class="QListWidget" name="suggestionsLW"/>
     </item>
-    <item row="7" column="2" >
-     <widget class="QPushButton" name="ignorePB" >
-      <property name="toolTip" >
+    <item row="7" column="1">
+     <widget class="QPushButton" name="ignorePB">
+      <property name="toolTip">
        <string>Ignore this word</string>
       </property>
-      <property name="text" >
+      <property name="text">
        <string>&amp;Ignore</string>
       </property>
      </widget>
     </item>
-    <item row="8" column="2" >
-     <widget class="QPushButton" name="ignoreAllPB" >
-      <property name="toolTip" >
+    <item row="8" column="1">
+     <widget class="QPushButton" name="ignoreAllPB">
+      <property name="toolTip">
        <string>Ignore this word throughout this session</string>
       </property>
-      <property name="text" >
+      <property name="text">
        <string>I&amp;gnore All</string>
       </property>
      </widget>
     </item>
-    <item row="9" column="2" >
-     <widget class="QPushButton" name="addPB" >
-      <property name="toolTip" >
+    <item row="9" column="1">
+     <widget class="QPushButton" name="addPB">
+      <property name="toolTip">
        <string>Add the word to your personal dictionary</string>
       </property>
-      <property name="text" >
+      <property name="text">
        <string>A&amp;dd</string>
       </property>
      </widget>
     </item>
-    <item row="10" column="2" >
+    <item row="10" column="1">
      <spacer>
-      <property name="orientation" >
+      <property name="orientation">
        <enum>Qt::Vertical</enum>
       </property>
-      <property name="sizeType" >
+      <property name="sizeType">
        <enum>QSizePolicy::Expanding</enum>
       </property>
-      <property name="sizeHint" >
+      <property name="sizeHint" stdset="0">
        <size>
         <width>74</width>
         <height>98</height>
@@ -173,40 +192,23 @@
       </property>
      </spacer>
     </item>
-    <item row="11" column="0" colspan="2" >
-     <widget class="QProgressBar" name="spellcheckPR" >
-      <property name="value" >
+    <item row="11" column="0">
+     <widget class="QProgressBar" name="spellcheckPR">
+      <property name="value">
        <number>24</number>
       </property>
-      <property name="orientation" >
+      <property name="orientation">
        <enum>Qt::Horizontal</enum>
       </property>
      </widget>
     </item>
-    <item row="11" column="2" >
-     <widget class="QPushButton" name="closePB" >
-      <property name="text" >
+    <item row="11" column="1">
+     <widget class="QPushButton" name="closePB">
+      <property name="text">
        <string>&amp;Close</string>
       </property>
      </widget>
     </item>
-    <item row="2" column="0" colspan="2" >
-     <widget class="QLabel" name="TextLabel3" >
-      <property name="text" >
-       <string>Unknown word:</string>
-      </property>
-      <property name="buddy" >
-       <cstring>wordED</cstring>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="0" colspan="3" >
-     <widget class="Line" name="line" >
-      <property name="orientation" >
-       <enum>Qt::Horizontal</enum>
-      </property>
-     </widget>
-    </item>
    </layout>
   </widget>
  </widget>

diff --git a/src/frontends/qt4/ui/TabularUi.ui b/src/frontends/qt4/ui/TabularUi.ui
index e446e4685160eb3239f4d2a7b0a2dfec613f37a8..4b2516caa08376cfa69a93b3526ae3fcad1179a8 100644 (file)
--- a/src/frontends/qt4/ui/TabularUi.ui
+++ b/src/frontends/qt4/ui/TabularUi.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>397</width>
-    <height>429</height>
+    <width>374</width>
+    <height>389</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -15,90 +15,7 @@
   <property name="sizeGripEnabled" stdset="0">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>9</number>
-   </property>
-   <property name="spacing">
-    <number>6</number>
-   </property>
-   <item row="1" column="0">
-    <layout class="QHBoxLayout">
-     <property name="spacing">
-      <number>6</number>
-     </property>
-     <property name="margin">
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="QLabel" name="TextLabel1">
-       <property name="text">
-        <string>Current cell:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="tabularRowED">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>40</width>
-         <height>32767</height>
-        </size>
-       </property>
-       <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
-       </property>
-       <property name="toolTip">
-        <string>Current row position</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="tabularColumnED">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>40</width>
-         <height>32767</height>
-        </size>
-       </property>
-       <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
-       </property>
-       <property name="toolTip">
-        <string>Current column position</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
+  <layout class="QGridLayout" name="_2">
    <item row="0" column="0">
     <widget class="QTabWidget" name="TabWidget">
      <property name="toolTip">
@@ -114,13 +31,13 @@
       <attribute name="title">
        <string>&amp;Table Settings</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout">
+      <layout class="QGridLayout" name="gridLayout_6">
        <item row="0" column="0" colspan="2">
         <widget class="QGroupBox" name="GroupBox12">
          <property name="title">
           <string>Column settings</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_5">
+         <layout class="QGridLayout" name="gridLayout">
           <item row="0" column="0">
            <widget class="QLabel" name="hAlignCO">
             <property name="text">
@@ -158,7 +75,7 @@
             </item>
            </widget>
           </item>
-          <item row="0" column="2">
+          <item row="0" column="2" colspan="2">
            <spacer>
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
@@ -184,7 +101,7 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="1">
+          <item row="1" column="1" colspan="2">
            <widget class="QLineEdit" name="widthED">
             <property name="enabled">
              <bool>true</bool>
@@ -197,24 +114,8 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="2">
-           <widget class="LengthCombo" name="widthUnitCB"/>
-          </item>
           <item row="1" column="3">
-           <spacer name="spacer_3">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Expanding</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>7</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
+           <widget class="LengthCombo" name="widthUnitCB"/>
           </item>
           <item row="2" column="0">
            <widget class="QLabel" name="vAlignCO">
@@ -248,7 +149,7 @@
             </item>
            </widget>
           </item>
-          <item row="2" column="2">
+          <item row="2" column="2" colspan="2">
            <spacer name="spacer">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
@@ -301,7 +202,7 @@
          <property name="title">
           <string>Cell setting</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_6">
+         <layout class="QGridLayout" name="gridLayout_5">
           <item row="0" column="0">
            <widget class="QCheckBox" name="rotateCellCB">
             <property name="toolTip">
@@ -391,36 +292,32 @@
          </layout>
         </widget>
        </item>
-       <item row="3" column="0" colspan="2">
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <item>
-          <widget class="QLabel" name="specialAlignmentLA">
-           <property name="text">
-            <string>LaTe&amp;X argument:</string>
-           </property>
-           <property name="buddy">
-            <cstring>specialAlignmentED</cstring>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLineEdit" name="specialAlignmentED">
-           <property name="toolTip">
-            <string>Custom column format (LaTeX)</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
+       <item row="3" column="0">
+        <widget class="QLabel" name="specialAlignmentLA">
+         <property name="text">
+          <string>LaTe&amp;X argument:</string>
+         </property>
+         <property name="buddy">
+          <cstring>specialAlignmentED</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <widget class="QLineEdit" name="specialAlignmentED">
+         <property name="toolTip">
+          <string>Custom column format (LaTeX)</string>
+         </property>
+        </widget>
        </item>
        <item row="4" column="1">
-        <spacer name="verticalSpacer_2">
+        <spacer name="verticalSpacer_3">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
-           <width>17</width>
-           <height>0</height>
+           <width>20</width>
+           <height>4</height>
           </size>
          </property>
         </spacer>
@@ -438,12 +335,6 @@
           <string>Set Borders</string>
          </property>
          <layout class="QGridLayout">
-          <property name="margin">
-           <number>9</number>
-          </property>
-          <property name="spacing">
-           <number>6</number>
-          </property>
           <item row="0" column="0">
            <widget class="QFrame" name="bordersF">
             <property name="sizePolicy">
@@ -928,12 +819,6 @@
              <enum>QFrame::Sunken</enum>
             </property>
             <layout class="QGridLayout">
-             <property name="margin">
-              <number>9</number>
-             </property>
-             <property name="spacing">
-              <number>6</number>
-             </property>
              <item row="0" column="0">
               <widget class="GuiSetBorder" name="borders" native="true">
                <property name="sizePolicy">
@@ -959,12 +844,6 @@
           <string>All Borders</string>
          </property>
          <layout class="QGridLayout">
-          <property name="margin">
-           <number>9</number>
-          </property>
-          <property name="spacing">
-           <number>6</number>
-          </property>
           <item row="0" column="0">
            <widget class="QPushButton" name="borderSetPB">
             <property name="toolTip">
@@ -994,12 +873,6 @@
           <string>Style</string>
          </property>
          <layout class="QGridLayout">
-          <property name="margin">
-           <number>9</number>
-          </property>
-          <property name="spacing">
-           <number>6</number>
-          </property>
           <item row="1" column="0">
            <widget class="QRadioButton" name="booktabsRB">
             <property name="toolTip">
@@ -1042,31 +915,12 @@
          </property>
         </spacer>
        </item>
-       <item row="1" column="1">
-        <spacer name="spacer_4">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>44</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="2" column="0" colspan="4">
+       <item row="1" column="0" colspan="4">
         <widget class="QGroupBox" name="SpaceGB">
          <property name="title">
           <string>Additional Space</string>
          </property>
          <layout class="QGridLayout">
-          <property name="margin">
-           <number>9</number>
-          </property>
-          <property name="spacing">
-           <number>6</number>
-          </property>
           <item row="0" column="0">
            <widget class="QLabel" name="topspaceLA">
             <property name="text">
@@ -1175,15 +1029,15 @@
          </layout>
         </widget>
        </item>
-       <item row="3" column="1">
-        <spacer>
+       <item row="2" column="1">
+        <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
-           <height>43</height>
+           <height>90</height>
           </size>
          </property>
         </spacer>
@@ -1478,6 +1332,77 @@
      </widget>
     </widget>
    </item>
+   <item row="1" column="0">
+    <layout class="QHBoxLayout" name="_3">
+     <item>
+      <widget class="QLabel" name="TextLabel1">
+       <property name="text">
+        <string>Current cell:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="tabularRowED">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>40</width>
+         <height>32767</height>
+        </size>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="toolTip">
+        <string>Current row position</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="tabularColumnED">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>40</width>
+         <height>32767</height>
+        </size>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="toolTip">
+        <string>Current column position</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Expanding</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
   </layout>
  </widget>
  <customwidgets>

diff --git a/src/frontends/qt4/ui/ThesaurusUi.ui b/src/frontends/qt4/ui/ThesaurusUi.ui
index b72647ea70449cc178726e59658aaa58d7027ef0..a9f340f429e6c8ea08946ac18c9db450dfa6c4b4 100644 (file)
--- a/src/frontends/qt4/ui/ThesaurusUi.ui
+++ b/src/frontends/qt4/ui/ThesaurusUi.ui
@@ -1,7 +1,7 @@
-<ui version="4.0" >
+<ui version="4.0">
  <class>ThesaurusUi</class>
- <widget class="QDialog" name="ThesaurusUi" >
-  <property name="geometry" >
+ <widget class="QDialog" name="ThesaurusUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,126 +9,122 @@
     <height>414</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <property name="sizeGripEnabled" >
+  <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="0" column="1" colspan="2" >
-    <widget class="QComboBox" name="languageCO" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>3</hsizetype>
-       <vsizetype>0</vsizetype>
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="toolTip" >
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QLabel" name="languageLA">
+     <property name="text">
+      <string>&amp;Language:</string>
+     </property>
+     <property name="buddy">
+      <cstring>languageCO</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" colspan="2">
+    <widget class="QComboBox" name="languageCO">
+     <property name="toolTip">
       <string>Language of the thesaurus</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="1" >
-    <widget class="QComboBox" name="entryCO" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>3</hsizetype>
-       <vsizetype>0</vsizetype>
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="toolTip" >
+   <item row="1" column="0">
+    <widget class="QLabel" name="entryLA">
+     <property name="toolTip">
+      <string>Index entry</string>
+     </property>
+     <property name="text">
+      <string>&amp;Keyword:</string>
+     </property>
+     <property name="buddy">
+      <cstring>entryCO</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QComboBox" name="entryCO">
+     <property name="toolTip">
       <string>Word to look up</string>
      </property>
-     <property name="editable" >
+     <property name="editable">
       <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item row="1" column="2" >
-    <widget class="QPushButton" name="lookupPB" >
-     <property name="toolTip" >
+   <item row="1" column="2">
+    <widget class="QPushButton" name="lookupPB">
+     <property name="toolTip">
       <string/>
      </property>
-     <property name="text" >
+     <property name="text">
       <string>L&amp;ookup</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="0" colspan="3" >
-    <widget class="QTreeWidget" name="meaningsTV" >
-     <property name="toolTip" >
-      <string>Click to select a proposal, double click to look it up.</string>
+   <item row="2" column="0">
+    <widget class="QLabel" name="selectionLA">
+     <property name="toolTip">
+      <string>The selected entry</string>
+     </property>
+     <property name="text">
+      <string>&amp;Selection:</string>
+     </property>
+     <property name="buddy">
+      <cstring>replaceED</cstring>
      </property>
     </widget>
    </item>
-   <item row="2" column="0" colspan="3" >
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
+   <item row="2" column="1">
+    <widget class="QLineEdit" name="replaceED">
+     <property name="toolTip">
+      <string>The selected entry</string>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+    </widget>
+   </item>
+   <item row="2" column="2">
+    <widget class="QPushButton" name="replacePB">
+     <property name="toolTip">
+      <string>Replace the entry with the selection</string>
      </property>
-     <item>
-      <widget class="QLabel" name="selectionLA" >
-       <property name="toolTip" >
-        <string>The selected entry</string>
-       </property>
-       <property name="text" >
-        <string>&amp;Selection:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>replaceED</cstring>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="replaceED" >
-       <property name="toolTip" >
-        <string>The selected entry</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="replacePB" >
-       <property name="toolTip" >
-        <string>Replace the entry with the selection</string>
-       </property>
-       <property name="text" >
-        <string>&amp;Replace</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+     <property name="text">
+      <string>&amp;Replace</string>
+     </property>
+    </widget>
    </item>
-   <item row="4" column="0" colspan="3" >
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
+   <item row="3" column="0" colspan="3">
+    <widget class="QTreeWidget" name="meaningsTV">
+     <property name="toolTip">
+      <string>Click to select a proposal, double click to look it up.</string>
      </property>
-     <property name="spacing" >
+     <column>
+      <property name="text">
+       <string notr="true">1</string>
+      </property>
+     </column>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="2">
+    <layout class="QHBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
+     <property name="margin">
+      <number>0</number>
+     </property>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeType" >
+       <property name="sizeType">
         <enum>QSizePolicy::Expanding</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
          <height>20</height>
@@ -137,37 +133,14 @@
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="closePB" >
-       <property name="text" >
+      <widget class="QPushButton" name="closePB">
+       <property name="text">
         <string>&amp;Close</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="languageLA" >
-     <property name="text" >
-      <string>&amp;Language:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>languageCO</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" >
-    <widget class="QLabel" name="entryLA" >
-     <property name="toolTip" >
-      <string>Index entry</string>
-     </property>
-     <property name="text" >
-      <string>&amp;Keyword:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>entryCO</cstring>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <tabstops>
@@ -180,7 +153,7 @@
   <tabstop>closePB</tabstop>
  </tabstops>
  <includes>
-  <include location="local" >qt_i18n.h</include>
+  <include location="local">qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>