couple more fixes

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

src/frontends/qt2/QPrefsDialog.C

@@ -59,18 +59,19 @@ QPrefsDialog::QPrefsDialog(QPrefs * form)
 		form, SLOT(slotClose()));
 	connect(restorePB, SIGNAL(clicked()),
 		form, SLOT(slotRestore()));
- 
+
 	prefsLV->setSorting(-1);
- 
+
 	// OK, Qt is REALLY broken. We have to hard
 	// code the menu structure here.
 
-	QListViewItem * adv(new QListViewItem(prefsLV, _("Advanced settings")));
-	adv->setSelectable(false);
-	QListViewItem * lan(new QListViewItem(prefsLV, _("Language settings")));
-	lan->setSelectable(false);
 	QListViewItem * lnf(new QListViewItem(prefsLV, _("Look and feel")));
-	lnf->setSelectable(false); 
+	lnf->setSelectable(false);
+	lnf->setOpen(true);
+	QListViewItem * lan(new QListViewItem(prefsLV, lnf, _("Language settings")));
+	lan->setSelectable(false);
+	QListViewItem * adv(new QListViewItem(prefsLV, lan, _("Advanced settings")));
+	adv->setSelectable(false);
 
 	asciiModule = new QPrefAsciiModule(prefsWS);
 	dateModule = new QPrefDateModule(prefsWS);
@@ -103,28 +104,28 @@ QPrefsDialog::QPrefsDialog(QPrefs * form)
 	prefsWS->addWidget(languageModule, 12);
 	prefsWS->addWidget(printerModule, 13);
 	prefsWS->addWidget(uiModule, 14);
- 
+
 	QListViewItem * i;
 
 	// advanced settings
- 
+
 	i = new QListViewItem(adv, _("Converters"));
 	pane_map_[i] = convertersModule;
 	i = new QListViewItem(adv, i, _("File formats"));
 	pane_map_[i] = fileformatsModule;
 	// language settings
- 
+
 	i = new QListViewItem(lan, _("Language"));
 	pane_map_[i] = languageModule;
 	i = new QListViewItem(lan, i, _("Spellchecker"));
 	pane_map_[i] = spellcheckerModule;
- 
+
 	// UI
- 
+
 	i = new QListViewItem(lnf, _("User interface"));
 	pane_map_[i] = uiModule;
 	prefsLV->setCurrentItem(i);
- 
+
 	i = new QListViewItem(lnf, i, _("Screen fonts"));
 	pane_map_[i] = screenfontsModule;
 	i = new QListViewItem(lnf, i, _("Colors"));
@@ -133,9 +134,9 @@ QPrefsDialog::QPrefsDialog(QPrefs * form)
 	pane_map_[i] = displayModule;
 	i = new QListViewItem(lnf, i, _("Miscellaneous")); // YUCK !
 	pane_map_[i] = lnfmiscModule;
- 
+
 	// rag bag of crap
- 
+
 	i = new QListViewItem(prefsLV, lan, _("Ascii"));
 	pane_map_[i] = asciiModule;
 	i = new QListViewItem(prefsLV, i, _("Date"));
@@ -148,8 +149,11 @@ QPrefsDialog::QPrefsDialog(QPrefs * form)
 	pane_map_[i] = pathsModule;
 	i = new QListViewItem(prefsLV, i, _("Printer"));
 	pane_map_[i] = printerModule;
- 
+
 	prefsLV->setMinimumSize(prefsLV->sizeHint());
+
+	// Qt sucks
+	resize(minimumSize());
 }
 
 

src/frontends/qt2/ui/QPrefsDialog.ui

@@ -17,6 +17,13 @@
             <height>192</height>
         </rect>
     </property>
+    <property stdset="1">
+        <name>sizePolicy</name>
+        <sizepolicy>
+            <hsizetype>1</hsizetype>
+            <vsizetype>1</vsizetype>
+        </sizepolicy>
+    </property>
     <property stdset="1">
         <name>caption</name>
         <string>Preferences</string>
@@ -131,42 +138,6 @@
                     <name>spacing</name>
                     <number>6</number>
                 </property>
-                <widget>
-                    <class>QLabel</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>titleL</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>7</hsizetype>
-                            <vsizetype>0</vsizetype>
-                        </sizepolicy>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>title here</string>
-                    </property>
-                </widget>
-                <widget>
-                    <class>Line</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>Line1</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>1</hsizetype>
-                            <vsizetype>0</vsizetype>
-                        </sizepolicy>
-                    </property>
-                    <property stdset="1">
-                        <name>orientation</name>
-                        <enum>Horizontal</enum>
-                    </property>
-                </widget>
                 <widget>
                     <class>QWidgetStack</class>
                     <property stdset="1">
@@ -188,15 +159,15 @@
             <column>
                 <property>
                     <name>text</name>
-                    <string>Column 1</string>
+                    <string>Preferences</string>
                 </property>
                 <property>
                     <name>clickable</name>
-                    <bool>true</bool>
+                    <bool>false</bool>
                 </property>
                 <property>
                     <name>resizeable</name>
-                    <bool>true</bool>
+                    <bool>false</bool>
                 </property>
             </column>
             <property stdset="1">
@@ -206,7 +177,7 @@
             <property stdset="1">
                 <name>sizePolicy</name>
                 <sizepolicy>
-                    <hsizetype>1</hsizetype>
+                    <hsizetype>5</hsizetype>
                     <vsizetype>7</vsizetype>
                 </sizepolicy>
             </property>