]> git.lyx.org Git - lyx.git/commitdiff
Introduce a new paned dialog class and use it for prefs
authorJohn Levon <levon@movementarian.org>
Fri, 28 Mar 2003 01:21:42 +0000 (01:21 +0000)
committerJohn Levon <levon@movementarian.org>
Fri, 28 Mar 2003 01:21:42 +0000 (01:21 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6600 a592a061-630c-0410-9148-cb99ea01b6c8

12 files changed:
src/frontends/qt2/ChangeLog
src/frontends/qt2/Makefile.am
src/frontends/qt2/Makefile.dialogs
src/frontends/qt2/QPrefsDialog.C
src/frontends/qt2/QPrefsDialog.h
src/frontends/qt2/panelstack.C [new file with mode: 0644]
src/frontends/qt2/panelstack.h [new file with mode: 0644]
src/frontends/qt2/ui/QPrefColorsModule.ui
src/frontends/qt2/ui/QPrefConvertersModule.ui
src/frontends/qt2/ui/QPrefFileformatsModule.ui
src/frontends/qt2/ui/QPrefUIModule.ui
src/frontends/qt2/ui/QPrefsDialogBase.ui

index beb647346041eca0498692a77190261fb4cbb716..dfcfc79163d6307c8205c93bd778ef8b0bb2d2b1 100644 (file)
@@ -1,3 +1,17 @@
+2003-03-28  John Levon  <levon@movementarian.org>
+
+       * Makefile.am:
+       * Makefile.dialogs:
+       * moc/Makefile.am:
+       * panelstack.h:
+       * panelstack.C: add new class for handling paned dialogs
+
+       * QPrefsDialog.h:
+       * QPrefsDialog.C:
+       * ui/QPrefsDialogBase.ui: use the above
+
+       * ui/QPrefUIModule.ui: re-layout
+
 2003-03-27  John Levon  <levon@movementarian.org>
 
        * ui/QParagraphDialogBase.ui: fix dupe accelerator / group label
index 9e537ed5fce7116f6801a015eda2bd4b486fbdc6..abf5adcabb8a706904cccc136ff32afef8243039 100644 (file)
@@ -67,6 +67,7 @@ libqt2_la_SOURCES = \
        QtLyXView.h \
        WorkAreaFactory.C \
        lyx_gui.C \
+       panelstack.h panelstack.C \
        qcoloritem.h qcoloritem.C \
        qfontexample.h qfontexample.C \
        qfont_loader.h qfont_loader.C \
index a5621676a777dfd8ef91ee24aad37e6c96347e9e..e5f366670c33cc22e2b7b6cacfbfeacf868e979b 100644 (file)
@@ -69,6 +69,7 @@ MOCFILES = \
        iconpalette.C iconpalette.h \
        io_callback.C io_callback.h \
        lengthcombo.C lengthcombo.h \
+       panelstack.C panelstack.h \
        QAboutDialog.C QAboutDialog.h \
        QBibitemDialog.C QBibitemDialog.h \
        QBibtexDialog.C QBibtexDialog.h \
index fe9c5fcafe38081d74f466362319d3c6c678db1f..1c49d68180737cc22492e35d7124e8baeee0b68b 100644 (file)
@@ -38,9 +38,8 @@
 #include "debug.h"
 #include "gettext.h"
 
-#include <qwidgetstack.h>
+#include "panelstack.h"
 #include <qpushbutton.h>
-#include <qlistview.h>
 #include <qlistbox.h>
 #include <qspinbox.h>
 #include <qlineedit.h>
@@ -53,7 +52,6 @@
 #include "qcoloritem.h"
 #include "qfontexample.h"
 
-using std::map;
 using std::endl;
 
 QPrefsDialog::QPrefsDialog(QPrefs * form)
@@ -68,99 +66,48 @@ QPrefsDialog::QPrefsDialog(QPrefs * form)
        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 * lnf(new QListViewItem(prefsLV, qt_("Look and feel")));
-       lnf->setSelectable(false);
-       lnf->setOpen(true);
-       QListViewItem * lan(new QListViewItem(prefsLV, lnf, qt_("Language settings")));
-       lan->setSelectable(false);
-       QListViewItem * out(new QListViewItem(prefsLV, lan, qt_("Outputs")));
-       out->setSelectable(false);
-
-       asciiModule = new QPrefAsciiModule(prefsWS);
-       dateModule = new QPrefDateModule(prefsWS);
-       keyboardModule = new QPrefKeyboardModule(prefsWS);
-       latexModule = new QPrefLatexModule(prefsWS);
-       screenfontsModule = new QPrefScreenFontsModule(prefsWS);
-       colorsModule = new QPrefColorsModule(prefsWS);
-       displayModule = new QPrefDisplayModule(prefsWS);
-       pathsModule = new QPrefPathsModule(prefsWS);
-       spellcheckerModule = new QPrefSpellcheckerModule(prefsWS);
-       convertersModule = new QPrefConvertersModule(prefsWS);
-       fileformatsModule = new QPrefFileformatsModule(prefsWS);
-       languageModule = new QPrefLanguageModule(prefsWS);
-       printerModule = new QPrefPrinterModule(prefsWS);
-       uiModule = new QPrefUIModule(prefsWS);
-       identityModule = new QPrefIdentityModule(prefsWS);
-
-       prefsWS->addWidget(asciiModule, 0);
-       prefsWS->addWidget(dateModule, 1);
-       prefsWS->addWidget(keyboardModule, 2);
-       prefsWS->addWidget(latexModule, 3);
-       prefsWS->addWidget(screenfontsModule, 4);
-       prefsWS->addWidget(colorsModule, 5);
-       prefsWS->addWidget(displayModule, 6);
-       prefsWS->addWidget(pathsModule, 7);
-       prefsWS->addWidget(spellcheckerModule, 8);
-       prefsWS->addWidget(convertersModule, 9);
-       prefsWS->addWidget(fileformatsModule, 10);
-       prefsWS->addWidget(languageModule, 11);
-       prefsWS->addWidget(printerModule, 12);
-       prefsWS->addWidget(uiModule, 13);
-       prefsWS->addWidget(identityModule, 14);
-
-       QListViewItem * i;
-
-       // language settings
-
-       i = new QListViewItem(lan, qt_("Language"));
-       pane_map_[i] = languageModule;
-       i = new QListViewItem(lan, i, qt_("Spellchecker"));
-       pane_map_[i] = spellcheckerModule;
-
-       // UI
-
-       i = new QListViewItem(lnf, qt_("User interface"));
-       pane_map_[i] = uiModule;
-       prefsLV->setCurrentItem(i);
-
-       i = new QListViewItem(lnf, i, qt_("Screen fonts"));
-       pane_map_[i] = screenfontsModule;
-       i = new QListViewItem(lnf, i, qt_("Colors"));
-       pane_map_[i] = colorsModule;
-       i = new QListViewItem(lnf, i, qt_("Graphics"));
-       pane_map_[i] = displayModule;
-       i = new QListViewItem(lnf, i, qt_("Keyboard"));
-       pane_map_[i] = keyboardModule;
-
-       // output
-
-       i = new QListViewItem(out, qt_("ASCII"));
-       pane_map_[i] = asciiModule;
-       i = new QListViewItem(out, i, qt_("Date format"));
-       pane_map_[i] = dateModule;
-       i = new QListViewItem(out, i, qt_("LaTeX"));
-       pane_map_[i] = latexModule;
-       i = new QListViewItem(out, i, qt_("Printer"));
-       pane_map_[i] = printerModule;
-
-       i = new QListViewItem(prefsLV, out, qt_("Identity"));
-       pane_map_[i] = identityModule;
-       i = new QListViewItem(prefsLV, out, qt_("Paths"));
-       pane_map_[i] = pathsModule;
-       i = new QListViewItem(prefsLV, i,  qt_("Converters"));
-       pane_map_[i] = convertersModule;
-       i = new QListViewItem(prefsLV, i, qt_("File formats"));
-       pane_map_[i] = fileformatsModule;
-
-       prefsLV->setMinimumSize(prefsLV->sizeHint());
-
-       // Qt sucks
-       resize(minimumSize());
+       asciiModule = new QPrefAsciiModule(this);
+       dateModule = new QPrefDateModule(this);
+       keyboardModule = new QPrefKeyboardModule(this);
+       latexModule = new QPrefLatexModule(this);
+       screenfontsModule = new QPrefScreenFontsModule(this);
+       colorsModule = new QPrefColorsModule(this);
+       displayModule = new QPrefDisplayModule(this);
+       pathsModule = new QPrefPathsModule(this);
+       spellcheckerModule = new QPrefSpellcheckerModule(this);
+       convertersModule = new QPrefConvertersModule(this);
+       fileformatsModule = new QPrefFileformatsModule(this);
+       languageModule = new QPrefLanguageModule(this);
+       printerModule = new QPrefPrinterModule(this);
+       uiModule = new QPrefUIModule(this);
+       identityModule = new QPrefIdentityModule(this);
+
+       string const laf = _("Look and feel");
+       prefsPS->addCategory(laf);
+       prefsPS->addPanel(uiModule, _("User interface"), laf);
+       prefsPS->addPanel(screenfontsModule, _("Screen fonts"), laf);
+       prefsPS->addPanel(colorsModule, _("Colors"), laf);
+       prefsPS->addPanel(displayModule, _("Graphics"), laf);
+       prefsPS->addPanel(keyboardModule, _("Keyboard"), laf);
+
+       string const ls = _("Language settings");
+       prefsPS->addCategory(ls);
+       prefsPS->addPanel(languageModule, _("Language"), ls);
+       prefsPS->addPanel(spellcheckerModule, _("Spell-checker"), ls);
+
+       string const op = _("Outputs");
+       prefsPS->addCategory(op);
+       prefsPS->addPanel(asciiModule, _("ASCII"), op);
+       prefsPS->addPanel(dateModule, _("Date format"), op);
+       prefsPS->addPanel(latexModule, _("LaTeX"), op);
+       prefsPS->addPanel(printerModule, _("Printer"), op);
+
+       prefsPS->addPanel(identityModule, _("Identity"));
+       prefsPS->addPanel(pathsModule, _("Paths"));
+       prefsPS->addPanel(fileformatsModule, _("File formats"));
+       prefsPS->addPanel(convertersModule, _("Converters"));
+
+       prefsPS->setCurrentPanel(_("User interface"));
 
        // FIXME: put in controller
        for (int i = 0; i < LColor::ignore; ++i) {
@@ -326,12 +273,6 @@ void QPrefsDialog::closeEvent(QCloseEvent * e)
 }
 
 
-void QPrefsDialog::switchPane(QListViewItem * i)
-{
-       prefsWS->raiseWidget(pane_map_[i]);
-}
-
-
 void QPrefsDialog::change_adaptor()
 {
        form_->changed();
index 8bc9e9669a08e900f93043c5576c18510ea6749e..fc56e2b7232ce7beb125e16e0795d76d789f60a4 100644 (file)
 
 #include "ui/QPrefsDialogBase.h"
 
-#include <map>
 #include <vector>
 
 class QPrefs;
-class QListViewItem;
 class QPrefAsciiModule;
 class QPrefDateModule;
 class QPrefKeyboardModule;
@@ -52,8 +50,6 @@ public:
        void updateFormats();
 
 public slots:
-       virtual void switchPane(QListViewItem * i);
-
        void change_adaptor();
 
        void switch_format(int);
@@ -87,9 +83,6 @@ protected:
        void closeEvent(QCloseEvent * e);
 
 private:
-       typedef std::map<QListViewItem *, QWidget *> PaneMap;
-
-       PaneMap pane_map_;
 
        std::vector<LColor::color> colors_;
 
diff --git a/src/frontends/qt2/panelstack.C b/src/frontends/qt2/panelstack.C
new file mode 100644 (file)
index 0000000..112a41d
--- /dev/null
@@ -0,0 +1,119 @@
+/**
+ * \file panelstack.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS
+ */
+
+#include "panelstack.h"
+
+#include "support/LAssert.h"
+
+#include "qt_helpers.h"
+
+#include <qwidgetstack.h>
+#include <qlayout.h>
+#include <qlistview.h>
+
+using std::map;
+
+
+PanelStack::PanelStack(QWidget * parent, const char * name)
+       : QWidget(parent, name)
+{
+       list_ = new QListView(this);
+       stack_ = new QWidgetStack(this);
+       list_->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
+       stack_->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
+
+       list_->setSorting(-1);
+       list_->setHScrollBarMode(QScrollView::AlwaysOff);
+       list_->setVScrollBarMode(QScrollView::AlwaysOff);
+       list_->addColumn("");
+       list_->setColumnWidthMode(0, QListView::Maximum);
+       list_->setResizeMode(QListView::AllColumns);
+       list_->setRootIsDecorated(true);
+
+       connect(list_, SIGNAL(currentChanged(QListViewItem*)),
+               this, SLOT(switchPanel(QListViewItem *)));
+
+       QHBoxLayout * layout = new QHBoxLayout(this);
+       layout->addWidget(list_, 0);
+       layout->addWidget(stack_, 1);
+}
+
+
+void PanelStack::addCategory(string const & n, string const & parent)
+{
+       QListViewItem * item;
+
+       QString name = toqstr(n);
+
+       if (!parent.empty()) {
+               PanelMap::iterator it = panel_map_.find(parent);
+               lyx::Assert(it != panel_map_.end());
+
+               QListViewItem * before = it->second->firstChild();
+               if (before) {
+                       while (before->nextSibling())
+                               before = before->nextSibling();
+
+                       item = new QListViewItem(it->second, before, name);
+               } else {
+                       item = new QListViewItem(it->second, name);
+               }
+       } else {
+               QListViewItem * before = list_->firstChild();
+               if (before) {
+                       while (before->nextSibling())
+                               before = before->nextSibling();
+                       item = new QListViewItem(list_, before, name);
+               } else {
+                       item = new QListViewItem(list_, name);
+               }
+       }
+
+       item->setSelectable(false);
+       item->setOpen(true);
+       panel_map_[n] = item;
+
+       // Qt is just unbelievably moronic
+       list_->setMinimumSize(QSize(150, list_->minimumHeight()));
+}
+
+
+void PanelStack::addPanel(QWidget * panel, string const & name, string const & parent)
+{
+       addCategory(name, parent);
+       QListViewItem * item = panel_map_.find(name)->second;
+
+       // reset the selectability set by addCategory
+       item->setSelectable(true);
+
+       widget_map_[item] = panel;
+       stack_->addWidget(panel);
+       stack_->setMinimumSize(panel->minimumSize());
+       resize(sizeHint());
+}
+
+
+void PanelStack::setCurrentPanel(string const & name)
+{
+       PanelMap::const_iterator cit = panel_map_.find(name);
+       lyx::Assert(cit != panel_map_.end());
+
+       switchPanel(cit->second);
+}
+
+
+void PanelStack::switchPanel(QListViewItem * item)
+{
+       WidgetMap::const_iterator cit = widget_map_.find(item);
+       if (cit == widget_map_.end())
+               return;
+
+       stack_->raiseWidget(cit->second);
+}
diff --git a/src/frontends/qt2/panelstack.h b/src/frontends/qt2/panelstack.h
new file mode 100644 (file)
index 0000000..d7473dd
--- /dev/null
@@ -0,0 +1,60 @@
+// -*- C++ -*-
+/**
+ * \file panelstack.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS
+ */
+#ifndef PANELSTACK_H
+#define PANELSTACK_H
+
+#include <config.h>
+#include "LString.h"
+
+#include <qwidget.h>
+
+#include <map>
+
+class QListView;
+class QListViewItem;
+class QWidgetStack;
+
+class PanelStack : public QWidget
+{
+       Q_OBJECT
+public:
+       PanelStack(QWidget * parent = 0, const char * name = "panelstack");
+
+       /// add a category with no associated panel
+       void addCategory(string const & name, string const & parent = string());
+
+       /// add a widget panel with a given name, under the given parent
+       void addPanel(QWidget * panel, string const & name, string const & parent = string());
+
+       /// set current panel by logical name
+       void setCurrentPanel(string const &);
+
+public slots:
+       /// set current panel from an item
+       void switchPanel(QListViewItem * i);
+
+private:
+       typedef std::map<string, QListViewItem *> PanelMap;
+
+       PanelMap panel_map_;
+
+       typedef std::map<QListViewItem *, QWidget *> WidgetMap;
+
+       WidgetMap widget_map_;
+
+       /// contains the items
+       QListView * list_;
+
+       /// contains the panes
+       QWidgetStack * stack_;
+};
+
+#endif // PANELSTACK_H
index a550d3217c64caa421faca378aef5e897d9b1111..a92cadc6c9fb9d62d748644b7f72adfc579d3c91 100644 (file)
@@ -13,7 +13,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>297</width>
+            <width>289</width>
             <height>259</height>
         </rect>
     </property>
                         <name>name</name>
                         <cstring>lyxObjectsLB</cstring>
                     </property>
+                    <property stdset="1">
+                        <name>resizePolicy</name>
+                        <enum>AutoOneFit</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>vScrollBarMode</name>
+                        <enum>AlwaysOn</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>hScrollBarMode</name>
+                        <enum>AlwaysOff</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>columnMode</name>
+                        <enum>FitToHeight</enum>
+                    </property>
                 </widget>
                 <widget>
                     <class>QLayoutWidget</class>
index 341edcd3a284aca9b0faee017e10b974883da53f..42b05e0809e86b26be61b6c21e8199df586ccbf7 100644 (file)
@@ -13,7 +13,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>354</width>
+            <width>384</width>
             <height>261</height>
         </rect>
     </property>
                                     <vsizetype>7</vsizetype>
                                 </sizepolicy>
                             </property>
+                            <property stdset="1">
+                                <name>vScrollBarMode</name>
+                                <enum>AlwaysOn</enum>
+                            </property>
+                            <property stdset="1">
+                                <name>hScrollBarMode</name>
+                                <enum>AlwaysOff</enum>
+                            </property>
                         </widget>
                         <widget row="1"  column="0" >
                             <class>QPushButton</class>
index 08526caa3107f46ef769f4b70493919e2f86ea24..2f45ff9574270c02392073aaf4690e9274b75454 100644 (file)
@@ -13,7 +13,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>360</width>
+            <width>356</width>
             <height>261</height>
         </rect>
     </property>
                                 <name>name</name>
                                 <cstring>formatsLB</cstring>
                             </property>
+                            <property stdset="1">
+                                <name>vScrollBarMode</name>
+                                <enum>AlwaysOn</enum>
+                            </property>
+                            <property stdset="1">
+                                <name>hScrollBarMode</name>
+                                <enum>AlwaysOff</enum>
+                            </property>
                         </widget>
                         <widget row="1"  column="1" >
                             <class>QPushButton</class>
index 526ea9c41d60a04f9c8af1eb8eebd9657f0a6b0c..73813e524b5b4736f335f970658e6b0037f5b0b7 100644 (file)
@@ -13,8 +13,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>477</width>
-            <height>341</height>
+            <width>273</width>
+            <height>366</height>
         </rect>
     </property>
     <property stdset="1">
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>Layout16</cstring>
+                <cstring>Layout7</cstring>
             </property>
             <hbox>
                 <property stdset="1">
                     <number>6</number>
                 </property>
                 <widget>
-                    <class>QGroupBox</class>
+                    <class>QLayoutWidget</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>scrollGB</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>title</name>
-                        <string>Scrolling</string>
-                    </property>
-                    <vbox>
-                        <property stdset="1">
-                            <name>margin</name>
-                            <number>11</number>
-                        </property>
-                        <property stdset="1">
-                            <name>spacing</name>
-                            <number>6</number>
-                        </property>
-                        <widget>
-                            <class>QLayoutWidget</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>Layout9</cstring>
-                            </property>
-                            <hbox>
-                                <property stdset="1">
-                                    <name>margin</name>
-                                    <number>0</number>
-                                </property>
-                                <property stdset="1">
-                                    <name>spacing</name>
-                                    <number>6</number>
-                                </property>
-                                <widget>
-                                    <class>QLabel</class>
-                                    <property stdset="1">
-                                        <name>name</name>
-                                        <cstring>wheelMouseLA</cstring>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>text</name>
-                                        <string>W&amp;heel mouse scroll:</string>
-                                    </property>
-                                    <property>
-                                        <name>buddy</name>
-                                        <cstring>wheelMouseSB</cstring>
-                                    </property>
-                                </widget>
-                                <widget>
-                                    <class>QSpinBox</class>
-                                    <property stdset="1">
-                                        <name>name</name>
-                                        <cstring>wheelMouseSB</cstring>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>maxValue</name>
-                                        <number>250</number>
-                                    </property>
-                                </widget>
-                            </hbox>
-                        </widget>
-                        <widget>
-                            <class>QCheckBox</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>cursorFollowsCB</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>text</name>
-                                <string>Cursor follo&amp;ws scrollbar</string>
-                            </property>
-                        </widget>
-                    </vbox>
-                </widget>
-                <widget>
-                    <class>QGroupBox</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>documentsGB</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>title</name>
-                        <string>Documents</string>
+                        <cstring>Layout6</cstring>
                     </property>
                     <vbox>
                         <property stdset="1">
                             <name>margin</name>
-                            <number>11</number>
+                            <number>0</number>
                         </property>
                         <property stdset="1">
                             <name>spacing</name>
                             <number>6</number>
                         </property>
                         <widget>
-                            <class>QCheckBox</class>
+                            <class>QGroupBox</class>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>autoSaveCB</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>text</name>
-                                <string>B&amp;ackup documents </string>
+                                <cstring>documentsGB</cstring>
                             </property>
-                        </widget>
-                        <widget>
-                            <class>QLayoutWidget</class>
                             <property stdset="1">
-                                <name>name</name>
-                                <cstring>Layout11</cstring>
+                                <name>title</name>
+                                <string>Documents</string>
                             </property>
-                            <hbox>
+                            <vbox>
                                 <property stdset="1">
                                     <name>margin</name>
-                                    <number>0</number>
+                                    <number>11</number>
                                 </property>
                                 <property stdset="1">
                                     <name>spacing</name>
                                     <number>6</number>
                                 </property>
-                                <spacer>
-                                    <property>
-                                        <name>name</name>
-                                        <cstring>Spacer6</cstring>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>orientation</name>
-                                        <enum>Horizontal</enum>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>sizeType</name>
-                                        <enum>Fixed</enum>
-                                    </property>
-                                    <property>
-                                        <name>sizeHint</name>
-                                        <size>
-                                            <width>21</width>
-                                            <height>20</height>
-                                        </size>
-                                    </property>
-                                </spacer>
                                 <widget>
-                                    <class>QLabel</class>
+                                    <class>QCheckBox</class>
                                     <property stdset="1">
                                         <name>name</name>
-                                        <cstring>autoSaveLA</cstring>
+                                        <cstring>autoSaveCB</cstring>
                                     </property>
                                     <property stdset="1">
                                         <name>text</name>
-                                        <string> every</string>
-                                    </property>
-                                    <property>
-                                        <name>buddy</name>
-                                        <cstring>autoSaveSB</cstring>
+                                        <string>B&amp;ackup documents </string>
                                     </property>
                                 </widget>
                                 <widget>
-                                    <class>QSpinBox</class>
+                                    <class>QLayoutWidget</class>
                                     <property stdset="1">
                                         <name>name</name>
-                                        <cstring>autoSaveSB</cstring>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>maxValue</name>
-                                        <number>300</number>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>minValue</name>
-                                        <number>1</number>
+                                        <cstring>Layout11</cstring>
                                     </property>
+                                    <hbox>
+                                        <property stdset="1">
+                                            <name>margin</name>
+                                            <number>0</number>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>spacing</name>
+                                            <number>6</number>
+                                        </property>
+                                        <spacer>
+                                            <property>
+                                                <name>name</name>
+                                                <cstring>Spacer6</cstring>
+                                            </property>
+                                            <property stdset="1">
+                                                <name>orientation</name>
+                                                <enum>Horizontal</enum>
+                                            </property>
+                                            <property stdset="1">
+                                                <name>sizeType</name>
+                                                <enum>Fixed</enum>
+                                            </property>
+                                            <property>
+                                                <name>sizeHint</name>
+                                                <size>
+                                                    <width>21</width>
+                                                    <height>20</height>
+                                                </size>
+                                            </property>
+                                        </spacer>
+                                        <widget>
+                                            <class>QLabel</class>
+                                            <property stdset="1">
+                                                <name>name</name>
+                                                <cstring>autoSaveLA</cstring>
+                                            </property>
+                                            <property stdset="1">
+                                                <name>text</name>
+                                                <string> every</string>
+                                            </property>
+                                            <property>
+                                                <name>buddy</name>
+                                                <cstring>autoSaveSB</cstring>
+                                            </property>
+                                        </widget>
+                                        <widget>
+                                            <class>QSpinBox</class>
+                                            <property stdset="1">
+                                                <name>name</name>
+                                                <cstring>autoSaveSB</cstring>
+                                            </property>
+                                            <property stdset="1">
+                                                <name>maxValue</name>
+                                                <number>300</number>
+                                            </property>
+                                            <property stdset="1">
+                                                <name>minValue</name>
+                                                <number>1</number>
+                                            </property>
+                                        </widget>
+                                        <widget>
+                                            <class>QLabel</class>
+                                            <property stdset="1">
+                                                <name>name</name>
+                                                <cstring>TextLabel1</cstring>
+                                            </property>
+                                            <property stdset="1">
+                                                <name>text</name>
+                                                <string>minutes</string>
+                                            </property>
+                                        </widget>
+                                    </hbox>
                                 </widget>
                                 <widget>
-                                    <class>QLabel</class>
+                                    <class>QLayoutWidget</class>
                                     <property stdset="1">
                                         <name>name</name>
-                                        <cstring>TextLabel1</cstring>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>text</name>
-                                        <string>minutes</string>
+                                        <cstring>Layout12</cstring>
                                     </property>
+                                    <hbox>
+                                        <property stdset="1">
+                                            <name>margin</name>
+                                            <number>0</number>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>spacing</name>
+                                            <number>6</number>
+                                        </property>
+                                        <widget>
+                                            <class>QLabel</class>
+                                            <property stdset="1">
+                                                <name>name</name>
+                                                <cstring>lastfilesLA</cstring>
+                                            </property>
+                                            <property stdset="1">
+                                                <name>text</name>
+                                                <string>&amp;Maximum last files:</string>
+                                            </property>
+                                            <property>
+                                                <name>buddy</name>
+                                                <cstring>lastfilesSB</cstring>
+                                            </property>
+                                        </widget>
+                                        <widget>
+                                            <class>QSpinBox</class>
+                                            <property stdset="1">
+                                                <name>name</name>
+                                                <cstring>lastfilesSB</cstring>
+                                            </property>
+                                            <property stdset="1">
+                                                <name>maxValue</name>
+                                                <number>9</number>
+                                            </property>
+                                        </widget>
+                                    </hbox>
                                 </widget>
-                            </hbox>
+                            </vbox>
                         </widget>
                         <widget>
-                            <class>QLayoutWidget</class>
+                            <class>QGroupBox</class>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>Layout12</cstring>
+                                <cstring>scrollGB</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>title</name>
+                                <string>Scrolling</string>
                             </property>
-                            <hbox>
+                            <vbox>
                                 <property stdset="1">
                                     <name>margin</name>
-                                    <number>0</number>
+                                    <number>11</number>
                                 </property>
                                 <property stdset="1">
                                     <name>spacing</name>
                                     <number>6</number>
                                 </property>
                                 <widget>
-                                    <class>QLabel</class>
+                                    <class>QLayoutWidget</class>
                                     <property stdset="1">
                                         <name>name</name>
-                                        <cstring>lastfilesLA</cstring>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>text</name>
-                                        <string>&amp;Maximum last files:</string>
-                                    </property>
-                                    <property>
-                                        <name>buddy</name>
-                                        <cstring>lastfilesSB</cstring>
+                                        <cstring>Layout9</cstring>
                                     </property>
+                                    <hbox>
+                                        <property stdset="1">
+                                            <name>margin</name>
+                                            <number>0</number>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>spacing</name>
+                                            <number>6</number>
+                                        </property>
+                                        <widget>
+                                            <class>QLabel</class>
+                                            <property stdset="1">
+                                                <name>name</name>
+                                                <cstring>wheelMouseLA</cstring>
+                                            </property>
+                                            <property stdset="1">
+                                                <name>text</name>
+                                                <string>W&amp;heel mouse scroll:</string>
+                                            </property>
+                                            <property>
+                                                <name>buddy</name>
+                                                <cstring>wheelMouseSB</cstring>
+                                            </property>
+                                        </widget>
+                                        <widget>
+                                            <class>QSpinBox</class>
+                                            <property stdset="1">
+                                                <name>name</name>
+                                                <cstring>wheelMouseSB</cstring>
+                                            </property>
+                                            <property stdset="1">
+                                                <name>maxValue</name>
+                                                <number>250</number>
+                                            </property>
+                                        </widget>
+                                    </hbox>
                                 </widget>
                                 <widget>
-                                    <class>QSpinBox</class>
+                                    <class>QCheckBox</class>
                                     <property stdset="1">
                                         <name>name</name>
-                                        <cstring>lastfilesSB</cstring>
+                                        <cstring>cursorFollowsCB</cstring>
                                     </property>
                                     <property stdset="1">
-                                        <name>maxValue</name>
-                                        <number>9</number>
+                                        <name>text</name>
+                                        <string>Cursor follo&amp;ws scrollbar</string>
                                     </property>
                                 </widget>
-                            </hbox>
+                            </vbox>
                         </widget>
                     </vbox>
                 </widget>
index 4d374e8f506dd2be71971677b9dc56b2f41b4cc9..a5ce0acb73d88600a266f56bd82ab5204260dbe3 100644 (file)
@@ -13,7 +13,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>449</width>
+            <width>437</width>
             <height>352</height>
         </rect>
     </property>
@@ -32,7 +32,7 @@
         <name>sizeGripEnabled</name>
         <bool>true</bool>
     </property>
-    <grid>
+    <vbox>
         <property stdset="1">
             <name>margin</name>
             <number>11</number>
             <name>spacing</name>
             <number>6</number>
         </property>
-        <widget row="1"  column="0"  rowspan="1"  colspan="2" >
+        <widget>
+            <class>PanelStack</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>prefsPS</cstring>
+            </property>
+        </widget>
+        <widget>
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
                 </widget>
             </hbox>
         </widget>
-        <widget row="0"  column="1" >
-            <class>QLayoutWidget</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>Layout3</cstring>
-            </property>
-            <vbox>
-                <property stdset="1">
-                    <name>margin</name>
-                    <number>0</number>
-                </property>
-                <property stdset="1">
-                    <name>spacing</name>
-                    <number>6</number>
-                </property>
-                <widget>
-                    <class>QWidgetStack</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>prefsWS</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>7</hsizetype>
-                            <vsizetype>7</vsizetype>
-                        </sizepolicy>
-                    </property>
-                </widget>
-            </vbox>
-        </widget>
-        <widget row="0"  column="0" >
-            <class>QListView</class>
-            <column>
-                <property>
-                    <name>text</name>
-                    <string>Preferences</string>
-                </property>
-                <property>
-                    <name>clickable</name>
-                    <bool>false</bool>
-                </property>
-                <property>
-                    <name>resizeable</name>
-                    <bool>false</bool>
-                </property>
-            </column>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>prefsLV</cstring>
-            </property>
-            <property stdset="1">
-                <name>sizePolicy</name>
-                <sizepolicy>
-                    <hsizetype>5</hsizetype>
-                    <vsizetype>5</vsizetype>
-                </sizepolicy>
-            </property>
-            <property stdset="1">
-                <name>minimumSize</name>
-                <size>
-                    <width>100</width>
-                    <height>0</height>
-                </size>
-            </property>
-            <property stdset="1">
-                <name>dragAutoScroll</name>
-                <bool>true</bool>
-            </property>
-            <property stdset="1">
-                <name>itemMargin</name>
-                <number>1</number>
-            </property>
-            <property stdset="1">
-                <name>rootIsDecorated</name>
-                <bool>true</bool>
-            </property>
-        </widget>
-    </grid>
+    </vbox>
 </widget>
 <customwidgets>
     <customwidget>
-        <class>QWidgetStack</class>
-        <header location="global">qwidgetstack.h</header>
+        <class>PanelStack</class>
+        <header location="local">panelstack.h</header>
         <sizehint>
             <width>-1</width>
             <height>-1</height>
         </sizehint>
-        <container>0</container>
+        <container>1</container>
         <sizepolicy>
             <hordata>7</hordata>
             <verdata>7</verdata>
         </sizepolicy>
         <pixmap>image0</pixmap>
-        <slot access="public">raiseWidget(int)</slot>
     </customwidget>
 </customwidgets>
 <images>
     </image>
 </images>
 <connections>
-    <connection>
-        <sender>prefsLV</sender>
-        <signal>currentChanged(QListViewItem*)</signal>
-        <receiver>QPrefsDialogBase</receiver>
-        <slot>switchPane(QListViewItem *)</slot>
-    </connection>
     <slot access="public">change_adaptor()</slot>
     <slot access="protected">defaultClicked()</slot>
-    <slot access="public">switchPane(QListViewItem *)</slot>
     <slot access="protected">saveClicked()</slot>
     <slot access="public">setTitle(int)</slot>
 </connections>
 <tabstops>
-    <tabstop>prefsLV</tabstop>
     <tabstop>restorePB</tabstop>
     <tabstop>savePB</tabstop>
     <tabstop>applyPB</tabstop>