From 3bdb7ebbcc6f7d08ed90f2232f0901b1c0e92d51 Mon Sep 17 00:00:00 2001
From: Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>
Date: Fri, 15 Jul 2011 02:55:31 +0200
Subject: Added icons to the confirm and cancel button of the quit dialog.

This a good example of use for the new graphics and button
functionalities.
---
 data/graphics/gui/CMakeLists.txt          |   2 ++
 data/graphics/gui/button-icon-cancel.png  | Bin 0 -> 641 bytes
 data/graphics/gui/button-icon-confirm.png | Bin 0 -> 540 bytes
 src/gui/quitdialog.cpp                    |   2 ++
 src/gui/quitdialog.h                      |   6 ++++--
 5 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 data/graphics/gui/button-icon-cancel.png
 create mode 100644 data/graphics/gui/button-icon-confirm.png

diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index d3f29210..d1a025f6 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -1,6 +1,8 @@
 SET (FILES
     bubble.png
     button.png
+    button-icon-confirm.png
+    button-icon-cancel.png
     button-icon-equipment.png
     button-icon-inventory.png
     button-icon-setup.png
diff --git a/data/graphics/gui/button-icon-cancel.png b/data/graphics/gui/button-icon-cancel.png
new file mode 100644
index 00000000..f85a2c4e
Binary files /dev/null and b/data/graphics/gui/button-icon-cancel.png differ
diff --git a/data/graphics/gui/button-icon-confirm.png b/data/graphics/gui/button-icon-confirm.png
new file mode 100644
index 00000000..c674662b
Binary files /dev/null and b/data/graphics/gui/button-icon-confirm.png differ
diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp
index 6ecc62a6..3da07206 100644
--- a/src/gui/quitdialog.cpp
+++ b/src/gui/quitdialog.cpp
@@ -44,7 +44,9 @@ QuitDialog::QuitDialog(QuitDialog** pointerToMe):
     mSwitchAccountServer = new RadioButton(_("Switch server"), "quitdialog");
     mSwitchCharacter = new RadioButton(_("Switch character"), "quitdialog");
     mOkButton = new Button(_("OK"), "ok", this);
+    mOkButton->setButtonIcon("button-icon-confirm.png");
     mCancelButton = new Button(_("Cancel"), "cancel", this);
+    mCancelButton->setButtonIcon("button-icon-cancel.png");
 
     addKeyListener(this);
 
diff --git a/src/gui/quitdialog.h b/src/gui/quitdialog.h
index 65a325b8..21fe2f8a 100644
--- a/src/gui/quitdialog.h
+++ b/src/gui/quitdialog.h
@@ -29,6 +29,8 @@
 
 #include <vector>
 
+class Button;
+
 /**
  * The quit dialog.
  *
@@ -62,8 +64,8 @@ class QuitDialog : public Window, public gcn::ActionListener,
         gcn::RadioButton *mForceQuit;
         gcn::RadioButton *mSwitchAccountServer;
         gcn::RadioButton *mSwitchCharacter;
-        gcn::Button *mOkButton;
-        gcn::Button *mCancelButton;
+        Button *mOkButton;
+        Button *mCancelButton;
 
         QuitDialog **mMyPointer;
 };
-- 
cgit v1.2.3-70-g09d2