Author: jrioux
Date: Tue Oct 11 20:22:06 2011
New Revision: 39829
URL: http://www.lyx.org/trac/changeset/39829
Log:
Fix the tab ordering of PrefsUi and GuiDocument Ui components.
Modified:
lyx-devel/branches/BRANCH_2_0_X/ (props changed)
lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/BranchesUi.ui
lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/BulletsUi.ui
lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/DocumentUi.ui
lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/FloatPlacementUi.ui
lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/FontUi.ui
lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/LaTeXUi.ui
lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/LanguageUi.ui
lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/MathsUi.ui
lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/NumberingUi.ui
lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/PDFSupportUi.ui
lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/PrefsUi.ui
lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/TextLayoutUi.ui
lyx-devel/branches/BRANCH_2_0_X/status.20x
Modified: lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/BranchesUi.ui
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/BranchesUi.ui Tue Oct
11 19:57:33 2011 (r39828)
+++ lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/BranchesUi.ui Tue Oct
11 20:22:06 2011 (r39829)
@@ -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>
Modified: lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/BulletsUi.ui
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/BulletsUi.ui Tue Oct
11 19:57:33 2011 (r39828)
+++ lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/BulletsUi.ui Tue Oct
11 20:22:06 2011 (r39829)
@@ -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>
Modified: lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/DocumentUi.ui
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/DocumentUi.ui Tue Oct
11 19:57:33 2011 (r39828)
+++ lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/DocumentUi.ui Tue Oct
11 20:22:06 2011 (r39829)
@@ -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>
Modified:
lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/FloatPlacementUi.ui
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/FloatPlacementUi.ui
Tue Oct 11 19:57:33 2011 (r39828)
+++ lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/FloatPlacementUi.ui
Tue Oct 11 20:22:06 2011 (r39829)
@@ -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>
Modified: lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/FontUi.ui
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/FontUi.ui Tue Oct
11 19:57:33 2011 (r39828)
+++ lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/FontUi.ui Tue Oct
11 20:22:06 2011 (r39829)
@@ -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>
Modified: lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/LaTeXUi.ui
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/LaTeXUi.ui Tue Oct
11 19:57:33 2011 (r39828)
+++ lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/LaTeXUi.ui Tue Oct
11 20:22:06 2011 (r39829)
@@ -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>
Modified: lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/LanguageUi.ui
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/LanguageUi.ui Tue Oct
11 19:57:33 2011 (r39828)
+++ lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/LanguageUi.ui Tue Oct
11 20:22:06 2011 (r39829)
@@ -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>
Modified: lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/MathsUi.ui
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/MathsUi.ui Tue Oct
11 19:57:33 2011 (r39828)
+++ lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/MathsUi.ui Tue Oct
11 20:22:06 2011 (r39829)
@@ -120,10 +120,6 @@
</item>
</layout>
</widget>
- <tabstops>
- <tabstop>amsautoCB</tabstop>
- <tabstop>esintautoCB</tabstop>
- </tabstops>
<includes>
<include location="local">qt_i18n.h</include>
</includes>
Modified: lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/NumberingUi.ui
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/NumberingUi.ui Tue Oct
11 19:57:33 2011 (r39828)
+++ lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/NumberingUi.ui Tue Oct
11 20:22:06 2011 (r39829)
@@ -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/>
Modified: lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/PDFSupportUi.ui
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/PDFSupportUi.ui
Tue Oct 11 19:57:33 2011 (r39828)
+++ lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/PDFSupportUi.ui
Tue Oct 11 20:22:06 2011 (r39829)
@@ -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&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 &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&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 &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>&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>&Open bookmarks</string>
- </property>
- </widget>
- </item>
<item row="2" column="1" >
<spacer>
<property name="orientation" >
Modified: lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/PrefsUi.ui
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/PrefsUi.ui Tue Oct
11 19:57:33 2011 (r39828)
+++ lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/PrefsUi.ui Tue Oct
11 20:22:06 2011 (r39829)
@@ -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>
Modified: lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/TextLayoutUi.ui
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/TextLayoutUi.ui
Tue Oct 11 19:57:33 2011 (r39828)
+++ lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/TextLayoutUi.ui
Tue Oct 11 20:22:06 2011 (r39829)
@@ -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>
Modified: lyx-devel/branches/BRANCH_2_0_X/status.20x
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/status.20x Tue Oct 11 19:57:33 2011
(r39828)
+++ lyx-devel/branches/BRANCH_2_0_X/status.20x Tue Oct 11 20:22:06 2011
(r39829)
@@ -132,7 +132,8 @@
- 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.
