diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2017-01-25 09:14:59 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2017-01-25 09:14:59 +0000 |
| commit | 632c205171ef6734d166ed39b61e10a2b1566bf3 (patch) | |
| tree | 098941152239f5b290127f10970728316830e0bd /src | |
| parent | merge lp:~inkscape.dev/inkscape/doc_rotate (diff) | |
| download | inkscape-632c205171ef6734d166ed39b61e10a2b1566bf3.tar.gz inkscape-632c205171ef6734d166ed39b61e10a2b1566bf3.zip | |
Comented one of the shortcuts for doc rotate because bad response now interactive mode onlu fire with CTRL+MMB
(bzr r15445)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/tools/tool-base.cpp | 32 | ||||
| -rw-r--r-- | src/widgets/desktop-widget.cpp | 2 |
2 files changed, 17 insertions, 17 deletions
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp index ca700f652..aab256712 100644 --- a/src/ui/tools/tool-base.cpp +++ b/src/ui/tools/tool-base.cpp @@ -732,13 +732,13 @@ bool ToolBase::root_handler(GdkEvent* event) { break; case GDK_KEY_space: - if (event->key.state & GDK_CONTROL_MASK) { - sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), event->button.time); - desktop->canvas->startRotateTo(desktop->namedview->document_rotation); - this->rotating_mode = true; - this->message_context->set(Inkscape::INFORMATION_MESSAGE, - _("<b>Space+mouse move</b> to rotate canvas, use modifiers on screen to change snaps")); - } else { +// if (event->key.state & GDK_CONTROL_MASK) { +// sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), event->button.time); +// desktop->canvas->startRotateTo(desktop->namedview->document_rotation); +// this->rotating_mode = true; +// this->message_context->set(Inkscape::INFORMATION_MESSAGE, +// _("<b>Space+mouse move</b> to rotate canvas, use modifiers on screen to change snaps")); +// } else { within_tolerance = true; xp = yp = 0; if (!allow_panning) break; @@ -746,7 +746,7 @@ bool ToolBase::root_handler(GdkEvent* event) { this->space_panning = true; this->message_context->set(Inkscape::INFORMATION_MESSAGE, _("<b>Space+mouse move</b> to pan canvas")); - } +// } ret = TRUE; break; @@ -805,14 +805,14 @@ bool ToolBase::root_handler(GdkEvent* event) { switch (get_group0_keyval(&event->key)) { case GDK_KEY_space: - if (this->rotating_mode) { - desktop->canvas->clearRotateTo(); - this->rotating_mode = false; - ret = TRUE; - if (desktop->canvas->endRotateTo()) { - sp_repr_set_svg_double(desktop->namedview->getRepr(), "inkscape:document-rotation", angle); - } - } +// if (this->rotating_mode) { +// desktop->canvas->clearRotateTo(); +// this->rotating_mode = false; +// ret = TRUE; +// if (desktop->canvas->endRotateTo()) { +// sp_repr_set_svg_double(desktop->namedview->getRepr(), "inkscape:document-rotation", angle); +// } +// } if (within_tolerance) { // Space was pressed, but not panned sp_toggle_selector(desktop); diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index 8dddb40eb..f0d0541c2 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -614,7 +614,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) // Rotate status spinbutton dtw->rotation_status = gtk_spin_button_new_with_range (-360.0,360.0, 1.0); - gtk_widget_set_tooltip_text (dtw->rotation_status, _("Rotation. Can be interactive with CTRL+SPACEBAR or CTRL+MMB")); + gtk_widget_set_tooltip_text (dtw->rotation_status, _("Rotation. Can be interactive with CTRL+MMB")); gtk_widget_set_size_request (dtw->rotation_status, STATUS_ROTATION_WIDTH, -1); gtk_entry_set_width_chars (GTK_ENTRY (dtw->rotation_status), 7); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (dtw->rotation_status), FALSE); |