further ui cleanup: correct tab order

author Edwin Leuven <e.leuven@gmail.com>

Thu, 31 Aug 2006 13:46:28 +0000 (13:46 +0000)

committer Edwin Leuven <e.leuven@gmail.com>

Thu, 31 Aug 2006 13:46:28 +0000 (13:46 +0000)
author Edwin Leuven <e.leuven@gmail.com>
Thu, 31 Aug 2006 13:46:28 +0000 (13:46 +0000)
committer Edwin Leuven <e.leuven@gmail.com>
Thu, 31 Aug 2006 13:46:28 +0000 (13:46 +0000)
diff --git a/src/frontends/qt4/ui/QBibitemUi.ui b/src/frontends/qt4/ui/QBibitemUi.ui

index 9c6c15cbe8dd0ec6e94f9ff11a8d74a12ec0e94f..fcd3baa3b363091f3c1b5d973894ca0b34148b3d 100644 (file)
--- a/src/frontends/qt4/ui/QBibitemUi.ui
+++ b/src/frontends/qt4/ui/QBibitemUi.ui
@@ -18,90 +18,70 @@
    <property name="sizeGripEnabled" >
     <bool>true</bool>
    </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QGridLayout" >
     <property name="margin" >
-    <number>11</number>
+    <number>9</number>
     </property>
     <property name="spacing" >
      <number>6</number>
     </property>
-   <item>
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
+   <item row="0" column="1" >
+    <widget class="QLineEdit" name="keyED" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>7</hsizetype>
+       <vsizetype>0</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
       </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="toolTip" >
+      <string>The bibliography key</string>
       </property>
-     <item>
-      <widget class="QLabel" name="keyLA" >
-       <property name="toolTip" >
-        <string>The bibliography key</string>
-       </property>
-       <property name="text" >
-        <string>&amp;Key:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>keyED</cstring>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="keyED" >
-       <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>7</hsizetype>
-         <vsizetype>0</vsizetype>
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="toolTip" >
-        <string>The bibliography key</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    </widget>
     </item>
-   <item>
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
+   <item row="1" column="1" >
+    <widget class="QLineEdit" name="labelED" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>7</hsizetype>
+       <vsizetype>0</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
       </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="toolTip" >
+      <string>The label as it appears in the document</string>
       </property>
-     <item>
-      <widget class="QLabel" name="labelLA" >
-       <property name="toolTip" >
-        <string>The label as it appears in the document</string>
-       </property>
-       <property name="text" >
-        <string>&amp;Label:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>labelED</cstring>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="labelED" >
-       <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>7</hsizetype>
-         <vsizetype>0</vsizetype>
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="toolTip" >
-        <string>The label as it appears in the document</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="labelLA" >
+     <property name="toolTip" >
+      <string>The label as it appears in the document</string>
+     </property>
+     <property name="text" >
+      <string>&amp;Label:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>labelED</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" >
+    <widget class="QLabel" name="keyLA" >
+     <property name="toolTip" >
+      <string>The bibliography key</string>
+     </property>
+     <property name="text" >
+      <string>&amp;Key:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>keyED</cstring>
+     </property>
+    </widget>
     </item>
-   <item>
+   <item row="2" column="0" colspan="2" >
      <layout class="QHBoxLayout" >
       <property name="margin" >
        <number>0</number>
diff --git a/src/frontends/qt4/ui/QBibtexAddUi.ui b/src/frontends/qt4/ui/QBibtexAddUi.ui

index f4f3a4f3a1006c96cd0fc4e236f91dd3e753756f..556d1142b4a9db52bfc4f06ff668f161e76855cb 100644 (file)
--- a/src/frontends/qt4/ui/QBibtexAddUi.ui
+++ b/src/frontends/qt4/ui/QBibtexAddUi.ui
@@ -137,7 +137,9 @@
   </widget>
   <pixmapfunction></pixmapfunction>
   <tabstops>
+  <tabstop>bibLW</tabstop>
    <tabstop>bibED</tabstop>
+  <tabstop>browsePB</tabstop>
    <tabstop>addPB</tabstop>
    <tabstop>closePB</tabstop>
   </tabstops>
diff --git a/src/frontends/qt4/ui/QBranchUi.ui b/src/frontends/qt4/ui/QBranchUi.ui

index e340839b6526fa384a64fe5b6b3e89e6c712d5ca..e8c47ab3afddf0b3d6be3c5d90412d3ad3311cae 100644 (file)
--- a/src/frontends/qt4/ui/QBranchUi.ui
+++ b/src/frontends/qt4/ui/QBranchUi.ui
@@ -75,6 +75,11 @@
    </layout>
   </widget>
   <pixmapfunction></pixmapfunction>
+ <tabstops>
+  <tabstop>branchCO</tabstop>
+  <tabstop>okPB</tabstop>
+  <tabstop>closePB</tabstop>
+ </tabstops>
   <resources/>
   <connections/>
  </ui>
diff --git a/src/frontends/qt4/ui/QChangesUi.ui b/src/frontends/qt4/ui/QChangesUi.ui

index 307cf04a6b8e9b831f5622ef02d87db79f9b1f22..8b0a1e575acc5c353aea78741abfd5d324a38759 100644 (file)
--- a/src/frontends/qt4/ui/QChangesUi.ui
+++ b/src/frontends/qt4/ui/QChangesUi.ui
@@ -137,6 +137,7 @@
   </widget>
   <pixmapfunction></pixmapfunction>
   <tabstops>
+  <tabstop>changeTB</tabstop>
    <tabstop>acceptPB</tabstop>
    <tabstop>rejectPB</tabstop>
    <tabstop>nextPB</tabstop>
diff --git a/src/frontends/qt4/ui/QCharacterUi.ui b/src/frontends/qt4/ui/QCharacterUi.ui

index 53761b9e85c3e5aa0800b7934ee2b59ee020b05e..8c4ab19af5c0091a78fd7e54dec89cbff2b9ac2d 100644 (file)
--- a/src/frontends/qt4/ui/QCharacterUi.ui
+++ b/src/frontends/qt4/ui/QCharacterUi.ui
@@ -8,8 +8,8 @@
     <rect>
      <x>0</x>
      <y>0</y>
-    <width>356</width>
-    <height>305</height>
+    <width>303</width>
+    <height>231</height>
     </rect>
    </property>
    <property name="windowTitle" >
diff --git a/src/frontends/qt4/ui/QCitationUi.ui b/src/frontends/qt4/ui/QCitationUi.ui

index 35719b3c2c9052522c3465792e92162e6c63e964..8c49a756eb368b2396b3e449e2ba7bad6fe68269 100644 (file)
--- a/src/frontends/qt4/ui/QCitationUi.ui
+++ b/src/frontends/qt4/ui/QCitationUi.ui
@@ -8,8 +8,8 @@
     <rect>
      <x>0</x>
      <y>0</y>
-    <width>390</width>
-    <height>415</height>
+    <width>392</width>
+    <height>387</height>
     </rect>
    </property>
    <property name="sizePolicy" >
@@ -359,10 +359,14 @@
   </widget>
   <pixmapfunction></pixmapfunction>
   <tabstops>
-  <tabstop>upPB</tabstop>
-  <tabstop>downPB</tabstop>
+  <tabstop>availableLV</tabstop>
+  <tabstop>selectedLV</tabstop>
    <tabstop>addPB</tabstop>
    <tabstop>deletePB</tabstop>
+  <tabstop>upPB</tabstop>
+  <tabstop>downPB</tabstop>
+  <tabstop>findLE</tabstop>
+  <tabstop>infoML</tabstop>
    <tabstop>citationStyleCO</tabstop>
    <tabstop>textBeforeED</tabstop>
    <tabstop>textAfterED</tabstop>
diff --git a/src/frontends/qt4/ui/QDelimiterUi.ui b/src/frontends/qt4/ui/QDelimiterUi.ui

index f77cb6d41a2e62a97af0c203960da49e782ed7a0..678fa0147e3dd9882c9cd921e9a80cec1bad70c4 100644 (file)
--- a/src/frontends/qt4/ui/QDelimiterUi.ui
+++ b/src/frontends/qt4/ui/QDelimiterUi.ui
@@ -154,6 +154,14 @@
    </layout>
   </widget>
   <pixmapfunction></pixmapfunction>
+ <tabstops>
+  <tabstop>leftCO</tabstop>
+  <tabstop>rightCO</tabstop>
+  <tabstop>matchCB</tabstop>
+  <tabstop>sizeCO</tabstop>
+  <tabstop>insertPB</tabstop>
+  <tabstop>closePB</tabstop>
+ </tabstops>
   <resources/>
   <connections/>
  </ui>
diff --git a/src/frontends/qt4/ui/QErrorListUi.ui b/src/frontends/qt4/ui/QErrorListUi.ui

index 2122509a4ac2c68344df581ac4e4c1fab49ec413..b052b64e22bc64b68406acdec99ab0350d72acd4 100644 (file)
--- a/src/frontends/qt4/ui/QErrorListUi.ui
+++ b/src/frontends/qt4/ui/QErrorListUi.ui
@@ -66,6 +66,11 @@
    </layout>
   </widget>
   <pixmapfunction></pixmapfunction>
+ <tabstops>
+  <tabstop>errorsLW</tabstop>
+  <tabstop>descriptionTB</tabstop>
+  <tabstop>closePB</tabstop>
+ </tabstops>
   <resources/>
   <connections/>
  </ui>
diff --git a/src/frontends/qt4/ui/QExternalUi.ui b/src/frontends/qt4/ui/QExternalUi.ui

index 3401a657190455827e0272056f9c3cb63c2a31a5..0cbc7d8c6d0e523a7d6f7e1e8299d03b9ef70c64 100644 (file)
--- a/src/frontends/qt4/ui/QExternalUi.ui
+++ b/src/frontends/qt4/ui/QExternalUi.ui
@@ -43,6 +43,9 @@
     </item>
     <item row="0" column="0" colspan="4" >
      <widget class="QTabWidget" name="tab" >
+     <property name="currentIndex" >
+      <number>0</number>
+     </property>
       <widget class="QWidget" name="filetab" >
        <attribute name="title" >
         <string>File</string>
@@ -715,13 +718,37 @@
   <customwidgets>
    <customwidget>
     <class>LengthCombo</class>
-   <extends></extends>
+   <extends>QWidget</extends>
     <header>lengthcombo.h</header>
     <container>0</container>
     <pixmap></pixmap>
    </customwidget>
   </customwidgets>
   <tabstops>
+  <tabstop>tab</tabstop>
+  <tabstop>fileED</tabstop>
+  <tabstop>browsePB</tabstop>
+  <tabstop>editPB</tabstop>
+  <tabstop>externalCO</tabstop>
+  <tabstop>externalTB</tabstop>
+  <tabstop>draftCB</tabstop>
+  <tabstop>displayCB</tabstop>
+  <tabstop>showCO</tabstop>
+  <tabstop>displayscaleED</tabstop>
+  <tabstop>angleED</tabstop>
+  <tabstop>originCO</tabstop>
+  <tabstop>widthED</tabstop>
+  <tabstop>widthUnitCO</tabstop>
+  <tabstop>heightED</tabstop>
+  <tabstop>aspectratioCB</tabstop>
+  <tabstop>clipCB</tabstop>
+  <tabstop>getbbPB</tabstop>
+  <tabstop>xrED</tabstop>
+  <tabstop>ytED</tabstop>
+  <tabstop>xlED</tabstop>
+  <tabstop>ybED</tabstop>
+  <tabstop>extraFormatCO</tabstop>
+  <tabstop>extraED</tabstop>
    <tabstop>okPB</tabstop>
    <tabstop>applyPB</tabstop>
    <tabstop>closePB</tabstop>
diff --git a/src/frontends/qt4/ui/QIncludeUi.ui b/src/frontends/qt4/ui/QIncludeUi.ui

index 096cc5d6f8ed0a83b716029b11f2177df5ab0e47..3f8c6b45e1a5cdb366c27d89330c401241418108 100644 (file)
--- a/src/frontends/qt4/ui/QIncludeUi.ui
+++ b/src/frontends/qt4/ui/QIncludeUi.ui
@@ -8,8 +8,8 @@
     <rect>
      <x>0</x>
      <y>0</y>
-    <width>353</width>
-    <height>266</height>
+    <width>386</width>
+    <height>171</height>
     </rect>
    </property>
    <property name="windowTitle" >
@@ -18,207 +18,151 @@
    <property name="sizeGripEnabled" >
     <bool>true</bool>
    </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QGridLayout" >
     <property name="margin" >
-    <number>11</number>
+    <number>9</number>
     </property>
     <property name="spacing" >
      <number>6</number>
     </property>
-   <item>
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
+   <item row="3" column="0" colspan="2" >
+    <widget class="QCheckBox" name="previewCB" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>3</hsizetype>
+       <vsizetype>0</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
       </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="toolTip" >
+      <string>Show LaTeX preview</string>
       </property>
-     <item>
-      <widget class="QLabel" name="filenameLA" >
-       <property name="toolTip" >
-        <string/>
-       </property>
-       <property name="text" >
-        <string>&amp;File:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>filenameED</cstring>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="filenameED" >
-       <property name="toolTip" >
-        <string>File name to include</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="browsePB" >
-       <property name="toolTip" >
-        <string>Select a file</string>
-       </property>
-       <property name="text" >
-        <string>&amp;Browse...</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+     <property name="text" >
+      <string>&amp;Show preview</string>
+     </property>
+    </widget>
     </item>
-   <item>
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
+   <item row="2" column="0" colspan="2" >
+    <widget class="QCheckBox" name="visiblespaceCB" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>3</hsizetype>
+       <vsizetype>0</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
       </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="toolTip" >
+      <string>Underline spaces in generated output</string>
       </property>
-     <item>
-      <widget class="QLabel" name="TextLabel1" >
-       <property name="text" >
-        <string>&amp;Include Type:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>typeCO</cstring>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QComboBox" name="typeCO" >
-       <item>
-        <property name="text" >
-         <string>Input</string>
-        </property>
-       </item>
-       <item>
-        <property name="text" >
-         <string>Include</string>
-        </property>
-       </item>
-       <item>
-        <property name="text" >
-         <string>Verbatim</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-     <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="loadPB" >
-       <property name="toolTip" >
-        <string>Load the file</string>
-       </property>
-       <property name="text" >
-        <string>&amp;Load</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+     <property name="text" >
+      <string>&amp;Mark spaces in output</string>
+     </property>
+    </widget>
     </item>
-   <item>
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
+   <item rowspan="2" row="2" column="2" colspan="3" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
       </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
       </property>
-     <item>
-      <layout class="QVBoxLayout" >
-       <property name="margin" >
-        <number>0</number>
-       </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <item>
-        <widget class="QCheckBox" name="visiblespaceCB" >
-         <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>3</hsizetype>
-           <vsizetype>0</vsizetype>
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="toolTip" >
-          <string>Underline spaces in generated output</string>
-         </property>
-         <property name="text" >
-          <string>&amp;Mark spaces in output</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QCheckBox" name="previewCB" >
-         <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>3</hsizetype>
-           <vsizetype>0</vsizetype>
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="toolTip" >
-          <string>Show LaTeX preview</string>
-         </property>
-         <property name="text" >
-          <string>&amp;Show preview</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <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>
-    </layout>
+     <property name="sizeHint" >
+      <size>
+       <width>130</width>
+       <height>50</height>
+      </size>
+     </property>
+    </spacer>
     </item>
-   <item>
+   <item row="0" column="1" colspan="3" >
+    <widget class="QLineEdit" name="filenameED" >
+     <property name="toolTip" >
+      <string>File name to include</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="4" >
+    <widget class="QPushButton" name="loadPB" >
+     <property name="toolTip" >
+      <string>Load the file</string>
+     </property>
+     <property name="text" >
+      <string>&amp;Load</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="3" >
      <spacer>
       <property name="orientation" >
-      <enum>Qt::Vertical</enum>
+      <enum>Qt::Horizontal</enum>
       </property>
       <property name="sizeType" >
        <enum>QSizePolicy::Expanding</enum>
       </property>
       <property name="sizeHint" >
        <size>
-       <width>20</width>
-       <height>20</height>
+       <width>28</width>
+       <height>28</height>
        </size>
       </property>
      </spacer>
     </item>
-   <item>
+   <item row="1" column="1" colspan="2" >
+    <widget class="QComboBox" name="typeCO" >
+     <item>
+      <property name="text" >
+       <string>Input</string>
+      </property>
+     </item>
+     <item>
+      <property name="text" >
+       <string>Include</string>
+      </property>
+     </item>
+     <item>
+      <property name="text" >
+       <string>Verbatim</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="TextLabel1" >
+     <property name="text" >
+      <string>&amp;Include Type:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>typeCO</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="4" >
+    <widget class="QPushButton" name="browsePB" >
+     <property name="toolTip" >
+      <string>Select a file</string>
+     </property>
+     <property name="text" >
+      <string>&amp;Browse...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" >
+    <widget class="QLabel" name="filenameLA" >
+     <property name="toolTip" >
+      <string/>
+     </property>
+     <property name="text" >
+      <string>&amp;File:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>filenameED</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="5" >
      <layout class="QHBoxLayout" >
       <property name="margin" >
        <number>0</number>
diff --git a/src/frontends/qt4/ui/QLogUi.ui b/src/frontends/qt4/ui/QLogUi.ui

index 092d3b4288707d6c84b20749df7f5b2efc163c0c..1cfff0c4a54b1806dbf29f9d2ca0f1f420bd9712 100644 (file)
--- a/src/frontends/qt4/ui/QLogUi.ui
+++ b/src/frontends/qt4/ui/QLogUi.ui
@@ -78,6 +78,7 @@
   </widget>
   <pixmapfunction></pixmapfunction>
   <tabstops>
+  <tabstop>logTB</tabstop>
    <tabstop>updatePB</tabstop>
    <tabstop>closePB</tabstop>
   </tabstops>
diff --git a/src/frontends/qt4/ui/QMathMatrixUi.ui b/src/frontends/qt4/ui/QMathMatrixUi.ui

index b35c3b43dccacdb72094aadc5b1c1075df4fad8a..d1b784d93a5d350a24833b2704b28c31768c0565 100644 (file)
--- a/src/frontends/qt4/ui/QMathMatrixUi.ui
+++ b/src/frontends/qt4/ui/QMathMatrixUi.ui
@@ -277,12 +277,20 @@
   <customwidgets>
    <customwidget>
     <class>EmptyTable</class>
-   <extends></extends>
+   <extends>QWidget</extends>
     <header>emptytable.h</header>
     <container>0</container>
     <pixmap></pixmap>
    </customwidget>
   </customwidgets>
+ <tabstops>
+  <tabstop>rowsSB</tabstop>
+  <tabstop>columnsSB</tabstop>
+  <tabstop>valignCO</tabstop>
+  <tabstop>halignED</tabstop>
+  <tabstop>okPB</tabstop>
+  <tabstop>closePB</tabstop>
+ </tabstops>
   <resources/>
   <connections/>
  </ui>
diff --git a/src/frontends/qt4/ui/QMathUi.ui b/src/frontends/qt4/ui/QMathUi.ui

index 7290b8ca97df1b2c366b23ea7b4f17eca077d45f..769ec3840a745b42125b4965b83553f7ce8d5638 100644 (file)
--- a/src/frontends/qt4/ui/QMathUi.ui
+++ b/src/frontends/qt4/ui/QMathUi.ui
@@ -457,17 +457,19 @@
   <pixmapfunction></pixmapfunction>
   <tabstops>
    <tabstop>symbolsCO</tabstop>
-  <tabstop>closePB</tabstop>
-  <tabstop>tearoffPB</tabstop>
-  <tabstop>delimitersPB</tabstop>
-  <tabstop>superscriptPB</tabstop>
+  <tabstop>sqrtPB</tabstop>
+  <tabstop>spacePB</tabstop>
+  <tabstop>stylePB</tabstop>
+  <tabstop>fontPB</tabstop>
+  <tabstop>fracPB</tabstop>
+  <tabstop>equationPB</tabstop>
    <tabstop>subscriptPB</tabstop>
+  <tabstop>superscriptPB</tabstop>
    <tabstop>matrixPB</tabstop>
-  <tabstop>equationPB</tabstop>
-  <tabstop>fontPB</tabstop>
-  <tabstop>stylePB</tabstop>
-  <tabstop>spacePB</tabstop>
-  <tabstop>sqrtPB</tabstop>
+  <tabstop>delimitersPB</tabstop>
+  <tabstop>functionsLW</tabstop>
+  <tabstop>tearoffPB</tabstop>
+  <tabstop>closePB</tabstop>
   </tabstops>
   <resources/>
   <connections/>
diff --git a/src/frontends/qt4/ui/QNoteUi.ui b/src/frontends/qt4/ui/QNoteUi.ui

index 18ccfdba2831c29b17cfd230b3499ee061612869..82218b8127f512a2c97d0e38c90d3f4a38ec59aa 100644 (file)
--- a/src/frontends/qt4/ui/QNoteUi.ui
+++ b/src/frontends/qt4/ui/QNoteUi.ui
@@ -8,8 +8,8 @@
     <rect>
      <x>0</x>
      <y>0</y>
-    <width>188</width>
-    <height>192</height>
+    <width>202</width>
+    <height>208</height>
     </rect>
    </property>
    <property name="windowTitle" >
@@ -113,6 +113,15 @@
    </layout>
   </widget>
   <pixmapfunction></pixmapfunction>
+ <tabstops>
+  <tabstop>noteRB</tabstop>
+  <tabstop>commentRB</tabstop>
+  <tabstop>greyedoutRB</tabstop>
+  <tabstop>framedRB</tabstop>
+  <tabstop>shadedRB</tabstop>
+  <tabstop>okPB</tabstop>
+  <tabstop>closePB</tabstop>
+ </tabstops>
   <resources/>
   <connections/>
  </ui>
diff --git a/src/frontends/qt4/ui/QParagraphUi.ui b/src/frontends/qt4/ui/QParagraphUi.ui

index aed279328a2241c416d420ffa4ca391d54a0692f..397746483c2aa355f27a1e194391589fba1070b7 100644 (file)
--- a/src/frontends/qt4/ui/QParagraphUi.ui
+++ b/src/frontends/qt4/ui/QParagraphUi.ui
@@ -9,7 +9,7 @@
      <x>0</x>
      <y>0</y>
      <width>396</width>
-    <height>254</height>
+    <height>237</height>
     </rect>
    </property>
    <property name="windowTitle" >
@@ -291,6 +291,11 @@
   </widget>
   <pixmapfunction></pixmapfunction>
   <tabstops>
+  <tabstop>align</tabstop>
+  <tabstop>linespacing</tabstop>
+  <tabstop>linespacingValue</tabstop>
+  <tabstop>indentCB</tabstop>
+  <tabstop>labelWidth</tabstop>
    <tabstop>restorePB</tabstop>
    <tabstop>okPB</tabstop>
    <tabstop>applyPB</tabstop>
diff --git a/src/frontends/qt4/ui/QPrefConvertersUi.ui b/src/frontends/qt4/ui/QPrefConvertersUi.ui

index fde7a483219a8be1af00e2cb01ddb1d923866205..7475cc14210b3c2c13ee54f9d0178dc16d562cc1 100644 (file)
--- a/src/frontends/qt4/ui/QPrefConvertersUi.ui
+++ b/src/frontends/qt4/ui/QPrefConvertersUi.ui
@@ -214,11 +214,13 @@
   </widget>
   <pixmapfunction></pixmapfunction>
   <tabstops>
+  <tabstop>convertersLW</tabstop>
    <tabstop>converterFromCO</tabstop>
    <tabstop>converterToCO</tabstop>
    <tabstop>converterED</tabstop>
    <tabstop>converterFlagED</tabstop>
    <tabstop>converterNewPB</tabstop>
+  <tabstop>converterModifyPB</tabstop>
    <tabstop>converterRemovePB</tabstop>
   </tabstops>
   <resources/>
diff --git a/src/frontends/qt4/ui/QPrefCopiersUi.ui b/src/frontends/qt4/ui/QPrefCopiersUi.ui

index 34828bfcd42b812709d2e4dbe3f9548802d49b2e..9dbfe3654d399324ca85371af11418aae2ea166d 100644 (file)
--- a/src/frontends/qt4/ui/QPrefCopiersUi.ui
+++ b/src/frontends/qt4/ui/QPrefCopiersUi.ui
@@ -176,9 +176,11 @@
   </widget>
   <pixmapfunction></pixmapfunction>
   <tabstops>
+  <tabstop>AllCopiersLW</tabstop>
    <tabstop>copierFormatCO</tabstop>
    <tabstop>copierED</tabstop>
    <tabstop>copierNewPB</tabstop>
+  <tabstop>copierModifyPB</tabstop>
    <tabstop>copierRemovePB</tabstop>
   </tabstops>
   <resources/>
diff --git a/src/frontends/qt4/ui/QPrefDisplayUi.ui b/src/frontends/qt4/ui/QPrefDisplayUi.ui

index f1a64434fe997836853d22442376f0ec1802ac79..edc744bd04dab1e2ef15c58f84efa9e848769deb 100644 (file)
--- a/src/frontends/qt4/ui/QPrefDisplayUi.ui
+++ b/src/frontends/qt4/ui/QPrefDisplayUi.ui
@@ -114,6 +114,10 @@
    </layout>
   </widget>
   <pixmapfunction></pixmapfunction>
+ <tabstops>
+  <tabstop>displayGraphicsCO</tabstop>
+  <tabstop>instantPreviewCO</tabstop>
+ </tabstops>
   <resources/>
   <connections/>
  </ui>
diff --git a/src/frontends/qt4/ui/QPrefFileformatsUi.ui b/src/frontends/qt4/ui/QPrefFileformatsUi.ui

index c2a007753a94970b0c8b35098b01d6ec333fac66..a86d90120efe714e54d7632790b5d9acaa44a71a 100644 (file)
--- a/src/frontends/qt4/ui/QPrefFileformatsUi.ui
+++ b/src/frontends/qt4/ui/QPrefFileformatsUi.ui
@@ -232,8 +232,7 @@
   </widget>
   <pixmapfunction></pixmapfunction>
   <tabstops>
-  <tabstop>formatNewPB</tabstop>
-  <tabstop>formatRemovePB</tabstop>
+  <tabstop>formatsLW</tabstop>
    <tabstop>formatED</tabstop>
    <tabstop>guiNameED</tabstop>
    <tabstop>shortcutED</tabstop>
@@ -241,6 +240,9 @@
    <tabstop>viewerED</tabstop>
    <tabstop>editorED</tabstop>
    <tabstop>documentCB</tabstop>
+  <tabstop>formatNewPB</tabstop>
+  <tabstop>formatModifyPB</tabstop>
+  <tabstop>formatRemovePB</tabstop>
   </tabstops>
   <resources/>
   <connections/>
diff --git a/src/frontends/qt4/ui/QPrefLatexUi.ui b/src/frontends/qt4/ui/QPrefLatexUi.ui

index d2f57bc88b636919806aa0fae94f3111a01252a8..f5b7a9ce0c66aa030e2f3ce1452c21cc4f86e4fe 100644 (file)
--- a/src/frontends/qt4/ui/QPrefLatexUi.ui
+++ b/src/frontends/qt4/ui/QPrefLatexUi.ui
@@ -8,241 +8,211 @@
     <rect>
      <x>0</x>
      <y>0</y>
-    <width>433</width>
-    <height>350</height>
+    <width>427</width>
+    <height>285</height>
     </rect>
    </property>
    <property name="windowTitle" >
     <string/>
    </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QGridLayout" >
     <property name="margin" >
-    <number>11</number>
+    <number>9</number>
     </property>
     <property name="spacing" >
      <number>6</number>
     </property>
-   <item>
-    <layout class="QGridLayout" >
-     <property name="margin" >
-      <number>0</number>
+   <item row="2" column="0" colspan="3" >
+    <widget class="QCheckBox" name="latexAutoresetCB" >
+     <property name="toolTip" >
+      <string>Set class options to default on class change</string>
       </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="text" >
+      <string>&amp;Reset class options when document class changes</string>
       </property>
-     <item row="3" column="0" >
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeType" >
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="3" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>409</width>
+       <height>75</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="latexPaperSizeLA" >
+     <property name="text" >
+      <string>Default paper si&amp;ze:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>latexPaperSizeCO</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" >
+    <widget class="QLabel" name="latexEncodingLA" >
+     <property name="text" >
+      <string>Te&amp;X encoding:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>latexEncodingED</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" >
+    <widget class="QLineEdit" name="latexEncodingED" />
+   </item>
+   <item row="1" column="1" >
+    <widget class="QComboBox" name="latexPaperSizeCO" >
+     <item>
+      <property name="text" >
+       <string>Default</string>
+      </property>
       </item>
-     <item row="1" column="0" >
-      <widget class="QCheckBox" name="latexAutoresetCB" >
-       <property name="toolTip" >
-        <string>Set class options to default on class change</string>
-       </property>
-       <property name="text" >
-        <string>&amp;Reset class options when document class changes</string>
-       </property>
-      </widget>
+     <item>
+      <property name="text" >
+       <string>US letter</string>
+      </property>
       </item>
-     <item row="2" column="0" >
-      <widget class="QGroupBox" name="GroupBox3" >
-       <property name="title" >
-        <string>External Applications</string>
-       </property>
-       <layout class="QGridLayout" >
-        <property name="margin" >
-         <number>11</number>
-        </property>
-        <property name="spacing" >
-         <number>6</number>
-        </property>
-        <item row="0" column="1" >
-         <widget class="QLineEdit" name="latexChecktexED" >
-          <property name="toolTip" >
-           <string>CheckTeX start options and flags</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="0" >
-         <widget class="QLabel" name="latexChecktexLA" >
-          <property name="text" >
-           <string>Chec&amp;kTeX command:</string>
-          </property>
-          <property name="buddy" >
-           <cstring>latexChecktexED</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1" >
-         <widget class="QLineEdit" name="latexBibtexED" >
-          <property name="toolTip" >
-           <string>BibTeX command and options</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0" >
-         <widget class="QLabel" name="latexBibtexLA" >
-          <property name="text" >
-           <string>&amp;BibTeX command:</string>
-          </property>
-          <property name="buddy" >
-           <cstring>latexChecktexED</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1" >
-         <widget class="QLineEdit" name="latexIndexED" >
-          <property name="toolTip" >
-           <string>Index command and options (makeindex, xindy)</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="0" >
-         <widget class="QLabel" name="latexIndexLA" >
-          <property name="text" >
-           <string>Index command:</string>
-          </property>
-          <property name="buddy" >
-           <cstring>latexDviPaperED</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="0" >
-         <widget class="QLabel" name="latexDviPaperLA" >
-          <property name="text" >
-           <string>DVI viewer paper size options:</string>
-          </property>
-          <property name="buddy" >
-           <cstring>latexDviPaperED</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="1" >
-         <widget class="QLineEdit" name="latexDviPaperED" >
-          <property name="toolTip" >
-           <string>Optional paper size flag (-paper) for some DVI viewers</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
+     <item>
+      <property name="text" >
+       <string>US legal</string>
+      </property>
+     </item>
+     <item>
+      <property name="text" >
+       <string>US executive</string>
+      </property>
+     </item>
+     <item>
+      <property name="text" >
+       <string>A3</string>
+      </property>
+     </item>
+     <item>
+      <property name="text" >
+       <string>A4</string>
+      </property>
+     </item>
+     <item>
+      <property name="text" >
+       <string>A5</string>
+      </property>
       </item>
-     <item row="0" column="0" >
-      <layout class="QHBoxLayout" >
-       <property name="margin" >
-        <number>0</number>
-       </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <item>
-        <layout class="QGridLayout" >
-         <property name="margin" >
-          <number>0</number>
-         </property>
-         <property name="spacing" >
-          <number>6</number>
-         </property>
-         <item row="1" column="1" >
-          <widget class="QComboBox" name="latexPaperSizeCO" >
-           <item>
-            <property name="text" >
-             <string>Default</string>
-            </property>
-           </item>
-           <item>
-            <property name="text" >
-             <string>US letter</string>
-            </property>
-           </item>
-           <item>
-            <property name="text" >
-             <string>US legal</string>
-            </property>
-           </item>
-           <item>
-            <property name="text" >
-             <string>US executive</string>
-            </property>
-           </item>
-           <item>
-            <property name="text" >
-             <string>A3</string>
-            </property>
-           </item>
-           <item>
-            <property name="text" >
-             <string>A4</string>
-            </property>
-           </item>
-           <item>
-            <property name="text" >
-             <string>A5</string>
-            </property>
-           </item>
-           <item>
-            <property name="text" >
-             <string>B5</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-         <item row="0" column="1" >
-          <widget class="QLineEdit" name="latexEncodingED" />
-         </item>
-         <item row="0" column="0" >
-          <widget class="QLabel" name="latexEncodingLA" >
-           <property name="text" >
-            <string>Te&amp;X encoding:</string>
-           </property>
-           <property name="buddy" >
-            <cstring>latexEncodingED</cstring>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0" >
-          <widget class="QLabel" name="latexPaperSizeLA" >
-           <property name="text" >
-            <string>Default paper si&amp;ze:</string>
-           </property>
-           <property name="buddy" >
-            <cstring>latexPaperSizeCO</cstring>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <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>
-      </layout>
+     <item>
+      <property name="text" >
+       <string>B5</string>
+      </property>
       </item>
-    </layout>
+    </widget>
+   </item>
+   <item rowspan="2" row="0" column="2" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>178</width>
+       <height>54</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="3" column="0" colspan="3" >
+    <widget class="QGroupBox" name="GroupBox3" >
+     <property name="title" >
+      <string>External Applications</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>11</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="0" column="1" >
+       <widget class="QLineEdit" name="latexChecktexED" >
+        <property name="toolTip" >
+         <string>CheckTeX start options and flags</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="latexChecktexLA" >
+        <property name="text" >
+         <string>Chec&amp;kTeX command:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>latexChecktexED</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QLineEdit" name="latexBibtexED" >
+        <property name="toolTip" >
+         <string>BibTeX command and options</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="latexBibtexLA" >
+        <property name="text" >
+         <string>&amp;BibTeX command:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>latexChecktexED</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <widget class="QLineEdit" name="latexIndexED" >
+        <property name="toolTip" >
+         <string>Index command and options (makeindex, xindy)</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="latexIndexLA" >
+        <property name="text" >
+         <string>Index command:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>latexDviPaperED</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="latexDviPaperLA" >
+        <property name="text" >
+         <string>DVI viewer paper size options:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>latexDviPaperED</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" >
+       <widget class="QLineEdit" name="latexDviPaperED" >
+        <property name="toolTip" >
+         <string>Optional paper size flag (-paper) for some DVI viewers</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
     </item>
    </layout>
   </widget>
diff --git a/src/frontends/qt4/ui/QPrefPathsUi.ui b/src/frontends/qt4/ui/QPrefPathsUi.ui

index 5848555217d7c467dd6004047034bfc2391daf09..0b7663e5216b8df2438defdc5266f9ac5894fbc8 100644 (file)
--- a/src/frontends/qt4/ui/QPrefPathsUi.ui
+++ b/src/frontends/qt4/ui/QPrefPathsUi.ui
@@ -8,159 +8,149 @@
     <rect>
      <x>0</x>
      <y>0</y>
-    <width>387</width>
-    <height>329</height>
+    <width>347</width>
+    <height>227</height>
     </rect>
    </property>
    <property name="windowTitle" >
     <string/>
    </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QGridLayout" >
     <property name="margin" >
-    <number>11</number>
+    <number>9</number>
     </property>
     <property name="spacing" >
      <number>6</number>
     </property>
-   <item>
-    <layout class="QGridLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <item row="4" column="1" >
-      <widget class="QLineEdit" name="tempDirED" />
-     </item>
-     <item row="3" column="2" >
-      <widget class="QPushButton" name="lyxserverDirPB" >
-       <property name="text" >
-        <string>Browse...</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0" >
-      <widget class="QLabel" name="templateDirLA" >
-       <property name="text" >
-        <string>&amp;Document templates:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>templateDirED</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1" >
-      <widget class="QLineEdit" name="workingDirED" />
-     </item>
-     <item row="2" column="1" >
-      <widget class="QLineEdit" name="backupDirED" />
-     </item>
-     <item row="2" column="0" >
-      <widget class="QLabel" name="backupDirLA" >
-       <property name="text" >
-        <string>&amp;Backup directory:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>backupDirED</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="0" >
-      <widget class="QLabel" name="tempDirLA" >
-       <property name="text" >
-        <string>&amp;Temporary directory:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>tempDirED</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="0" >
-      <widget class="QLabel" name="pathPrefixLA" >
-       <property name="text" >
-        <string>&amp;PATH prefix:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>pathPrefixED</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="0" >
-      <widget class="QLabel" name="workingDirLA" >
-       <property name="text" >
-        <string>&amp;Working directory:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>workingDirED</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="2" >
-      <widget class="QPushButton" name="workingDirPB" >
-       <property name="text" >
-        <string>Browse...</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1" >
-      <widget class="QLineEdit" name="templateDirED" />
-     </item>
-     <item row="3" column="1" >
-      <widget class="QLineEdit" name="lyxserverDirED" />
-     </item>
-     <item row="4" column="2" >
-      <widget class="QPushButton" name="tempDirPB" >
-       <property name="text" >
-        <string>Browse...</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="2" >
-      <widget class="QPushButton" name="backupDirPB" >
-       <property name="text" >
-        <string>Browse...</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="1" colspan="2" >
-      <widget class="QLineEdit" name="pathPrefixED" />
-     </item>
-     <item row="1" column="2" >
-      <widget class="QPushButton" name="templateDirPB" >
-       <property name="text" >
-        <string>Browse...</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="0" >
-      <widget class="QLabel" name="lyxserverDirLA" >
-       <property name="text" >
-        <string>Ly&amp;XServer pipe:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>lyxserverDirED</cstring>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
+   <item row="3" column="0" >
+    <widget class="QLabel" name="lyxserverDirLA" >
+     <property name="text" >
+      <string>Ly&amp;XServer pipe:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>lyxserverDirED</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2" >
+    <widget class="QPushButton" name="templateDirPB" >
+     <property name="text" >
+      <string>Browse...</string>
+     </property>
+     <property name="autoDefault" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1" colspan="2" >
+    <widget class="QLineEdit" name="pathPrefixED" />
+   </item>
+   <item row="2" column="2" >
+    <widget class="QPushButton" name="backupDirPB" >
+     <property name="text" >
+      <string>Browse...</string>
+     </property>
+     <property name="autoDefault" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="2" >
+    <widget class="QPushButton" name="tempDirPB" >
+     <property name="text" >
+      <string>Browse...</string>
+     </property>
+     <property name="autoDefault" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1" >
+    <widget class="QLineEdit" name="lyxserverDirED" />
+   </item>
+   <item row="1" column="1" >
+    <widget class="QLineEdit" name="templateDirED" />
+   </item>
+   <item row="0" column="2" >
+    <widget class="QPushButton" name="workingDirPB" >
+     <property name="text" >
+      <string>Browse...</string>
+     </property>
+     <property name="autoDefault" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0" >
+    <widget class="QLabel" name="pathPrefixLA" >
+     <property name="text" >
+      <string>&amp;PATH prefix:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>pathPrefixED</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" >
+    <widget class="QLabel" name="tempDirLA" >
+     <property name="text" >
+      <string>&amp;Temporary directory:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>tempDirED</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="backupDirLA" >
+     <property name="text" >
+      <string>&amp;Backup directory:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>backupDirED</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" >
+    <widget class="QLineEdit" name="backupDirED" />
+   </item>
+   <item row="0" column="1" >
+    <widget class="QLineEdit" name="workingDirED" />
+   </item>
+   <item row="3" column="2" >
+    <widget class="QPushButton" name="lyxserverDirPB" >
+     <property name="text" >
+      <string>Browse...</string>
+     </property>
+     <property name="autoDefault" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" >
+    <widget class="QLabel" name="workingDirLA" >
+     <property name="text" >
+      <string>&amp;Working directory:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>workingDirED</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="templateDirLA" >
+     <property name="text" >
+      <string>&amp;Document templates:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>templateDirED</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1" >
+    <widget class="QLineEdit" name="tempDirED" />
+   </item>
+   <item row="6" column="0" colspan="3" >
      <spacer>
       <property name="orientation" >
        <enum>Qt::Vertical</enum>
diff --git a/src/frontends/qt4/ui/QPrefPrinterUi.ui b/src/frontends/qt4/ui/QPrefPrinterUi.ui

index de4ce73c1c467f749ef07dc7bd04d7010f8582c7..ea1f55755411f9036a08c0577d6504edc10bb19b 100644 (file)
--- a/src/frontends/qt4/ui/QPrefPrinterUi.ui
+++ b/src/frontends/qt4/ui/QPrefPrinterUi.ui
@@ -8,97 +8,57 @@
     <rect>
      <x>0</x>
      <y>0</y>
-    <width>433</width>
-    <height>485</height>
+    <width>385</width>
+    <height>386</height>
     </rect>
    </property>
    <property name="windowTitle" >
     <string/>
    </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QGridLayout" >
     <property name="margin" >
-    <number>11</number>
+    <number>9</number>
     </property>
     <property name="spacing" >
      <number>6</number>
     </property>
-   <item>
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
+   <item rowspan="3" row="0" column="2" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
       </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
       </property>
-     <item>
-      <layout class="QGridLayout" >
-       <property name="margin" >
-        <number>0</number>
-       </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <item row="0" column="0" >
-        <widget class="QLabel" name="printerNameLA" >
-         <property name="text" >
-          <string>Printer &amp;name:</string>
-         </property>
-         <property name="buddy" >
-          <cstring>printerNameED</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="2" >
-        <widget class="QLineEdit" name="printerCommandED" />
-       </item>
-       <item row="2" column="0" colspan="2" >
-        <widget class="QLabel" name="printerCommandLA" >
-         <property name="text" >
-          <string>Printer co&amp;mmand:</string>
-         </property>
-         <property name="buddy" >
-          <cstring>printerCommandED</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1" colspan="2" >
-        <widget class="QLineEdit" name="printerNameED" >
-         <property name="toolTip" >
-          <string>Name of the default printer</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0" colspan="2" >
-        <widget class="QCheckBox" name="printerAdaptCB" >
-         <property name="toolTip" >
-          <string>Use printer name explicitely</string>
-         </property>
-         <property name="text" >
-          <string>Adapt outp&amp;ut</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <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>
-    </layout>
+     <property name="sizeHint" >
+      <size>
+       <width>184</width>
+       <height>83</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="1" >
+    <widget class="QLineEdit" name="printerCommandED" />
+   </item>
+   <item row="0" column="1" >
+    <widget class="QLineEdit" name="printerNameED" >
+     <property name="toolTip" >
+      <string>Name of the default printer</string>
+     </property>
+    </widget>
     </item>
-   <item>
+   <item row="1" column="0" >
+    <widget class="QCheckBox" name="printerAdaptCB" >
+     <property name="toolTip" >
+      <string>Use printer name explicitely</string>
+     </property>
+     <property name="text" >
+      <string>Adapt outp&amp;ut</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="3" >
      <widget class="QGroupBox" name="GroupBox1" >
       <property name="title" >
        <string>Command Options</string>
@@ -315,7 +275,7 @@
       </layout>
      </widget>
     </item>
-   <item>
+   <item row="4" column="1" >
      <spacer>
       <property name="orientation" >
        <enum>Qt::Vertical</enum>
@@ -331,6 +291,26 @@
       </property>
      </spacer>
     </item>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="printerCommandLA" >
+     <property name="text" >
+      <string>Printer co&amp;mmand:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>printerCommandED</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" >
+    <widget class="QLabel" name="printerNameLA" >
+     <property name="text" >
+      <string>Printer &amp;name:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>printerNameED</cstring>
+     </property>
+    </widget>
+   </item>
    </layout>
   </widget>
   <pixmapfunction></pixmapfunction>
diff --git a/src/frontends/qt4/ui/QPrefScreenFontsUi.ui b/src/frontends/qt4/ui/QPrefScreenFontsUi.ui

index a1faa29d451dea8aa5054d87fcf6fb0e0bd6b5f5..ee6883d375ce05228d22c866d391f285fa060292 100644 (file)
--- a/src/frontends/qt4/ui/QPrefScreenFontsUi.ui
+++ b/src/frontends/qt4/ui/QPrefScreenFontsUi.ui
@@ -9,7 +9,7 @@
      <x>0</x>
      <y>0</y>
      <width>342</width>
-    <height>441</height>
+    <height>365</height>
     </rect>
    </property>
    <property name="windowTitle" >
@@ -378,7 +378,7 @@
   <customwidgets>
    <customwidget>
     <class>QFontExample</class>
-   <extends></extends>
+   <extends>QWidget</extends>
     <header>qfontexample.h</header>
     <container>0</container>
     <pixmap></pixmap>
diff --git a/src/frontends/qt4/ui/QPrefUi.ui b/src/frontends/qt4/ui/QPrefUi.ui

index 33918592238e15974a2d691ff5c44787aeb92971..05e1f214612844fc0122eacd6336d45efe314d76 100644 (file)
--- a/src/frontends/qt4/ui/QPrefUi.ui
+++ b/src/frontends/qt4/ui/QPrefUi.ui
@@ -8,8 +8,8 @@
     <rect>
      <x>0</x>
      <y>0</y>
-    <width>728</width>
-    <height>657</height>
+    <width>413</width>
+    <height>387</height>
     </rect>
    </property>
    <property name="sizePolicy" >
@@ -23,453 +23,353 @@
    <property name="windowTitle" >
     <string/>
    </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QGridLayout" >
     <property name="margin" >
      <number>9</number>
     </property>
     <property name="spacing" >
      <number>6</number>
     </property>
-   <item>
-    <layout class="QGridLayout" >
-     <property name="margin" >
-      <number>0</number>
+   <item row="3" column="2" colspan="2" >
+    <widget class="QGroupBox" name="scrollGB" >
+     <property name="title" >
+      <string>Scrolling</string>
       </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="alignment" >
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
       </property>
-     <item row="1" column="2" >
-      <widget class="QPushButton" name="bindFilePB" >
-       <property name="text" >
-        <string>B&amp;rowse...</string>
-       </property>
-      </widget>
-     </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>
-     <item row="1" column="0" >
-      <widget class="QLabel" name="bindFileLA" >
-       <property name="text" >
-        <string>&amp;Bind file:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>bindFileED</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="1" column="1" >
-      <widget class="QLineEdit" name="bindFileED" />
-     </item>
-    </layout>
+     <layout class="QVBoxLayout" >
+      <property name="margin" >
+       <number>11</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item>
+       <widget class="QCheckBox" name="cursorFollowsCB" >
+        <property name="text" >
+         <string>Cursor follows &amp;scrollbar</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="4" column="1" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="3" >
+    <widget class="QPushButton" name="bindFilePB" >
+     <property name="text" >
+      <string>B&amp;rowse...</string>
+     </property>
+    </widget>
+   </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>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="bindFileLA" >
+     <property name="text" >
+      <string>&amp;Bind file:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>bindFileED</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" colspan="2" >
+    <widget class="QLineEdit" name="uiFileED" />
+   </item>
+   <item row="0" column="3" >
+    <widget class="QPushButton" name="uiFilePB" >
+     <property name="text" >
+      <string>Bro&amp;wse...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" colspan="2" >
+    <widget class="QLineEdit" name="bindFileED" />
     </item>
-   <item>
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
+   <item row="2" column="0" colspan="4" >
+    <widget class="QGroupBox" name="GeometryGB" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>5</hsizetype>
+       <vsizetype>5</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
       </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="title" >
+      <string>Session</string>
       </property>
-     <item>
-      <widget class="QGroupBox" name="documentsGB" >
-       <property name="title" >
-        <string>Documents</string>
-       </property>
-       <layout class="QVBoxLayout" >
+     <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="QCheckBox" name="loadWindowSizeCB" >
+        <property name="text" >
+         <string>Save/restore window size, or use fixed window</string>
+        </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="4" column="0" >
+       <widget class="QCheckBox" name="loadSessionCB" >
+        <property name="text" >
+         <string>Load opened files from last session</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QCheckBox" name="restoreCursorCB" >
+        <property name="text" >
+         <string>Restore cursor positions</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QCheckBox" name="loadWindowLocationCB" >
+        <property name="enabled" >
+         <bool>true</bool>
+        </property>
+        <property name="toolTip" >
+         <string>Restore to cursor position when the file was last closed</string>
+        </property>
+        <property name="text" >
+         <string>Save/restore window position</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <layout class="QHBoxLayout" >
          <property name="margin" >
-         <number>11</number>
+         <number>0</number>
          </property>
          <property name="spacing" >
           <number>6</number>
          </property>
          <item>
-         <widget class="QCheckBox" name="autoSaveCB" >
-          <property name="text" >
-           <string>B&amp;ackup documents </string>
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
            </property>
-         </widget>
+          <property name="sizeType" >
+           <enum>QSizePolicy::Fixed</enum>
+          </property>
+          <property name="sizeHint" >
+           <size>
+            <width>30</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
          </item>
          <item>
-         <layout class="QHBoxLayout" >
-          <property name="margin" >
-           <number>0</number>
+         <widget class="QLabel" name="windowWidthLA" >
+          <property name="enabled" >
+           <bool>false</bool>
            </property>
-          <property name="spacing" >
-           <number>6</number>
+          <property name="text" >
+           <string>Width</string>
            </property>
-          <item>
-           <spacer>
-            <property name="orientation" >
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeType" >
-             <enum>QSizePolicy::Fixed</enum>
-            </property>
-            <property name="sizeHint" >
-             <size>
-              <width>21</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item>
-           <widget class="QLabel" name="autoSaveLA" >
-            <property name="text" >
-             <string> every</string>
-            </property>
-            <property name="buddy" >
-             <cstring>autoSaveSB</cstring>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QSpinBox" name="autoSaveSB" >
-            <property name="maximum" >
-             <number>300</number>
-            </property>
-            <property name="minimum" >
-             <number>1</number>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="TextLabel1" >
-            <property name="text" >
-             <string>minutes</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
+         </widget>
          </item>
          <item>
-         <layout class="QHBoxLayout" >
-          <property name="margin" >
-           <number>0</number>
+         <widget class="QSpinBox" name="windowWidthSB" >
+          <property name="maximum" >
+           <number>9999</number>
            </property>
-          <property name="spacing" >
-           <number>6</number>
+          <property name="minimum" >
+           <number>200</number>
            </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>
-         </layout>
+          <property name="singleStep" >
+           <number>10</number>
+          </property>
+         </widget>
          </item>
-       </layout>
-      </widget>
-     </item>
-     <item>
-      <widget class="QGroupBox" name="GeometryGB" >
-       <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>5</hsizetype>
-         <vsizetype>5</vsizetype>
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="title" >
-        <string>Geometry</string>
-       </property>
-       <layout class="QVBoxLayout" >
-        <property name="margin" >
-         <number>9</number>
-        </property>
-        <property name="spacing" >
-         <number>6</number>
-        </property>
          <item>
-         <widget class="QCheckBox" name="loadWindowSizeCB" >
-          <property name="text" >
-           <string>Save/restore window size, or use fixed window</string>
+         <widget class="QLabel" name="windowHeightLA" >
+          <property name="enabled" >
+           <bool>false</bool>
            </property>
-          <property name="checked" >
-           <bool>true</bool>
+          <property name="text" >
+           <string>Height</string>
            </property>
           </widget>
          </item>
          <item>
-         <layout class="QHBoxLayout" >
-          <property name="margin" >
-           <number>0</number>
+         <widget class="QSpinBox" name="windowHeightSB" >
+          <property name="maximum" >
+           <number>9999</number>
+          </property>
+          <property name="minimum" >
+           <number>200</number>
            </property>
-          <property name="spacing" >
-           <number>6</number>
+          <property name="singleStep" >
+           <number>10</number>
            </property>
-          <item>
-           <spacer>
-            <property name="orientation" >
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeType" >
-             <enum>QSizePolicy::Fixed</enum>
-            </property>
-            <property name="sizeHint" >
-             <size>
-              <width>30</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item>
-           <widget class="QLabel" name="windowWidthLA" >
-            <property name="enabled" >
-             <bool>false</bool>
-            </property>
-            <property name="text" >
-             <string>Width</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QSpinBox" name="windowWidthSB" >
-            <property name="maximum" >
-             <number>9999</number>
-            </property>
-            <property name="minimum" >
-             <number>200</number>
-            </property>
-            <property name="singleStep" >
-             <number>10</number>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="windowHeightLA" >
-            <property name="enabled" >
-             <bool>false</bool>
-            </property>
-            <property name="text" >
-             <string>Height</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QSpinBox" name="windowHeightSB" >
-            <property name="maximum" >
-             <number>9999</number>
-            </property>
-            <property name="minimum" >
-             <number>200</number>
-            </property>
-            <property name="singleStep" >
-             <number>10</number>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <spacer>
-            <property name="orientation" >
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeType" >
-             <enum>QSizePolicy::Fixed</enum>
-            </property>
-            <property name="sizeHint" >
-             <size>
-              <width>30</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
+         </widget>
          </item>
          <item>
-         <widget class="QCheckBox" name="loadWindowLocationCB" >
-          <property name="enabled" >
-           <bool>true</bool>
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
            </property>
-          <property name="toolTip" >
-           <string>Restore to cursor position when the file was last closed</string>
+          <property name="sizeType" >
+           <enum>QSizePolicy::Fixed</enum>
            </property>
-          <property name="text" >
-           <string>Save/restore window position</string>
+          <property name="sizeHint" >
+           <size>
+            <width>30</width>
+            <height>20</height>
+           </size>
            </property>
-         </widget>
+         </spacer>
          </item>
         </layout>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType" >
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>51</width>
-         <height>174</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
+      </item>
+     </layout>
+    </widget>
     </item>
-   <item>
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <property name="spacing" >
-      <number>6</number>
+   <item row="3" column="0" colspan="2" >
+    <widget class="QGroupBox" name="documentsGB" >
+     <property name="title" >
+      <string>Documents</string>
       </property>
-     <item>
-      <widget class="QGroupBox" name="sessionGB" >
-       <property name="title" >
-        <string>Session</string>
-       </property>
-       <layout class="QGridLayout" >
+     <layout class="QVBoxLayout" >
+      <property name="margin" >
+       <number>11</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item>
+       <widget class="QCheckBox" name="autoSaveCB" >
+        <property name="text" >
+         <string>B&amp;ackup documents </string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" >
          <property name="margin" >
-         <number>9</number>
+         <number>0</number>
          </property>
          <property name="spacing" >
           <number>6</number>
          </property>
-        <item row="0" column="0" >
-         <layout class="QVBoxLayout" >
-          <property name="margin" >
-           <number>0</number>
+        <item>
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType" >
+           <enum>QSizePolicy::Fixed</enum>
+          </property>
+          <property name="sizeHint" >
+           <size>
+            <width>21</width>
+            <height>20</height>
+           </size>
            </property>
-          <property name="spacing" >
-           <number>6</number>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QLabel" name="autoSaveLA" >
+          <property name="text" >
+           <string> every</string>
+          </property>
+          <property name="buddy" >
+           <cstring>autoSaveSB</cstring>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="autoSaveSB" >
+          <property name="maximum" >
+           <number>300</number>
+          </property>
+          <property name="minimum" >
+           <number>1</number>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="TextLabel1" >
+          <property name="text" >
+           <string>minutes</string>
            </property>
-          <item>
-           <widget class="QCheckBox" name="restoreCursorCB" >
-            <property name="text" >
-             <string>Restore cursor positions</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="loadSessionCB" >
-            <property name="text" >
-             <string>Load opened files from last session</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
+         </widget>
          </item>
         </layout>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType" >
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>351</width>
-         <height>124</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <item>
-      <widget class="QGroupBox" name="scrollGB" >
-       <property name="title" >
-        <string>Scrolling</string>
-       </property>
-       <layout class="QVBoxLayout" >
+      </item>
+      <item>
+       <layout class="QHBoxLayout" >
          <property name="margin" >
-         <number>11</number>
+         <number>0</number>
          </property>
          <property name="spacing" >
           <number>6</number>
          </property>
          <item>
-         <widget class="QCheckBox" name="cursorFollowsCB" >
+         <widget class="QLabel" name="lastfilesLA" >
            <property name="text" >
-           <string>Cursor follows &amp;scrollbar</string>
+           <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>
         </layout>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType" >
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>351</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>394</width>
-       <height>31</height>
-      </size>
-     </property>
-    </spacer>
+      </item>
+     </layout>
+    </widget>
     </item>
    </layout>
   </widget>
@@ -479,10 +379,16 @@
    <tabstop>uiFilePB</tabstop>
    <tabstop>bindFileED</tabstop>
    <tabstop>bindFilePB</tabstop>
-  <tabstop>cursorFollowsCB</tabstop>
+  <tabstop>loadWindowSizeCB</tabstop>
+  <tabstop>windowWidthSB</tabstop>
+  <tabstop>windowHeightSB</tabstop>
+  <tabstop>loadWindowLocationCB</tabstop>
+  <tabstop>restoreCursorCB</tabstop>
+  <tabstop>loadSessionCB</tabstop>
    <tabstop>autoSaveCB</tabstop>
    <tabstop>autoSaveSB</tabstop>
    <tabstop>lastfilesSB</tabstop>
+  <tabstop>cursorFollowsCB</tabstop>
   </tabstops>
   <resources/>
   <connections/>
diff --git a/src/frontends/qt4/ui/QPrintUi.ui b/src/frontends/qt4/ui/QPrintUi.ui

index 6dd3ab82f5cbb8eea97b95d8c130ab618f89185c..029676964512a348d1244eecb8f52bc4b4b8a915 100644 (file)
--- a/src/frontends/qt4/ui/QPrintUi.ui
+++ b/src/frontends/qt4/ui/QPrintUi.ui
@@ -9,7 +9,7 @@
      <x>0</x>
      <y>0</y>
      <width>403</width>
-    <height>454</height>
+    <height>366</height>
     </rect>
    </property>
    <property name="windowTitle" >
@@ -330,8 +330,11 @@
    <tabstop>fileED</tabstop>
    <tabstop>browsePB</tabstop>
    <tabstop>allRB</tabstop>
+  <tabstop>rangeRB</tabstop>
    <tabstop>fromED</tabstop>
    <tabstop>toED</tabstop>
+  <tabstop>oddCB</tabstop>
+  <tabstop>evenCB</tabstop>
    <tabstop>reverseCB</tabstop>
    <tabstop>copiesSB</tabstop>
    <tabstop>collateCB</tabstop>
diff --git a/src/frontends/qt4/ui/QRefUi.ui b/src/frontends/qt4/ui/QRefUi.ui

index 1d68ab0ea912df5795edcd0bab8f2f9ddbcdd6b1..8d1cb9fa8027e4cfdb8505430620d7da73ba2f96 100644 (file)
--- a/src/frontends/qt4/ui/QRefUi.ui
+++ b/src/frontends/qt4/ui/QRefUi.ui
@@ -261,6 +261,7 @@
   <pixmapfunction></pixmapfunction>
   <tabstops>
    <tabstop>bufferCO</tabstop>
+  <tabstop>refsLW</tabstop>
    <tabstop>sortCB</tabstop>
    <tabstop>updatePB</tabstop>
    <tabstop>gotoPB</tabstop>
diff --git a/src/frontends/qt4/ui/QSendtoUi.ui b/src/frontends/qt4/ui/QSendtoUi.ui

index d5befb2b7e466084024a61fa4814b08e5794b5cd..52b26be2804d716a898fca858b719ee94f4913e0 100644 (file)
--- a/src/frontends/qt4/ui/QSendtoUi.ui
+++ b/src/frontends/qt4/ui/QSendtoUi.ui
@@ -122,6 +122,8 @@
   </widget>
   <pixmapfunction></pixmapfunction>
   <tabstops>
+  <tabstop>formatLW</tabstop>
+  <tabstop>commandCO</tabstop>
    <tabstop>okPB</tabstop>
    <tabstop>applyPB</tabstop>
    <tabstop>closePB</tabstop>
diff --git a/src/frontends/qt4/ui/QSpellcheckerUi.ui b/src/frontends/qt4/ui/QSpellcheckerUi.ui

index 78f102bdd081aaa98bafc8cd7b07516234ff1eb3..8bd876cc7ce37f2748711b87ffe658e3d5aa70ce 100644 (file)
--- a/src/frontends/qt4/ui/QSpellcheckerUi.ui
+++ b/src/frontends/qt4/ui/QSpellcheckerUi.ui
@@ -175,6 +175,7 @@
    <tabstop>wordED</tabstop>
    <tabstop>replaceCO</tabstop>
    <tabstop>replacePB</tabstop>
+  <tabstop>suggestionsLW</tabstop>
    <tabstop>ignorePB</tabstop>
    <tabstop>replacePB_3</tabstop>
    <tabstop>addPB</tabstop>
diff --git a/src/frontends/qt4/ui/QTabularUi.ui b/src/frontends/qt4/ui/QTabularUi.ui

index d14949115bd4b3185bbf00f69f241d07966c4026..1915c19b478d61063113c6d184f6384e2fd60767 100644 (file)
--- a/src/frontends/qt4/ui/QTabularUi.ui
+++ b/src/frontends/qt4/ui/QTabularUi.ui
@@ -8,8 +8,8 @@
     <rect>
      <x>0</x>
      <y>0</y>
-    <width>439</width>
-    <height>360</height>
+    <width>432</width>
+    <height>351</height>
     </rect>
    </property>
    <property name="windowTitle" >
@@ -34,7 +34,7 @@
        <enum>QTabWidget::Rounded</enum>
       </property>
       <property name="currentIndex" >
-      <number>2</number>
+      <number>0</number>
       </property>
       <widget class="QWidget" name="Settings" >
        <attribute name="title" >
diff --git a/src/frontends/qt4/ui/QTexinfoUi.ui b/src/frontends/qt4/ui/QTexinfoUi.ui

index da49eb4dd0b96afec7866eb83b59647288f98b84..e3c186d12586e55ab58641bf6137f77c246f7204 100644 (file)
--- a/src/frontends/qt4/ui/QTexinfoUi.ui
+++ b/src/frontends/qt4/ui/QTexinfoUi.ui
@@ -177,6 +177,7 @@
   <tabstops>
    <tabstop>whatStyle</tabstop>
    <tabstop>path</tabstop>
+  <tabstop>fileList</tabstop>
    <tabstop>rescanPB</tabstop>
    <tabstop>viewPB</tabstop>
    <tabstop>closePB</tabstop>
diff --git a/src/frontends/qt4/ui/QThesaurusUi.ui b/src/frontends/qt4/ui/QThesaurusUi.ui

index 0804af7ed4f6f053add60e6a89940e04c08bbde4..fd9c56165f79c6cc78e0a17ee1484829e7c82b1e 100644 (file)
--- a/src/frontends/qt4/ui/QThesaurusUi.ui
+++ b/src/frontends/qt4/ui/QThesaurusUi.ui
@@ -152,6 +152,7 @@
   <pixmapfunction></pixmapfunction>
   <tabstops>
    <tabstop>entryED</tabstop>
+  <tabstop>meaningsTV</tabstop>
    <tabstop>replaceED</tabstop>
    <tabstop>replacePB</tabstop>
    <tabstop>closePB</tabstop>
diff --git a/src/frontends/qt4/ui/QTocUi.ui b/src/frontends/qt4/ui/QTocUi.ui

index d5a45911ef4f3cbf8f6510ebf2802356e39130a1..4b5b3468f1c5c0f65fa25e63ea6b3148796f2371 100644 (file)
--- a/src/frontends/qt4/ui/QTocUi.ui
+++ b/src/frontends/qt4/ui/QTocUi.ui
@@ -173,6 +173,17 @@
    </layout>
   </widget>
   <pixmapfunction></pixmapfunction>
+ <tabstops>
+  <tabstop>typeCO</tabstop>
+  <tabstop>tocTV</tabstop>
+  <tabstop>depthSL</tabstop>
+  <tabstop>moveUpPB</tabstop>
+  <tabstop>moveDownPB</tabstop>
+  <tabstop>moveInPB</tabstop>
+  <tabstop>moveOutPB</tabstop>
+  <tabstop>updatePB</tabstop>
+  <tabstop>closePB</tabstop>
+ </tabstops>
   <resources/>
   <connections/>
  </ui>
diff --git a/src/frontends/qt4/ui/QVSpaceUi.ui b/src/frontends/qt4/ui/QVSpaceUi.ui

index 0e730da08234abae9255d57cf331c277ca28c2e7..376a491bfe42fde779eb1de760cda9ddaa1ef146 100644 (file)
--- a/src/frontends/qt4/ui/QVSpaceUi.ui
+++ b/src/frontends/qt4/ui/QVSpaceUi.ui
@@ -215,13 +215,16 @@
   <customwidgets>
    <customwidget>
     <class>LengthCombo</class>
-   <extends></extends>
+   <extends>QWidget</extends>
     <header>lengthcombo.h</header>
     <container>0</container>
     <pixmap></pixmap>
    </customwidget>
   </customwidgets>
   <tabstops>
+  <tabstop>spacingCO</tabstop>
+  <tabstop>valueLE</tabstop>
+  <tabstop>keepCB</tabstop>
    <tabstop>okPB</tabstop>
    <tabstop>applyPB</tabstop>
    <tabstop>closePB</tabstop>
diff --git a/src/frontends/qt4/ui/QViewSourceUi.ui b/src/frontends/qt4/ui/QViewSourceUi.ui

index 6c6b3cef3881c57da3da625389115fb7a6080549..42fe5622acf1a62d96cc980f990435711176d9c7 100644 (file)
--- a/src/frontends/qt4/ui/QViewSourceUi.ui
+++ b/src/frontends/qt4/ui/QViewSourceUi.ui
@@ -126,6 +126,9 @@
   <pixmapfunction></pixmapfunction>
   <tabstops>
    <tabstop>viewSourceTV</tabstop>
+  <tabstop>viewFullSourceCB</tabstop>
+  <tabstop>autoUpdateCB</tabstop>
+  <tabstop>updatePB</tabstop>
    <tabstop>closePB</tabstop>
   </tabstops>
   <resources/>
diff --git a/src/frontends/qt4/ui/TextLayoutUi.ui b/src/frontends/qt4/ui/TextLayoutUi.ui

index 18efb5338c186303e833c2b87239c8c8fb62cd61..3939755163e396bab5de4d4c491d53696d2358cb 100644 (file)
--- a/src/frontends/qt4/ui/TextLayoutUi.ui
+++ b/src/frontends/qt4/ui/TextLayoutUi.ui
@@ -8,43 +8,134 @@
     <rect>
      <x>0</x>
      <y>0</y>
-    <width>344</width>
-    <height>404</height>
+    <width>287</width>
+    <height>208</height>
     </rect>
    </property>
    <property name="windowTitle" >
     <string/>
    </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QGridLayout" >
     <property name="margin" >
-    <number>11</number>
+    <number>9</number>
     </property>
     <property name="spacing" >
      <number>6</number>
     </property>
-   <item>
+   <item row="1" column="2" >
+    <widget class="QLineEdit" name="lspacingLE" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>1</hsizetype>
+       <vsizetype>0</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" >
+    <widget class="QComboBox" name="lspacingCO" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>5</hsizetype>
+       <vsizetype>0</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="duplicatesEnabled" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="lspacingL" >
+     <property name="text" >
+      <string>&amp;Line spacing:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>lspacingCO</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" colspan="3" >
      <widget class="QGroupBox" name="ButtonGroup6" >
       <property name="title" >
        <string>Separate Paragraphs With</string>
       </property>
-     <layout class="QVBoxLayout" >
+     <layout class="QGridLayout" >
        <property name="margin" >
-       <number>11</number>
+       <number>9</number>
        </property>
        <property name="spacing" >
         <number>6</number>
        </property>
-      <item>
-       <widget class="QRadioButton" name="indentRB" >
-        <property name="toolTip" >
-         <string>Indent consecutive paragraphs</string>
+      <item row="2" column="1" >
+       <widget class="QComboBox" name="skipCO" >
+        <property name="enabled" >
+         <bool>false</bool>
          </property>
-        <property name="text" >
-         <string>&amp;Indentation</string>
+       </widget>
+      </item>
+      <item row="2" column="2" colspan="2" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType" >
+         <enum>QSizePolicy::Expanding</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>178</width>
+          <height>22</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="3" column="3" >
+       <widget class="LengthCombo" name="skipLengthCO" >
+        <property name="enabled" >
+         <bool>false</bool>
          </property>
         </widget>
        </item>
-      <item>
+      <item row="3" column="1" colspan="2" >
+       <widget class="QLineEdit" name="skipLE" >
+        <property name="enabled" >
+         <bool>false</bool>
+        </property>
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>1</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item rowspan="2" row="2" column="0" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType" >
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>31</width>
+          <height>58</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="1" column="0" colspan="4" >
         <widget class="QRadioButton" name="skipRB" >
          <property name="toolTip" >
           <string/>
@@ -54,181 +145,20 @@
          </property>
         </widget>
        </item>
-      <item>
-       <layout class="QHBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
+      <item row="0" column="0" colspan="4" >
+       <widget class="QRadioButton" name="indentRB" >
+        <property name="toolTip" >
+         <string>Indent consecutive paragraphs</string>
          </property>
-        <property name="spacing" >
-         <number>6</number>
+        <property name="text" >
+         <string>&amp;Indentation</string>
          </property>
-        <item>
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType" >
-           <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name="sizeHint" >
-           <size>
-            <width>31</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <layout class="QVBoxLayout" >
-          <property name="margin" >
-           <number>0</number>
-          </property>
-          <property name="spacing" >
-           <number>6</number>
-          </property>
-          <item>
-           <layout class="QHBoxLayout" >
-            <property name="margin" >
-             <number>0</number>
-            </property>
-            <property name="spacing" >
-             <number>6</number>
-            </property>
-            <item>
-             <widget class="QComboBox" name="skipCO" >
-              <property name="enabled" >
-               <bool>false</bool>
-              </property>
-             </widget>
-            </item>
-            <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>
-           </layout>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" >
-            <property name="margin" >
-             <number>0</number>
-            </property>
-            <property name="spacing" >
-             <number>6</number>
-            </property>
-            <item>
-             <widget class="QLineEdit" name="skipLE" >
-              <property name="enabled" >
-               <bool>false</bool>
-              </property>
-              <property name="sizePolicy" >
-               <sizepolicy>
-                <hsizetype>1</hsizetype>
-                <vsizetype>0</vsizetype>
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="LengthCombo" name="skipLengthCO" >
-              <property name="enabled" >
-               <bool>false</bool>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </item>
-       </layout>
+       </widget>
        </item>
       </layout>
      </widget>
     </item>
-   <item>
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <item>
-      <widget class="QLabel" name="lspacingL" >
-       <property name="text" >
-        <string>&amp;Line spacing:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>lspacingCO</cstring>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" >
-       <property name="margin" >
-        <number>0</number>
-       </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <item>
-        <widget class="QComboBox" name="lspacingCO" >
-         <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>5</hsizetype>
-           <vsizetype>0</vsizetype>
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="duplicatesEnabled" >
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLineEdit" name="lspacingLE" >
-         <property name="enabled" >
-          <bool>false</bool>
-         </property>
-         <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>1</hsizetype>
-           <vsizetype>0</vsizetype>
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QCheckBox" name="twoColumnCB" >
-     <property name="toolTip" >
-      <string>Format text into two columns</string>
-     </property>
-     <property name="text" >
-      <string>Two-&amp;column document</string>
-     </property>
-    </widget>
-   </item>
-   <item>
+   <item row="3" column="0" colspan="3" >
      <spacer>
       <property name="orientation" >
        <enum>Qt::Vertical</enum>
@@ -244,13 +174,23 @@
       </property>
      </spacer>
     </item>
+   <item row="2" column="0" colspan="3" >
+    <widget class="QCheckBox" name="twoColumnCB" >
+     <property name="toolTip" >
+      <string>Format text into two columns</string>
+     </property>
+     <property name="text" >
+      <string>Two-&amp;column document</string>
+     </property>
+    </widget>
+   </item>
    </layout>
   </widget>
   <pixmapfunction></pixmapfunction>
   <customwidgets>
    <customwidget>
     <class>LengthCombo</class>
-   <extends></extends>
+   <extends>QWidget</extends>
     <header>lengthcombo.h</header>
     <container>0</container>
     <pixmap></pixmap>
author	Edwin Leuven <e.leuven@gmail.com>
	Thu, 31 Aug 2006 13:46:28 +0000 (13:46 +0000)
committer	Edwin Leuven <e.leuven@gmail.com>
	Thu, 31 Aug 2006 13:46:28 +0000 (13:46 +0000)
src/frontends/qt4/ui/QBibitemUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QBibtexAddUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QBranchUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QChangesUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QCharacterUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QCitationUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QDelimiterUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QErrorListUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QExternalUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QIncludeUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QLogUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QMathMatrixUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QMathUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QNoteUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QParagraphUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QPrefConvertersUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QPrefCopiersUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QPrefDisplayUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QPrefFileformatsUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QPrefLatexUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QPrefPathsUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QPrefPrinterUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QPrefScreenFontsUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QPrefUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QPrintUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QRefUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QSendtoUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QSpellcheckerUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QTabularUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QTexinfoUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QThesaurusUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QTocUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QVSpaceUi.ui		patch \| blob \| history
src/frontends/qt4/ui/QViewSourceUi.ui		patch \| blob \| history
src/frontends/qt4/ui/TextLayoutUi.ui		patch \| blob \| history