Fix the tab ordering of GuiDocument components.

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

diff --git a/src/frontends/qt4/GuiPrefs.h b/src/frontends/qt4/GuiPrefs.h
index 6aed28dfefe3ecee45ef259a53b5b4e94c843e69..571cb9c76df19d9ad3aae3be7821e7eea2ec0f4f 100644 (file)
--- a/src/frontends/qt4/GuiPrefs.h
+++ b/src/frontends/qt4/GuiPrefs.h
@@ -26,8 +26,7 @@
 
 #include "ui_PrefsUi.h"
 
-#include "ui_PrefPlaintextUi.h"
-#include "ui_PrefDateUi.h"
+#include "ui_PrefOutputUi.h"
 #include "ui_PrefInputUi.h"
 #include "ui_PrefLatexUi.h"
 #include "ui_PrefScreenFontsUi.h"
@@ -72,11 +71,12 @@ public:
 public Q_SLOTS:
        void change_adaptor();
 
+Q_SIGNALS:
+       void prefsApplied(LyXRC const & rc);
+
 public:
        /// Apply changes
        void applyView();
-       /// update (do we need this?)
-       void updateContents();
 
        std::vector<PrefModule *> modules_;
 
@@ -93,7 +93,6 @@ public:
        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
        QString browse(QString const & file, QString const & title) const;
@@ -160,25 +159,17 @@ Q_SIGNALS:
 };
 
 
-class PrefPlaintext : public PrefModule, public Ui::PrefPlaintextUi
+class PrefOutput : public PrefModule, public Ui::PrefOutputUi
 {
        Q_OBJECT
 public:
-       PrefPlaintext(GuiPreferences * form);
+       PrefOutput(GuiPreferences * form);
 
        virtual void apply(LyXRC & rc) const;
        virtual void update(LyXRC const & rc);
-};
-
-
-class PrefDate : public PrefModule, public Ui::PrefDateUi
-{
-       Q_OBJECT
-public:
-       PrefDate(GuiPreferences * form);
 
-       virtual void apply(LyXRC & rc) const;
-       virtual void update(LyXRC const & rc);
+private Q_SLOTS:
+       void on_DateED_textChanged(const QString &);
 };
 
 
@@ -195,6 +186,7 @@ private Q_SLOTS:
        void on_firstKeymapPB_clicked(bool);
        void on_secondKeymapPB_clicked(bool);
        void on_keymapCB_toggled(bool);
+       void on_scrollzoomEnableCB_toggled(bool);
 
 private:
        QString testKeymap(QString const & keymap);
@@ -209,6 +201,10 @@ public:
 
        virtual void apply(LyXRC & rc) const;
        virtual void update(LyXRC const & rc);
+       virtual void enableCB();
+private Q_SLOTS:
+       void on_popupTextCB_clicked();
+       void on_inlineTextCB_clicked();
 };
 
 
@@ -220,6 +216,17 @@ public:
 
        virtual void apply(LyXRC & rc) const;
        virtual void update(LyXRC const & rc);
+
+private Q_SLOTS:
+       void on_latexEncodingCB_stateChanged(int state);
+       void on_latexBibtexCO_activated(int n);
+       void on_latexIndexCO_activated(int n);
+
+private:
+       ///
+       std::set<std::string> bibtex_alternatives;
+       ///
+       std::set<std::string> index_alternatives;
 };
 
 
@@ -233,9 +240,12 @@ public:
        virtual void update(LyXRC const & rc);
 
 private Q_SLOTS:
-       void select_roman(const QString&);
-       void select_sans(const QString&);
-       void select_typewriter(const QString&);
+       void selectRoman(const QString&);
+       void selectSans(const QString&);
+       void selectTypewriter(const QString&);
+
+public Q_SLOTS:
+       void updateScreenFontSizes(LyXRC const & rc);
 };
 
 
@@ -249,8 +259,9 @@ public:
        void update(LyXRC const & rc);
 
 private Q_SLOTS:
-       void change_color();
-       void change_lyxObjects_selection();
+       void changeColor();
+       void changeSysColor();
+       void changeLyxObjectsSelection();
 
 private:
        std::vector<ColorCode> lcolors_;
@@ -267,6 +278,10 @@ public:
 
        void apply(LyXRC & rc) const;
        void update(LyXRC const & rc);
+
+private Q_SLOTS:
+       void on_instantPreviewCO_currentIndexChanged(int);
+       void on_displayGraphicsCB_toggled(bool);
 };
 
 
@@ -280,12 +295,14 @@ public:
        void update(LyXRC const & rc);
 
 private Q_SLOTS:
-       void select_exampledir();
-       void select_templatedir();
-       void select_tempdir();
-       void select_backupdir();
-       void select_workingdir();
-       void select_lyxpipe();
+       void selectExampledir();
+       void selectTemplatedir();
+       void selectTempdir();
+       void selectBackupdir();
+       void selectWorkingdir();
+       void selectThesaurusdir();
+       void selectHunspelldir();
+       void selectLyxPipe();
 
 };
 
@@ -300,7 +317,7 @@ public:
        void update(LyXRC const & rc);
 
 private Q_SLOTS:
-       void select_dict();
+       void on_spellcheckerCB_currentIndexChanged(int);
 };
 
 
@@ -317,10 +334,10 @@ public Q_SLOTS:
        void updateGui();
 
 private Q_SLOTS:
-       void update_converter();
-       void switch_converter();
-       void converter_changed();
-       void remove_converter();
+       void updateConverter();
+       void switchConverter();
+       void removeConverter();
+       void changeConverter();
        void on_cacheCB_stateChanged(int state);
 
 private:
@@ -343,7 +360,7 @@ Q_SIGNALS:
 
 private Q_SLOTS:
        void on_copierED_textEdited(const QString & s);
-       void on_extensionED_textEdited(const QString &);
+       void on_extensionsED_textEdited(const QString &);
        void on_viewerED_textEdited(const QString &);
        void on_editorED_textEdited(const QString &);
        void on_shortcutED_textEdited(const QString &);
@@ -353,11 +370,21 @@ private Q_SLOTS:
        void on_formatsCB_editTextChanged(const QString &);
        void on_formatNewPB_clicked();
        void on_formatRemovePB_clicked();
+       void on_viewerCO_currentIndexChanged(int i);
+       void on_editorCO_currentIndexChanged(int i);
        void setFlags();
        void updatePrettyname();
 
 private:
        Format & currentFormat();
+       ///
+       void updateViewers();
+       ///
+       void updateEditors();
+       ///
+       LyXRC::Alternatives viewer_alternatives;
+       ///
+       LyXRC::Alternatives editor_alternatives;
 };
 
 
@@ -372,6 +399,7 @@ public:
 
 private Q_SLOTS:
        void on_uiLanguageCO_currentIndexChanged(int);
+       void on_languagePackageCO_currentIndexChanged(int);
 };
 
 
@@ -396,7 +424,8 @@ public:
        void update(LyXRC const & rc);
 
 public Q_SLOTS:
-       void select_ui();
+       void selectUi();
+       void on_clearSessionPB_clicked();
 };
 
 
@@ -422,15 +451,6 @@ public:
 class PrefShortcuts : public PrefModule, public Ui::PrefShortcuts
 {
        Q_OBJECT
-private:
-       enum ItemType {
-               System,         //< loaded from a bind file
-               UserBind,       //< \bind loaded from user.bind
-               UserUnbind,     //< \unbind loaded from user.bind, with corresponding
-                               //<    entry in system bind file
-               UserExtraUnbind //< \unbind loaded from user.bind, without
-                               //<    corresponding entry in system bind file.
-       };
 public:
        PrefShortcuts(GuiPreferences * form);
 
@@ -438,22 +458,26 @@ public:
        void update(LyXRC const & rc);
        void updateShortcutsTW();
        void modifyShortcut();
+       void removeShortcut();
        ///
-       void setItemType(QTreeWidgetItem * item, ItemType tag);
+       void setItemType(QTreeWidgetItem * item, KeyMap::ItemType tag);
        QTreeWidgetItem * insertShortcutItem(FuncRequest const & lfun, 
-               KeySequence const & shortcut, ItemType tag);
+               KeySequence const & shortcut, KeyMap::ItemType tag);
 
 public Q_SLOTS:
-       void select_bind();
+       void selectBind();
        void on_modifyPB_pressed();
        void on_newPB_pressed();
        void on_removePB_pressed();
        void on_searchLE_textEdited();
        ///
        void on_shortcutsTW_itemSelectionChanged();
-       void shortcut_okPB_pressed();
-       void shortcut_clearPB_pressed();
        void on_shortcutsTW_itemDoubleClicked();
+       ///
+       void shortcutOkPressed();
+       void shortcutCancelPressed();
+       void shortcutClearPressed();
+       void shortcutRemovePressed();
 
 private:
        ///
@@ -476,6 +500,8 @@ private:
        KeyMap system_bind_;
        KeyMap user_bind_;
        KeyMap user_unbind_;
+       ///
+       QString save_lfun_;
 };