From 96c0a2246b5a04e4a1c07dea343518ca72851464 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Thu, 10 Jan 2013 06:34:16 +0100 Subject: Filters. Fix for Bug #1089406 (filter name is random filter232 when first added) by insaner. (bzr r12012) --- src/ui/dialog/filter-effects-dialog.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/ui/dialog') diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp index 7574b9266..0e25fece9 100644 --- a/src/ui/dialog/filter-effects-dialog.cpp +++ b/src/ui/dialog/filter-effects-dialog.cpp @@ -1201,6 +1201,7 @@ void FilterEffectsDialog::FilterModifier::on_change_selection() { Inkscape::Selection *selection = sp_desktop_selection (SP_ACTIVE_DESKTOP); update_selection(selection); + update_filters(); } void FilterEffectsDialog::FilterModifier::on_modified_selection( guint flags ) -- cgit v1.2.3 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/filter-effects-dialog.cpp | 4 ++-- src/ui/dialog/inkscape-preferences.cpp | 2 +- src/ui/dialog/layers.cpp | 2 +- src/ui/dialog/ocaldialogs.cpp | 6 +++++- src/ui/dialog/symbols.cpp | 4 ++-- 5 files changed, 11 insertions(+), 7 deletions(-) (limited to 'src/ui/dialog') diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp index 0e25fece9..418132abb 100644 --- a/src/ui/dialog/filter-effects-dialog.cpp +++ b/src/ui/dialog/filter-effects-dialog.cpp @@ -1186,7 +1186,7 @@ void FilterEffectsDialog::FilterModifier::setTargetDesktop(SPDesktop *desktop) } // When the document changes, update connection to resources -void FilterEffectsDialog::FilterModifier::on_document_replaced(SPDesktop *desktop, SPDocument *document) +void FilterEffectsDialog::FilterModifier::on_document_replaced(SPDesktop * /*desktop*/, SPDocument *document) { if (_resource_changed) { _resource_changed.disconnect(); @@ -1686,7 +1686,7 @@ void FilterEffectsDialog::PrimitiveList::remove_selected() } #if !WITH_GTKMM_3_0 -bool FilterEffectsDialog::PrimitiveList::on_expose_signal(GdkEventExpose *e) +bool FilterEffectsDialog::PrimitiveList::on_expose_signal(GdkEventExpose * /*evt*/) { bool result = false; 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; diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp index 4f7b8f27c..fdc33b2a6 100644 --- a/src/ui/dialog/layers.cpp +++ b/src/ui/dialog/layers.cpp @@ -655,7 +655,7 @@ bool LayersPanel::_handleButtonEvent(GdkEventButton* event) * Drap and drop within the tree * Save the drag source and drop target SPObjects and if its a drag between layers or into (sublayer) a layer */ -bool LayersPanel::_handleDragDrop(const Glib::RefPtr& context, int x, int y, guint time) +bool LayersPanel::_handleDragDrop(const Glib::RefPtr& /*context*/, int x, int y, guint /*time*/) { int cell_x = 0, cell_y = 0; Gtk::TreeModel::Path target_path; diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp index 75c766566..09ce59e9c 100644 --- a/src/ui/dialog/ocaldialogs.cpp +++ b/src/ui/dialog/ocaldialogs.cpp @@ -324,7 +324,11 @@ bool LoadingBox::_on_expose_event(GdkEventExpose* /*event*/) } #endif -bool LoadingBox::_on_draw(const Cairo::RefPtr& cr) +bool LoadingBox::_on_draw(const Cairo::RefPtr & +#if WITH_GTKMM_3_0 +cr +#endif +) { // Draw shadow int x = get_allocation().get_x(); diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp index 3188f1681..71674368b 100644 --- a/src/ui/dialog/symbols.cpp +++ b/src/ui/dialog/symbols.cpp @@ -231,8 +231,8 @@ void SymbolsDialog::rebuild() { draw_symbols( symbolDocument ); } -void SymbolsDialog::iconDragDataGet(const Glib::RefPtr& context, Gtk::SelectionData& data, guint info, guint time) { - +void SymbolsDialog::iconDragDataGet(const Glib::RefPtr& /*context*/, Gtk::SelectionData& data, guint /*info*/, guint /*time*/) +{ #if WITH_GTKMM_3_0 std::vector iconArray = iconView->get_selected_items(); #else -- 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') 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') 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 dd4c7a17222e0d6c33615236a9ac558d23661e67 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Tue, 15 Jan 2013 09:36:54 +0100 Subject: i18n. String disambiguation. Translations. Translations template and French translation update. (bzr r12026) --- src/ui/dialog/guides.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/ui/dialog') diff --git a/src/ui/dialog/guides.cpp b/src/ui/dialog/guides.cpp index 1f02002ca..d8bbb5539 100644 --- a/src/ui/dialog/guides.cpp +++ b/src/ui/dialog/guides.cpp @@ -45,8 +45,8 @@ namespace Dialogs { GuidelinePropertiesDialog::GuidelinePropertiesDialog(SPGuide *guide, SPDesktop *desktop) : _desktop(desktop), _guide(guide), _relative_toggle(_("Rela_tive change"), _("Move and/or rotate the guide relative to current settings")), - _spin_button_x(_("_X:"), "", UNIT_TYPE_LINEAR, "", "", &_unit_menu), - _spin_button_y(_("_Y:"), "", UNIT_TYPE_LINEAR, "", "", &_unit_menu), + _spin_button_x(C_("Guides", "_X:"), "", UNIT_TYPE_LINEAR, "", "", &_unit_menu), + _spin_button_y(C_("Guides", "_Y:"), "", UNIT_TYPE_LINEAR, "", "", &_unit_menu), _label_entry(_("_Label:"), _("Optionally give this guideline a name")), _spin_angle(_("_Angle:"), "", UNIT_TYPE_RADIAL), _mode(true), _oldpos(0.,0.), _oldangle(0.0) -- cgit v1.2.3 From 50bf4919dcdf6279d579face174dc2881d593cf3 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Wed, 16 Jan 2013 00:37:04 +0000 Subject: Cleanup EekPreview widget implementation: * Strip out dead code * Move all properties to private structure * Use modern GObject style in most places * Replace explicit get_type implementation with G_DEFINE_TYPE (bzr r12028) --- src/ui/dialog/color-item.cpp | 57 +++++--------------------------------------- 1 file changed, 6 insertions(+), 51 deletions(-) (limited to 'src/ui/dialog') diff --git a/src/ui/dialog/color-item.cpp b/src/ui/dialog/color-item.cpp index e370a0342..2ff4ed657 100644 --- a/src/ui/dialog/color-item.cpp +++ b/src/ui/dialog/color-item.cpp @@ -573,46 +573,21 @@ Gtk::Widget* ColorItem::getPreview(PreviewStyle style, ViewType view, ::PreviewS lbl->set_alignment(Gtk::ALIGN_START, Gtk::ALIGN_CENTER); widget = lbl; } else { -// Glib::ustring blank(" "); -// if ( size == Inkscape::ICON_SIZE_MENU || size == Inkscape::ICON_SIZE_DECORATION ) { -// blank = " "; -// } - GtkWidget* eekWidget = eek_preview_new(); EekPreview * preview = EEK_PREVIEW(eekWidget); Gtk::Widget* newBlot = Glib::wrap(eekWidget); - _regenPreview(preview); - eek_preview_set_details( preview, (::PreviewStyle)style, (::ViewType)view, (::PreviewSize)size, ratio, border ); + eek_preview_set_details( preview, + (::ViewType)view, + (::PreviewSize)size, + ratio, + border ); def.addCallback( _colorDefChanged, this ); - - GValue val = {0, {{0}, {0}}}; - g_value_init( &val, G_TYPE_BOOLEAN ); - g_value_set_boolean( &val, FALSE ); - g_object_set_property( G_OBJECT(preview), "focus-on-click", &val ); - -/* - Gtk::Button *btn = new Gtk::Button(blank); - Gdk::Color color; - color.set_rgb((_r << 8)|_r, (_g << 8)|_g, (_b << 8)|_b); - btn->modify_bg(Gtk::STATE_NORMAL, color); - btn->modify_bg(Gtk::STATE_ACTIVE, color); - btn->modify_bg(Gtk::STATE_PRELIGHT, color); - btn->modify_bg(Gtk::STATE_SELECTED, color); - - Gtk::Widget* newBlot = btn; -*/ - + eek_preview_set_focus_on_click(preview, FALSE); newBlot->set_tooltip_text(def.descr); -/* - newBlot->signal_clicked().connect( sigc::mem_fun(*this, &ColorItem::buttonClicked) ); - - sigc::signal type_signal_something; -*/ - g_signal_connect( G_OBJECT(newBlot->gobj()), "clicked", G_CALLBACK(handleClick), @@ -674,26 +649,6 @@ Gtk::Widget* ColorItem::getPreview(PreviewStyle style, ViewType view, ::PreviewS G_CALLBACK(handleLeaveNotify), this); -// g_signal_connect( G_OBJECT(newBlot->gobj()), -// "drag-drop", -// G_CALLBACK(dragDropColorData), -// this); - - if ( def.isEditable() ) - { -// gtk_drag_dest_set( GTK_WIDGET(newBlot->gobj()), -// GTK_DEST_DEFAULT_ALL, -// destColorTargets, -// G_N_ELEMENTS(destColorTargets), -// GdkDragAction(GDK_ACTION_COPY | GDK_ACTION_MOVE) ); - - -// g_signal_connect( G_OBJECT(newBlot->gobj()), -// "drag-data-received", -// G_CALLBACK(_dropDataIn), -// this ); - } - g_signal_connect( G_OBJECT(newBlot->gobj()), "destroy", G_CALLBACK(dieDieDie), -- 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') 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