diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 8c2d2fb953..0fc5e5c923 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,7 @@ +2002-11-13 John Levon + + * all pref files: make the stack work + 2002-11-13 John Levon * Dialogs.C: diff --git a/src/frontends/qt2/Makefile.dialogs b/src/frontends/qt2/Makefile.dialogs index 3576f51908..638d070af4 100644 --- a/src/frontends/qt2/Makefile.dialogs +++ b/src/frontends/qt2/Makefile.dialogs @@ -218,9 +218,24 @@ UIDIALOGS = \ NumberingModuleBase.h NumberingModuleBase.C \ BiblioModuleBase.h BiblioModuleBase.C \ PreambleModuleBase.h PreambleModuleBase.C \ - BulletsModuleBase.h BulletsModuleBase.C + BulletsModuleBase.h BulletsModuleBase.C \ + QPrefAsciiModule.h QPrefAsciiModule.C \ + QPrefDateModule.h QPrefDateModule.C \ + QPrefKeyboardModule.h QPrefKeyboardModule.C \ + QPrefLatexModule.h QPrefLatexModule.C \ + QPrefScreenFontsModule.h QPrefScreenFontsModule.C \ + QPrefColorsModule.h QPrefColorsModule.C \ + QPrefDisplayModule.h QPrefDisplayModule.C \ + QPrefLNFMiscModule.h QPrefLNFMiscModule.C \ + QPrefPathsModule.h QPrefPathsModule.C \ + QPrefSpellcheckerModule.h QPrefSpellcheckerModule.C \ + QPrefConvertersModule.h QPrefConvertersModule.C \ + QPrefFileformatsModule.h QPrefFileformatsModule.C \ + QPrefLanguageModule.h QPrefLanguageModule.C \ + QPrefPrinterModule.h QPrefPrinterModule.C \ + QPrefUIModule.h QPrefUIModule.C -UIMOCDIALOGS = \ + UIMOCDIALOGS = \ QAboutDialogBase_moc.C \ QAskForTextDialog_moc.C \ QBibitemDialogBase_moc.C \ @@ -264,4 +279,19 @@ UIMOCDIALOGS = \ NumberingModuleBase_moc.C \ BiblioModuleBase_moc.C \ PreambleModuleBase_moc.C \ - BulletsModuleBase_moc.C + BulletsModuleBase_moc.C \ + QPrefAsciiModule_moc.C \ + QPrefDateModule_moc.C \ + QPrefKeyboardModule_moc.C \ + QPrefLatexModule_moc.C \ + QPrefScreenFontsModule_moc.C \ + QPrefColorsModule_moc.C \ + QPrefDisplayModule_moc.C \ + QPrefLNFMiscModule_moc.C \ + QPrefPathsModule_moc.C \ + QPrefSpellcheckerModule_moc.C \ + QPrefConvertersModule_moc.C \ + QPrefFileformatsModule_moc.C \ + QPrefLanguageModule_moc.C \ + QPrefPrinterModule_moc.C \ + QPrefUIModule_moc.C diff --git a/src/frontends/qt2/QDocument.C b/src/frontends/qt2/QDocument.C index d2c255925d..b052c397af 100644 --- a/src/frontends/qt2/QDocument.C +++ b/src/frontends/qt2/QDocument.C @@ -145,7 +145,7 @@ void QDocument::build_dialog() // Manage the restore, ok, apply, restore and cancel/close buttons bc().setOK(dialog_->okPB); bc().setApply(dialog_->applyPB); - bc().setCancel(dialog_->cancelPB); + bc().setCancel(dialog_->closePB); bc().setRestore(dialog_->restorePB); } diff --git a/src/frontends/qt2/QDocumentDialog.C b/src/frontends/qt2/QDocumentDialog.C index 6c0d258cf7..e439acfa0d 100644 --- a/src/frontends/qt2/QDocumentDialog.C +++ b/src/frontends/qt2/QDocumentDialog.C @@ -56,7 +56,7 @@ QDocumentDialog::QDocumentDialog(QDocument * form) form, SLOT(slotOK())); connect(applyPB, SIGNAL(clicked()), form, SLOT(slotApply())); - connect(cancelPB, SIGNAL(clicked()), + connect(closePB, SIGNAL(clicked()), form, SLOT(slotClose())); connect(restorePB, SIGNAL(clicked()), form, SLOT(slotRestore())); @@ -84,15 +84,15 @@ QDocumentDialog::QDocumentDialog(QDocument * form) biblioModule = new BiblioModuleBase(this); preambleModule = new PreambleModuleBase(this); - moduleStack->addWidget(layoutModule,LAYOUT); - moduleStack->addWidget(paperModule,PAPER); - moduleStack->addWidget(marginsModule,MARGINS); - moduleStack->addWidget(packagesModule,PACKAGES); - moduleStack->addWidget(langModule,LANGUAGE); - moduleStack->addWidget(bulletsModule,BULLETS); - moduleStack->addWidget(numberingModule,NUMBERING); - moduleStack->addWidget(biblioModule,BIBLIOGRAPHY); - moduleStack->addWidget(preambleModule,PREAMBLE); + moduleStack->addWidget(layoutModule, LAYOUT); + moduleStack->addWidget(paperModule, PAPER); + moduleStack->addWidget(marginsModule, MARGINS); + moduleStack->addWidget(packagesModule, PACKAGES); + moduleStack->addWidget(langModule, LANGUAGE); + moduleStack->addWidget(bulletsModule, BULLETS); + moduleStack->addWidget(numberingModule, NUMBERING); + moduleStack->addWidget(biblioModule, BIBLIOGRAPHY); + moduleStack->addWidget(preambleModule, PREAMBLE); moduleStack->raiseWidget(LAYOUT); diff --git a/src/frontends/qt2/QPrefsDialog.C b/src/frontends/qt2/QPrefsDialog.C index bd830e4db0..60be634225 100644 --- a/src/frontends/qt2/QPrefsDialog.C +++ b/src/frontends/qt2/QPrefsDialog.C @@ -20,34 +20,32 @@ #include "QPrefsDialog.h" -#include "ui/ClassModuleBase.h" -#include "ui/PackagesModuleBase.h" -#include "ui/PaperModuleBase.h" -#include "ui/LanguageModuleBase.h" -#include "ui/BulletsModuleBase.h" -#include "BulletsModule.h" -#include "ui/BiblioModuleBase.h" -#include "ui/NumberingModuleBase.h" -#include "ui/MarginsModuleBase.h" -#include "ui/PreambleModuleBase.h" +#include "ui/QPrefAsciiModule.h" +#include "ui/QPrefDateModule.h" +#include "ui/QPrefKeyboardModule.h" +#include "ui/QPrefLatexModule.h" +#include "ui/QPrefScreenFontsModule.h" +#include "ui/QPrefColorsModule.h" +#include "ui/QPrefDisplayModule.h" +#include "ui/QPrefLNFMiscModule.h" +#include "ui/QPrefPathsModule.h" +#include "ui/QPrefSpellcheckerModule.h" +#include "ui/QPrefConvertersModule.h" +#include "ui/QPrefFileformatsModule.h" +#include "ui/QPrefLanguageModule.h" +#include "ui/QPrefPrinterModule.h" +#include "ui/QPrefUIModule.h" -#include "Spacing.h" #include "support/lstrings.h" #include "lyxrc.h" -#include "buffer.h" +#include "debug.h" #include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include "lengthcombo.h" +#include +using std::map; +using std::endl; QPrefsDialog::QPrefsDialog(QPrefs * form) : QPrefsDialogBase(0, 0, false, 0), form_(form) @@ -61,6 +59,97 @@ 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); + + 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); + lnfmiscModule = new QPrefLNFMiscModule(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); + + 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(lnfmiscModule, 7); + prefsWS->addWidget(pathsModule, 8); + prefsWS->addWidget(spellcheckerModule, 9); + prefsWS->addWidget(convertersModule, 10); + prefsWS->addWidget(fileformatsModule, 11); + 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")); + pane_map_[i] = colorsModule; + i = new QListViewItem(lnf, i, _("Display")); + 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")); + pane_map_[i] = dateModule; + i = new QListViewItem(prefsLV, i, _("Keyboard")); + pane_map_[i] = keyboardModule; + i = new QListViewItem(prefsLV, i, _("LaTeX")); + pane_map_[i] = latexModule; + i = new QListViewItem(prefsLV, i, _("Paths")); + pane_map_[i] = pathsModule; + i = new QListViewItem(prefsLV, i, _("Printer")); + pane_map_[i] = printerModule; + + prefsLV->setMinimumSize(prefsLV->sizeHint()); } @@ -74,3 +163,9 @@ void QPrefsDialog::closeEvent(QCloseEvent * e) form_->slotWMHide(); e->accept(); } + + +void QPrefsDialog::switchPane(QListViewItem * i) +{ + prefsWS->raiseWidget(pane_map_[i]); +} diff --git a/src/frontends/qt2/QPrefsDialog.h b/src/frontends/qt2/QPrefsDialog.h index d3dd1d9659..204c0d2bd7 100644 --- a/src/frontends/qt2/QPrefsDialog.h +++ b/src/frontends/qt2/QPrefsDialog.h @@ -18,7 +18,25 @@ #include "ui/QPrefsDialogBase.h" +#include + class QPrefs; +class QListViewItem; +class QPrefAsciiModule; +class QPrefDateModule; +class QPrefKeyboardModule; +class QPrefLatexModule; +class QPrefScreenFontsModule; +class QPrefColorsModule; +class QPrefDisplayModule; +class QPrefLNFMiscModule; +class QPrefPathsModule; +class QPrefSpellcheckerModule; +class QPrefConvertersModule; +class QPrefFileformatsModule; +class QPrefLanguageModule; +class QPrefPrinterModule; +class QPrefUIModule; class QPrefsDialog : public QPrefsDialogBase { Q_OBJECT @@ -29,10 +47,68 @@ public: ~QPrefsDialog(); +public slots: + virtual void switchPane(QListViewItem * i); + protected: void closeEvent(QCloseEvent * e); private: + /*enum Panes { + ASCII, + DATE, + KEYBOARD, + LATEX, + SCREENFONTS, + COLORS, + DISPLAY, + LNFMISC, + PATHS, + SPELLCHECKER, + CONVERTERS, + FILEFORMATS, + LANGUAGE, + PRINTER, + UI + };*/ + + typedef std::map PaneMap; + + PaneMap pane_map_; + +/* +QPrefAsciiModule +QPrefDateModule +QPrefKeyboardModule +QPrefLatexModule +QPrefScreenFontsModule +QPrefColorsModule +QPrefDisplayModule +QPrefLNFMiscModule +QPrefPathsModule +QPrefSpellcheckerModule +QPrefConvertersModule +QPrefFileformatsModule +QPrefLanguageModule +QPrefPrinterModule +QPrefUIModule +*/ + QPrefAsciiModule * asciiModule; + QPrefDateModule * dateModule; + QPrefKeyboardModule * keyboardModule; + QPrefLatexModule * latexModule; + QPrefScreenFontsModule * screenfontsModule; + QPrefColorsModule * colorsModule; + QPrefDisplayModule * displayModule; + QPrefLNFMiscModule * lnfmiscModule; + QPrefPathsModule * pathsModule; + QPrefSpellcheckerModule * spellcheckerModule; + QPrefConvertersModule * convertersModule; + QPrefFileformatsModule * fileformatsModule; + QPrefLanguageModule * languageModule; + QPrefPrinterModule * printerModule; + QPrefUIModule * uiModule; + QPrefs * form_; }; diff --git a/src/frontends/qt2/ui/Makefile.am b/src/frontends/qt2/ui/Makefile.am index f77021e532..2a555bb745 100644 --- a/src/frontends/qt2/ui/Makefile.am +++ b/src/frontends/qt2/ui/Makefile.am @@ -77,6 +77,10 @@ PreambleModuleBase.C: PreambleModuleBase.h PreambleModuleBase.ui $(UIC) -impl $^ | $(SED) '$(SEDREPLACETR);$(SEDREMOVEEMPTY)' > $@ +%Module.h: %Module.ui + $(UIC) $< -o $@ +%Module.C: %Module.h %Module.ui + $(UIC) -impl $^ | $(SED) '$(SEDREPLACETR);$(SEDREMOVEEMPTY)' > $@ %Base.h: %.ui $(UIC) $< -o $@ diff --git a/src/frontends/qt2/ui/QAskForTextDialog.ui b/src/frontends/qt2/ui/QAskForTextDialog.ui index 356a5a7529..290d65efed 100644 --- a/src/frontends/qt2/ui/QAskForTextDialog.ui +++ b/src/frontends/qt2/ui/QAskForTextDialog.ui @@ -132,7 +132,7 @@ QPushButton name - cancelPB + closePB text @@ -155,7 +155,7 @@ accept() - cancelPB + closePB clicked() QAskForTextDialog reject() diff --git a/src/frontends/qt2/ui/QDocumentDialog.ui b/src/frontends/qt2/ui/QDocumentDialog.ui index 22987fab1f..116d2409fd 100644 --- a/src/frontends/qt2/ui/QDocumentDialog.ui +++ b/src/frontends/qt2/ui/QDocumentDialog.ui @@ -172,7 +172,7 @@ QPushButton name - cancelPB + closePB text diff --git a/src/frontends/qt2/ui/QPrefAsciiModule.ui b/src/frontends/qt2/ui/QPrefAsciiModule.ui index 26a4c9af35..16d3d7f6d6 100644 --- a/src/frontends/qt2/ui/QPrefAsciiModule.ui +++ b/src/frontends/qt2/ui/QPrefAsciiModule.ui @@ -1,17 +1,19 @@ -QPrefAsciiModuleBase +QPrefAsciiModule +config.h +gettext.h - QDialog + QWidget name - QPrefAsciiModuleBase + QPrefAsciiModule geometry 0 0 - 356 + 348 99 diff --git a/src/frontends/qt2/ui/QPrefColorsModule.ui b/src/frontends/qt2/ui/QPrefColorsModule.ui index 04afc90c4a..604d1872be 100644 --- a/src/frontends/qt2/ui/QPrefColorsModule.ui +++ b/src/frontends/qt2/ui/QPrefColorsModule.ui @@ -1,7 +1,9 @@ QPrefColorsModule +config.h +gettext.h - QDialog + QWidget name QPrefColorsModule @@ -11,7 +13,7 @@ 0 0 - 317 + 309 259 diff --git a/src/frontends/qt2/ui/QPrefConvertersModule.ui b/src/frontends/qt2/ui/QPrefConvertersModule.ui index e3ef4efc27..c7a536d226 100644 --- a/src/frontends/qt2/ui/QPrefConvertersModule.ui +++ b/src/frontends/qt2/ui/QPrefConvertersModule.ui @@ -1,18 +1,20 @@ -QPrefConvertersModuleBase +QPrefConvertersModule +config.h +gettext.h - QDialog + QWidget name - QPrefConvertersModuleBase + QPrefConvertersModule geometry 0 0 - 362 - 263 + 358 + 261 diff --git a/src/frontends/qt2/ui/QPrefDateModule.ui b/src/frontends/qt2/ui/QPrefDateModule.ui index 903bd2eabb..9ada971ce8 100644 --- a/src/frontends/qt2/ui/QPrefDateModule.ui +++ b/src/frontends/qt2/ui/QPrefDateModule.ui @@ -1,17 +1,19 @@ -QPrefDateModuleBase +QPrefDateModule +config.h +gettext.h - QDialog + QWidget name - QPrefDateModuleBase + QPrefDateModule geometry 0 0 - 291 + 287 53 diff --git a/src/frontends/qt2/ui/QPrefDisplayModule.ui b/src/frontends/qt2/ui/QPrefDisplayModule.ui index e104674b6c..d00cd1228b 100644 --- a/src/frontends/qt2/ui/QPrefDisplayModule.ui +++ b/src/frontends/qt2/ui/QPrefDisplayModule.ui @@ -1,17 +1,19 @@ -QPrefDisplayModuleBase +QPrefDisplayModule +config.h +gettext.h - QDialog + QWidget name - QPrefDisplayModuleBase + QPrefDisplayModule geometry 0 0 - 248 + 244 102 diff --git a/src/frontends/qt2/ui/QPrefFileformatsModule.ui b/src/frontends/qt2/ui/QPrefFileformatsModule.ui index 06540fc6ad..2023d1c749 100644 --- a/src/frontends/qt2/ui/QPrefFileformatsModule.ui +++ b/src/frontends/qt2/ui/QPrefFileformatsModule.ui @@ -1,17 +1,19 @@ -QPrefFileformatsModuleBase +QPrefFileformatsModule +config.h +gettext.h - QDialog + QWidget name - QPrefFileformatsModuleBase + QPrefFileformatsModule geometry 0 0 - 349 + 345 261 diff --git a/src/frontends/qt2/ui/QPrefKeyboardModule.ui b/src/frontends/qt2/ui/QPrefKeyboardModule.ui index dad54ec348..456d9372c1 100644 --- a/src/frontends/qt2/ui/QPrefKeyboardModule.ui +++ b/src/frontends/qt2/ui/QPrefKeyboardModule.ui @@ -1,17 +1,19 @@ -QPrefKeyboardModuleBase +QPrefKeyboardModule +config.h +gettext.h - QDialog + QWidget name - QPrefKeyboardModuleBase + QPrefKeyboardModule geometry 0 0 - 358 + 354 253 diff --git a/src/frontends/qt2/ui/QPrefLNFMiscModule.ui b/src/frontends/qt2/ui/QPrefLNFMiscModule.ui index ebf1f480d7..e60eb68d5c 100644 --- a/src/frontends/qt2/ui/QPrefLNFMiscModule.ui +++ b/src/frontends/qt2/ui/QPrefLNFMiscModule.ui @@ -1,17 +1,19 @@ -QPrefLNFMiscBase +QPrefLNFMiscModule +config.h +gettext.h - QDialog + QWidget name - QPrefLNFMiscBase + QPrefLNFMiscModule geometry 0 0 - 248 + 244 211 diff --git a/src/frontends/qt2/ui/QPrefLanguageModule.ui b/src/frontends/qt2/ui/QPrefLanguageModule.ui index bb04928349..3a544fd3d1 100644 --- a/src/frontends/qt2/ui/QPrefLanguageModule.ui +++ b/src/frontends/qt2/ui/QPrefLanguageModule.ui @@ -1,17 +1,19 @@ -QLanguageModuleBase +QPrefLanguageModule +config.h +gettext.h - QDialog + QWidget name - QLanguageModuleBase + QPrefLanguageModule geometry 0 0 - 322 + 318 258 diff --git a/src/frontends/qt2/ui/QPrefLatexModule.ui b/src/frontends/qt2/ui/QPrefLatexModule.ui index a6a5dbf335..dffb4eb5a6 100644 --- a/src/frontends/qt2/ui/QPrefLatexModule.ui +++ b/src/frontends/qt2/ui/QPrefLatexModule.ui @@ -1,17 +1,19 @@ -QPrefLatexModuleBase +QPrefLatexModule +config.h +gettext.h - QDialog + QWidget name - QPrefLatexModuleBase + QPrefLatexModule geometry 0 0 - 359 + 355 237 diff --git a/src/frontends/qt2/ui/QPrefPathsModule.ui b/src/frontends/qt2/ui/QPrefPathsModule.ui index 6ecf9a186e..ad2b7c0c28 100644 --- a/src/frontends/qt2/ui/QPrefPathsModule.ui +++ b/src/frontends/qt2/ui/QPrefPathsModule.ui @@ -1,17 +1,19 @@ -QPrefLNFModuleBase +QPrefPathsModule +config.h +gettext.h - QDialog + QWidget name - QPrefLNFModuleBase + QPrefPathsModule geometry 0 0 - 366 + 387 297 diff --git a/src/frontends/qt2/ui/QPrefPrinterModule.ui b/src/frontends/qt2/ui/QPrefPrinterModule.ui index 88e5bb4962..d77f47e830 100644 --- a/src/frontends/qt2/ui/QPrefPrinterModule.ui +++ b/src/frontends/qt2/ui/QPrefPrinterModule.ui @@ -1,17 +1,19 @@ -QPrefPrinterModuleBase +QPrefPrinterModule +config.h +gettext.h - QDialog + QWidget name - QPrefPrinterModuleBase + QPrefPrinterModule geometry 0 0 - 328 + 324 307 diff --git a/src/frontends/qt2/ui/QPrefScreenFontsModule.ui b/src/frontends/qt2/ui/QPrefScreenFontsModule.ui index 94286b0e8b..626ed80eca 100644 --- a/src/frontends/qt2/ui/QPrefScreenFontsModule.ui +++ b/src/frontends/qt2/ui/QPrefScreenFontsModule.ui @@ -1,7 +1,9 @@ QPrefScreenFontsModule +config.h +gettext.h - QDialog + QWidget name QPrefScreenFontsModule @@ -11,7 +13,7 @@ 0 0 - 306 + 302 296 diff --git a/src/frontends/qt2/ui/QPrefSpellcheckerModule.ui b/src/frontends/qt2/ui/QPrefSpellcheckerModule.ui index c61f1df671..a2d8fd9f17 100644 --- a/src/frontends/qt2/ui/QPrefSpellcheckerModule.ui +++ b/src/frontends/qt2/ui/QPrefSpellcheckerModule.ui @@ -1,17 +1,19 @@ -QPrefSpellcheckerModuleBase +QPrefSpellcheckerModule +config.h +gettext.h - QDialog + QWidget name - QPrefSpellcheckerModuleBase + QPrefSpellcheckerModule geometry 0 0 - 349 + 345 213 diff --git a/src/frontends/qt2/ui/QPrefUIModule.ui b/src/frontends/qt2/ui/QPrefUIModule.ui index 7319223250..365ba6f78b 100644 --- a/src/frontends/qt2/ui/QPrefUIModule.ui +++ b/src/frontends/qt2/ui/QPrefUIModule.ui @@ -1,7 +1,9 @@ QPrefUIModule +config.h +gettext.h - QDialog + QWidget name QPrefUIModule @@ -11,7 +13,7 @@ 0 0 - 328 + 324 191 diff --git a/src/frontends/qt2/ui/QPreferencesDialog.ui b/src/frontends/qt2/ui/QPreferencesDialog.ui deleted file mode 100644 index 567f386fd1..0000000000 --- a/src/frontends/qt2/ui/QPreferencesDialog.ui +++ /dev/null @@ -1,256 +0,0 @@ - -QPreferencesDialogBase -config.h -gettext.h - - QDialog - - name - QPreferencesDialogBase - - - geometry - - 0 - 0 - 476 - 382 - - - - caption - Preferences - - - - margin - 11 - - - spacing - 6 - - - QLayoutWidget - - name - Layout3 - - - - margin - 0 - - - spacing - 6 - - - QPushButton - - name - restorePB - - - text - &Restore - - - - - name - Spacer1 - - - orientation - Horizontal - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - QPushButton - - name - savePB - - - text - &Save - - - - QPushButton - - name - applyPB - - - text - &Apply - - - - QPushButton - - name - cancelPB - - - text - &Close - - - - - - QLayoutWidget - - name - Layout3 - - - - margin - 0 - - - spacing - 6 - - - QLabel - - name - titleL - - - sizePolicy - - 7 - 1 - - - - text - title here - - - - Line - - name - Line1 - - - sizePolicy - - 1 - 0 - - - - orientation - Horizontal - - - - QWidgetStack - - name - moduleStack - - - - - - QListView - - - text - Column 1 - - - clickable - true - - - resizeable - true - - - - - text - New Item - - - pixmap - - - - - name - moduleLV - - - sizePolicy - - 1 - 7 - - - - dragAutoScroll - true - - - itemMargin - 1 - - - rootIsDecorated - false - - - - - - - QWidgetStack -
qwidgetstack.h
- - 0 - -1 - - 0 - - 7 - 7 - - image0 - raiseWidget(int) - - - - - image0 - 789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758 - - - - change_adaptor() - defaultClicked() - saveClicked() - setTitle(int) - - diff --git a/src/frontends/qt2/ui/QPrefsDialog.ui b/src/frontends/qt2/ui/QPrefsDialog.ui index 4324c55b8e..071871e615 100644 --- a/src/frontends/qt2/ui/QPrefsDialog.ui +++ b/src/frontends/qt2/ui/QPrefsDialog.ui @@ -13,19 +13,19 @@ 0 0 - 530 - 473 + 452 + 382 caption - Index + Preferences sizeGripEnabled true - + margin 11 @@ -34,196 +34,7 @@ spacing 6 - - QLayoutWidget - - name - Layout4 - - - - margin - 0 - - - spacing - 6 - - - QListView - - - text - Preferences - - - clickable - false - - - resizeable - false - - - - - text - Look and Feel - - - pixmap - - - - - text - Interface - - - pixmap - - - - - - text - Zoom settings - - - pixmap - - - - - - text - Fonts - - - pixmap - - - - - - text - Colors - - - pixmap - - - - - - text - Graphics - - - pixmap - - - - - - - text - Language - - - pixmap - - - - - text - Spellchecking - - - pixmap - - - - - - text - Advanced settings - - - pixmap - - - - - - - text - Default paths - - - pixmap - - - - - - text - File types - - - pixmap - - - - - - text - File convertors - - - pixmap - - - - - - text - Advanced settings - - - pixmap - - - - - name - prefsLV - - - sizePolicy - - 5 - 7 - - - - - QWidgetStack - - name - prefsWS - - - sizePolicy - - 7 - 7 - - - - - - + QLayoutWidget name @@ -246,13 +57,13 @@ text - Restore + &Restore name - Spacer2 + Spacer1 orientation @@ -278,11 +89,7 @@ text - Save - - - default - true + &Save @@ -293,7 +100,7 @@ text - Apply + &Apply @@ -304,12 +111,112 @@ text - Close + &Close - + + QLayoutWidget + + name + Layout3 + + + + margin + 0 + + + spacing + 6 + + + QLabel + + name + titleL + + + sizePolicy + + 7 + 0 + + + + text + title here + + + + Line + + name + Line1 + + + sizePolicy + + 1 + 0 + + + + orientation + Horizontal + + + + QWidgetStack + + name + prefsWS + + + + + + QListView + + + text + Column 1 + + + clickable + true + + + resizeable + true + + + + name + prefsLV + + + sizePolicy + + 1 + 7 + + + + dragAutoScroll + true + + + itemMargin + 1 + + + rootIsDecorated + true + + + @@ -325,6 +232,7 @@ 7 image0 + raiseWidget(int) @@ -334,6 +242,16 @@ + + prefsLV + currentChanged(QListViewItem*) + QPrefsDialogBase + switchPane(QListViewItem *) + change_adaptor() + defaultClicked() + switchPane(QListViewItem *) + saveClicked() + setTitle(int)