From aba2f7bce6a9d968d325636627f26ea12d9d0a48 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Wed, 14 Mar 2007 22:55:25 +0000 Subject: Renamed icons to make things easier for Debian packaging, and the "-icon" part was superfluous anyway. --- ChangeLog | 21 ++++++++++++----- data/icons/CMakeLists.txt | 8 +++---- data/icons/Makefile.am | 8 +++---- data/icons/tmw-icon.ico | Bin 2238 -> 0 bytes data/icons/tmw-icon.png | Bin 1103 -> 0 bytes data/icons/tmw-icon.xpm | 56 ---------------------------------------------- data/icons/tmw.ico | Bin 0 -> 2238 bytes data/icons/tmw.png | Bin 0 -> 1103 bytes data/icons/tmw.xpm | 56 ++++++++++++++++++++++++++++++++++++++++++++++ src/main.cpp | 2 +- src/tmw.rc | 2 +- 11 files changed, 81 insertions(+), 72 deletions(-) delete mode 100644 data/icons/tmw-icon.ico delete mode 100644 data/icons/tmw-icon.png delete mode 100644 data/icons/tmw-icon.xpm create mode 100644 data/icons/tmw.ico create mode 100644 data/icons/tmw.png create mode 100644 data/icons/tmw.xpm diff --git a/ChangeLog b/ChangeLog index 939d477c..c3c8f046 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,12 @@ -2007-03-12 Philipp Sehmisch +2007-03-14 Bjørn Lindeijer + + * src/main.cpp, src/tmw.rc, data/icons/tmw-icon.png, + data/icons/tmw-icon.xpm, data/icons/tmw.ico, data/icons/tmw-icon.ico, + data/icons/Makefile.am, data/icons/tmw.png, data/icons/tmw.xpm, + data/icons/CMakeLists.txt: Renamed icons to make things easier for + Debian packaging, and the "-icon" part was superfluous anyway. + +2007-03-12 Philipp Sehmisch * src/simpleanimation.cpp, src/simpleanimation.h, src/CmakeLists.txt, src/Makefile.am: Added a simple animation class that hosts a looping @@ -6,8 +14,8 @@ 2007-03-12 Bjørn Lindeijer - * data/graphics/items/armor-head-rangerhat.png: New version of ranger hat - icon by Pauan. + * data/graphics/items/armor-head-rangerhat.png: New version of ranger + hat icon by Pauan. 2007-03-11 Philipp Sehmisch @@ -17,10 +25,11 @@ 2007-03-09 Bjørn Lindeijer * data/graphics/gui/target-cursor-blue.png, - data/graphics/gui/target-cursor-red.png: Added targeting cursors by Pauan. + data/graphics/gui/target-cursor-red.png: Added targeting cursors by + Pauan. * data/graphics/sprites/chest-cotton-male.png, - data/graphics/sprites/chest-cotton-female.png: Replaced cotton shirt with - improved version by Pauan. + data/graphics/sprites/chest-cotton-female.png: Replaced cotton shirt + with improved version by Pauan. 2007-02-27 Philipp Sehmisch diff --git a/data/icons/CMakeLists.txt b/data/icons/CMakeLists.txt index 30d96d86..009ed32e 100644 --- a/data/icons/CMakeLists.txt +++ b/data/icons/CMakeLists.txt @@ -1,9 +1,9 @@ SET(FILES - tmw-icon.ico - tmw-icon.png - tmw-icon.xpm + tmw.ico + tmw.png + tmw.xpm ) INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/icons) -INSTALL(FILES "tmw-icon.png" DESTINATION share/pixmaps RENAME tmw.png) +INSTALL(FILES "tmw.png" DESTINATION share/pixmaps) diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index 26dcd623..9697a363 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -2,13 +2,13 @@ iconsdir = $(pkgdatadir)/data/icons icons_DATA = \ - tmw-icon.ico \ - tmw-icon.png \ - tmw-icon.xpm + tmw.ico \ + tmw.png \ + tmw.xpm install-data-local: $(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps - $(INSTALL) $(srcdir)/tmw-icon.png $(DESTDIR)$(datadir)/pixmaps/tmw.png + $(INSTALL) $(srcdir)/tmw.png $(DESTDIR)$(datadir)/pixmaps/tmw.png uninstall-local: rm -f $(DESTDIR)$(datadir)/pixmaps/tmw.png diff --git a/data/icons/tmw-icon.ico b/data/icons/tmw-icon.ico deleted file mode 100644 index 5ba6e1b7..00000000 Binary files a/data/icons/tmw-icon.ico and /dev/null differ diff --git a/data/icons/tmw-icon.png b/data/icons/tmw-icon.png deleted file mode 100644 index 2598a620..00000000 Binary files a/data/icons/tmw-icon.png and /dev/null differ diff --git a/data/icons/tmw-icon.xpm b/data/icons/tmw-icon.xpm deleted file mode 100644 index a9e91161..00000000 --- a/data/icons/tmw-icon.xpm +++ /dev/null @@ -1,56 +0,0 @@ -/* XPM */ -static char *dummy[]={ -"32 32 21 1", -". c None", -"f c #003300", -"s c #003333", -"# c #003366", -"d c #006600", -"h c #009933", -"c c #040404", -"m c #0c0c0c", -"a c #3366cc", -"e c #339933", -"g c #33cc33", -"o c #66cc99", -"r c #993300", -"n c #996633", -"b c #99ccff", -"j c #c0c0c0", -"k c #cc6666", -"q c #cc9933", -"i c #cc9999", -"p c #cccc66", -"l c #efd6c6", -"................................", -".........................#......", -"........#................a......", -".......#a..............#aba#....", -"...#.......cccccccc......a......", -"...a......ccdeddcfdcc....#......", -".#ab#....ccccegdheefc...........", -"...#...cccdheeeeehdddc..........", -".......cheheegeeehddfcc.cc......", -"........ccdhedeeehhdcc..cic.....", -".......ccdhgeeeheeddfc.cijc.....", -".......cfddhehhhddfccc.cikcc....", -".......ccccfdhedfdffc..cjliccm..", -"..........cccdfdfcccc.cciiknc...", -".....cccc...cccccc...cceciiicc..", -"....cgoggccccnpqrc..mcgogeckcec.", -"....ccggogggccqpqccmccecciidogcm", -"....cjncgggecpncnrcccnijijikdec.", -".....ciikceccrqqcncrciiliikcnc..", -"....ccccccrcpqpqnrnkdkiiiiiinc..", -"..cccgogeccnqpccpqncdcseinikrc..", -"..cgooogggecnqcnqcpneedddsknegc.", -"..ccccggoooggcnegeceeegdedseogg.", -"...ccrkggggggoogggoeggegeeddcec.", -".....ccrcceggggeggggeggegeeckcc.", -".....mcnilkcgepccceggecceeecic..", -"......mcriikccinkcpeeencceciic..", -"........cijiilikiikccciknccrkc..", -".......cckiknccckiijiiknrc.cc...", -"........cccncc.ccnkknrccc...c...", -"..........ccc....ccccc..........", -"...........m...................."}; diff --git a/data/icons/tmw.ico b/data/icons/tmw.ico new file mode 100644 index 00000000..5ba6e1b7 Binary files /dev/null and b/data/icons/tmw.ico differ diff --git a/data/icons/tmw.png b/data/icons/tmw.png new file mode 100644 index 00000000..2598a620 Binary files /dev/null and b/data/icons/tmw.png differ diff --git a/data/icons/tmw.xpm b/data/icons/tmw.xpm new file mode 100644 index 00000000..a9e91161 --- /dev/null +++ b/data/icons/tmw.xpm @@ -0,0 +1,56 @@ +/* XPM */ +static char *dummy[]={ +"32 32 21 1", +". c None", +"f c #003300", +"s c #003333", +"# c #003366", +"d c #006600", +"h c #009933", +"c c #040404", +"m c #0c0c0c", +"a c #3366cc", +"e c #339933", +"g c #33cc33", +"o c #66cc99", +"r c #993300", +"n c #996633", +"b c #99ccff", +"j c #c0c0c0", +"k c #cc6666", +"q c #cc9933", +"i c #cc9999", +"p c #cccc66", +"l c #efd6c6", +"................................", +".........................#......", +"........#................a......", +".......#a..............#aba#....", +"...#.......cccccccc......a......", +"...a......ccdeddcfdcc....#......", +".#ab#....ccccegdheefc...........", +"...#...cccdheeeeehdddc..........", +".......cheheegeeehddfcc.cc......", +"........ccdhedeeehhdcc..cic.....", +".......ccdhgeeeheeddfc.cijc.....", +".......cfddhehhhddfccc.cikcc....", +".......ccccfdhedfdffc..cjliccm..", +"..........cccdfdfcccc.cciiknc...", +".....cccc...cccccc...cceciiicc..", +"....cgoggccccnpqrc..mcgogeckcec.", +"....ccggogggccqpqccmccecciidogcm", +"....cjncgggecpncnrcccnijijikdec.", +".....ciikceccrqqcncrciiliikcnc..", +"....ccccccrcpqpqnrnkdkiiiiiinc..", +"..cccgogeccnqpccpqncdcseinikrc..", +"..cgooogggecnqcnqcpneedddsknegc.", +"..ccccggoooggcnegeceeegdedseogg.", +"...ccrkggggggoogggoeggegeeddcec.", +".....ccrcceggggeggggeggegeeckcc.", +".....mcnilkcgepccceggecceeecic..", +"......mcriikccinkcpeeencceciic..", +"........cijiilikiikccciknccrkc..", +".......cckiknccckiijiiknrc.cc...", +"........cccncc.ccnkknrccc...c...", +"..........ccc....ccccc..........", +"...........m...................."}; diff --git a/src/main.cpp b/src/main.cpp index 383e7f39..3cc32873 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -256,7 +256,7 @@ void init_engine(const Options &options) } SDL_WM_SetCaption("The Mana World", NULL); - SDL_WM_SetIcon(IMG_Load(TMW_DATADIR "data/icons/tmw-icon.png"), NULL); + SDL_WM_SetIcon(IMG_Load(TMW_DATADIR "data/icons/tmw.png"), NULL); #ifdef USE_OPENGL bool useOpenGL = (config.getValue("opengl", 0) == 1); diff --git a/src/tmw.rc b/src/tmw.rc index ee5f99cd..673b2387 100644 --- a/src/tmw.rc +++ b/src/tmw.rc @@ -2,7 +2,7 @@ #include "winver.h" -A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/tmw-icon.ico" +A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/tmw.ico" 1 VERSIONINFO FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD -- cgit v1.2.3-70-g09d2