From dc171fd00cd575d76b51501d6ce68b68faefe2e7 Mon Sep 17 00:00:00 2001 From: Guillaume Melquiond Date: Wed, 8 Aug 2007 09:59:13 +0000 Subject: Moved equipment background to the gui directory. Changed name to lowercase only. --- ChangeLog | 11 +++++++++-- data/graphics/gui/Makefile.am | 1 + data/graphics/gui/equip_bg.png | Bin 0 -> 18901 bytes data/graphics/images/EquipBackground.png | Bin 18901 -> 0 bytes src/gui/equipmentwindow.cpp | 2 +- 5 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 data/graphics/gui/equip_bg.png delete mode 100644 data/graphics/images/EquipBackground.png diff --git a/ChangeLog b/ChangeLog index e229fe5d..3b6f5d94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,11 @@ +2007-08-08 Guillaume Melquiond + + * src/gui/equipmentwindow.cpp, data/graphics/gui/Makefile.am, + data/graphics/images/EquipBackground.png: Moved equipment background to + the gui directory. Changed name to lowercase only. + 2007-08-08 Josh Langley + * src/equipment.h, src/gui/equipmentwindow.cpp, src/gui/equipmentwindow.h, src/localplayer.cpp, src/net/gameserver/player.cpp, src/net/gameserver/player.h, data/graphics/images/EquipBackground.png: @@ -34,7 +41,7 @@ * src/gui/inventory.cpp: Completed marking of translatable strings for inventory window. * po/tmw.pot: Updated with new translatable strings. - * po/fr.po: Completed translation of inventory window in french. + * po/fr.po: Completed translation of inventory window in French. * src/resources/gettext.h, src/main.cpp: Moved header to utils directory. * src/utils/tostring.h: Fixed typo in macro guard. @@ -49,7 +56,7 @@ * src/gui/inventorywindow.cpp: Marked a few strings as translatable for testing purpose. * po/tmw.pot: Generated the main template. - * po/LINGUAS, po/fr.po: Added the french translation. + * po/LINGUAS, po/fr.po: Added French translation. 2007-08-01 Guillaume Melquiond diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am index a37e1196..92e4f3bb 100644 --- a/data/graphics/gui/Makefile.am +++ b/data/graphics/gui/Makefile.am @@ -11,6 +11,7 @@ gui_DATA = \ buttonpress.png \ checkbox.png \ deepbox.png \ + equip_bg.png \ fixedfont.png \ hits_blue.png \ hits_red.png \ diff --git a/data/graphics/gui/equip_bg.png b/data/graphics/gui/equip_bg.png new file mode 100644 index 00000000..77ac63d8 Binary files /dev/null and b/data/graphics/gui/equip_bg.png differ diff --git a/data/graphics/images/EquipBackground.png b/data/graphics/images/EquipBackground.png deleted file mode 100644 index 77ac63d8..00000000 Binary files a/data/graphics/images/EquipBackground.png and /dev/null differ diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp index 729e1283..5e835985 100644 --- a/src/gui/equipmentwindow.cpp +++ b/src/gui/equipmentwindow.cpp @@ -73,7 +73,7 @@ EquipmentWindow::EquipmentWindow(Equipment *equipment): } ResourceManager *resman = ResourceManager::getInstance(); - mBackground = resman->getImage("graphics/images/equipBackground.png"); + mBackground = resman->getImage("graphics/gui/equip_bg.png"); mBackground->setAlpha(0.3); } -- cgit v1.2.3-60-g2f50