From e49c087d2ea128bdf66cc60871649b49a6ac97af Mon Sep 17 00:00:00 2001 From: tweenk Date: Thu, 26 Feb 2009 02:52:45 +0000 Subject: [PATCH] Several icon name fixes --- .../hicolor/scalable/actions/Makefile.am | 1 + .../hicolor/scalable/actions/window-new.svg | 197 ++++++++++++++++++ share/icons/hicolor/update-makefiles.sh | 8 +- src/main.cpp | 3 + src/ui/icon-names.h | 2 +- src/ui/widget/layer-selector.cpp | 7 +- src/widgets/desktop-widget.cpp | 5 +- src/widgets/toolbox.cpp | 2 +- 8 files changed, 215 insertions(+), 10 deletions(-) create mode 100644 share/icons/hicolor/scalable/actions/window-new.svg diff --git a/share/icons/hicolor/scalable/actions/Makefile.am b/share/icons/hicolor/scalable/actions/Makefile.am index 213a6ddc7..b1cca3d10 100644 --- a/share/icons/hicolor/scalable/actions/Makefile.am +++ b/share/icons/hicolor/scalable/actions/Makefile.am @@ -173,6 +173,7 @@ icons_DATA = \ transform-scale-vertical.svg \ transform-skew-horizontal.svg \ transform-skew-vertical.svg \ + window-new.svg \ window-next.svg \ window-previous.svg \ xml-attribute-delete.svg \ diff --git a/share/icons/hicolor/scalable/actions/window-new.svg b/share/icons/hicolor/scalable/actions/window-new.svg new file mode 100644 index 000000000..99f56a25d --- /dev/null +++ b/share/icons/hicolor/scalable/actions/window-new.svg @@ -0,0 +1,197 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/share/icons/hicolor/update-makefiles.sh b/share/icons/hicolor/update-makefiles.sh index b802df053..50f7f966a 100755 --- a/share/icons/hicolor/update-makefiles.sh +++ b/share/icons/hicolor/update-makefiles.sh @@ -13,14 +13,14 @@ if test -d $dir_size; then for dir in $dir_size/*; do if test -d $dir; then - ICONS_DATA=$(find $dir -name '*.svg' -and -not -name '*.svn*' -printf '\t%f \\\n' \ + ICONS_DATA=$(find $dir \( -name '*.svg' -o -name '*.png' \) -printf '\t%f \\\n' \ | sort \ | sed -e '$s|\\||') -SIZE=$(echo $dir_size | sed -e 's|x.*||') +#SIZE=$(echo $dir_size | sed -e 's|x.*||') CONTEXT=$(echo $dir | sed -e 's|^.*/||') echo \ 'themedir = $(pkgdatadir)/icons/hicolor -size = '$SIZE' +size = '$dir_size' context = '$CONTEXT' iconsdir = $(themedir)/$(size)/$(context) @@ -32,7 +32,7 @@ icons_DATA = \ '$ICONS_DATA' EXTRA_DIST = $(icons_DATA)' > $dir/Makefile.am - fi +fi done fi diff --git a/src/main.cpp b/src/main.cpp index 9da8c3048..bfee432ba 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -836,7 +836,10 @@ sp_main_gui(int argc, char const **argv) g_return_val_if_fail(retVal == 0, 1); // Add our icon directory to the search path for icon theme lookups. + gchar *usericondir = profile_path("icons"); + gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), usericondir); gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), INKSCAPE_PIXMAPDIR); + g_free(usericondir); gdk_event_handler_set((GdkEventFunc)snooper, NULL, NULL); Inkscape::Debug::log_display_config(); diff --git a/src/ui/icon-names.h b/src/ui/icon-names.h index 00341c4dd..535b14795 100644 --- a/src/ui/icon-names.h +++ b/src/ui/icon-names.h @@ -513,7 +513,7 @@ #define INKSCAPE_ICON_VIEW_FULLSCREEN \ "view-fullscreen" #define INKSCAPE_ICON_WINDOW_NEW \ - "window-neW" + "window-new" #define INKSCAPE_ICON_WINDOW_NEXT \ "window-next" #define INKSCAPE_ICON_WINDOW_PREVIOUS \ diff --git a/src/ui/widget/layer-selector.cpp b/src/ui/widget/layer-selector.cpp index 51084b127..f25192b2a 100644 --- a/src/ui/widget/layer-selector.cpp +++ b/src/ui/widget/layer-selector.cpp @@ -23,6 +23,7 @@ #include "layer-manager.h" #include "sp-item.h" #include "ui/dialog/layer-properties.h" +#include "ui/icon-names.h" #include "ui/widget/layer-selector.h" #include "util/filter-list.h" #include "util/reverse-list.h" @@ -92,7 +93,8 @@ LayerSelector::LayerSelector(SPDesktop *desktop) { AlternateIcons *label; - label = Gtk::manage(new AlternateIcons(Inkscape::ICON_SIZE_DECORATION, "visible", "hidden")); + label = Gtk::manage(new AlternateIcons(Inkscape::ICON_SIZE_DECORATION, + INKSCAPE_ICON_OBJECT_VISIBLE, INKSCAPE_ICON_OBJECT_HIDDEN)); _visibility_toggle.add(*label); _visibility_toggle.signal_toggled().connect( sigc::compose( @@ -112,7 +114,8 @@ LayerSelector::LayerSelector(SPDesktop *desktop) _tooltips.set_tip(_visibility_toggle, _("Toggle current layer visibility")); pack_start(_visibility_toggle, Gtk::PACK_EXPAND_PADDING); - label = Gtk::manage(new AlternateIcons(Inkscape::ICON_SIZE_DECORATION, "lock_unlocked", "width_height_lock")); + label = Gtk::manage(new AlternateIcons(Inkscape::ICON_SIZE_DECORATION, + INKSCAPE_ICON_OBJECT_UNLOCKED, INKSCAPE_ICON_OBJECT_LOCKED)); _lock_toggle.add(*label); _lock_toggle.signal_toggled().connect( sigc::compose( diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index 356a09418..6550ca0cd 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -51,6 +51,7 @@ #include "toolbox.h" #include "ui/dialog/dialog-manager.h" #include "ui/dialog/swatches.h" +#include "ui/icon-names.h" #include "ui/widget/dock.h" #include "ui/widget/layer-selector.h" #include "ui/widget/selected-style.h" @@ -374,7 +375,7 @@ sp_desktop_widget_init (SPDesktopWidget *dtw) dtw->sticky_zoom = sp_button_new_from_data ( Inkscape::ICON_SIZE_DECORATION, SP_BUTTON_TYPE_TOGGLE, NULL, - "sticky_zoom", + INKSCAPE_ICON_ZOOM, _("Zoom drawing if window size changes"), dtw->tt); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dtw->sticky_zoom), prefs->getBool("/options/stickyzoom/value")); @@ -396,7 +397,7 @@ sp_desktop_widget_init (SPDesktopWidget *dtw) dtw->cms_adjust = sp_button_new_from_data( Inkscape::ICON_SIZE_DECORATION, SP_BUTTON_TYPE_TOGGLE, NULL, - "color_management", + INKSCAPE_ICON_COLOR_MANAGEMENT, tip, dtw->tt ); #if ENABLE_LCMS diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 3049d53e7..690b434e4 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -4352,7 +4352,7 @@ static void sp_tweak_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainAction InkToggleAction* act = ink_toggle_action_new( "TweakPressureAction", _("Pressure"), _("Use the pressure of the input device to alter the force of tweak action"), - "use_pressure", + INKSCAPE_ICON_DRAW_USE_PRESSURE, Inkscape::ICON_SIZE_DECORATION ); gtk_action_group_add_action( mainActions, GTK_ACTION( act ) ); g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(sp_tweak_pressure_state_changed), NULL); -- 2.30.2