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.

svn path=/trunk/; revision=909
This commit is contained in:
Curtis Gedak 2008-09-22 22:41:49 +00:00
parent 30bec7af96
commit f5a80bc904
18 changed files with 3477 additions and 13 deletions

View File

@ -22,6 +22,12 @@ Curtis Gedak <gedakc@users.sourceforge.net>
* Created OperationLabelPartition.h, OperationLabelPartition.cc
* Maintained from official 0.3.5 release onward
Michael Monreal <michael.monreal@gmx.net>
* Wrote small patch to implement themed app icon in hicolor
Sebastian Kraft <kraft.sebastion@gmail.com>
* Designed Tango theme icons
Bart Harkvoort <gparted@users.sourceforge.net>
* Original author of GParted.
* Created and maintained up to official 0.3.3 release and

View File

@ -1,3 +1,36 @@
2008-09-22 Curtis Gedak <gedakc@gmail.com>
* 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 <gedakc@gmail.com>
* configure.in,

View File

@ -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@

View File

@ -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
])

1
data/Makefile.am Normal file
View File

@ -0,0 +1 @@
SUBDIRS = icons

81
data/icons/Makefile.am Normal file
View File

@ -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

Binary file not shown.

After

Width:  |  Height:  |  Size: 782 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 46 KiB

2311
data/icons/svg/gparted.svg Normal file

File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 120 KiB

View File

@ -1,2 +0,0 @@
Makefile
Makefile.in

View File

@ -1,4 +0,0 @@
appicondir = $(datadir)/pixmaps
appicon_DATA = gparted.png
EXTRA_DIST = $(appicon_DATA)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

View File

@ -1,8 +1,7 @@
INCLUDES = \
$(GTKMM_CFLAGS) \
-DGPARTED_DATADIR=\""$(datadir)"\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DGNOME_ICONDIR=\""$(datadir)/pixmaps"\"
-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
AM_CFLAGS = -Wall

View File

@ -71,7 +71,7 @@ Win_GParted::Win_GParted( const std::vector<Glib::ustring> & 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" ) ;