From da18a5f411185d3a4d5aa3851e8c7f621d3e9718 Mon Sep 17 00:00:00 2001
From: Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>
Date: Fri, 15 Jul 2011 02:07:34 +0200
Subject: Reached the state where the menu bar is now using image buttons.
I had to adapt a bit the images given by Enchilado
to do that.
---
data/graphics/gui/CMakeLists.txt | 8 ++++++++
data/graphics/gui/button-icon-equipment.png | Bin 0 -> 871 bytes
data/graphics/gui/button-icon-inventory.png | Bin 0 -> 726 bytes
data/graphics/gui/button-icon-setup.png | Bin 556 -> 775 bytes
data/graphics/gui/button-icon-shortcut.png | Bin 0 -> 668 bytes
data/graphics/gui/button-icon-skills.png | Bin 0 -> 680 bytes
data/graphics/gui/button-icon-smilies.png | Bin 0 -> 814 bytes
data/graphics/gui/button-icon-social.png | Bin 822 -> 615 bytes
data/graphics/gui/button-icon-specials.png | Bin 0 -> 766 bytes
data/graphics/gui/button-icon-status.png | Bin 0 -> 699 bytes
src/gui/windowmenu.cpp | 14 +++++++-------
11 files changed, 15 insertions(+), 7 deletions(-)
create mode 100644 data/graphics/gui/button-icon-equipment.png
create mode 100644 data/graphics/gui/button-icon-inventory.png
create mode 100644 data/graphics/gui/button-icon-shortcut.png
create mode 100644 data/graphics/gui/button-icon-skills.png
create mode 100644 data/graphics/gui/button-icon-smilies.png
create mode 100644 data/graphics/gui/button-icon-specials.png
create mode 100644 data/graphics/gui/button-icon-status.png
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index d8adb10f..d3f29210 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -1,7 +1,15 @@
SET (FILES
bubble.png
button.png
+ button-icon-equipment.png
+ button-icon-inventory.png
+ button-icon-setup.png
+ button-icon-shortcut.png
+ button-icon-skills.png
+ button-icon-smilies.png
button-icon-social.png
+ button-icon-specials.png
+ button-icon-status.png
button_disabled.png
buttonhi.png
buttonpress.png
diff --git a/data/graphics/gui/button-icon-equipment.png b/data/graphics/gui/button-icon-equipment.png
new file mode 100644
index 00000000..4f40f3ad
Binary files /dev/null and b/data/graphics/gui/button-icon-equipment.png differ
diff --git a/data/graphics/gui/button-icon-inventory.png b/data/graphics/gui/button-icon-inventory.png
new file mode 100644
index 00000000..c0fe5bf7
Binary files /dev/null and b/data/graphics/gui/button-icon-inventory.png differ
diff --git a/data/graphics/gui/button-icon-setup.png b/data/graphics/gui/button-icon-setup.png
index 7c2b2b86..8e028358 100644
Binary files a/data/graphics/gui/button-icon-setup.png and b/data/graphics/gui/button-icon-setup.png differ
diff --git a/data/graphics/gui/button-icon-shortcut.png b/data/graphics/gui/button-icon-shortcut.png
new file mode 100644
index 00000000..10b97577
Binary files /dev/null and b/data/graphics/gui/button-icon-shortcut.png differ
diff --git a/data/graphics/gui/button-icon-skills.png b/data/graphics/gui/button-icon-skills.png
new file mode 100644
index 00000000..3d68f42b
Binary files /dev/null and b/data/graphics/gui/button-icon-skills.png differ
diff --git a/data/graphics/gui/button-icon-smilies.png b/data/graphics/gui/button-icon-smilies.png
new file mode 100644
index 00000000..dd2a00c4
Binary files /dev/null and b/data/graphics/gui/button-icon-smilies.png differ
diff --git a/data/graphics/gui/button-icon-social.png b/data/graphics/gui/button-icon-social.png
index 524510af..4c6b49f1 100644
Binary files a/data/graphics/gui/button-icon-social.png and b/data/graphics/gui/button-icon-social.png differ
diff --git a/data/graphics/gui/button-icon-specials.png b/data/graphics/gui/button-icon-specials.png
new file mode 100644
index 00000000..31c66e81
Binary files /dev/null and b/data/graphics/gui/button-icon-specials.png differ
diff --git a/data/graphics/gui/button-icon-status.png b/data/graphics/gui/button-icon-status.png
new file mode 100644
index 00000000..96c54d15
Binary files /dev/null and b/data/graphics/gui/button-icon-status.png differ
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp
index 2595c819..1c5f2d77 100644
--- a/src/gui/windowmenu.cpp
+++ b/src/gui/windowmenu.cpp
@@ -50,19 +50,19 @@ WindowMenu::WindowMenu():
{
int x = 0, h = 0;
- addButton(":-)", x, h);
- addButton(N_("Status"), x, h);
- addButton(N_("Equipment"), x, h);
- addButton(N_("Inventory"), x, h);
+ addButton(":-)", x, h, "button-icon-smilies.png");
+ addButton(N_("Status"), x, h, "button-icon-status.png");
+ addButton(N_("Equipment"), x, h, "button-icon-equipment.png");
+ addButton(N_("Inventory"), x, h, "button-icon-inventory.png");
if (skillDialog->hasSkills())
- addButton(N_("Skills"), x, h);
+ addButton(N_("Skills"), x, h, "button-icon-skills.png");
// if (specialsWindow->hasSpecials())
- addButton(N_("Specials"), x, h);
+ addButton(N_("Specials"), x, h, "button-icon-specials.png");
addButton(N_("Social"), x, h, "button-icon-social.png");
- addButton(N_("Shortcut"), x, h);
+ addButton(N_("Shortcut"), x, h, "button-icon-shortcut.png");
addButton(N_("Setup"), x, h, "button-icon-setup.png");
setDimension(gcn::Rectangle(graphics->getWidth() - x - 3, 3,
--
cgit v1.2.3-70-g09d2