![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/verbs.cpp b/src/verbs.cpp
index 711f24879ec64a0d27cedd54db3500cf81034b2c..ea4ffd71bcdef5ac9ad8d47b0dd499419f3560ae 100644 (file)
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
#include "gradient-context.h"
#include "shape-editor.h"
#include "draw-context.h"
+#include "gradient-drag.h"
/**
namespace Inkscape {
-/// \todo !!!FIXME:: kill this, use DialogManager instead!!!
-
-class PanelDialog : public Inkscape::UI::Dialog::Dialog
-{
-public:
- PanelDialog(char const *prefs_path, int const verb_num) :
- Dialog(
- (prefs_get_int_attribute_limited ("options.dialogtype", "value", UI::Dialog::DOCK, 0, 1) == UI::Dialog::FLOATING ?
- &UI::Dialog::Behavior::FloatingBehavior::create :
- &UI::Dialog::Behavior::DockBehavior::create),
- prefs_path, verb_num) {}
-/*
- virtual Glib::ustring getName() const {return "foo";}
- virtual Glib::ustring getDesc() const {return "bar";}
-*/
-};
-
-/** \brief Utility function to get a panel displayed. */
-static void show_panel( Inkscape::UI::Widget::Panel &panel, char const *prefs_path, int const verb_num )
-{
- Gtk::Container *container = panel.get_toplevel();
- if ( &panel == container ) { // safe check?
- //g_message("Creating new dialog to hold it");
- PanelDialog *dia = new PanelDialog(prefs_path, verb_num);
- Gtk::VBox *mainVBox = dia->get_vbox();
- mainVBox->pack_start(panel);
- dia->show_all_children();
- dia->read_geometry();
- dia->present();
- } else {
- PanelDialog *dia = dynamic_cast<PanelDialog*>(container);
- if ( dia ) {
- //g_message("Found an existing dialog");
- dia->read_geometry();
- dia->present();
- } else {
- g_message("Failed to find an existing dialog");
- }
- }
-}
-
-
/** \brief A class to encompass all of the verbs which deal with
file operations. */
class FileVerb : public Verb {
\return NULL to represent error (this function shouldn't ever be called)
*/
SPAction *
-Verb::make_action(Inkscape::UI::View::View *view)
+Verb::make_action(Inkscape::UI::View::View */*view*/)
{
//std::cout << "make_action" << std::endl;
return NULL;
for (ActionTable::iterator cur_action = _actions->begin();
cur_action != _actions->end();
cur_action++) {
- if (in_doc == NULL || (cur_action->first != NULL && cur_action->first->doc() == in_doc)) {
+ if (in_doc == NULL || (cur_action->first != NULL && cur_action->first->doc() == in_doc)) {
sp_action_set_sensitive(cur_action->second, in_sensitive ? 1 : 0);
}
}
for (ActionTable::iterator cur_action = _actions->begin();
cur_action != _actions->end();
cur_action++) {
- if (in_doc == NULL || (cur_action->first != NULL && cur_action->first->doc() == in_doc)) {
- sp_action_set_name(cur_action->second, in_name);
+ if (in_doc == NULL || (cur_action->first != NULL && cur_action->first->doc() == in_doc)) {
+ sp_action_set_name(cur_action->second, in_name);
}
}
}
/** \brief Decode the verb code and take appropriate action */
void
-FileVerb::perform(SPAction *action, void *data, void *pdata)
+FileVerb::perform(SPAction *action, void *data, void */*pdata*/)
{
#if 0
/* These aren't used, but are here to remind people not to use
#endif
SPDesktop *desktop = dynamic_cast<SPDesktop*>(sp_action_get_view(action));
- g_assert(desktop != NULL);
- Gtk::Window *parent = desktop->getToplevel();
- g_assert(parent != NULL);
+ g_assert(desktop != NULL);
+ Gtk::Window *parent = desktop->getToplevel();
+ g_assert(parent != NULL);
switch ((long) data) {
case SP_VERB_FILE_NEW:
/** \brief Decode the verb code and take appropriate action */
void
-EditVerb::perform(SPAction *action, void *data, void *pdata)
+EditVerb::perform(SPAction *action, void *data, void */*pdata*/)
{
SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action));
if (!dt)
case SP_VERB_EDIT_UNLINK_CLONE:
sp_selection_unlink();
break;
- case SP_VERB_EDIT_CLONE_ORIGINAL:
+ case SP_VERB_EDIT_CLONE_SELECT_ORIGINAL:
sp_select_clone_original();
break;
+ case SP_VERB_EDIT_SELECTION_2_MARKER:
+ sp_selection_to_marker();
+ break;
case SP_VERB_EDIT_TILE:
sp_selection_tile();
break;
case SP_VERB_EDIT_SELECT_NEXT:
if (tools_isactive(dt, TOOLS_NODES)) {
SP_NODE_CONTEXT(ec)->shape_editor->select_next();
- } else if (tools_isactive(dt, TOOLS_GRADIENT)) {
+ } else if (tools_isactive(dt, TOOLS_GRADIENT)
+ && ec->_grdrag->isNonEmpty()) {
sp_gradient_context_select_next (ec);
} else {
sp_selection_item_next();
case SP_VERB_EDIT_SELECT_PREV:
if (tools_isactive(dt, TOOLS_NODES)) {
SP_NODE_CONTEXT(ec)->shape_editor->select_prev();
- } else if (tools_isactive(dt, TOOLS_GRADIENT)) {
+ } else if (tools_isactive(dt, TOOLS_GRADIENT)
+ && ec->_grdrag->isNonEmpty()) {
sp_gradient_context_select_prev (ec);
} else {
sp_selection_item_prev();
sp_desktop_selection(dt)->clear();
}
break;
+
+ case SP_VERB_EDIT_NEXT_PATHEFFECT_PARAMETER:
+ sp_selection_next_patheffect_param(dt);
+ break;
default:
break;
}
/** \brief Decode the verb code and take appropriate action */
void
-SelectionVerb::perform(SPAction *action, void *data, void *pdata)
+SelectionVerb::perform(SPAction *action, void *data, void */*pdata*/)
{
SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action));
/** \brief Decode the verb code and take appropriate action */
void
-LayerVerb::perform(SPAction *action, void *data, void *pdata)
+LayerVerb::perform(SPAction *action, void *data, void */*pdata*/)
{
SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action));
unsigned int verb = reinterpret_cast<std::size_t>(data);
if (next) {
dt->setCurrentLayer(next);
sp_document_done(sp_desktop_document(dt), SP_VERB_LAYER_NEXT,
- _("Move to next layer"));
- dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Moved to next layer."));
+ _("Switch to next layer"));
+ dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Switched to next layer."));
} else {
- dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Cannot move past last layer."));
+ dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Cannot go past last layer."));
}
break;
}
if (prev) {
dt->setCurrentLayer(prev);
sp_document_done(sp_desktop_document(dt), SP_VERB_LAYER_PREV,
- _("Move to previous layer"));
- dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Moved to previous layer."));
+ _("Switch to previous layer"));
+ dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Switched to previous layer."));
} else {
- dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Cannot move past first layer."));
+ dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Cannot go before first layer."));
}
break;
}
/** \brief Decode the verb code and take appropriate action */
void
-ObjectVerb::perform( SPAction *action, void *data, void *pdata )
+ObjectVerb::perform( SPAction *action, void *data, void */*pdata*/ )
{
SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action));
if (!dt)
// ... flip the selected nodes about that node
SP_NODE_CONTEXT(ec)->shape_editor->flip(NR::X, active_node->pos);
- } else {
+ } else {
// ... or else about the center of their bounding box.
SP_NODE_CONTEXT(ec)->shape_editor->flip(NR::X);
/** \brief Decode the verb code and take appropriate action */
void
-ContextVerb::perform(SPAction *action, void *data, void *pdata)
+ContextVerb::perform(SPAction *action, void *data, void */*pdata*/)
{
SPDesktop *dt;
sp_verb_t verb;
/** \brief Decode the verb code and take appropriate action */
void
-TextVerb::perform(SPAction *action, void *data, void *pdata)
+TextVerb::perform(SPAction *action, void */*data*/, void */*pdata*/)
{
SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action));
if (!dt)
/** \brief Decode the verb code and take appropriate action */
void
-ZoomVerb::perform(SPAction *action, void *data, void *pdata)
+ZoomVerb::perform(SPAction *action, void *data, void */*pdata*/)
{
SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action));
if (!dt)
sp_namedview_toggle_guides(doc, repr);
break;
case SP_VERB_TOGGLE_GRID:
- dt->toggleGrid();
+ dt->toggleGrids();
break;
#ifdef HAVE_GTK_WINDOW_FULLSCREEN
case SP_VERB_FULLSCREEN:
case SP_VERB_VIEW_MODE_TOGGLE:
dt->displayModeToggle();
break;
+ case SP_VERB_VIEW_CMS_TOGGLE:
+ dt->toggleColorProfAdjust();
+ break;
case SP_VERB_VIEW_ICON_PREVIEW:
inkscape_dialogs_unhide();
dt->_dlg_mgr->showDialog("IconPreviewPanel");
/** \brief Decode the verb code and take appropriate action */
void
-DialogVerb::perform(SPAction *action, void *data, void *pdata)
+DialogVerb::perform(SPAction *action, void *data, void */*pdata*/)
{
if (reinterpret_cast<std::size_t>(data) != SP_VERB_DIALOG_TOGGLE) {
// unhide all when opening a new dialog
dt->_dlg_mgr->showDialog("FillAndStroke");
break;
case SP_VERB_DIALOG_SWATCHES:
- show_panel( Inkscape::UI::Dialogs::SwatchesPanel::getInstance(), "dialogs.swatches", SP_VERB_DIALOG_SWATCHES);
- break;
+ dt->_dlg_mgr->showDialog("Swatches");
+ break;
case SP_VERB_DIALOG_TRANSFORM:
dt->_dlg_mgr->showDialog("Transformation");
break;
break;
#ifdef WITH_INKBOARD
case SP_VERB_XMPP_CLIENT:
- {
+ {
Inkscape::Whiteboard::SessionManager::showClient();
- break;
- }
+ break;
+ }
#endif
case SP_VERB_DIALOG_INPUT:
sp_input_dialog();
/** \brief Decode the verb code and take appropriate action */
void
-HelpVerb::perform(SPAction *action, void *data, void *pdata)
+HelpVerb::perform(SPAction *action, void *data, void */*pdata*/)
{
SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action));
g_assert(dt->_dlg_mgr != NULL);
sp_help_about();
break;
case SP_VERB_HELP_ABOUT_EXTENSIONS: {
- Inkscape::UI::Dialogs::ExtensionsPanel *panel = new Inkscape::UI::Dialogs::ExtensionsPanel();
- panel->set_full(true);
- show_panel( *panel, "dialogs.aboutextensions", SP_VERB_HELP_ABOUT_EXTENSIONS );
+ // Inkscape::UI::Dialogs::ExtensionsPanel *panel = new Inkscape::UI::Dialogs::ExtensionsPanel();
+ // panel->set_full(true);
+ // show_panel( *panel, "dialogs.aboutextensions", SP_VERB_HELP_ABOUT_EXTENSIONS );
break;
}
/** \brief Decode the verb code and take appropriate action */
void
-TutorialVerb::perform(SPAction *action, void *data, void *pdata)
+TutorialVerb::perform(SPAction */*action*/, void *data, void */*pdata*/)
{
switch (reinterpret_cast<std::size_t>(data)) {
case SP_VERB_TUTORIAL_BASIC:
/** \brief Decode the verb code and take appropriate action */
void
-EffectLastVerb::perform(SPAction *action, void *data, void *pdata)
+EffectLastVerb::perform(SPAction *action, void *data, void */*pdata*/)
{
/* These aren't used, but are here to remind people not to use
the CURRENT_DOCUMENT macros unless they really have to. */
/** \brief Decode the verb code and take appropriate action */
void
-FitCanvasVerb::perform(SPAction *action, void *data, void *pdata)
+FitCanvasVerb::perform(SPAction *action, void *data, void */*pdata*/)
{
SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action));
if (!dt) return;
/** \brief Decode the verb code and take appropriate action */
void
-LockAndHideVerb::perform(SPAction *action, void *data, void *pdata)
+LockAndHideVerb::perform(SPAction *action, void *data, void */*pdata*/)
{
SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action));
if (!dt) return;
N_("Create a clone (a copy linked to the original) of selected object"), "edit_clone"),
new EditVerb(SP_VERB_EDIT_UNLINK_CLONE, "EditUnlinkClone", N_("Unlin_k Clone"),
N_("Cut the selected clone's link to its original, turning it into a standalone object"), "edit_unlink_clone"),
- new EditVerb(SP_VERB_EDIT_CLONE_ORIGINAL, "EditCloneOriginal", N_("Select _Original"),
+ new EditVerb(SP_VERB_EDIT_CLONE_SELECT_ORIGINAL, "EditCloneSelectOriginal", N_("Select _Original"),
N_("Select the object to which the selected clone is linked"), "edit_select_original"),
+ // TRANSLATORS: Convert selection to a line marker
+ new EditVerb(SP_VERB_EDIT_SELECTION_2_MARKER, "ObjectsToMarker", N_("Objects to _Marker"),
+ N_("Convert selection to a line marker"), NULL),
// TRANSLATORS: Convert selection to a rectangle with tiled pattern fill
new EditVerb(SP_VERB_EDIT_TILE, "ObjectsToPattern", N_("Objects to Patter_n"),
N_("Convert selection to a rectangle with tiled pattern fill"), NULL),
N_("Select previous object or node"), NULL),
new EditVerb(SP_VERB_EDIT_DESELECT, "EditDeselect", N_("D_eselect"),
N_("Deselect any selected objects or nodes"), "selection_deselect"),
+ new EditVerb(SP_VERB_EDIT_NEXT_PATHEFFECT_PARAMETER, "EditNextPathEffectParameter", N_("Next Path Effect Parameter"),
+ N_("Show next Path Effect parameter for editing"), NULL),
/* Selection */
new SelectionVerb(SP_VERB_SELECTION_TO_FRONT, "SelectionToFront", N_("Raise to _Top"),
new ZoomVerb(SP_VERB_VIEW_MODE_TOGGLE, "ViewModeToggle", N_("_Toggle"),
N_("Toggle between normal and outline display modes"), NULL),
+ new ZoomVerb(SP_VERB_VIEW_CMS_TOGGLE, "ViewCmsToggle", N_("Display Adjustment"),
+ N_("Toggle CMS display adjustment on and off"), "swatches"),
+
new ZoomVerb(SP_VERB_VIEW_ICON_PREVIEW, "ViewIconPreview", N_("Ico_n Preview..."),
N_("Open a window to preview objects at different icon resolutions"), "view_icon_preview"),
new ZoomVerb(SP_VERB_ZOOM_PAGE, "ZoomPage", N_("_Page"),