Fix the tab ordering of GuiDocument components.

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

diff --git a/src/frontends/qt4/GuiDocument.h b/src/frontends/qt4/GuiDocument.h
index 64ce15aaa9defe917abd4c536cdb94e8caa67cd7..1b5aad13b8bd3f3417831a93e281afa7764ab6b5 100644 (file)
--- a/src/frontends/qt4/GuiDocument.h
+++ b/src/frontends/qt4/GuiDocument.h
@@ -20,25 +20,24 @@
 #include "GuiDialog.h"
 #include "GuiIdListModel.h"
 
+#include "ui_BiblioUi.h"
+#include "ui_ColorUi.h"
 #include "ui_DocumentUi.h"
 #include "ui_FontUi.h"
-#include "ui_TextLayoutUi.h"
-#include "ui_MasterChildUi.h"
-#include "ui_MathsUi.h"
-#include "ui_LaTeXUi.h"
-#include "ui_PageLayoutUi.h"
 #include "ui_LanguageUi.h"
-#include "ui_BiblioUi.h"
-#include "ui_NumberingUi.h"
+#include "ui_LaTeXUi.h"
+#include "ui_ListingsSettingsUi.h"
+#include "ui_LocalLayoutUi.h"
 #include "ui_MarginsUi.h"
-#include "ui_PreambleUi.h"
-#include "ui_PDFSupportUi.h"
+#include "ui_MasterChildUi.h"
+#include "ui_MathsUi.h"
 #include "ui_ModulesUi.h"
+#include "ui_NumberingUi.h"
 #include "ui_OutputUi.h"
-#include "ui_ListingsSettingsUi.h"
-
-#include <list>
-#include <map>
+#include "ui_PageLayoutUi.h"
+#include "ui_PDFSupportUi.h"
+#include "ui_PreambleUi.h"
+#include "ui_TextLayoutUi.h"
 
 namespace lyx {
 
@@ -53,6 +52,7 @@ class GuiBranches;
 class GuiIndices;
 class ModuleSelectionManager;
 class PreambleModule;
+class LocalLayout;
 
 ///
 typedef void const * BufferId;
@@ -78,7 +78,6 @@ public:
        void updatePagestyle(std::string const &, std::string const &);
        bool isChildIncluded(std::string const &);
 
-       void showPreamble();
        ///
        BufferParams const & params() const { return bp_; }
 
@@ -90,7 +89,7 @@ private Q_SLOTS:
        void saveDefaultClicked();
        void useDefaultsClicked();
        void setLSpacing(int);
-       void setMargins(bool);
+       void setMargins();
        void papersizeChanged(int);
        void setColSep();
        void setCustomMargins(bool);
@@ -102,18 +101,22 @@ private Q_SLOTS:
        void enableIndent(bool);
        void setSkip(int);
        void enableSkip(bool);
-       void portraitChanged();
        void browseLayout();
        void browseMaster();
        void classChanged();
+       void languagePackageChanged(int);
        void bibtexChanged(int);
        void updateModuleInfo();
        void modulesChanged();
        void changeBackgroundColor();
        void deleteBackgroundColor();
+       void changeFontColor();
+       void deleteFontColor();
        void changeNoteFontColor();
        void deleteNoteFontColor();
-       void xetexChanged(bool);
+       void changeBoxBackgroundColor();
+       void deleteBoxBackgroundColor();
+       void osFontsChanged(bool);
        void branchesRename(docstring const &, docstring const &);
 private:
        /// validate listings parameters and return an error message, if any
@@ -125,6 +128,7 @@ private:
        UiWidget<Ui::PageLayoutUi> *pageLayoutModule;
        UiWidget<Ui::MarginsUi> *marginsModule;
        UiWidget<Ui::LanguageUi> *langModule;
+       UiWidget<Ui::ColorUi> *colorModule;
        UiWidget<Ui::NumberingUi> *numberingModule;
        UiWidget<Ui::BiblioUi> *biblioModule;
        UiWidget<Ui::MathsUi> *mathsModule;
@@ -134,6 +138,7 @@ private:
        UiWidget<Ui::OutputUi> *outputModule;
        UiWidget<Ui::ListingsSettingsUi> *listingsModule;
        PreambleModule * preambleModule;
+       LocalLayout * localLayout;
        
        GuiBranches * branchesModule;
        GuiIndices * indicesModule;
@@ -164,6 +169,7 @@ private:
        void useClassDefaults();
        ///
        void setLayoutComboByIDString(std::string const & idString);
+
        /// available classes
        GuiIdListModel classes_model_;
        /// available modules
@@ -176,7 +182,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];
@@ -268,6 +274,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