merge the two parts of the implementation of frontends::Dialogs

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

diff --git a/src/frontends/Dialogs.cpp b/src/frontends/Dialogs.cpp
deleted file mode 100644 (file)
index 6a8d9b5..0000000
--- a/src/frontends/Dialogs.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-/**
- * \file frontends/Dialogs.cpp
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Angus Leeming
- *
- * Full author contact details are available in file CREDITS.
- *
- * Common to all frontends' Dialogs
- */
-
-#include <config.h>
-
-#include "Dialogs.h"
-#include "Dialog.h"
-
-using std::string;
-
-namespace lyx {
-
-extern bool quitting;
-
-namespace frontend {
-
-Dialogs::Dialogs(LyXView & lyxview)
-       : lyxview_(lyxview), in_show_(false)
-{}
-
-
-Dialog * Dialogs::find_or_build(string const & name)
-{
-       if (!isValidName(name))
-               return 0;
-
-       std::map<string, DialogPtr>::iterator it =
-               dialogs_.find(name);
-
-       if (it != dialogs_.end())
-               return it->second.get();
-
-       dialogs_[name].reset(build(name));
-       return dialogs_[name].get();
-}
-
-
-void Dialogs::show(string const & name, string const & data, Inset * inset)
-{
-       if (in_show_)
-               return;
-
-       in_show_ = true;
-       Dialog * dialog = find_or_build(name);
-       if (dialog) {
-               dialog->showData(data);
-               if (inset)
-                       open_insets_[name] = inset;
-       }
-       in_show_ = false;
-}
-
-
-bool Dialogs::visible(string const & name) const
-{
-       std::map<string, DialogPtr>::const_iterator it = dialogs_.find(name);
-       if (it == dialogs_.end())
-               return false;
-       return it->second.get()->isVisibleView();
-}
-
-
-void Dialogs::update(string const & name, string const & data)
-{
-       std::map<string, DialogPtr>::const_iterator it = dialogs_.find(name);
-       if (it == dialogs_.end())
-               return;
-
-       Dialog * const dialog = it->second.get();
-       if (dialog->isVisibleView())
-               dialog->updateData(data);
-}
-
-
-void Dialogs::hide(string const & name, Inset* inset)
-{
-       // Don't send the signal if we are quitting, because on MSVC it is
-       // destructed before the cut stack in CutAndPaste.cpp, and this method
-       // is called from some inset destructor if the cut stack is not empty
-       // on exit.
-       if (quitting)
-               return;
-
-       std::map<string, DialogPtr>::const_iterator it =
-               dialogs_.find(name);
-       if (it == dialogs_.end())
-               return;
-
-       if (inset && inset != getOpenInset(name))
-               return;
-
-       Dialog * const dialog = it->second.get();
-       if (dialog->isVisibleView())
-               dialog->hide();
-       open_insets_[name] = 0;
-}
-
-
-void Dialogs::disconnect(string const & name)
-{
-       if (!isValidName(name))
-               return;
-
-       if (open_insets_.find(name) != open_insets_.end())
-               open_insets_[name] = 0;
-}
-
-
-Inset * Dialogs::getOpenInset(string const & name) const
-{
-       if (!isValidName(name))
-               return 0;
-
-       std::map<string, Inset *>::const_iterator it =
-               open_insets_.find(name);
-       return it == open_insets_.end() ? 0 : it->second;
-}
-
-
-void Dialogs::hideAll() const
-{
-       std::map<string, DialogPtr>::const_iterator it  = dialogs_.begin();
-       std::map<string, DialogPtr>::const_iterator end = dialogs_.end();
-
-       for(; it != end; ++it)
-               it->second->hide();
-}
-
-
-void Dialogs::hideBufferDependent() const
-{
-       std::map<string, DialogPtr>::const_iterator it  = dialogs_.begin();
-       std::map<string, DialogPtr>::const_iterator end = dialogs_.end();
-
-       for(; it != end; ++it) {
-               Dialog * dialog = it->second.get();
-               if (dialog->isBufferDependent())
-                       dialog->hide();
-       }
-}
-
-
-void Dialogs::updateBufferDependent(bool switched) const
-{
-       std::map<string, DialogPtr>::const_iterator it  = dialogs_.begin();
-       std::map<string, DialogPtr>::const_iterator end = dialogs_.end();
-
-       for(; it != end; ++it) {
-               Dialog * dialog = it->second.get();
-               if (switched && dialog->isBufferDependent()) {
-                       if (dialog->isVisibleView() && dialog->initialiseParams(""))
-                               dialog->updateView();
-                       else
-                               dialog->hide();
-               } else {
-                       // A bit clunky, but the dialog will request
-                       // that the kernel provides it with the necessary
-                       // data.
-                       dialog->slotRestore();
-               }
-       }
-}
-
-
-void Dialogs::redraw() const
-{
-       std::map<string, DialogPtr>::const_iterator it  = dialogs_.begin();
-       std::map<string, DialogPtr>::const_iterator end = dialogs_.end();
-
-       for(; it != end; ++it)
-               it->second->redraw();
-}
-
-
-void Dialogs::checkStatus()
-{
-       std::map<string, DialogPtr>::const_iterator it  = dialogs_.begin();
-       std::map<string, DialogPtr>::const_iterator end = dialogs_.end();
-
-       for(; it != end; ++it) {
-               Dialog * const dialog = it->second.get();
-               if (dialog && dialog->isVisibleView())
-                       dialog->checkStatus();
-       }
-}
-
-} // namespace frontend
-} // namespace lyx

diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am
index 60ebeea57966b7a13565041080ca779f04737bd8..5e361c477197bf1aed0fd205bccfd646737f665a 100644 (file)
--- a/src/frontends/Makefile.am
+++ b/src/frontends/Makefile.am
@@ -14,7 +14,6 @@ liblyxfrontends_la_SOURCES = \
        Application.h \
        NoGuiFontLoader.h \
        NoGuiFontMetrics.h \
-       Dialogs.cpp \
        Dialogs.h \
        FileDialog.h \
        FontLoader.h \

diff --git a/src/frontends/qt4/Dialogs.cpp b/src/frontends/qt4/Dialogs.cpp
index e7788db147a0cd7f8b3b846352848334601b3407..4be491f48dd0b182764ff9f077fea86dbb57cf17 100644 (file)
--- a/src/frontends/qt4/Dialogs.cpp
+++ b/src/frontends/qt4/Dialogs.cpp
@@ -11,14 +11,189 @@
 #include <config.h>
 
 #include "Dialogs.h"
+#include "Dialog.h"
 
 #include <boost/assert.hpp>
 
 using std::string;
 
 namespace lyx {
+
+extern bool quitting;
+
 namespace frontend {
 
+Dialogs::Dialogs(LyXView & lyxview)
+       : lyxview_(lyxview), in_show_(false)
+{}
+
+
+Dialog * Dialogs::find_or_build(string const & name)
+{
+       if (!isValidName(name))
+               return 0;
+
+       std::map<string, DialogPtr>::iterator it =
+               dialogs_.find(name);
+
+       if (it != dialogs_.end())
+               return it->second.get();
+
+       dialogs_[name].reset(build(name));
+       return dialogs_[name].get();
+}
+
+
+void Dialogs::show(string const & name, string const & data, Inset * inset)
+{
+       if (in_show_)
+               return;
+
+       in_show_ = true;
+       Dialog * dialog = find_or_build(name);
+       if (dialog) {
+               dialog->showData(data);
+               if (inset)
+                       open_insets_[name] = inset;
+       }
+       in_show_ = false;
+}
+
+
+bool Dialogs::visible(string const & name) const
+{
+       std::map<string, DialogPtr>::const_iterator it = dialogs_.find(name);
+       if (it == dialogs_.end())
+               return false;
+       return it->second.get()->isVisibleView();
+}
+
+
+void Dialogs::update(string const & name, string const & data)
+{
+       std::map<string, DialogPtr>::const_iterator it = dialogs_.find(name);
+       if (it == dialogs_.end())
+               return;
+
+       Dialog * const dialog = it->second.get();
+       if (dialog->isVisibleView())
+               dialog->updateData(data);
+}
+
+
+void Dialogs::hide(string const & name, Inset* inset)
+{
+       // Don't send the signal if we are quitting, because on MSVC it is
+       // destructed before the cut stack in CutAndPaste.cpp, and this method
+       // is called from some inset destructor if the cut stack is not empty
+       // on exit.
+       if (quitting)
+               return;
+
+       std::map<string, DialogPtr>::const_iterator it =
+               dialogs_.find(name);
+       if (it == dialogs_.end())
+               return;
+
+       if (inset && inset != getOpenInset(name))
+               return;
+
+       Dialog * const dialog = it->second.get();
+       if (dialog->isVisibleView())
+               dialog->hide();
+       open_insets_[name] = 0;
+}
+
+
+void Dialogs::disconnect(string const & name)
+{
+       if (!isValidName(name))
+               return;
+
+       if (open_insets_.find(name) != open_insets_.end())
+               open_insets_[name] = 0;
+}
+
+
+Inset * Dialogs::getOpenInset(string const & name) const
+{
+       if (!isValidName(name))
+               return 0;
+
+       std::map<string, Inset *>::const_iterator it =
+               open_insets_.find(name);
+       return it == open_insets_.end() ? 0 : it->second;
+}
+
+
+void Dialogs::hideAll() const
+{
+       std::map<string, DialogPtr>::const_iterator it  = dialogs_.begin();
+       std::map<string, DialogPtr>::const_iterator end = dialogs_.end();
+
+       for(; it != end; ++it)
+               it->second->hide();
+}
+
+
+void Dialogs::hideBufferDependent() const
+{
+       std::map<string, DialogPtr>::const_iterator it  = dialogs_.begin();
+       std::map<string, DialogPtr>::const_iterator end = dialogs_.end();
+
+       for(; it != end; ++it) {
+               Dialog * dialog = it->second.get();
+               if (dialog->isBufferDependent())
+                       dialog->hide();
+       }
+}
+
+
+void Dialogs::updateBufferDependent(bool switched) const
+{
+       std::map<string, DialogPtr>::const_iterator it  = dialogs_.begin();
+       std::map<string, DialogPtr>::const_iterator end = dialogs_.end();
+
+       for(; it != end; ++it) {
+               Dialog * dialog = it->second.get();
+               if (switched && dialog->isBufferDependent()) {
+                       if (dialog->isVisibleView() && dialog->initialiseParams(""))
+                               dialog->updateView();
+                       else
+                               dialog->hide();
+               } else {
+                       // A bit clunky, but the dialog will request
+                       // that the kernel provides it with the necessary
+                       // data.
+                       dialog->slotRestore();
+               }
+       }
+}
+
+
+void Dialogs::redraw() const
+{
+       std::map<string, DialogPtr>::const_iterator it  = dialogs_.begin();
+       std::map<string, DialogPtr>::const_iterator end = dialogs_.end();
+
+       for(; it != end; ++it)
+               it->second->redraw();
+}
+
+
+void Dialogs::checkStatus()
+{
+       std::map<string, DialogPtr>::const_iterator it  = dialogs_.begin();
+       std::map<string, DialogPtr>::const_iterator end = dialogs_.end();
+
+       for(; it != end; ++it) {
+               Dialog * const dialog = it->second.get();
+               if (dialog && dialog->isVisibleView())
+                       dialog->checkStatus();
+       }
+}
+
+
 namespace {
 
 // This list should be kept in sync with the list of insets in