Enable OK/Apply buttons when resetting to class defaults.

[lyx.git] / src / frontends / qt4 / Action.cpp

diff --git a/src/frontends/qt4/Action.cpp b/src/frontends/qt4/Action.cpp
index 683f073165015a0ea67be11a53a89c38472838fe..bd102e6b73a8f987c248ec55dec6e07759ee35c0 100644 (file)
--- a/src/frontends/qt4/Action.cpp
+++ b/src/frontends/qt4/Action.cpp
@@ -12,32 +12,48 @@
 
 #include "Action.h"
 
-#include "frontends/LyXView.h"
-
-#include "callback.h"
-#include "debug.h"
+// DispatchResult.h is needed by the windows compiler because lyx::dispatch
+// returns a DispatchResult const reference. Gcc does not complain. Weird...
+#include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "GuiView.h"
-#include "LyXFunc.h"
+#include "LyX.h"
+
 #include "qt_helpers.h"
 
+#include "support/debug.h"
 #include "support/lstrings.h"
 
+using namespace std;
+
+
 namespace lyx {
 namespace frontend {
 
 
-Action::Action(GuiViewBase & lyxView, QString const & icon,
-         QString const & text, FuncRequest const & func,
-         QString const & tooltip)
-       : QAction(&lyxView), func_(func), lyxView_(lyxView)
+Action::Action(FuncRequest func, QIcon const & icon, QString const & text,
+               QString const & tooltip, QObject * parent)
+       : QAction(parent), func_(make_shared<FuncRequest>(move(func)))
+{
+       init(icon, text, tooltip);
+}
+
+
+Action::Action(shared_ptr<FuncRequest const> func,
+               QIcon const & icon, QString const & text,
+               QString const & tooltip, QObject * parent)
+       : QAction(parent), func_(func)
+{
+       init(icon, text, tooltip);
+}
+
+
+void Action::init(QIcon const & icon, QString const & text,
+                  QString const & tooltip)
 {
-#if QT_VERSION >= 0x040200
        // only Qt/Mac handles that
        setMenuRole(NoRole);
-#endif
-       setIcon(QPixmap(icon));
+       setIcon(icon);
        setText(text);
        setToolTip(tooltip);
        setStatusTip(tooltip);
@@ -48,12 +64,12 @@ Action::Action(GuiViewBase & lyxView, QString const & icon,
 
 void Action::update()
 {
-       FuncStatus const status = getStatus(func_);
+       FuncStatus const status = getStatus(*func_);
 
-       if (status.onoff(true)) {
+       if (status.onOff(true)) {
                setCheckable(true);
                setChecked(true);
-       } else if (status.onoff(false)) {
+       } else if (status.onOff(false)) {
                setCheckable(true);
                setChecked(false);
        } else {
@@ -66,13 +82,13 @@ void Action::update()
 
 void Action::action()
 {
-       //      LYXERR(Debug::ACTION) << "calling LyXFunc::dispatch: func_: "
-       //      "\n";
-       lyxView_.dispatch(func_);
+       //LYXERR(Debug::ACTION, "calling lyx::dispatch: func_: ");
+
+       lyx::dispatch(*func_);
        triggered(this);
 }
 
 } // namespace frontend
 } // namespace lyx
 
-#include "Action_moc.cpp"
+#include "moc_Action.cpp"