Fix handling of the add branch textfield in GuiBranches

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

diff --git a/src/frontends/qt4/GuiDocument.h b/src/frontends/qt4/GuiDocument.h
index 29eaa49a98ba1de0594beb670ff88b8ea716fe1f..69067df6e7a7449f9809e0990b5e3f97b602b1c1 100644 (file)
--- a/src/frontends/qt4/GuiDocument.h
+++ b/src/frontends/qt4/GuiDocument.h
@@ -27,6 +27,7 @@
 #include "ui_LanguageUi.h"
 #include "ui_LaTeXUi.h"
 #include "ui_ListingsSettingsUi.h"
+#include "ui_LocalLayoutUi.h"
 #include "ui_MarginsUi.h"
 #include "ui_MasterChildUi.h"
 #include "ui_MathsUi.h"
@@ -51,6 +52,7 @@ class GuiBranches;
 class GuiIndices;
 class ModuleSelectionManager;
 class PreambleModule;
+class LocalLayout;
 
 ///
 typedef void const * BufferId;
@@ -73,10 +75,10 @@ public:
        void updateFontsize(std::string const &, std::string const &);
        void updateFontlist();
        void updateDefaultFormat();
+       void updateEngineType(std::string const &, CiteEngineType const &);
        void updatePagestyle(std::string const &, std::string const &);
        bool isChildIncluded(std::string const &);
 
-       void showPreamble();
        ///
        BufferParams const & params() const { return bp_; }
 
@@ -88,7 +90,7 @@ private Q_SLOTS:
        void saveDefaultClicked();
        void useDefaultsClicked();
        void setLSpacing(int);
-       void setMargins(bool);
+       void setMargins();
        void papersizeChanged(int);
        void setColSep();
        void setCustomMargins(bool);
@@ -100,11 +102,14 @@ private Q_SLOTS:
        void enableIndent(bool);
        void setSkip(int);
        void enableSkip(bool);
-       void portraitChanged();
        void browseLayout();
        void browseMaster();
        void classChanged();
+       void languagePackageChanged(int);
+       void biblioChanged();
        void bibtexChanged(int);
+       void setAuthorYear(bool);
+       void setNumerical(bool);
        void updateModuleInfo();
        void modulesChanged();
        void changeBackgroundColor();
@@ -115,7 +120,7 @@ private Q_SLOTS:
        void deleteNoteFontColor();
        void changeBoxBackgroundColor();
        void deleteBoxBackgroundColor();
-       void xetexChanged(bool);
+       void osFontsChanged(bool);
        void branchesRename(docstring const &, docstring const &);
 private:
        /// validate listings parameters and return an error message, if any
@@ -137,7 +142,8 @@ private:
        UiWidget<Ui::OutputUi> *outputModule;
        UiWidget<Ui::ListingsSettingsUi> *listingsModule;
        PreambleModule * preambleModule;
-       
+       LocalLayout * localLayout;
+
        GuiBranches * branchesModule;
        GuiIndices * indicesModule;
 
@@ -180,7 +186,7 @@ private:
        /// return false if validate_listings_params returns error
        bool isValid();
 
-       /// font family names for BufferParams::fontsDefaultFamily
+       /// font family names for BufferParams::fonts_default_family
        static char const * const fontfamilies[5];
        /// GUI names corresponding fontfamilies
        static char const * fontfamilies_gui[5];
@@ -215,7 +221,7 @@ private:
        ///
        std::list<modInfoStruct> const getProvidedModules();
        ///
-       std::list<modInfoStruct> const 
+       std::list<modInfoStruct> const
                        makeModuleInfo(LayoutModuleList const & mods);
        ///
        void setLanguage() const;
@@ -246,6 +252,8 @@ private:
        std::map<docstring, docstring> changedBranches_;
        ///
        std::list<std::string> includeonlys_;
+       ///
+       bool biblioChanged_;
 };
 
 
@@ -272,6 +280,33 @@ private:
 };
 
 
+class LocalLayout : public UiWidget<Ui::LocalLayoutUi>
+{
+       Q_OBJECT
+public:
+       LocalLayout();
+       void update(BufferParams const & params, BufferId id);
+       void apply(BufferParams & params);
+       bool isValid() const { return is_valid_; }
+
+Q_SIGNALS:
+       /// signal that something's changed in the Widget.
+       void changed();
+
+private:
+       void validate();
+       void convert();
+private Q_SLOTS:
+       void textChanged();
+       void validatePressed();
+       void convertPressed();
+
+private:
+       BufferId current_id_;
+       bool is_valid_;
+};
+
+
 } // namespace frontend
 } // namespace lyx