summaryrefslogtreecommitdiffstats
path: root/src/verbs.h
diff options
context:
space:
mode:
authorEric Greveson <eric@greveson.co.uk>2013-07-01 20:04:32 +0000
committerEric Greveson <eric@greveson.co.uk>2013-07-01 20:04:32 +0000
commitc3a160589a9cb41c70a56e5e7b66a65857a0d10e (patch)
tree46860c161eda2e11687aff38141e04b40185798b /src/verbs.h
parentCorrectly ignore symbolic link to ltmain.sh (diff)
downloadinkscape-c3a160589a9cb41c70a56e5e7b66a65857a0d10e.tar.gz
inkscape-c3a160589a9cb41c70a56e5e7b66a65857a0d10e.zip
Factored layer model out into new Inkscape::LayerModel class. This allows
Inkscape::Selection to use a LayerModel that is not associated with a UI. Changed the interface of verbs (SPAction) to use a new ActionContext rather than UI::View::View, again so that verbs may be used in a console mode. Modified boolean operation verbs to work in console-only mode. Fixed up DESKTOP_IS_ACTIVE macro to work in the case of no desktops. Modified main.cpp to process selections and verbs in no-GUI mode. Other changes are all consequences of the SPDesktop, Selection and LayerModel interface changes. (bzr r12387.1.1)
Diffstat (limited to 'src/verbs.h')
-rw-r--r--src/verbs.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/verbs.h b/src/verbs.h
index dab524d7a..35165822a 100644
--- a/src/verbs.h
+++ b/src/verbs.h
@@ -23,6 +23,9 @@ struct SPAction;
class SPDocument;
namespace Inkscape {
+
+class ActionContext;
+
namespace UI {
namespace View {
class View;
@@ -472,8 +475,8 @@ public:
protected:
- SPAction *make_action_helper (Inkscape::UI::View::View *view, void (*perform_fun)(SPAction *, void *), void *in_pntr = NULL);
- virtual SPAction *make_action (Inkscape::UI::View::View *view);
+ SPAction *make_action_helper (Inkscape::ActionContext const & context, void (*perform_fun)(SPAction *, void *), void *in_pntr = NULL);
+ virtual SPAction *make_action (Inkscape::ActionContext const & context);
public:
@@ -521,7 +524,7 @@ public:
Verb (gchar const * id, gchar const * name, gchar const * tip, gchar const * image, gchar const * group);
virtual ~Verb (void);
- SPAction * get_action(Inkscape::UI::View::View * view);
+ SPAction * get_action(Inkscape::ActionContext const & context);
private:
static Verb * get_search (unsigned int code);