summaryrefslogtreecommitdiffstats
path: root/src/ui/widget
diff options
context:
space:
mode:
authorNicholas Bishop <nicholasbishop@gmail.com>2007-08-01 20:33:00 +0000
committernicholasbishop <nicholasbishop@users.sourceforge.net>2007-08-01 20:33:00 +0000
commit7071591e0ab43a37e6e4a6875878aa201e49cc5e (patch)
tree9143677d4f19a4f4c2eb5579bb1c04c68c158d2f /src/ui/widget
parentRenamed various classes: (diff)
downloadinkscape-7071591e0ab43a37e6e4a6875878aa201e49cc5e.tar.gz
inkscape-7071591e0ab43a37e6e4a6875878aa201e49cc5e.zip
Filter effects dialog:
Removed unused header file. (bzr r3359)
Diffstat (limited to 'src/ui/widget')
-rw-r--r--src/ui/widget/filter-effect-chooser.cpp7
-rw-r--r--src/ui/widget/filter-effect-chooser.h4
2 files changed, 6 insertions, 5 deletions
diff --git a/src/ui/widget/filter-effect-chooser.cpp b/src/ui/widget/filter-effect-chooser.cpp
index 9cc235895..0820a2f28 100644
--- a/src/ui/widget/filter-effect-chooser.cpp
+++ b/src/ui/widget/filter-effect-chooser.cpp
@@ -72,8 +72,9 @@ void FilterEffectChooser::update_filters()
Gtk::TreeModel::Row row = *_model->append();
SPFilter* f = (SPFilter*)l->data;
row[_columns.filter] = f;
+ const gchar* lbl = f->label();
const gchar* id = SP_OBJECT_ID(f);
- row[_columns.id] = id ? id : "";
+ row[_columns.label] = lbl ? lbl : (id ? id : "filter");
}
}
@@ -113,7 +114,7 @@ SimpleFilterModifier::SimpleFilterModifier()
_blend.signal_changed().connect(signal_blend_blur_changed());
_blur.signal_value_changed().connect(signal_blend_blur_changed());
_filter.set_model(_model);
- _filter.pack_start(_columns.id);
+ _filter.pack_start(_columns.label);
_edit_filters.signal_clicked().connect(sigc::mem_fun(*this, &SimpleFilterModifier::show_filter_dialog));
_edit_filters.set_use_underline();
@@ -188,7 +189,7 @@ void SimpleFilterModifier::update_filters()
// Set state if no filters exist
Gtk::TreeModel::Row row = *_model->prepend();
row[_columns.filter] = 0;
- row[_columns.id] = "None";
+ row[_columns.label] = "None";
_filter.set_sensitive(false);
_filter.set_active(0);
}
diff --git a/src/ui/widget/filter-effect-chooser.h b/src/ui/widget/filter-effect-chooser.h
index 9a49f523b..5d1d16efd 100644
--- a/src/ui/widget/filter-effect-chooser.h
+++ b/src/ui/widget/filter-effect-chooser.h
@@ -44,12 +44,12 @@ protected:
Columns()
{
add(filter);
- add(id);
+ add(label);
add(sel);
}
Gtk::TreeModelColumn<SPFilter*> filter;
- Gtk::TreeModelColumn<Glib::ustring> id;
+ Gtk::TreeModelColumn<Glib::ustring> label;
Gtk::TreeModelColumn<int> sel;
};