#include "Dialogs.h"
+#include "lyx_cb.h"
+
#include "controllers/Dialog.h"
#include <boost/signal.hpp>
#include <boost/bind.hpp>
+namespace lyx {
+
+
using std::string;
using lyx::frontend::Dialog;
};
-boost::signal<void()> & Dialogs::redrawGUI()
-{
- static BugfixSignal<boost::signal<void()> > thesignal;
- return thesignal();
-}
-
-
namespace {
BugfixSignal<boost::signal<void(string const &, InsetBase*)> > hideSignal;
void Dialogs::hide(string const & name, InsetBase* inset)
{
- hideSignal()(name, inset);
+ // Don't send the signal if we are quitting, because on MSVC it is
+ // destructed before the cut stack in CutAndPaste.C, and this method
+ // is called from some inset destructor if the cut stack is not empty
+ // on exit.
+ if (!quitting)
+ hideSignal()(name, inset);
}
: lyxview_(lyxview), in_show_(false)
{
// Connect signals
- redrawGUI().connect(boost::bind(&Dialogs::redraw, this));
+ hideSignal().connect(boost::bind(&Dialogs::hideSlot, this, _1, _2));
}
if (dialog) {
// FIXME! Should check that the dialog is NOT an inset dialog.
dialog->show(data);
- }
+ }
in_show_ = false;
}
if (!isValidName(name))
return;
- open_insets_[name] = 0;
+ if (open_insets_.find(name) != open_insets_.end())
+ open_insets_[name] = 0;
}
for(; it != end; ++it) {
Dialog * dialog = it->second.get();
if (switched && dialog->controller().isBufferDependent()) {
- dialog->hide();
+ if (dialog->isVisible() && dialog->controller().initialiseParams(""))
+ dialog->view().update();
+ else
+ dialog->hide();
} else {
// A bit clunky, but the dialog will request
// that the kernel provides it with the necessary
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->isVisible())
+ dialog->checkStatus();
+ }
+}
+
+
+} // namespace lyx