Minipage is no more (long live the box inset)

[lyx.git] / src / frontends / Dialogs.C

diff --git a/src/frontends/Dialogs.C b/src/frontends/Dialogs.C
index 23907a8709127028fd48fc09dc0610f5af4c5357..9990de1f41398983ff1b8ff919286bbdf4b0635a 100644 (file)
--- a/src/frontends/Dialogs.C
+++ b/src/frontends/Dialogs.C
@@ -2,9 +2,10 @@
  * \file frontends/Dialogs.C
  * 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
+ * Full author contact details are available in file CREDITS.
  *
  * Common to all frontends' Dialogs
  */
@@ -12,10 +13,16 @@
 #include <config.h>
 
 #include "Dialogs.h"
+
 #include "controllers/Dialog.h"
+
+#include <boost/signals/signal2.hpp>
 #include <boost/bind.hpp>
 
 
+using std::string;
+
+
 // Note that static boost signals break some compilers, so this wrapper
 // initialises the signal dynamically when it is first invoked.
 template<typename Signal>
@@ -43,11 +50,25 @@ boost::signal0<void> & Dialogs::redrawGUI()
 }
 
 
+namespace {
+
+BugfixSignal<boost::signal2<void, string const &, InsetBase*> > hideSignal;
+
+}
+
+
+void Dialogs::hide(string const & name, InsetBase* inset)
+{
+       hideSignal()(name, inset);
+}
+
+
 Dialogs::Dialogs(LyXView & lyxview)
        : lyxview_(lyxview)
 {
        // Connect signals
        redrawGUI().connect(boost::bind(&Dialogs::redraw, this));
+       hideSignal().connect(boost::bind(&Dialogs::hideSlot, this, _1, _2));
 
        // All this is slated to go
        init_pimpl();
@@ -57,7 +78,7 @@ Dialogs::Dialogs(LyXView & lyxview)
 }
 
 
-Dialog * Dialogs::find(string const & name)
+Dialog * Dialogs::find_or_build(string const & name)
 {
        if (!isValidName(name))
                return 0;
@@ -65,53 +86,71 @@ Dialog * Dialogs::find(string const & name)
        std::map<string, DialogPtr>::iterator it =
                dialogs_.find(name);
 
-       if (it == dialogs_.end()) {
-               dialogs_[name] = DialogPtr(build(name));
-               return dialogs_[name].get();
-       }
+       if (it != dialogs_.end())
+               return it->second.get();
 
-       return it->second.get();
+       dialogs_[name] = DialogPtr(build(name));
+       return dialogs_[name].get();
 }
 
 
-void Dialogs::show(string const & name)
+void Dialogs::show(string const & name, string const & data)
 {
-       Dialog * dialog = find(name);
+       Dialog * dialog = find_or_build(name);
        if (!dialog)
                return;
 
-       dialog->show();
+       // FIXME! Should check that the dialog is NOT an inset dialog.
+       dialog->show(data);
 }
 
 
 void Dialogs::show(string const & name, string const & data, InsetBase * inset)
 {
-       Dialog * dialog = find(name);
+       Dialog * dialog = find_or_build(name);
        if (!dialog)
                return;
 
+       // FIXME! Should check that the dialog IS an inset dialog.
        dialog->show(data);
        open_insets_[name] = inset;
 }
 
 
+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()->isVisible();
+}
+
+
 void Dialogs::update(string const & name, string const & data)
 {
-       Dialog * dialog = find(name);
-       if (!dialog)
+       std::map<string, DialogPtr>::const_iterator it =
+               dialogs_.find(name);
+       if (it == dialogs_.end())
                return;
 
+       Dialog * const dialog = it->second.get();
        if (dialog->isVisible())
                dialog->update(data);
 }
 
 
-void Dialogs::hide(string const & name)
+void Dialogs::hideSlot(string const & name, InsetBase * inset)
 {
-       Dialog * dialog = find(name);
-       if (!dialog)
+       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->isVisible())
                dialog->hide();
        open_insets_[name] = 0;