diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | data/graphics/gui/Makefile.am | 1 | ||||
| -rw-r--r-- | data/graphics/gui/equip_bg.png (renamed from data/graphics/images/EquipBackground.png) | bin | 18901 -> 18901 bytes | |||
| -rw-r--r-- | src/gui/equipmentwindow.cpp | 2 |
4 files changed, 11 insertions, 3 deletions
@@ -1,4 +1,11 @@ +2007-08-08 Guillaume Melquiond <guillaume.melquiond@gmail.com> + + * 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 <joshlangley[at]optusnet.com.au> + * 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 <guillaume.melquiond@gmail.com> 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/images/EquipBackground.png b/data/graphics/gui/equip_bg.png Binary files differindex 77ac63d8..77ac63d8 100644 --- a/data/graphics/images/EquipBackground.png +++ b/data/graphics/gui/equip_bg.png 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); } |
