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 21b327ae898f07323113a350fd1299cbafdc72bc..039c1c4f16b937636db561cbca9f1d692b4b493a 100644 (file)
--- a/src/frontends/controllers/Dialog.C
+++ b/src/frontends/controllers/Dialog.C
@@ -175,9 +175,19 @@ void Dialog::setView(View * v)
 
 void Dialog::checkStatus()
 {
-       FuncRequest const fr(LFUN_INSET_APPLY, name());
-       FuncStatus const fs(kernel().lyxview().getLyXFunc().getStatus(fr));
-       if (fs.enabled())
+       // 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);
@@ -189,6 +199,14 @@ Dialog::Controller::Controller(Dialog & 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());