#include <config.h>
#include "Dialogs.h"
+
+#include "lyx_cb.h"
+
#include "controllers/Dialog.h"
-#include <boost/signals/signal2.hpp>
+
+#include <boost/signal.hpp>
#include <boost/bind.hpp>
+namespace lyx {
+
+
+using std::string;
+using lyx::frontend::Dialog;
+
+
// Note that static boost signals break some compilers, so this wrapper
// initialises the signal dynamically when it is first invoked.
template<typename Signal>
};
-boost::signal0<void> & Dialogs::redrawGUI()
-{
- static BugfixSignal<boost::signal0<void> > thesignal;
- return thesignal();
-}
-
-
namespace {
-BugfixSignal<boost::signal2<void, string const &, InsetBase*> > hideSignal;
+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);
}
Dialogs::Dialogs(LyXView & lyxview)
- : lyxview_(lyxview)
+ : lyxview_(lyxview), in_show_(false)
{
// 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();
- // reduce the number of connections needed in
- // dialogs by a simple connection here.
- hideAllSignal.connect(hideBufferDependentSignal);
}
-Dialog * Dialogs::find(string const & name)
+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()) {
- dialogs_[name] = DialogPtr(build(name));
- return dialogs_[name].get();
- }
+ if (it != dialogs_.end())
+ return it->second.get();
- return it->second.get();
+ dialogs_[name] = build(name);
+ return dialogs_[name].get();
}
void Dialogs::show(string const & name, string const & data)
{
- Dialog * dialog = find(name);
- if (!dialog)
+ if (in_show_) {
return;
-
- // FIXME! Should check that the dialog is NOT an inset dialog.
- dialog->show(data);
+ }
+ in_show_ = true;
+ Dialog * dialog = find_or_build(name);
+ if (dialog) {
+ // FIXME! Should check that the dialog is NOT an inset dialog.
+ dialog->show(data);
+ }
+ in_show_ = false;
}
void Dialogs::show(string const & name, string const & data, InsetBase * inset)
{
- Dialog * dialog = find(name);
- if (!dialog)
+ if (in_show_) {
return;
-
- // FIXME! Should check that the dialog IS an inset dialog.
- dialog->show(data);
- open_insets_[name] = inset;
+ }
+ in_show_ = true;
+ Dialog * dialog = find_or_build(name);
+ if (dialog) {
+ // FIXME! Should check that the dialog IS an inset dialog.
+ dialog->show(data);
+ open_insets_[name] = inset;
+ }
+ in_show_ = false;
}
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::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;
if (!isValidName(name))
return;
- open_insets_[name] = 0;
+ if (open_insets_.find(name) != open_insets_.end())
+ open_insets_[name] = 0;
}
for(; it != end; ++it) {
it->second->hide();
}
- hideAllSignal();
}
if (dialog->controller().isBufferDependent())
dialog->hide();
}
- hideBufferDependentSignal();
}
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
dialog->RestoreButton();
}
}
- updateBufferDependentSignal(switched);
}
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