refine the logic for checking whether a dialog may apply its data or not

[lyx.git] / src / frontends / controllers / Dialog.C

diff --git a/src/frontends/controllers/Dialog.C b/src/frontends/controllers/Dialog.C
index 6b7e91ef3232af83861219029fbb764214bd7bbe..039c1c4f16b937636db561cbca9f1d692b4b493a 100644 (file)
--- a/src/frontends/controllers/Dialog.C
+++ b/src/frontends/controllers/Dialog.C
@@ -15,6 +15,17 @@
 #include "ButtonController.h"
 #include "BCView.h"
 
+#include "frontends/LyXView.h"
+
+#include "funcrequest.h"
+#include "FuncStatus.h"
+#include "lyxfunc.h"
+
+
+using std::string;
+
+namespace lyx {
+namespace frontend {
 
 Dialog::Dialog(LyXView & lv, string const & name)
        : is_closing_(false), kernel_(lv), name_(name),
@@ -87,8 +98,7 @@ void Dialog::update(string const & data)
 
        if (!controller().initialiseParams(data)) {
                lyxerr << "Dialog \"" << name_
-                      << "\" failed to translate the data "
-                       "string passed to update()" << std::endl;
+                      << "\" could not be initialized" << std::endl;
                return;
        }
 
@@ -107,13 +117,17 @@ void Dialog::hide()
 
        controller().clearParams();
        view().hide();
+       kernel().disconnect(name());
 }
 
 
 void Dialog::apply()
 {
-       if (kernel().isBufferReadonly())
-               return;
+       if (controller().isBufferDependent()) {
+               if (!kernel().isBufferAvailable() ||
+                   kernel().isBufferReadonly())
+                       return;
+       }
 
        view().apply();
        controller().dispatchParams();
@@ -159,11 +173,40 @@ void Dialog::setView(View * v)
 }
 
 
+void Dialog::checkStatus()
+{
+       // buffer independant dialogs are always active.
+       // This check allows us leave canApply unimplemented for some dialogs.
+       if (!controller().isBufferDependent())
+               return;
+
+       // deactivate the dialog if we have no buffer
+       if (!kernel().isBufferAvailable()) {
+               bc().readOnly(true);
+               return;
+       }
+
+       // check whether this dialog may be active
+       if (controller().canApply())
+               bc().readOnly(kernel().isBufferReadonly());
+       else
+               bc().readOnly(true);
+}
+
+
 Dialog::Controller::Controller(Dialog & parent)
        : parent_(parent)
 {}
 
 
+bool Dialog::Controller::canApply() const
+{
+       FuncRequest const fr(getLfun(), dialog().name());
+       FuncStatus const fs(kernel().lyxview().getLyXFunc().getStatus(fr));
+       return fs.enabled();
+}
+
+
 Dialog::Controller & Dialog::controller() const
 {
        BOOST_ASSERT(controller_ptr_.get());
@@ -197,3 +240,6 @@ string const & Dialog::View::getTitle() const
 
 void Dialog::View::partialUpdate(int)
 {}
+
+} // namespace frontend
+} // namespace lyx