Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

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

diff --git a/src/frontends/qt4/GuiDocument.h b/src/frontends/qt4/GuiDocument.h
index fc136f2f2cd7c14dc763317ae3a7651c2f1a65ff..92965adea2fa63b77abd660bbe1ba6e58fa335e6 100644 (file)
--- a/src/frontends/qt4/GuiDocument.h
+++ b/src/frontends/qt4/GuiDocument.h
@@ -21,10 +21,7 @@
 #include "GuiIdListModel.h"
 #include "GuiSelectionManager.h"
 
-#include "support/types.h"
-
 #include "ui_DocumentUi.h"
-#include "ui_EmbeddedFilesUi.h"
 #include "ui_FontUi.h"
 #include "ui_TextLayoutUi.h"
 #include "ui_MathsUi.h"
@@ -52,6 +49,9 @@ namespace frontend {
 class GuiBranches;
 class PreambleModule;
 
+///
+QModelIndex getSelectedIndex(QListView * lv);
+
 ///
 typedef void const * BufferId;
 
@@ -63,6 +63,7 @@ public:
 };
 
 
+/// SelectionManager for use with modules
 class ModuleSelMan : public GuiSelectionManager 
 {
 public:
@@ -125,6 +126,7 @@ private Q_SLOTS:
        void setLSpacing(int);
        void setMargins(bool);
        void setCustomPapersize(int);
+       void setColSep();
        void setCustomMargins(bool);
        void romanChanged(int);
        void sansChanged(int);
@@ -132,12 +134,9 @@ private Q_SLOTS:
        void setSkip(int);
        void enableSkip(bool);
        void portraitChanged();
+       void browseLayout();
        void classChanged();
        void updateModuleInfo();
-       void updateEmbeddedFileList();
-       
-private:
-       void closeEvent(QCloseEvent * e);
 
 private:
        UiWidget<Ui::TextLayoutUi> *textLayoutModule;
@@ -150,7 +149,6 @@ private:
        UiWidget<Ui::MathsUi> *mathsModule;
        UiWidget<Ui::LaTeXUi> *latexModule;
        UiWidget<Ui::PDFSupportUi> *pdfSupportModule;
-       UiWidget<Ui::EmbeddedFilesUi> *embeddedFilesModule;
        PreambleModule *preambleModule;
        
        GuiBranches *branchesModule;
@@ -160,18 +158,20 @@ private:
 
        GuiSelectionManager * selectionManager;
 
-       // FIXME
-       std::vector<std::string> lang_;
+       ///
+       QStringList lang_;
 
        /// Available modules
-       GuiIdListModel * availableModel() { return &available_model_; }
+       GuiIdListModel * availableModel() { return &modules_av_model_; }
        /// Selected modules
-       GuiIdListModel * selectedModel() { return &selected_model_; }
+       GuiIdListModel * selectedModel() { return &modules_sel_model_; }
 private:
        /// Apply changes
        void applyView();
        /// update
        void updateContents();
+       /// force content update
+       void forceUpdate();
        ///
        void updateAvailableModules();
        ///
@@ -180,10 +180,16 @@ private:
        void saveDocDefault();
        /// reset to default params
        void useClassDefaults();
+       ///
+       void setLayoutComboByIDString(std::string const & idString);
+       /// available classes
+       GuiIdListModel classes_model_;
        /// available modules
-       GuiIdListModel available_model_;
+       GuiIdListModel modules_av_model_;
        /// selected modules
-       GuiIdListModel selected_model_;
+       GuiIdListModel modules_sel_model_;
+       /// current buffer
+       BufferId current_id_;
 
 protected:
        /// return false if validate_listings_params returns error
@@ -204,7 +210,7 @@ protected:
        /// always true since we don't manipulate document contents
        bool canApply() const { return true; }
        ///
-       TextClass const & textClass() const;
+       DocumentClass const & documentClass() const;
        ///
        BufferParams & params() { return bp_; }
        ///
@@ -213,8 +219,9 @@ protected:
        BufferId id() const;
        ///
        struct modInfoStruct {
-               std::string name;
+               QString name;
                std::string id;
+               QString description;
        };
        /// List of available modules
        std::vector<modInfoStruct> const & getModuleInfo();
@@ -242,9 +249,6 @@ private:
 };
 
 
-typedef void const * BufferId;
-
-
 class PreambleModule : public UiWidget<Ui::PreambleUi>
 {
        Q_OBJECT