Fix the tab ordering of PrefsUi and GuiDocument Ui components.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39829 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/ui/BranchesUi.ui b/src/frontends/qt4/ui/BranchesUi.ui
index 298931e1e55ad175c6b96e2dcf0aa4f730b18b15..5c0b60156ba25d6fd7636aceb821978b19248a47 100644 (file)
--- a/src/frontends/qt4/ui/BranchesUi.ui
+++ b/src/frontends/qt4/ui/BranchesUi.ui
@@ -146,6 +146,17 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>newBranchLE</tabstop>
+  <tabstop>addBranchPB</tabstop>
+  <tabstop>branchesTW</tabstop>
+  <tabstop>removePB</tabstop>
+  <tabstop>renamePB</tabstop>
+  <tabstop>colorPB</tabstop>
+  <tabstop>suffixPB</tabstop>
+  <tabstop>activatePB</tabstop>
+  <tabstop>unknownPB</tabstop>
+ </tabstops>
  <includes>
   <include location="local" >qt_i18n.h</include>
  </includes>

diff --git a/src/frontends/qt4/ui/BulletsUi.ui b/src/frontends/qt4/ui/BulletsUi.ui
index 3ecb726b5ea1526334aaea289bbb23e5d6379134..a9959c9e8bb18cb5e7c7288f1823651735ff4064 100644 (file)
--- a/src/frontends/qt4/ui/BulletsUi.ui
+++ b/src/frontends/qt4/ui/BulletsUi.ui
@@ -192,6 +192,14 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>levelLW</tabstop>
+  <tabstop>bulletpaneCO</tabstop>
+  <tabstop>bulletpaneSW</tabstop>
+  <tabstop>customCB</tabstop>
+  <tabstop>customLE</tabstop>
+  <tabstop>bulletsizeCO</tabstop>
+ </tabstops>
  <includes>
   <include location="local" >qt_i18n.h</include>
  </includes>

diff --git a/src/frontends/qt4/ui/DocumentUi.ui b/src/frontends/qt4/ui/DocumentUi.ui
index 58e91a13cab5b102cb3684e10f7903865487badc..3a7b4c9ef637c88f27c4e775e5a982283479ec5a 100644 (file)
--- a/src/frontends/qt4/ui/DocumentUi.ui
+++ b/src/frontends/qt4/ui/DocumentUi.ui
@@ -165,6 +165,15 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>docPS</tabstop>
+  <tabstop>defaultPB</tabstop>
+  <tabstop>savePB</tabstop>
+  <tabstop>restorePB</tabstop>
+  <tabstop>okPB</tabstop>
+  <tabstop>applyPB</tabstop>
+  <tabstop>closePB</tabstop>
+ </tabstops>
  <includes>
   <include location="local" >qt_i18n.h</include>
  </includes>

diff --git a/src/frontends/qt4/ui/FloatPlacementUi.ui b/src/frontends/qt4/ui/FloatPlacementUi.ui
index 0114986a9dae59c5df8260c82899962b4e893209..f6e02ae76a2dc3146d02e2843929f13ff0029198 100644 (file)
--- a/src/frontends/qt4/ui/FloatPlacementUi.ui
+++ b/src/frontends/qt4/ui/FloatPlacementUi.ui
@@ -123,6 +123,15 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>defaultsCB</tabstop>
+  <tabstop>topCB</tabstop>
+  <tabstop>bottomCB</tabstop>
+  <tabstop>pageCB</tabstop>
+  <tabstop>herepossiblyCB</tabstop>
+  <tabstop>heredefinitelyCB</tabstop>
+  <tabstop>ignoreCB</tabstop>
+ </tabstops>
  <includes>
   <include location="local" >qt_i18n.h</include>
  </includes>

diff --git a/src/frontends/qt4/ui/FontUi.ui b/src/frontends/qt4/ui/FontUi.ui
index 5531b9b52640f4ff599732298dccdf5c7241b3ed..efdde1ab708f2e64f00bd41f8a9500c4db310d7f 100644 (file)
--- a/src/frontends/qt4/ui/FontUi.ui
+++ b/src/frontends/qt4/ui/FontUi.ui
@@ -241,13 +241,17 @@
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <tabstops>
+  <tabstop>osFontsCB</tabstop>
   <tabstop>fontsDefaultCO</tabstop>
   <tabstop>fontsizeCO</tabstop>
+  <tabstop>fontencCO</tabstop>
+  <tabstop>fontencLE</tabstop>
+  <tabstop>fontsRomanCO</tabstop>
   <tabstop>fontsSansCO</tabstop>
   <tabstop>scaleSansSB</tabstop>
   <tabstop>fontsTypewriterCO</tabstop>
   <tabstop>scaleTypewriterSB</tabstop>
-  <tabstop>fontsRomanCO</tabstop>
+  <tabstop>cjkFontLE</tabstop>
   <tabstop>fontScCB</tabstop>
   <tabstop>fontOsfCB</tabstop>
  </tabstops>

diff --git a/src/frontends/qt4/ui/LaTeXUi.ui b/src/frontends/qt4/ui/LaTeXUi.ui
index 3af878cba212370d4d3387dad5364a2d5af181e7..02520b9aa489db5c4c5c22cedac842836f54e871 100644 (file)
--- a/src/frontends/qt4/ui/LaTeXUi.ui
+++ b/src/frontends/qt4/ui/LaTeXUi.ui
@@ -211,8 +211,16 @@
  </widget>
  <tabstops>
   <tabstop>classCO</tabstop>
+  <tabstop>layoutPB</tabstop>
+  <tabstop>defaultOptionsCB</tabstop>
+  <tabstop>defaultOptionsLE</tabstop>
   <tabstop>optionsLE</tabstop>
   <tabstop>psdriverCO</tabstop>
+  <tabstop>childDocGB</tabstop>
+  <tabstop>childDocLE</tabstop>
+  <tabstop>childDocPB</tabstop>
+  <tabstop>suppressDateCB</tabstop>
+  <tabstop>refstyleCB</tabstop>
  </tabstops>
  <includes>
   <include location="local">qt_i18n.h</include>

diff --git a/src/frontends/qt4/ui/LanguageUi.ui b/src/frontends/qt4/ui/LanguageUi.ui
index 3dea1c27d6712eab34f8620c4dc9f808602984c9..e3612329e843dc66064144e809b87c5b9c7d8670 100644 (file)
--- a/src/frontends/qt4/ui/LanguageUi.ui
+++ b/src/frontends/qt4/ui/LanguageUi.ui
@@ -182,6 +182,8 @@
   <tabstop>defaultencodingRB</tabstop>
   <tabstop>otherencodingRB</tabstop>
   <tabstop>encodingCO</tabstop>
+  <tabstop>languagePackageCO</tabstop>
+  <tabstop>languagePackageLE</tabstop>
  </tabstops>
  <includes>
   <include location="local">qt_i18n.h</include>

diff --git a/src/frontends/qt4/ui/MathsUi.ui b/src/frontends/qt4/ui/MathsUi.ui
index 81b5c1984c33e946a51918413acdce709e68c1ac..559a3ac21db37c0f46927eb30b8837fa21a26cd0 100644 (file)
--- a/src/frontends/qt4/ui/MathsUi.ui
+++ b/src/frontends/qt4/ui/MathsUi.ui
@@ -120,10 +120,6 @@
    </item>
   </layout>
  </widget>
- <tabstops>
-  <tabstop>amsautoCB</tabstop>
-  <tabstop>esintautoCB</tabstop>
- </tabstops>
  <includes>
   <include location="local">qt_i18n.h</include>
  </includes>

diff --git a/src/frontends/qt4/ui/NumberingUi.ui b/src/frontends/qt4/ui/NumberingUi.ui
index 63a7bfa8cbafdc305f335173bde2708b6d7e9b1e..3cd91a955ef8bdbdf6d9d941b11de232df876121 100644 (file)
--- a/src/frontends/qt4/ui/NumberingUi.ui
+++ b/src/frontends/qt4/ui/NumberingUi.ui
@@ -81,8 +81,9 @@
   <include location="local" >qt_i18n.h</include>
  </includes>
  <tabstops>
-  <tabstop>tocSL</tabstop>
   <tabstop>depthSL</tabstop>
+  <tabstop>tocSL</tabstop>
+  <tabstop>tocTW</tabstop>
  </tabstops>
  <resources/>
  <connections/>

diff --git a/src/frontends/qt4/ui/PDFSupportUi.ui b/src/frontends/qt4/ui/PDFSupportUi.ui
index 80966510734e55a64992b7592efc9facaae28f71..9d282a5871f4a1f9f4786352cdcd8913f41a42ba 100644 (file)
--- a/src/frontends/qt4/ui/PDFSupportUi.ui
+++ b/src/frontends/qt4/ui/PDFSupportUi.ui
@@ -85,36 +85,6 @@
             </property>
            </spacer>
           </item>
-          <item row="1" column="0" >
-           <layout class="QVBoxLayout" >
-            <property name="spacing" >
-             <number>6</number>
-            </property>
-            <property name="margin" >
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QCheckBox" name="pdfusetitleCB" >
-              <property name="toolTip" >
-               <string>If not stated explicitly, fill title and author from appropriate environments</string>
-              </property>
-              <property name="text" >
-               <string>Automatically fi&amp;ll header</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QCheckBox" name="fullscreenCB" >
-              <property name="toolTip" >
-               <string>Enable fullscreen PDF presentation</string>
-              </property>
-              <property name="text" >
-               <string>Load in &amp;fullscreen mode</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
           <item row="0" column="0" colspan="2" >
            <widget class="QGroupBox" name="groupBox_2" >
             <property name="title" >
@@ -182,6 +152,36 @@
             </layout>
            </widget>
           </item>
+          <item row="1" column="0" >
+           <layout class="QVBoxLayout" >
+            <property name="spacing" >
+             <number>6</number>
+            </property>
+            <property name="margin" >
+             <number>0</number>
+            </property>
+            <item>
+             <widget class="QCheckBox" name="pdfusetitleCB" >
+              <property name="toolTip" >
+               <string>If not stated explicitly, fill title and author from appropriate environments</string>
+              </property>
+              <property name="text" >
+               <string>Automatically fi&amp;ll header</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="fullscreenCB" >
+              <property name="toolTip" >
+               <string>Enable fullscreen PDF presentation</string>
+              </property>
+              <property name="text" >
+               <string>Load in &amp;fullscreen mode</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
          </layout>
         </widget>
         <widget class="QWidget" name="tab_2" >
@@ -315,6 +315,13 @@
                </property>
               </widget>
              </item>
+             <item row="1" column="0" >
+              <widget class="QCheckBox" name="bookmarksopenGB" >
+               <property name="text" >
+                <string>&amp;Open bookmarks</string>
+               </property>
+              </widget>
+             </item>
              <item row="2" column="0" >
               <layout class="QHBoxLayout" >
                <property name="spacing" >
@@ -342,13 +349,6 @@
                </item>
               </layout>
              </item>
-             <item row="1" column="0" >
-              <widget class="QCheckBox" name="bookmarksopenGB" >
-               <property name="text" >
-                <string>&amp;Open bookmarks</string>
-               </property>
-              </widget>
-             </item>
              <item row="2" column="1" >
               <spacer>
                <property name="orientation" >

diff --git a/src/frontends/qt4/ui/PrefsUi.ui b/src/frontends/qt4/ui/PrefsUi.ui
index fc990471ee2255a5edc4dd33ad1cd307772b36fc..5da08dba44a27d01ca9d3e500e91886bdcc0e230 100644 (file)
--- a/src/frontends/qt4/ui/PrefsUi.ui
+++ b/src/frontends/qt4/ui/PrefsUi.ui
@@ -23,17 +23,14 @@
   <property name="sizeGripEnabled" >
    <bool>true</bool>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QGridLayout" >
    <property name="margin" >
     <number>11</number>
    </property>
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item>
-    <widget class="lyx::frontend::PanelStack" name="prefsPS" />
-   </item>
-   <item>
+   <item row="1" column="0" >
     <layout class="QHBoxLayout" >
      <property name="margin" >
       <number>0</number>
@@ -99,27 +96,29 @@
      </item>
     </layout>
    </item>
+   <item row="0" column="0" >
+    <widget class="lyx::frontend::PanelStack" native="1" name="prefsPS" />
+   </item>
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
- <includes>
-  <include location="local" >qt_i18n.h</include>
- </includes>
  <customwidgets>
   <customwidget>
    <class>lyx::frontend::PanelStack</class>
-   <extends></extends>
+   <extends>QWidget</extends>
    <header>PanelStack.h</header>
    <container>1</container>
-   <pixmap></pixmap>
   </customwidget>
  </customwidgets>
  <tabstops>
+  <tabstop>prefsPS</tabstop>
   <tabstop>restorePB</tabstop>
   <tabstop>savePB</tabstop>
   <tabstop>applyPB</tabstop>
   <tabstop>closePB</tabstop>
  </tabstops>
+ <includes>
+  <include location="local" >qt_i18n.h</include>
+ </includes>
  <resources/>
  <connections/>
 </ui>

diff --git a/src/frontends/qt4/ui/TextLayoutUi.ui b/src/frontends/qt4/ui/TextLayoutUi.ui
index 3a131d1818e8884cab1fb8d8c4c3ffc0213c0526..dadcd79cc4b102aa1363a4f419e381c0d7e0b224 100644 (file)
--- a/src/frontends/qt4/ui/TextLayoutUi.ui
+++ b/src/frontends/qt4/ui/TextLayoutUi.ui
@@ -285,9 +285,13 @@
  </customwidgets>
  <tabstops>
   <tabstop>indentRB</tabstop>
+  <tabstop>indentCO</tabstop>
+  <tabstop>indentLE</tabstop>
+  <tabstop>indentLengthCO</tabstop>
   <tabstop>skipRB</tabstop>
   <tabstop>skipCO</tabstop>
   <tabstop>skipLE</tabstop>
+  <tabstop>skipLengthCO</tabstop>
   <tabstop>lspacingCO</tabstop>
   <tabstop>lspacingLE</tabstop>
   <tabstop>twoColumnCB</tabstop>

diff --git a/status.20x b/status.20x
index dd9290a3b878e1d301a57219faad4b269ac306a4..c044fab4280e68b6ba1208535174637af846162e 100644 (file)
--- a/status.20x
+++ b/status.20x
@@ -132,7 +132,8 @@ What's new
 - Fix on-screen display of graphics when the name of the temporary directory
   contains non-ascii characters (bug 7621).
 
-- Fix the tab ordering of widgets in the Tools->Preferences panel.
+- Fix the tab ordering of widgets in the Document->Settings and
+  Tools->Preferences panels.
 
 - Mark settings as changed when the Nomenclature line is edited in the
   Tools->Preferences panel.