#include "Action.h"
-#include "frontends/LyXView.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, QIcon 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(icon);
setText(text);
setToolTip(tooltip);
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 {
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"