![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/verbs.cpp b/src/verbs.cpp
index d9f89b98a6a474a83b2e365e6d56854f4350dae1..66792ae410a1b8f5babd2e1947d184188ad9196b 100644 (file)
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
action = this->make_action(view);
// if (action == NULL) printf("Hmm, NULL in %s\n", _name);
+ if (action == NULL) printf("Hmm, NULL in %s\n", _name);
if (!_default_sensitive) {
sp_action_set_sensitive(action, 0);
} else {
switch (reinterpret_cast<std::size_t>(data)) {
case SP_VERB_EDIT_UNDO:
- sp_undo(dt, SP_DT_DOCUMENT(dt));
+ sp_undo(dt, sp_desktop_document(dt));
break;
case SP_VERB_EDIT_REDO:
- sp_redo(dt, SP_DT_DOCUMENT(dt));
+ sp_redo(dt, sp_desktop_document(dt));
break;
case SP_VERB_EDIT_CUT:
sp_selection_cut();
if (tools_isactive(dt, TOOLS_NODES)) {
sp_nodepath_deselect(SP_NODE_CONTEXT(ec)->nodepath);
} else {
- SP_DT_SELECTION(dt)->clear();
+ sp_desktop_selection(dt)->clear();
}
break;
default:
SPObject *next=Inkscape::next_layer(dt->currentRoot(), dt->currentLayer());
if (next) {
dt->setCurrentLayer(next);
- sp_document_done(SP_DT_DOCUMENT(dt));
+ sp_document_done(sp_desktop_document(dt));
dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Moved to next layer."));
} else {
dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Cannot move past last layer."));
SPObject *prev=Inkscape::previous_layer(dt->currentRoot(), dt->currentLayer());
if (prev) {
dt->setCurrentLayer(prev);
- sp_document_done(SP_DT_DOCUMENT(dt));
+ sp_document_done(sp_desktop_document(dt));
dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Moved to previous layer."));
} else {
dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Cannot move past first layer."));
message = g_strdup_printf(_("Lowered layer <b>%s</b>."), layer->defaultLabel());
break;
};
- sp_document_done(SP_DT_DOCUMENT(dt));
+ sp_document_done(sp_desktop_document(dt));
if (message) {
dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, message);
g_free((void *) message);
}
case SP_VERB_LAYER_DELETE: {
if ( dt->currentLayer() != dt->currentRoot() ) {
- SP_DT_SELECTION(dt)->clear();
+ sp_desktop_selection(dt)->clear();
SPObject *old_layer=dt->currentLayer();
sp_object_ref(old_layer, NULL);
dt->setCurrentLayer(survivor);
}
- sp_document_done(SP_DT_DOCUMENT(dt));
+ sp_document_done(sp_desktop_document(dt));
// TRANSLATORS: this means "The layer has been deleted."
dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Deleted layer."));
SPEventContext *ec = dt->event_context;
- Inkscape::Selection *sel = SP_DT_SELECTION(dt);
+ Inkscape::Selection *sel = sp_desktop_selection(dt);
if (sel->isEmpty())
return;
} else {
sp_selection_scale_relative(sel, center, NR::scale(-1.0, 1.0));
}
- sp_document_done(SP_DT_DOCUMENT(dt));
+ sp_document_done(sp_desktop_document(dt));
break;
case SP_VERB_OBJECT_FLIP_VERTICAL:
if (tools_isactive(dt, TOOLS_NODES)) {
} else {
sp_selection_scale_relative(sel, center, NR::scale(1.0, -1.0));
}
- sp_document_done(SP_DT_DOCUMENT(dt));
+ sp_document_done(sp_desktop_document(dt));
break;
case SP_VERB_OBJECT_SET_MASK:
sp_selection_set_mask(false, false);
if (!dt)
return;
- SPDocument *doc = SP_DT_DOCUMENT(dt);
+ SPDocument *doc = sp_desktop_document(dt);
Inkscape::XML::Node *repr = SP_OBJECT_REPR(dt->namedview);
SPActionEventVector HelpVerb::vector =
{{NULL},HelpVerb::perform, NULL, NULL, NULL};
-
-/* *********** Effect Last ********** */
/**
* Action vector to define functions called if a staticly defined tutorial verb
* is called
SPActionEventVector TutorialVerb::vector =
{{NULL},TutorialVerb::perform, NULL, NULL, NULL};
+/* *********** Effect Last ********** */
+
/** \brief A class to represent the last effect issued */
class EffectLastVerb : public Verb {
private:
}
/* *********** End Effect Last ********** */
+/* *********** Fit Canvas ********** */
+
+/** \brief A class to represent the canvas fitting verbs */
+class FitCanvasVerb : public Verb {
+private:
+ static void perform(SPAction *action, void *mydata, void *otherdata);
+ static SPActionEventVector vector;
+protected:
+ virtual SPAction *make_action(Inkscape::UI::View::View *view);
+public:
+ /** \brief Use the Verb initializer with the same parameters. */
+ FitCanvasVerb(unsigned int const code,
+ gchar const *id,
+ gchar const *name,
+ gchar const *tip,
+ gchar const *image) :
+ Verb(code, id, name, tip, image)
+ {
+ set_default_sensitive(false);
+ }
+}; /* FitCanvasVerb class */
+
+/**
+ * The vector to attach in the fit canvas verb.
+ */
+SPActionEventVector FitCanvasVerb::vector =
+ {{NULL},FitCanvasVerb::perform, NULL, NULL, NULL};
+
+/** \brief Create an action for a \c FitCanvasVerb
+ \param view Which view the action should be created for
+ \return The built action.
+
+ Calls \c make_action_helper with the \c vector.
+*/
+SPAction *
+FitCanvasVerb::make_action(Inkscape::UI::View::View *view)
+{
+ SPAction *action = make_action_helper(view, &vector);
+ return action;
+}
+
+/** \brief Decode the verb code and take appropriate action */
+void
+FitCanvasVerb::perform(SPAction *action, void *data, void *pdata)
+{
+ SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action));
+ if (!dt) return;
+ SPDocument *doc = sp_desktop_document(dt);
+ if (!doc) return;
+
+ switch ((long) data) {
+ case SP_VERB_FIT_CANVAS_TO_SELECTION:
+ fit_canvas_to_selection(dt);
+ break;
+ case SP_VERB_FIT_CANVAS_TO_DRAWING:
+ fit_canvas_to_drawing(doc);
+ break;
+ case SP_VERB_FIT_CANVAS_TO_SELECTION_OR_DRAWING:
+ fit_canvas_to_selection_or_drawing(dt);
+ break;
+ default:
+ return;
+ }
+
+ return;
+}
+/* *********** End Fit Canvas ********** */
+
+
+
+
+
+
/* these must be in the same order as the SP_VERB_* enum in "verbs.h" */
Verb *Verb::_base_verbs[] = {
/* Header */
N_("Memory usage information"), NULL),
new HelpVerb(SP_VERB_HELP_ABOUT, "HelpAbout", N_("_About Inkscape"),
N_("Inkscape version, authors, license"), /*"help_about"*/"inkscape_options"),
+ //new HelpVerb(SP_VERB_SHOW_LICENSE, "ShowLicense", N_("_License"),
+ // N_("Distribution terms"), /*"show_license"*/"inkscape_options"),
/* Tutorials */
new TutorialVerb(SP_VERB_TUTORIAL_BASIC, "TutorialsBasic", N_("Inkscape: _Basic"),
new EffectLastVerb(SP_VERB_EFFECT_LAST_PREF, "EffectLastPref", N_("Previous Effect Settings..."),
N_("Repeat the last effect with new settings"), NULL/*"tutorial_tips"*/),
+ /* Fit Canvas */
+ new FitCanvasVerb(SP_VERB_FIT_CANVAS_TO_SELECTION, "FitCanvasToSelection", N_("Fit Canvas to Selection"),
+ N_("Fit the canvas to the current selection"), NULL),
+ new FitCanvasVerb(SP_VERB_FIT_CANVAS_TO_DRAWING, "FitCanvasToDrawing", N_("Fit Canvas to Drawing"),
+ N_("Fit the canvas to the drawing"), NULL),
+ new FitCanvasVerb(SP_VERB_FIT_CANVAS_TO_SELECTION_OR_DRAWING, "FitCanvasToSelectionOrDrawing", N_("Fit Canvas to Selection or Drawing"),
+ N_("Fit the canvas to the current selection or the drawing if there is no selection"), NULL),
+
/* Footer */
new Verb(SP_VERB_LAST, NULL, NULL, NULL, NULL)
};