Fix handling of the add branch textfield in GuiBranches

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

diff --git a/src/frontends/qt4/GuiPrefs.h b/src/frontends/qt4/GuiPrefs.h
index 5e5d03a9c7637c30b81aac081d0959c2b81ca054..8d9028042d1f6379d91ce5c3fa1dd257d8ac5ee7 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,6 +71,9 @@ public:
 public Q_SLOTS:
        void change_adaptor();
 
+Q_SIGNALS:
+       void prefsApplied(LyXRC const & rc);
+
 public:
        /// Apply changes
        void applyView();
@@ -101,11 +103,6 @@ public:
        /// update the screen fonts after change
        void updateScreenFonts();
 
-       /// adjust the prefs paper sizes
-       PAPER_SIZE toPaperSize(int i) const;
-       /// adjust the prefs paper sizes
-       int fromPaperSize(PAPER_SIZE papersize) const;
-
        LyXRC & rc() { return rc_; }
        Converters & converters() { return converters_; }
        Formats & formats() { return formats_; }
@@ -157,22 +154,11 @@ Q_SIGNALS:
 };
 
 
-class PrefPlaintext : public PrefModule, public Ui::PrefPlaintextUi
+class PrefOutput : public PrefModule, public Ui::PrefOutputUi
 {
        Q_OBJECT
 public:
-       PrefPlaintext(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);
+       PrefOutput(GuiPreferences * form);
 
        virtual void apply(LyXRC & rc) const;
        virtual void update(LyXRC const & rc);
@@ -195,6 +181,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);
@@ -226,6 +213,7 @@ public:
        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);
 
@@ -250,6 +238,9 @@ private Q_SLOTS:
        void selectRoman(const QString&);
        void selectSans(const QString&);
        void selectTypewriter(const QString&);
+
+public Q_SLOTS:
+       void updateScreenFontSizes(LyXRC const & rc);
 };
 
 
@@ -264,6 +255,7 @@ public:
 
 private Q_SLOTS:
        void changeColor();
+       void changeSysColor();
        void changeLyxObjectsSelection();
 
 private:
@@ -281,6 +273,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);
 };
 
 
@@ -315,6 +311,8 @@ public:
        void apply(LyXRC & rc) const;
        void update(LyXRC const & rc);
 
+private Q_SLOTS:
+       void on_spellcheckerCB_currentIndexChanged(int);
 };
 
 
@@ -357,9 +355,10 @@ 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_mimeED_textEdited(const QString &);
        void on_shortcutED_textEdited(const QString &);
        void on_formatED_editingFinished();
        void on_formatED_textChanged(const QString &);
@@ -367,11 +366,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;
 };
 
 
@@ -386,6 +395,7 @@ public:
 
 private Q_SLOTS:
        void on_uiLanguageCO_currentIndexChanged(int);
+       void on_languagePackageCO_currentIndexChanged(int);
 };