#include <config.h>
#include "Dialogs.h"
-
-#include "callback.h"
-
-#include "controllers/Dialog.h"
+#include "Dialog.h"
#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>
-class BugfixSignal {
-public:
- Signal & operator()() { return thesignal(); }
- Signal const & operator()() const { return thesignal(); }
-
-private:
- Signal & thesignal() const
- {
- if (!signal_.get())
- signal_.reset(new Signal);
- return *signal_;
- }
-
- mutable boost::scoped_ptr<Signal> signal_;
-};
-
-
-namespace {
-
-BugfixSignal<boost::signal<void(string const &, Inset*)> > hideSignal;
-
-}
+namespace lyx {
-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)
- hideSignal()(name, inset);
-}
+extern bool quitting;
+namespace frontend {
Dialogs::Dialogs(LyXView & lyxview)
: lyxview_(lyxview), in_show_(false)
-{
- // Connect signals
- hideSignal().connect(boost::bind(&Dialogs::hideSlot, this, _1, _2));
-}
+{}
Dialog * Dialogs::find_or_build(string const & name)
if (it != dialogs_.end())
return it->second.get();
- dialogs_[name] = build(name);
+ dialogs_[name].reset(build(name));
return dialogs_[name].get();
}
-void Dialogs::show(string const & name, string const & data)
-{
- if (in_show_) {
- return;
- }
- 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, Inset * inset)
{
- if (in_show_) {
+ if (in_show_)
return;
- }
+
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;
+ 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);
+ std::map<string, DialogPtr>::const_iterator it = dialogs_.find(name);
if (it == dialogs_.end())
return false;
- return it->second.get()->isVisible();
+ return it->second.get()->isVisibleView();
}
void Dialogs::update(string const & name, string const & data)
{
- std::map<string, DialogPtr>::const_iterator it =
- dialogs_.find(name);
+ 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);
+ if (dialog->isVisibleView())
+ dialog->updateData(data);
}
-void Dialogs::hideSlot(string const & name, Inset * inset)
+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;
Dialog * const dialog = it->second.get();
- if (dialog->isVisible())
+ if (dialog->isVisibleView())
dialog->hide();
open_insets_[name] = 0;
}
std::map<string, DialogPtr>::const_iterator it = dialogs_.begin();
std::map<string, DialogPtr>::const_iterator end = dialogs_.end();
- for(; it != end; ++it) {
+ for(; it != end; ++it)
it->second->hide();
- }
}
std::map<string, DialogPtr>::const_iterator end = dialogs_.end();
for(; it != end; ++it) {
- Dialog * dialog = it->second.get();
- if (dialog->controller().isBufferDependent())
+ Dialog * dialog = it->second.get();
+ if (dialog->isBufferDependent())
dialog->hide();
}
}
std::map<string, DialogPtr>::const_iterator end = dialogs_.end();
for(; it != end; ++it) {
- Dialog * dialog = it->second.get();
- if (switched && dialog->controller().isBufferDependent()) {
- if (dialog->isVisible() && dialog->controller().initialiseParams(""))
- dialog->view().update();
+ 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->RestoreButton();
+ dialog->slotRestore();
}
}
}
std::map<string, DialogPtr>::const_iterator it = dialogs_.begin();
std::map<string, DialogPtr>::const_iterator end = dialogs_.end();
- for(; it != end; ++it) {
+ for(; it != end; ++it)
it->second->redraw();
- }
}
for(; it != end; ++it) {
Dialog * const dialog = it->second.get();
- if (dialog->isVisible())
+ if (dialog && dialog->isVisibleView())
dialog->checkStatus();
}
}
-
+} // namespace frontend
} // namespace lyx