summaryrefslogtreecommitdiffstats
path: root/src/ui/dialog/livepatheffect-editor.cpp
diff options
context:
space:
mode:
authorKrzysztof Kosi??ski <tweenk.pl@gmail.com>2011-07-15 00:21:05 +0000
committerKrzysztof KosiƄski <tweenk.pl@gmail.com>2011-07-15 00:21:05 +0000
commit896fc3e9669eb94159e5471f41f95be9f8f90611 (patch)
treede2eba4091750cb621c2246fc18204c38fc9204b /src/ui/dialog/livepatheffect-editor.cpp
parentMerge SPCanvasArena caching layer work (diff)
downloadinkscape-896fc3e9669eb94159e5471f41f95be9f8f90611.tar.gz
inkscape-896fc3e9669eb94159e5471f41f95be9f8f90611.zip
Remove the icon-names.h thing, which was a mistake.
The file now contains a no-op macro which is used to mark icon names. This way we can still generate a list of icon names we use using a simple grep, but don't trigger unnecessary rebuilds when a new icon names is added. (bzr r10452)
Diffstat (limited to 'src/ui/dialog/livepatheffect-editor.cpp')
-rw-r--r--src/ui/dialog/livepatheffect-editor.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp
index bf60fe059..40b7f26ac 100644
--- a/src/ui/dialog/livepatheffect-editor.cpp
+++ b/src/ui/dialog/livepatheffect-editor.cpp
@@ -138,7 +138,7 @@ LivePathEffectEditor::LivePathEffectEditor()
//Add the visibility icon column:
Inkscape::UI::Widget::ImageToggler *eyeRenderer = manage( new Inkscape::UI::Widget::ImageToggler(
- INKSCAPE_ICON_OBJECT_VISIBLE, INKSCAPE_ICON_OBJECT_HIDDEN) );
+ INKSCAPE_ICON("object-visible"), INKSCAPE_ICON("object-visible")) );
int visibleColNum = effectlist_view.append_column("is_visible", *eyeRenderer) - 1;
eyeRenderer->signal_toggled().connect( sigc::mem_fun(*this, &LivePathEffectEditor::on_visibility_toggled) );
eyeRenderer->property_activatable() = true;
@@ -245,7 +245,7 @@ LivePathEffectEditor::onSelectionChanged(Inkscape::Selection *sel)
// this was triggered by selecting a row in the list, so skip reloading
lpe_list_locked = false;
return;
- }
+ }
effectlist_store->clear();
current_lpeitem = NULL;
@@ -265,7 +265,7 @@ LivePathEffectEditor::onSelectionChanged(Inkscape::Selection *sel)
Inkscape::LivePathEffect::Effect *lpe = sp_lpe_item_get_current_lpe(lpeitem);
if (lpe) {
showParams(*lpe);
- lpe_list_locked = true;
+ lpe_list_locked = true;
selectInList(lpe);
} else {
showText(_("Unknown effect is applied"));