summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJon A. Cruz <jon@joncruz.org>2010-07-25 04:49:41 +0000
committerJon A. Cruz <jon@joncruz.org>2010-07-25 04:49:41 +0000
commitf719429cac77f4902ac57751bde92b6b0fc9d021 (patch)
tree8237265f3119172b374711ac90bf5c1909c91fc1 /src
parentAdded preference to keep last selected item shown. (diff)
downloadinkscape-f719429cac77f4902ac57751bde92b6b0fc9d021.tar.gz
inkscape-f719429cac77f4902ac57751bde92b6b0fc9d021.zip
Added preference to suppress icon preview frames.
(bzr r9606.1.20)
Diffstat (limited to 'src')
-rw-r--r--src/preferences-skeleton.h1
-rw-r--r--src/ui/dialog/icon-preview.cpp12
2 files changed, 9 insertions, 4 deletions
diff --git a/src/preferences-skeleton.h b/src/preferences-skeleton.h
index e117e85a5..d7b93f13f 100644
--- a/src/preferences-skeleton.h
+++ b/src/preferences-skeleton.h
@@ -394,6 +394,7 @@ static char const preferences_skeleton[] =
" id=\"iconpreview\"\n"
" pack=\"1\"\n"
" selectionHold=\"0\"\n"
+" showFrames=\"1\"\n"
" selectionOnly=\"0\">\n"
" <group\n"
" id=\"sizes\">\n"
diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index d3a28d96f..2fb684a38 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -171,10 +171,14 @@ IconPreviewPanel::IconPreviewPanel() :
Glib::ustring label(*labels[i]);
buttons[i] = new Gtk::ToggleToolButton(label);
buttons[i]->set_active( i == hot );
- Gtk::Frame *frame = new Gtk::Frame();
- frame->set_shadow_type(Gtk::SHADOW_ETCHED_IN);
- frame->add(*images[i]);
- buttons[i]->set_icon_widget(*Gtk::manage(frame));
+ if ( prefs->getBool("/iconpreview/showFrames", true) ) {
+ Gtk::Frame *frame = new Gtk::Frame();
+ frame->set_shadow_type(Gtk::SHADOW_ETCHED_IN);
+ frame->add(*images[i]);
+ buttons[i]->set_icon_widget(*Gtk::manage(frame));
+ } else {
+ buttons[i]->set_icon_widget(*images[i]);
+ }
tips.set_tip((*buttons[i]), label);