From 39d569661a3f4411d4501f9a8db9c7360ef5d568 Mon Sep 17 00:00:00 2001
From: Julien Rioux <jrioux@lyx.org>
Date: Sat, 24 Sep 2011 16:39:26 +0000
Subject: [PATCH] Fix the tab ordering of PanelStack and PrefsUi.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39746 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/PanelStack.cpp |  2 +-
 src/frontends/qt4/ui/PrefsUi.ui  | 21 ++++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/frontends/qt4/PanelStack.cpp b/src/frontends/qt4/PanelStack.cpp
index 5537ee1562..68fb07e73c 100644
--- a/src/frontends/qt4/PanelStack.cpp
+++ b/src/frontends/qt4/PanelStack.cpp
@@ -49,9 +49,9 @@ PanelStack::PanelStack(QWidget * parent)
 	: QWidget(parent)
 {
 	delay_search_ = new QTimer(this);
+	search_ = new FancyLineEdit(this);
 	list_ = new QTreeWidget(this);
 	stack_ = new QStackedWidget(this);
-	search_ = new FancyLineEdit(this);
 
 	// Configure the timer
 	delay_search_->setSingleShot(true);
diff --git a/src/frontends/qt4/ui/PrefsUi.ui b/src/frontends/qt4/ui/PrefsUi.ui
index fc990471ee..5da08dba44 100644
--- 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>