#include "controllers/Dialog.h"
-#include <boost/signals/signal2.hpp>
+#include <boost/signal.hpp>
#include <boost/bind.hpp>
using std::string;
+using lyx::frontend::Dialog;
// Note that static boost signals break some compilers, so this wrapper
};
-boost::signal0<void> & Dialogs::redrawGUI()
+boost::signal<void()> & Dialogs::redrawGUI()
{
- static BugfixSignal<boost::signal0<void> > thesignal;
+ static BugfixSignal<boost::signal<void()> > thesignal;
return thesignal();
}
namespace {
-BugfixSignal<boost::signal2<void, string const &, InsetBase*> > hideSignal;
+BugfixSignal<boost::signal<void(string const &, InsetBase*)> > hideSignal;
}
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);
}
if (it != dialogs_.end())
return it->second.get();
- dialogs_[name] = DialogPtr(build(name));
+ dialogs_[name] = build(name);
return dialogs_[name].get();
}
void Dialogs::show(string const & name, string const & data)
{
- Dialog * dialog = find_or_build(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_or_build(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;
}
for(; it != end; ++it) {
it->second->hide();
}
- hideAllSignal();
}
if (dialog->controller().isBufferDependent())
dialog->hide();
}
- hideBufferDependentSignal();
}
dialog->RestoreButton();
}
}
- updateBufferDependentSignal(switched);
}