Reached the state where the menu bar is now using image buttons.

I had to adapt a bit the images given by Poison ivy
to do that.

11 files changed, 15 insertions, 7 deletions

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
--- /dev/null
+++ b/data/graphics/gui/button-icon-equipment.png
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
--- /dev/null
+++ b/data/graphics/gui/button-icon-inventory.png
diff --git a/data/graphics/gui/button-icon-setup.png b/data/graphics/gui/button-icon-setup.png
index 7c2b2b86..8e028358 100644
--- a/data/graphics/gui/button-icon-setup.png
+++ b/data/graphics/gui/button-icon-setup.png
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
--- /dev/null
+++ b/data/graphics/gui/button-icon-shortcut.png
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
--- /dev/null
+++ b/data/graphics/gui/button-icon-skills.png
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
--- /dev/null
+++ b/data/graphics/gui/button-icon-smilies.png
diff --git a/data/graphics/gui/button-icon-social.png b/data/graphics/gui/button-icon-social.png
index 524510af..4c6b49f1 100644
--- a/data/graphics/gui/button-icon-social.png
+++ b/data/graphics/gui/button-icon-social.png
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
--- /dev/null
+++ b/data/graphics/gui/button-icon-specials.png
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
--- /dev/null
+++ b/data/graphics/gui/button-icon-status.png
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,