diff --git a/AUTHORS b/AUTHORS index bfab65b6..c7f244f3 100644 --- a/AUTHORS +++ b/AUTHORS @@ -22,6 +22,12 @@ Curtis Gedak * Created OperationLabelPartition.h, OperationLabelPartition.cc * Maintained from official 0.3.5 release onward +Michael Monreal + * Wrote small patch to implement themed app icon in hicolor + +Sebastian Kraft + * Designed Tango theme icons + Bart Harkvoort * Original author of GParted. * Created and maintained up to official 0.3.3 release and diff --git a/ChangeLog b/ChangeLog index 7cf36ba0..70192e97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,36 @@ +2008-09-22 Curtis Gedak + + * configure.in, + src/Win_GParted.cc, + src/Makefile.am, + makefile.am: Enabled GParted to use themed app icon (Tango theme). + - Thanks to Sebastion Kraft for designing the icons. + - Thanks to Michael Monreal for the small patch to make use of themed + app icon from hicolor. + - Closes GParted bug #350894 + + * data/Makefile.am, + data/icons/Makefile.am, + data/icons/hicolor_apps_16x16_gparted.png, + data/icons/hicolor_apps_22x22_gparted.png, + data/icons/hicolor_apps_24x24_gparted.png, + data/icons/hicolor_apps_32x32_gparted.png, + data/icons/hicolor_apps_48x48_gparted.png, + data/icons/hicolor_apps_scalable_gparted.svg, + data/icons/svg/gparted.svg: Created files. + - Icons by Sebastian Kraft + - Small patch by Michael Monreal. + + * data, + data/icons, + data/icons/svg: Created directories. + - Small patch by Michael Monreal. + + * pixmaps, + pixmaps/Makefile.am, + pixmaps/gparted.png: Removed directory and files. + - This directory and its contents are no longer required - see above notes. + 2008-09-15 Curtis Gedak * configure.in, diff --git a/Makefile.am b/Makefile.am index cfd316e8..b846983d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,8 @@ ### Do not execute make in the help subdirectory if DISABLE_DOC is set if DISABLE_DOC -SUBDIRS = compose doc include pixmaps po src +SUBDIRS = compose data doc include po src else -SUBDIRS = help compose doc include pixmaps po src +SUBDIRS = help compose data doc include po src endif @INTLTOOL_DESKTOP_RULE@ diff --git a/configure.in b/configure.in index 9577b26a..1cec09ff 100644 --- a/configure.in +++ b/configure.in @@ -111,11 +111,12 @@ AM_CONDITIONAL(DISABLE_DOC, test ${enable_doc} = no) AC_CONFIG_FILES([ Makefile compose/Makefile +data/Makefile +data/icons/Makefile doc/Makefile help/Makefile include/Makefile src/Makefile -pixmaps/Makefile po/Makefile.in ]) diff --git a/data/Makefile.am b/data/Makefile.am new file mode 100644 index 00000000..61a1a631 --- /dev/null +++ b/data/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = icons diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am new file mode 100644 index 00000000..40ea8463 --- /dev/null +++ b/data/icons/Makefile.am @@ -0,0 +1,81 @@ +NULL = + +public_icons_themes = \ + hicolor \ + $(NULL) + +public_icons = \ + hicolor_apps_16x16_gparted.png \ + hicolor_apps_22x22_gparted.png \ + hicolor_apps_24x24_gparted.png \ + hicolor_apps_32x32_gparted.png \ + hicolor_apps_48x48_gparted.png \ + hicolor_apps_scalable_gparted.svg \ + $(NULL) + +private_icons = \ + $(NULL) + +noinst_DATA = \ + $(NULL) + +EXTRA_DIST = \ + $(public_icons) \ + $(private_icons) \ + $(noinst_DATA) \ + $(NULL) + +############################################################################### + +gtk_update_icon_cache = gtk-update-icon-cache -f -t + +update-icon-cache: + @-if test -z "$(DESTDIR)"; then \ + echo "Updating Gtk icon cache."; \ + for theme in $(public_icons_themes); do \ + $(gtk_update_icon_cache) $(datadir)/icons/$$theme; \ + done; \ + else \ + echo "*** Icon cache not updated. After (un)install, run this:"; \ + for theme in $(public_icons_themes); do \ + echo "*** $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \ + done; \ + fi + +install-icons: + for icon in $(public_icons); do \ + THEME=`echo $$icon | cut -d_ -f1`; \ + CONTEXT=`echo $$icon | cut -d_ -f2`; \ + SIZE=`echo $$icon | cut -d_ -f3`; \ + ICONFILE=`echo $$icon | cut -d_ -f4`; \ + mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \ + $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ + done; \ + for icon in $(private_icons); do \ + THEME=`echo $$icon | cut -d_ -f1`; \ + CONTEXT=`echo $$icon | cut -d_ -f2`; \ + SIZE=`echo $$icon | cut -d_ -f3`; \ + ICONFILE=`echo $$icon | cut -d_ -f4`; \ + mkdir -p $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \ + $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ + done + +uninstall-icons: + -for icon in $(public_icons); do \ + THEME=`echo $$icon | cut -d_ -f1`; \ + CONTEXT=`echo $$icon | cut -d_ -f2`; \ + SIZE=`echo $$icon | cut -d_ -f3`; \ + ICONFILE=`echo $$icon | cut -d_ -f4`; \ + rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ + done; \ + for icon in $(private_icons); do \ + THEME=`echo $$icon | cut -d_ -f1`; \ + CONTEXT=`echo $$icon | cut -d_ -f2`; \ + SIZE=`echo $$icon | cut -d_ -f3`; \ + ICONFILE=`echo $$icon | cut -d_ -f4`; \ + rm -f $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ + done + +install-data-local: install-icons update-icon-cache + +uninstall-local: uninstall-icons update-icon-cache diff --git a/data/icons/hicolor_apps_16x16_gparted.png b/data/icons/hicolor_apps_16x16_gparted.png new file mode 100644 index 00000000..ab03573d Binary files /dev/null and b/data/icons/hicolor_apps_16x16_gparted.png differ diff --git a/data/icons/hicolor_apps_22x22_gparted.png b/data/icons/hicolor_apps_22x22_gparted.png new file mode 100644 index 00000000..eab7fe3b Binary files /dev/null and b/data/icons/hicolor_apps_22x22_gparted.png differ diff --git a/data/icons/hicolor_apps_24x24_gparted.png b/data/icons/hicolor_apps_24x24_gparted.png new file mode 100644 index 00000000..8ef834ca Binary files /dev/null and b/data/icons/hicolor_apps_24x24_gparted.png differ diff --git a/data/icons/hicolor_apps_32x32_gparted.png b/data/icons/hicolor_apps_32x32_gparted.png new file mode 100644 index 00000000..ead33781 Binary files /dev/null and b/data/icons/hicolor_apps_32x32_gparted.png differ diff --git a/data/icons/hicolor_apps_48x48_gparted.png b/data/icons/hicolor_apps_48x48_gparted.png new file mode 100644 index 00000000..77b459dc Binary files /dev/null and b/data/icons/hicolor_apps_48x48_gparted.png differ diff --git a/data/icons/hicolor_apps_scalable_gparted.svg b/data/icons/hicolor_apps_scalable_gparted.svg new file mode 100644 index 00000000..7efd31a9 --- /dev/null +++ b/data/icons/hicolor_apps_scalable_gparted.svg @@ -0,0 +1,1038 @@ + + + + gparted + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Sebastian Kraft + + + gparted + apps + + + system + partition + harddisk + + + 2008-09-16 + + + + Jakub Steiner, Lapo Calamandrei + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/svg/gparted.svg b/data/icons/svg/gparted.svg new file mode 100644 index 00000000..17844e69 --- /dev/null +++ b/data/icons/svg/gparted.svg @@ -0,0 +1,2311 @@ + + + + gparted + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Sebastian Kraft + + + gparted + apps + + + system + partition + harddisk + + + 2008-09-16 + + + + Jakub Steiner, Lapo Calamandrei + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pixmaps/.cvsignore b/pixmaps/.cvsignore deleted file mode 100644 index 282522db..00000000 --- a/pixmaps/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am deleted file mode 100644 index 47816bf5..00000000 --- a/pixmaps/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -appicondir = $(datadir)/pixmaps -appicon_DATA = gparted.png - -EXTRA_DIST = $(appicon_DATA) diff --git a/pixmaps/gparted.png b/pixmaps/gparted.png deleted file mode 100644 index 235cf749..00000000 Binary files a/pixmaps/gparted.png and /dev/null differ diff --git a/src/Makefile.am b/src/Makefile.am index 53470e36..43a91886 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,8 +1,7 @@ INCLUDES = \ $(GTKMM_CFLAGS) \ -DGPARTED_DATADIR=\""$(datadir)"\" \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" AM_CFLAGS = -Wall diff --git a/src/Win_GParted.cc b/src/Win_GParted.cc index 931a0547..f67a0a9f 100644 --- a/src/Win_GParted.cc +++ b/src/Win_GParted.cc @@ -71,7 +71,7 @@ Win_GParted::Win_GParted( const std::vector & user_devices ) try { - this ->set_icon_from_file( GNOME_ICONDIR "/gparted.png" ) ; + this ->set_default_icon_name( "gparted" ) ; } catch ( Glib::Exception & e ) { @@ -1191,7 +1191,7 @@ void Win_GParted::menu_help_about() dialog .set_transient_for( *this ) ; dialog .set_name( _("GParted") ) ; - dialog .set_logo( this ->get_icon() ) ; + dialog .set_logo_icon_name( "gparted" ) ; dialog .set_version( VERSION ) ; dialog .set_comments( _( "GNOME Partition Editor" ) ) ; dialog .set_copyright( "Copyright © 2004-2008 Bart Hakvoort" ) ;