From cfe9c94712a2ff6849b123672e51b603f20e76ae Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Thu, 10 Jan 2013 23:30:09 -0800 Subject: Warning and dead code cleanup. (bzr r12014) --- src/ui/dialog/inkscape-preferences.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ui/dialog/inkscape-preferences.cpp') diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index 6e6473c5a..c7760c5bd 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -1527,7 +1527,7 @@ void InkscapePreferences::onKBExport() sp_shortcut_file_export(); } -bool InkscapePreferences::onKBSearchKeyEvent(GdkEventKey *event) +bool InkscapePreferences::onKBSearchKeyEvent(GdkEventKey * /*event*/) { _kb_filter->refilter(); return FALSE; -- cgit v1.2.3 From 3a487f955c5544933ee2ebcfb481c8c3ed0df84b Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Mon, 14 Jan 2013 12:21:34 +0100 Subject: Preferences. Moving selection option to avoid confusion. (bzr r12023) --- src/ui/dialog/inkscape-preferences.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/ui/dialog/inkscape-preferences.cpp') diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index c7760c5bd..da5998097 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -1097,6 +1097,9 @@ void InkscapePreferences::initPageBehavior() _sel_locked.init ( _("Ignore locked objects and layers"), "/options/kbselection/onlysensitive", true); _sel_layer_deselects.init ( _("Deselect upon layer change"), "/options/selection/layerdeselect", true); + _page_select.add_line( false, "", _sel_layer_deselects, "", + _("Uncheck this to be able to keep the current objects selected when the current layer changes")); + _page_select.add_group_header( _("Ctrl+A, Tab, Shift+Tab")); _page_select.add_line( true, "", _sel_all, "", _("Make keyboard selection commands work on objects in all layers")); @@ -1109,10 +1112,6 @@ void InkscapePreferences::initPageBehavior() _page_select.add_line( true, "", _sel_locked, "", _("Uncheck this to be able to select objects that are locked (either by themselves or by being in a locked layer)")); - _page_select.add_line( false, "", _sel_layer_deselects, "", - _("Uncheck this to be able to keep the current objects selected when the current layer changes")); - - _sel_cycle.init ( _("Wrap when cycling objects in z-order"), "/options/selection/cycleWrap", true); _page_select.add_group_header( _("Alt+Scroll Wheel")); -- cgit v1.2.3 From 50bce1d217a13cdf38e1687decdae3ca4a11c264 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Mon, 14 Jan 2013 19:49:20 +0100 Subject: clarify preference text (thought it was a bug first) (bzr r12025) --- src/ui/dialog/inkscape-preferences.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ui/dialog/inkscape-preferences.cpp') diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index da5998097..856e3e4b2 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -812,7 +812,7 @@ void InkscapePreferences::initPageIO() // Input devices options _mouse_sens.init ( "/options/cursortolerance/value", 0.0, 30.0, 1.0, 1.0, 8.0, true, false); - _page_mouse.add_line( false, _("_Grab sensitivity:"), _mouse_sens, _("pixels"), + _page_mouse.add_line( false, _("_Grab sensitivity:"), _mouse_sens, _("pixels (requires restart)"), _("How close on the screen you need to be to an object to be able to grab it with mouse (in screen pixels)"), false); _mouse_thres.init ( "/options/dragtolerance/value", 0.0, 20.0, 1.0, 1.0, 4.0, true, false); _page_mouse.add_line( false, _("_Click/drag threshold:"), _mouse_thres, _("pixels"), -- cgit v1.2.3 From 66ab0fabcd526c71213502b3a0ebd4abdd26ef34 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Fri, 18 Jan 2013 12:54:46 +0100 Subject: i18n. Shortcuts preferences are now fully translatable. (bzr r12042) --- src/ui/dialog/inkscape-preferences.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/ui/dialog/inkscape-preferences.cpp') diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index 856e3e4b2..d963e0c7f 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -1651,7 +1651,7 @@ void InkscapePreferences::onKBListKeyboardShortcuts() } // Find this group in the tree - Glib::ustring group = verb->get_group() ? verb->get_group() : "Misc"; + Glib::ustring group = verb->get_group() ? _(verb->get_group()) : _("Misc"); Gtk::TreeStore::iterator iter_group; bool found = false; while (path) { @@ -1679,7 +1679,7 @@ void InkscapePreferences::onKBListKeyboardShortcuts() } // Remove the key accelerators from the verb name - Glib::ustring name = verb->get_name(); + Glib::ustring name = _(verb->get_name()); std::string::size_type k = 0; while((k=name.find('_',k))!=name.npos) { name.erase(k, 1); @@ -1698,9 +1698,9 @@ void InkscapePreferences::onKBListKeyboardShortcuts() } // Add the verb to the group Gtk::TreeStore::iterator row = _kb_store->append(iter_group->children()); - (*row)[_kb_columns.name] = name; + (*row)[_kb_columns.name] = name; (*row)[_kb_columns.shortcut] = shortcut_label; - (*row)[_kb_columns.description] = verb->get_short_tip() ? verb->get_short_tip() : ""; + (*row)[_kb_columns.description] = verb->get_short_tip() ? _(verb->get_short_tip()) : ""; (*row)[_kb_columns.shortcutid] = shortcut_id; (*row)[_kb_columns.id] = verb->get_id(); (*row)[_kb_columns.user_set] = sp_shortcut_is_user_set(verb); -- cgit v1.2.3