From ff3b32e8b7b4dd658161a6ef8dae45065f3f0976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Mon, 3 Sep 2007 18:22:17 +0000 Subject: [PATCH] move stuff from a class template to a ordinary class... git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20022 a592a061-630c-0410-9148-cb99ea01b6c8 --- .../controllers/ControlEmbeddedFiles.cpp | 1 + src/frontends/qt4/GuiDialogView.cpp | 9 +++++++++ src/frontends/qt4/GuiDialogView.h | 20 ++++--------------- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/frontends/controllers/ControlEmbeddedFiles.cpp b/src/frontends/controllers/ControlEmbeddedFiles.cpp index 7ad8ba63b4..4887541266 100644 --- a/src/frontends/controllers/ControlEmbeddedFiles.cpp +++ b/src/frontends/controllers/ControlEmbeddedFiles.cpp @@ -55,6 +55,7 @@ void ControlEmbeddedFiles::updateEmbeddedFiles() { // copy buffer embeddedFiles to a local copy kernel().buffer().embeddedFiles().update(); + //kernel().buffer().embeddingChanged(); } diff --git a/src/frontends/qt4/GuiDialogView.cpp b/src/frontends/qt4/GuiDialogView.cpp index 9fd6b9151e..716aef5f68 100644 --- a/src/frontends/qt4/GuiDialogView.cpp +++ b/src/frontends/qt4/GuiDialogView.cpp @@ -73,6 +73,15 @@ void GuiDialogView::hide() } +void GuiDialogView::build() +{ + // protect the BC from unwarranted state transitions + updating_ = true; + build_dialog(); + updating_ = false; +} + + bool GuiDialogView::isValid() { return true; diff --git a/src/frontends/qt4/GuiDialogView.h b/src/frontends/qt4/GuiDialogView.h index 8d2fb4e2de..8da53c57d3 100644 --- a/src/frontends/qt4/GuiDialogView.h +++ b/src/frontends/qt4/GuiDialogView.h @@ -45,8 +45,8 @@ public: protected: /// build the actual dialog virtual void build_dialog() = 0; - /// - virtual void build() = 0; + /// Build the dialog + virtual void build(); /// Hide the dialog. virtual void hide(); /// Create the dialog if necessary, update it and display it. @@ -55,30 +55,26 @@ protected: virtual void update_contents() = 0; /// virtual bool isVisible() const; - /// is the dialog currently valid ? virtual bool isValid(); /// are we updating ? bool updating_; - + /// GuiDialog & parent_; public Q_SLOTS: // dialog closed from WM void slotWMHide(); - // Restore button clicked void slotRestore(); - // OK button clicked void slotOK(); - // Apply button clicked void slotApply(); - // Close button clicked void slotClose(); + private: /// Pointer to the actual instantiation of the Qt dialog virtual QWidget * form() const = 0; @@ -107,14 +103,6 @@ protected: dialog_->update(); } - /// Build the dialog - virtual void build() { - // protect the BC from unwarranted state transitions - updating_ = true; - build_dialog(); - updating_ = false; - } - /// Pointer to the actual instantiation of the Qt dialog virtual GUIDialog * form() const { return dialog_.get(); }