Some string(widget->text()) fixes. Weirdness

[lyx.git] / src / frontends / qt2 / QPrefsDialog.h

diff --git a/src/frontends/qt2/QPrefsDialog.h b/src/frontends/qt2/QPrefsDialog.h
index 204c0d2bd716273d4b462a7debe3e45cd0907b92..7b3ae38ad5c35cc9e4ed862fa6e19f0245628121 100644 (file)
--- a/src/frontends/qt2/QPrefsDialog.h
+++ b/src/frontends/qt2/QPrefsDialog.h
@@ -16,9 +16,12 @@
 #pragma interface
 #endif
 
+#include "LColor.h"
+ 
 #include "ui/QPrefsDialogBase.h"
 
 #include <map>
+#include <vector>
  
 class QPrefs;
 class QListViewItem;
@@ -29,7 +32,6 @@ class QPrefLatexModule;
 class QPrefScreenFontsModule;
 class QPrefColorsModule;
 class QPrefDisplayModule;
-class QPrefLNFMiscModule;
 class QPrefPathsModule;
 class QPrefSpellcheckerModule;
 class QPrefConvertersModule;
@@ -47,52 +49,52 @@ public:
  
        ~QPrefsDialog();
 
+       void updateConverters();
+
+       void updateFormats();
+
 public slots:
        virtual void switchPane(QListViewItem * i);
 
+       void change_adaptor();
+
+       void switch_format(int);
+       void new_format();
+       void modify_format();
+       void remove_format();
+ 
+       void switch_converter(int);
+       void new_converter();
+       void modify_converter();
+       void remove_converter();
+ 
+       void change_color();
+ 
+       void select_ui();
+       void select_bind();
+       void select_keymap1();
+       void select_keymap2();
+       void select_dict();
+       void select_templatedir();
+       void select_tempdir();
+       void select_backupdir();
+       void select_workingdir();
+       void select_lyxpipe();
+
+       void select_roman(const QString&);
+       void select_sans(const QString&);
+       void select_typewriter(const QString&);
+ 
 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<QListViewItem *, QWidget *> PaneMap;
 
        PaneMap pane_map_;
 
-/*
-QPrefAsciiModule
-QPrefDateModule
-QPrefKeyboardModule
-QPrefLatexModule
-QPrefScreenFontsModule
-QPrefColorsModule
-QPrefDisplayModule
-QPrefLNFMiscModule
-QPrefPathsModule
-QPrefSpellcheckerModule
-QPrefConvertersModule
-QPrefFileformatsModule
-QPrefLanguageModule
-QPrefPrinterModule
-QPrefUIModule
-*/ 
+       std::vector<LColor::color> colors_;
+ 
        QPrefAsciiModule * asciiModule;
        QPrefDateModule * dateModule;
        QPrefKeyboardModule * keyboardModule;
@@ -100,7 +102,6 @@ QPrefUIModule
        QPrefScreenFontsModule * screenfontsModule;
        QPrefColorsModule * colorsModule;
        QPrefDisplayModule * displayModule;
-       QPrefLNFMiscModule * lnfmiscModule;
        QPrefPathsModule * pathsModule;
        QPrefSpellcheckerModule * spellcheckerModule;
        QPrefConvertersModule * convertersModule;