* clean-up layout document class settings

* enable tooltips in document class combobox

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

diff --git a/src/frontends/qt4/GuiIdListModel.cpp b/src/frontends/qt4/GuiIdListModel.cpp
index 2d15b0efabf511c46c25b3660e67fbdbac4c8dcc..5872514d9644c976315ab72d557583d6b0cbaf4f 100644 (file)
--- a/src/frontends/qt4/GuiIdListModel.cpp
+++ b/src/frontends/qt4/GuiIdListModel.cpp
@@ -26,7 +26,7 @@ QVariant GuiIdListModel::data(QModelIndex const & index, int role) const
        int const row = index.row();
        if (!rowIsValid(row))
                return QVariant();
-       if (role == Qt::DisplayRole || role == Qt::EditRole)
+       if (role == Qt::DisplayRole || role == Qt::EditRole || role == Qt::ToolTipRole)
                return userData_[row].uiString;
        if (role == Qt::UserRole)
                return userData_[row].idString;

diff --git a/src/frontends/qt4/ui/LaTeXUi.ui b/src/frontends/qt4/ui/LaTeXUi.ui
index 7199ca93eb2f0abc4403785446bb39df9e0daeb5..215575e95af17871ee998d805c01c1fdfe70d75a 100644 (file)
--- a/src/frontends/qt4/ui/LaTeXUi.ui
+++ b/src/frontends/qt4/ui/LaTeXUi.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>375</width>
-    <height>409</height>
+    <width>381</width>
+    <height>375</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -19,60 +19,20 @@
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item row="1" column="0" >
-    <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="0" column="0" colspan="2" >
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <item>
-      <widget class="QLabel" name="classL" >
-       <property name="text" >
-        <string>Document &amp;class:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>classCO</cstring>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QComboBox" name="classCO" >
-       <property name="maxVisibleItems" >
-        <number>20</number>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="5" column="1" >
+   <item row="4" column="2" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" >
       <size>
-       <width>84</width>
-       <height>41</height>
+       <width>20</width>
+       <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item row="4" column="0" colspan="2" >
+   <item row="3" column="0" colspan="4" >
     <widget class="QGroupBox" name="modulesGB" >
      <property name="title" >
       <string>Modules</string>
@@ -165,70 +125,50 @@
      </layout>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2" >
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
+   <item row="2" column="2" colspan="2" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="sizeHint" >
+      <size>
+       <width>261</width>
+       <height>22</height>
+      </size>
      </property>
-     <item>
-      <widget class="QLabel" name="psdriverL" >
-       <property name="text" >
-        <string>&amp;Postscript driver:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>psdriverCO</cstring>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QComboBox" name="psdriverCO" >
-       <property name="duplicatesEnabled" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>261</width>
-         <height>22</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
+    </spacer>
    </item>
-   <item row="2" column="0" colspan="2" >
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
+   <item row="2" column="1" >
+    <widget class="QComboBox" name="psdriverCO" >
+     <property name="duplicatesEnabled" >
+      <bool>false</bool>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+    </widget>
+   </item>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="psdriverL" >
+     <property name="text" >
+      <string>&amp;Postscript driver:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>psdriverCO</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" colspan="3" >
+    <widget class="QLineEdit" name="optionsLE" />
+   </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="optionsL" >
+     <property name="text" >
+      <string>&amp;Options:</string>
      </property>
-     <item>
-      <widget class="QLabel" name="optionsL" >
-       <property name="text" >
-        <string>&amp;Options:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>optionsLE</cstring>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="optionsLE" />
-     </item>
-    </layout>
+     <property name="buddy" >
+      <cstring>optionsLE</cstring>
+     </property>
+    </widget>
    </item>
-   <item row="1" column="1" >
+   <item row="0" column="3" >
     <widget class="QPushButton" name="layoutPB" >
      <property name="sizePolicy" >
       <sizepolicy>
@@ -242,7 +182,24 @@
       <string>Click to select a local document class definition file</string>
      </property>
      <property name="text" >
-      <string>&amp;Select Local Layout...</string>
+      <string>&amp;Local Layout...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" >
+    <widget class="QLabel" name="classL" >
+     <property name="text" >
+      <string>Document &amp;class:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>classCO</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" colspan="2" >
+    <widget class="QComboBox" name="classCO" >
+     <property name="maxVisibleItems" >
+      <number>20</number>
      </property>
     </widget>
    </item>