do what the FIXME suggested

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

diff --git a/src/frontends/qt4/GuiPrefs.h b/src/frontends/qt4/GuiPrefs.h
index e4b5f19a96b6578f7cebec5fc1f667c0629852bb..ec37c76a607967dfac899b5cddaa48b45ff0eb9a 100644 (file)
--- a/src/frontends/qt4/GuiPrefs.h
+++ b/src/frontends/qt4/GuiPrefs.h
@@ -5,6 +5,8 @@
  * Licence details can be found in the file COPYING.
  *
  * \author John Levon
+ * \author Bo Peng
+ * \author Edwin Leuven
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -14,7 +16,7 @@
 
 #include "GuiDialog.h"
 
-#include "Color.h"
+#include "ColorCode.h"
 #include "Converter.h"
 #include "Format.h"
 #include "KeyMap.h"
@@ -26,7 +28,7 @@
 
 #include "ui_PrefPlaintextUi.h"
 #include "ui_PrefDateUi.h"
-#include "ui_PrefKeyboardUi.h"
+#include "ui_PrefInputUi.h"
 #include "ui_PrefLatexUi.h"
 #include "ui_PrefScreenFontsUi.h"
 #include "ui_PrefColorsUi.h"
@@ -51,7 +53,6 @@
 
 namespace lyx {
 
-class Color_color;
 class Converters;
 class Formats;
 class Movers;
@@ -105,11 +106,11 @@ public:
 };
 
 
-class PrefKeyboard : public PrefModule, public Ui::PrefKeyboardUi
+class PrefInput : public PrefModule, public Ui::PrefInputUi
 {
        Q_OBJECT
 public:
-       PrefKeyboard(GuiPreferences * form, QWidget * parent = 0);
+       PrefInput(GuiPreferences * form, QWidget * parent = 0);
 
        virtual void apply(LyXRC & rc) const;
        virtual void update(LyXRC const & rc);
@@ -165,7 +166,7 @@ private Q_SLOTS:
        void change_lyxObjects_selection();
 
 private:
-       std::vector<Color_color> lcolors_;
+       std::vector<ColorCode> lcolors_;
        // FIXME the use of mutable here is required due to the
        // fact that initialization is not done in the controller
        // but in the constructor.
@@ -196,6 +197,7 @@ public:
        void update(LyXRC const & rc);
 
 private Q_SLOTS:
+       void select_exampledir();
        void select_templatedir();
        void select_tempdir();
        void select_backupdir();
@@ -342,19 +344,13 @@ public:
 
 public Q_SLOTS:
        void select_ui();
-       void on_loadWindowSizeCB_toggled(bool);
-
 };
 
 
-class GuiShortcutDialog : public QDialog, public Ui::ShortcutUi
+class GuiShortcutDialog : public QDialog, public Ui::shortcutUi
 {
 public:
-       GuiShortcutDialog(QWidget * parent) : QDialog(parent)
-       {
-               Ui::ShortcutUi::setupUi(this);
-               QDialog::setModal(true);
-       }
+       GuiShortcutDialog(QWidget * parent);
 };
 
 
@@ -385,11 +381,11 @@ public Q_SLOTS:
        void select_bind();
        void on_newPB_pressed();
        void on_removePB_pressed();
-       void on_searchPB_pressed();
-       void on_searchLE_textChanged();
+       void on_searchLE_textEdited();
        ///
        void on_shortcutsTW_itemSelectionChanged();
        void shortcut_okPB_pressed();
+       void shortcut_clearPB_pressed();
        void on_shortcutsTW_itemDoubleClicked();
 
 private:
@@ -431,7 +427,7 @@ class GuiPreferences : public GuiDialog, public Ui::PrefsUi
 {
        Q_OBJECT
 public:
-       GuiPreferences(LyXView & lv);
+       GuiPreferences(GuiView & lv);
 
        void apply(LyXRC & rc) const;
        void updateRc(LyXRC const & rc);
@@ -440,8 +436,6 @@ public Q_SLOTS:
        void change_adaptor();
 
 public:
-       //
-       void closeEvent(QCloseEvent * e);
        ///
        void add(PrefModule * module);
        /// Apply changes
@@ -475,7 +469,7 @@ public:
                                    docstring const & title) const;
 
        /// set a color
-       void setColor(Color_color col, std::string const & hex);
+       void setColor(ColorCode col, std::string const & hex);
 
        /// update the screen fonts after change
        void updateScreenFonts();