Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

[lyx.git] / src / frontends / qt4 / GuiPrefs.h

diff --git a/src/frontends/qt4/GuiPrefs.h b/src/frontends/qt4/GuiPrefs.h
index 50202e5dd2d58f22fcb52b94f29ad97c9d02ab41..afca6d4b421dc596a3e819086f7b9839464b46c2 100644 (file)
--- a/src/frontends/qt4/GuiPrefs.h
+++ b/src/frontends/qt4/GuiPrefs.h
@@ -19,8 +19,8 @@
 #include "ColorCode.h"
 #include "Converter.h"
 #include "Format.h"
+#include "FuncCode.h"
 #include "KeyMap.h"
-#include "lfuns.h"
 #include "LyXRC.h"
 #include "Mover.h"
 
@@ -31,8 +31,10 @@
 #include "ui_PrefInputUi.h"
 #include "ui_PrefLatexUi.h"
 #include "ui_PrefScreenFontsUi.h"
+#include "ui_PrefCompletionUi.h"
 #include "ui_PrefColorsUi.h"
 #include "ui_PrefDisplayUi.h"
+#include "ui_PrefEditUi.h"
 #include "ui_PrefPathsUi.h"
 #include "ui_PrefShortcutsUi.h"
 #include "ui_PrefSpellcheckerUi.h"
@@ -65,18 +67,20 @@ class PrefModule : public QWidget
 {
        Q_OBJECT
 public:
-       PrefModule(docstring const & t,
+       PrefModule(QString const & cat, QString const & t,
                        GuiPreferences * form = 0, QWidget * parent = 0)
-               : QWidget(parent), title_(t), form_(form)
+               : QWidget(parent), category_(cat), title_(t), form_(form)
        {}
 
        virtual void apply(LyXRC & rc) const = 0;
        virtual void update(LyXRC const & rc) = 0;
 
-       docstring const & title() const { return title_; }
+       QString const & category() const { return category_; }
+       QString const & title() const { return title_; }
 
 protected:
-       docstring title_;
+       QString category_;
+       QString title_;
        GuiPreferences * form_;
 
 Q_SIGNALS:
@@ -125,6 +129,17 @@ private:
 };
 
 
+class PrefCompletion : public PrefModule, public Ui::PrefCompletionUi
+{
+       Q_OBJECT
+public:
+       PrefCompletion(GuiPreferences * form, QWidget * parent = 0);
+
+       virtual void apply(LyXRC & rc) const;
+       virtual void update(LyXRC const & rc);
+};
+
+
 class PrefLatex : public PrefModule, public Ui::PrefLatexUi
 {
        Q_OBJECT
@@ -318,7 +333,7 @@ public:
        void update(LyXRC const & rc);
 
 private:
-       std::vector<std::string> lang_;
+       QStringList lang_;
 };
 
 
@@ -347,6 +362,18 @@ public Q_SLOTS:
 };
 
 
+class PrefEdit : public PrefModule, public Ui::PrefEditUi
+{
+       Q_OBJECT
+public:
+       PrefEdit(GuiPreferences * form, QWidget * parent = 0);
+
+       void apply(LyXRC & rc) const;
+       void update(LyXRC const & rc);
+};
+
+
+
 class GuiShortcutDialog : public QDialog, public Ui::shortcutUi
 {
 public:
@@ -436,8 +463,6 @@ public Q_SLOTS:
        void change_adaptor();
 
 public:
-       //
-       void closeEvent(QCloseEvent * e);
        ///
        void add(PrefModule * module);
        /// Apply changes
@@ -457,18 +482,16 @@ public:
        bool isBufferDependent() const { return false; }
 
        /// various file pickers
-       docstring const browsebind(docstring const & file) const;
-       docstring const browseUI(docstring const & file) const;
-       docstring const browsekbmap(docstring const & file) const;
-       docstring const browsedict(docstring const & file) const;
+       QString browsebind(QString const & file) const;
+       QString browseUI(QString const & file) const;
+       QString browsekbmap(QString const & file) const;
+       QString browsedict(QString const & file) const;
 
        /// general browse
-       docstring const browse(docstring const & file,
-                                docstring const & title) const;
+       QString browse(QString const & file, QString const & title) const;
 
        /// browse directory
-       docstring const browsedir(docstring const & path,
-                                   docstring const & title) const;
+       QString browsedir(QString const & path, QString const & title) const;
 
        /// set a color
        void setColor(ColorCode col, std::string const & hex);