Dock the Embedding dialog (code copied from the ViewSource dialog and I do not really...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20156 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/Dialogs.cpp b/src/frontends/qt4/Dialogs.cpp
index ff0bc0aea33af5547c2d024183482304398b8209..be51c854755ac8f6964195dc62e63cafc4874c42 100644 (file)
--- a/src/frontends/qt4/Dialogs.cpp
+++ b/src/frontends/qt4/Dialogs.cpp
@@ -136,7 +136,8 @@ Dialog * Dialogs::build(string const & name)
        } else if (name == "document") {
                dialog = new GuiDocumentDialog(lyxview_);
        } else if (name == "embedding") {
-               dialog = new GuiEmbeddedFilesDialog(lyxview_);
+               dialog = new DockView<ControlEmbeddedFiles, GuiEmbeddedFilesDialog>(
+                       guiview, name, Qt::RightDockWidgetArea);
        } else if (name == "errorlist") {
                dialog = new GuiErrorListDialog(lyxview_);
        } else if (name == "ert") {

diff --git a/src/frontends/qt4/GuiEmbeddedFiles.cpp b/src/frontends/qt4/GuiEmbeddedFiles.cpp
index 9f48afc489e0a82610cd0cd185dbed6fc481d0b9..4628dcf2b6b5a530b4015ea03c213b9a018ca0b8 100644 (file)
--- a/src/frontends/qt4/GuiEmbeddedFiles.cpp
+++ b/src/frontends/qt4/GuiEmbeddedFiles.cpp
@@ -21,48 +21,36 @@ namespace lyx {
 namespace frontend {
 
 
-GuiEmbeddedFilesDialog::GuiEmbeddedFilesDialog(LyXView & lv)
-       : GuiDialog(lv, "embedding")
+GuiEmbeddedFilesDialog::GuiEmbeddedFilesDialog(ControlEmbeddedFiles & controller)
+       : controller_(controller)
 {
        setupUi(this);
-       setController(new ControlEmbeddedFiles(*this));
-       setViewTitle(_("Embedded Files"));
-
-       //setView(new DockView<GuiEmbeddedFiles, GuiEmbeddedFilesDialog>(
-       //              *dialog, qef, &gui_view, _("Embedded Files"), Qt::RightDockWidgetArea));
-       
-       bc().setPolicy(ButtonPolicy::OkCancelPolicy);
+       setWindowTitle(qt_("Embedded Files"));
 
        updateView();
 }
 
 
-ControlEmbeddedFiles & GuiEmbeddedFilesDialog::controller() const
-{
-       return static_cast<ControlEmbeddedFiles &>(Dialog::controller());
-}
-
-
 void GuiEmbeddedFilesDialog::on_filesLW_itemChanged(QListWidgetItem* item)
 {
-       EmbeddedFiles & files = controller().embeddedFiles();
+       EmbeddedFiles & files = controller_.embeddedFiles();
        if (item->checkState() == Qt::Checked) {
                if (files[filesLW->row(item)].embedded())
                        return;
-               controller().setEmbed(files[filesLW->row(item)], true);
-               controller().dispatchMessage("Embed file " + fromqstr(item->text()));
+               controller_.setEmbed(files[filesLW->row(item)], true);
+               controller_.dispatchMessage("Embed file " + fromqstr(item->text()));
        } else {
                if (!files[filesLW->row(item)].embedded())
                        return;
-               controller().setEmbed(files[filesLW->row(item)], false);
-               controller().dispatchMessage("Stop embedding file " + fromqstr(item->text()));
+               controller_.setEmbed(files[filesLW->row(item)], false);
+               controller_.dispatchMessage("Stop embedding file " + fromqstr(item->text()));
        }
 }
 
 
 void GuiEmbeddedFilesDialog::on_filesLW_itemSelectionChanged()
 {
-       EmbeddedFiles & files = controller().embeddedFiles();
+       EmbeddedFiles & files = controller_.embeddedFiles();
 
        QList<QListWidgetItem *> selection = filesLW->selectedItems();
 
@@ -95,14 +83,14 @@ void GuiEmbeddedFilesDialog::on_filesLW_itemSelectionChanged()
 
 void GuiEmbeddedFilesDialog::on_filesLW_itemClicked(QListWidgetItem* item)
 {
-       EmbeddedFiles & files = controller().embeddedFiles();
+       EmbeddedFiles & files = controller_.embeddedFiles();
        int idx = filesLW->row(item);
        fullpathLE->setText(toqstr(files[idx].absFilename()));
        if (files[idx].refCount() > 1) {
                // if multiple insets are referred, click again will move
                // to another inset
                int k = item->data(Qt::UserRole).toInt();
-               controller().goTo(files[idx], k);
+               controller_.goTo(files[idx], k);
                k = (k + 1) % files[idx].refCount();
                item->setData(Qt::UserRole, k);
                // update label
@@ -111,14 +99,14 @@ void GuiEmbeddedFilesDialog::on_filesLW_itemClicked(QListWidgetItem* item)
                        + convert<string>(files[idx].refCount()) + ")";
                item->setText(toqstr(label));
        } else
-               controller().goTo(files[idx], 0);
+               controller_.goTo(files[idx], 0);
 }
 
 
 void GuiEmbeddedFilesDialog::on_filesLW_itemDoubleClicked(QListWidgetItem* item)
 {
-       EmbeddedFiles & files = controller().embeddedFiles();
-       controller().view(files[filesLW->row(item)]);
+       EmbeddedFiles & files = controller_.embeddedFiles();
+       controller_.view(files[filesLW->row(item)]);
 }
 
 
@@ -126,7 +114,7 @@ void GuiEmbeddedFilesDialog::updateView()
 {
        filesLW->clear();
        //
-       EmbeddedFiles const & files = controller().embeddedFiles();
+       EmbeddedFiles const & files = controller_.embeddedFiles();
        EmbeddedFiles::EmbeddedFileList::const_iterator it = files.begin();
        EmbeddedFiles::EmbeddedFileList::const_iterator it_end = files.end();
        for (; it != it_end; ++it) {
@@ -151,62 +139,62 @@ void GuiEmbeddedFilesDialog::updateView()
 
 void GuiEmbeddedFilesDialog::on_selectPB_clicked()
 {
-       EmbeddedFiles & files = controller().embeddedFiles();
+       EmbeddedFiles & files = controller_.embeddedFiles();
        QList<QListWidgetItem *> selection = filesLW->selectedItems();
        for (QList<QListWidgetItem*>::iterator it = selection.begin(); 
                it != selection.end(); ++it) {
                (*it)->setCheckState(Qt::Checked);
-               controller().setEmbed(files[filesLW->row(*it)], true);
+               controller_.setEmbed(files[filesLW->row(*it)], true);
        }
-       controller().dispatchMessage("Embedding files");
+       controller_.dispatchMessage("Embedding files");
 }
 
 
 void GuiEmbeddedFilesDialog::on_unselectPB_clicked()
 {
-       EmbeddedFiles & files = controller().embeddedFiles();
+       EmbeddedFiles & files = controller_.embeddedFiles();
        QList<QListWidgetItem *> selection = filesLW->selectedItems();
        for (QList<QListWidgetItem*>::iterator it = selection.begin(); 
                it != selection.end(); ++it) {
                (*it)->setCheckState(Qt::Checked);
-               controller().setEmbed(files[filesLW->row(*it)], false);
+               controller_.setEmbed(files[filesLW->row(*it)], false);
        }
-       controller().dispatchMessage("Stop embedding files");
+       controller_.dispatchMessage("Stop embedding files");
 }
 
 
 void GuiEmbeddedFilesDialog::on_addPB_clicked()
 {
-       docstring const file = controller().browseFile();
+       docstring const file = controller_.browseFile();
        if (!file.empty()) {
-               EmbeddedFiles & files = controller().embeddedFiles();
+               EmbeddedFiles & files = controller_.embeddedFiles();
                files.registerFile(to_utf8(file), true);
        }
-       controller().dispatchMessage("Add an embedded file");
+       controller_.dispatchMessage("Add an embedded file");
 }
 
 
 void GuiEmbeddedFilesDialog::on_extractPB_clicked()
 {
-       EmbeddedFiles const & files = controller().embeddedFiles();
+       EmbeddedFiles const & files = controller_.embeddedFiles();
        QList<QListWidgetItem *> selection = filesLW->selectedItems();
        for (QList<QListWidgetItem*>::iterator it = selection.begin(); 
                it != selection.end(); ++it)
-               controller().extract(files[filesLW->row(*it)]);
+               controller_.extract(files[filesLW->row(*it)]);
        // FIXME: collect extraction status and display a dialog
-       controller().dispatchMessage("Extract embedded files");
+       controller_.dispatchMessage("Extract embedded files");
 }
 
 
 void GuiEmbeddedFilesDialog::on_updatePB_clicked()
 {
-       EmbeddedFiles const & files = controller().embeddedFiles();
+       EmbeddedFiles const & files = controller_.embeddedFiles();
        QList<QListWidgetItem *> selection = filesLW->selectedItems();
        for (QList<QListWidgetItem*>::iterator it = selection.begin(); 
                it != selection.end(); ++it)
-               controller().update(files[filesLW->row(*it)]);
+               controller_.update(files[filesLW->row(*it)]);
        // FIXME: collect update status and display a dialog
-       controller().dispatchMessage("Update embedded files from external file");
+       controller_.dispatchMessage("Update embedded files from external file");
 }
 
 
@@ -214,12 +202,12 @@ void GuiEmbeddedFilesDialog::on_updatePB_clicked()
 void GuiEmbeddedFilesDialog::on_enableCB_toggled(bool enable)
 {
        //
-       controller().embeddedFiles().enable(enable);
+       controller_.embeddedFiles().enable(enable);
        // immediately post the change to buffer (and bufferView)
        if (enable)
-               controller().dispatchMessage("Enable file embedding");
+               controller_.dispatchMessage("Enable file embedding");
        else
-               controller().dispatchMessage("Disable file embedding");
+               controller_.dispatchMessage("Disable file embedding");
 }
 
 

diff --git a/src/frontends/qt4/GuiEmbeddedFiles.h b/src/frontends/qt4/GuiEmbeddedFiles.h
index 13bb84587526c1e8d6eed16305741f62b57af2b4..525f96c97469519d134c426d2dfbac420e376697 100644 (file)
--- a/src/frontends/qt4/GuiEmbeddedFiles.h
+++ b/src/frontends/qt4/GuiEmbeddedFiles.h
@@ -20,12 +20,12 @@
 namespace lyx {
 namespace frontend {
 
-class GuiEmbeddedFilesDialog : public GuiDialog, public Ui::GuiEmbeddedFilesUi
+class GuiEmbeddedFilesDialog : public QWidget, public Ui::GuiEmbeddedFilesUi
 {
        Q_OBJECT
 
 public:
-       GuiEmbeddedFilesDialog(LyXView & lv);
+       GuiEmbeddedFilesDialog(ControlEmbeddedFiles &);
 
 public Q_SLOTS:
        ///
@@ -45,7 +45,7 @@ public Q_SLOTS:
        void on_updatePB_clicked();
 
 private:
-       ControlEmbeddedFiles & controller() const;
+       ControlEmbeddedFiles & controller_;
        void set_embedding_status(bool embed);
 };