From 8abccc9bea0ac29cdc1adf3821ea4cec507c7cae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Tue, 26 May 2009 20:45:36 +0000 Subject: [PATCH] Move the icons geany.png and geany.ico into the icons directory. Add a 16x16 pixel Geany icon and the scalable SVG icon. Drop the pixmaps directory. git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3816 ea778897-0a13-0410-b9d1-a72fbfd435f5 --- ChangeLog | 9 + Makefile.am | 17 - configure.in | 4 +- geany.nsi | 2 +- geany.spec.in | 2 +- geany_private.rc | 2 +- icons/16x16/Makefile.am | 11 +- icons/16x16/geany.png | Bin 0 -> 830 bytes icons/48x48/Makefile.am | 4 + {pixmaps => icons/48x48}/geany.png | Bin icons/Makefile.am | 3 +- {pixmaps => icons}/geany.ico | Bin icons/scalable/Makefile.am | 4 + icons/scalable/geany.svg | 661 +++++++++++++++++++++++++++++ src/makefile.win32 | 2 +- wscript | 3 +- 16 files changed, 693 insertions(+), 31 deletions(-) create mode 100644 icons/16x16/geany.png create mode 100644 icons/48x48/Makefile.am rename {pixmaps => icons/48x48}/geany.png (100%) rename {pixmaps => icons}/geany.ico (100%) create mode 100644 icons/scalable/Makefile.am create mode 100644 icons/scalable/geany.svg diff --git a/ChangeLog b/ChangeLog index ad82cbd122..c87f6e2ce3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,15 @@ * src/project.c: Fix wrong initialisation of the default project path button callback in the preferences dialog. + * Makefile.am, configure.in, geany.nsi, geany.spec.in, wscript, + geany_private.rc, icons/16x16/Makefile.am, icons/16x16/geany.png, + icons/48x48, icons/48x48/Makefile.am, icons/48x48/geany.png, + icons/Makefile.am, icons/geany.ico, icons/scalable, + icons/scalable/Makefile.am, icons/scalable/geany.svg, + src/makefile.win32: + Move the icons geany.png and geany.ico into the icons directory. + Add a 16x16 pixel Geany icon and the scalable SVG icon. + Drop the pixmaps directory. 2009-05-22 Nick Treleaven diff --git a/Makefile.am b/Makefile.am index 0fbb424a57..a8d85dc0a6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,15 +52,9 @@ DISTCLEANFILES = \ uninstall-local: rm -rf $(DESTDIR)$(pkgdatadir); - rm -f $(DESTDIR)$(datadir)/pixmaps/geany.png; - rm -f $(DESTDIR)$(datadir)/pixmaps/geany.ico; install-data-local: @$(NORMAL_INSTALL) - if test -d $(srcdir)/pixmaps; then \ - $(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps; \ - $(INSTALL_DATA) $(srcdir)/pixmaps/geany.png $(DESTDIR)$(datadir)/pixmaps; \ - fi $(mkinstalldirs) $(DESTDIR)$(pkgdatadir); \ $(INSTALL_DATA) $(srcdir)/data/c99.tags $(DESTDIR)$(pkgdatadir); \ $(INSTALL_DATA) $(srcdir)/data/php.tags $(DESTDIR)$(pkgdatadir); \ @@ -75,15 +69,6 @@ install-data-local: fi \ done -dist-hook: - if test -d pixmaps; then \ - mkdir $(distdir)/pixmaps; \ - for pixmap in $(srcdir)/pixmaps/*; do \ - if test -f $$pixmap; then \ - cp -p $$pixmap $(distdir)/pixmaps; \ - fi \ - done \ - fi BZIP2_ENV =--best @@ -105,8 +90,6 @@ rpm: dist rpmbuild -ta $(distdir).tar.gz -logodir = $(datadir)/pixmaps - pkgconfig_DATA = geany.pc pkgconfigdir = $(libdir)/pkgconfig diff --git a/configure.in b/configure.in index a08dd91325..fa196be57b 100644 --- a/configure.in +++ b/configure.in @@ -259,8 +259,6 @@ if test -z "${docdir}"; then AC_SUBST(docdir) fi -GEANY_PIXMAPS_DIR=`eval echo ${datarootdir}/pixmaps` -AC_SUBST(GEANY_PIXMAPS_DIR) GEANY_DATA_DIR=`eval echo ${datarootdir}/geany` AC_SUBST(GEANY_DATA_DIR) @@ -274,6 +272,8 @@ AC_OUTPUT([ Makefile icons/Makefile icons/16x16/Makefile +icons/48x48/Makefile +icons/scalable/Makefile tagmanager/Makefile tagmanager/include/Makefile scintilla/Makefile diff --git a/geany.nsi b/geany.nsi index 805e690bfd..789d935d9a 100644 --- a/geany.nsi +++ b/geany.nsi @@ -78,7 +78,7 @@ Var UNINSTDIR !include "MUI2.nsh" !define MUI_ABORTWARNING -!define MUI_ICON "pixmaps\geany.ico" +!define MUI_ICON "icons\geany.ico" !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall-full.ico" ; Welcome page diff --git a/geany.spec.in b/geany.spec.in index 2366071980..f932b531e7 100644 --- a/geany.spec.in +++ b/geany.spec.in @@ -62,7 +62,7 @@ Some basic features of Geany: %{_datadir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/locale/*/LC_MESSAGES/%{name}.mo -%{_datadir}/pixmaps/%{name}.png +%{_datadir}/icons/48x48/%{name}.png %{_datadir}/doc/%{name}/ %{_mandir}/man1/%{name}.1.gz %{_datadir}/icons/hicolor/16x16/apps/classviewer-*.png diff --git a/geany_private.rc b/geany_private.rc index 84f96070f8..dabd6cc0dd 100644 --- a/geany_private.rc +++ b/geany_private.rc @@ -2,7 +2,7 @@ #include // include for version info constants -A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../pixmaps/geany.ico" +A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../icons/geany.ico" 1 VERSIONINFO FILEVERSION 0,18,0,0 diff --git a/icons/16x16/Makefile.am b/icons/16x16/Makefile.am index 0c6adaa59e..7953f2e84f 100644 --- a/icons/16x16/Makefile.am +++ b/icons/16x16/Makefile.am @@ -1,5 +1,6 @@ iconsdir = $(datadir)/icons/hicolor/16x16/apps -icons_DATA = \ + +icons_DATA = \ classviewer-class.png \ classviewer-macro.png \ classviewer-member.png \ @@ -7,7 +8,7 @@ icons_DATA = \ classviewer-namespace.png \ classviewer-other.png \ classviewer-struct.png \ - classviewer-var.png - -EXTRA_DIST = \ - $(icons_DATA) + classviewer-var.png \ + geany.png + +EXTRA_DIST = $(icons_DATA) diff --git a/icons/16x16/geany.png b/icons/16x16/geany.png new file mode 100644 index 0000000000000000000000000000000000000000..5f8eaaadaa55e695b374ba5491f009660b27f69d GIT binary patch literal 830 zcmV-E1Ht@>P)M6I9<#DSJI zSv9V$ZjN5ou3frW*EGi_?KwF)=lgsr>@ok>|ApVfU(8*dx!-l2QG4As08+_RU|G?l znLD$2nvm(b&S-U`YV670gHnpC^Rosp3Yg6dNPFEjGJRRLB~v65Np{`Q#}-Xf1X?Mq zh=pky2mz5u1mE|Y?IR;(b9-l0!G zJN*6YOMu!W;A<`Tz;s-Pcs!2Mn(L)Sx>~M`sgx|Wc0I_B-H#JbWmqV_j=lUnXrFCu z`{~*DWNdkM)(mju&{Sv4W?L8Hit`rd>MDM-> zn8p;@-1AK5-xFf;{9CFf4+(&n`y*j*lwG-xxN-Syw)Z|vG|@&VY*QV&O0W^L}ZgTe?+bnZPtB-x2-^b@i?lx?$IeIK`WlfbWI#kb?R6@o^cNX$gkw7&PT zceQ!sStiea+3;I;9yH_W94m9DaTacI>A8zMaP}lE12J?^Wo`O*tTqcFZB?Bwdxc@6 z*0+Dvl>jIv%S&f5Op}hgU!ZW}4LWm!j1PZ`f9D` + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + geany + 29-06-07 + + + Sebastian Kraft + + + + + application + geany + editor + programming + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/makefile.win32 b/src/makefile.win32 index f48e934839..909abe8147 100644 --- a/src/makefile.win32 +++ b/src/makefile.win32 @@ -74,7 +74,7 @@ OBJS = about.o build.o callbacks.o dialogs.o document.o editor.o encodings.o fil # all: binclean $(TARGET) #exec all: $(TARGET) -$(RES): ../geany_private.rc ../pixmaps/geany.ico +$(RES): ../geany_private.rc ../icons/geany.ico $(WINDRES) -i $< --input-format=rc -o $@ -O coff # this calls parent clean-local target because del ../file won't work diff --git a/wscript b/wscript index 564f456483..b418fdf1ff 100644 --- a/wscript +++ b/wscript @@ -422,8 +422,9 @@ def build(bld): bld.install_files('${DATADIR}/geany', 'data/ui_toolbar.xml') bld.install_as('${DATADIR}/geany/GPL-2', 'COPYING') # Icons - bld.install_files('${DATADIR}/pixmaps', 'pixmaps/geany.png') bld.install_files('${DATADIR}/icons/hicolor/16x16/apps', 'icons/16x16/*.png') + bld.install_files('${DATADIR}/icons/hicolor/48x48/apps', 'icons/48x48/*.png') + bld.install_files('${DATADIR}/icons/hicolor/scalable/apps', 'icons/scalable/*.svg') def shutdown():