Merged with Aethyra master as of 2009-01-27

Conflicts:
	Almost everywhere.

1 files changed, 18 insertions, 9 deletions

diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index d38fb2e3..d18f365c 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -19,31 +19,33 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "setup.h"
+#include <algorithm>
+#include <iostream>
 
 #include "button.h"
+#include "setup.h"
 #include "setup_audio.h"
+#include "setup_colours.h"
 #include "setup_joystick.h"
-#include "setup_video.h"
 #include "setup_keyboard.h"
 #include "setup_players.h"
+#include "setup_video.h"
 
 #include "widgets/tabbedarea.h"
 
 #include "../utils/dtor.h"
 #include "../utils/gettext.h"
 
-#include <algorithm>
-#include <iostream>
-
-extern Window *statusWindow;
-extern Window *minimap;
 extern Window *chatWindow;
-extern Window *inventoryWindow;
 extern Window *equipmentWindow;
 extern Window *helpWindow;
+extern Window *inventoryWindow;
+extern Window *minimap;
 extern Window *skillDialog;
+extern Window *statusWindow;
 extern Window *itemShortcutWindow;
+extern Window *emoteShortcutWindow;
+extern Window *emoteWindow;
 extern Window *tradeWindow;
 
 Setup::Setup():
@@ -58,7 +60,8 @@ Setup::Setup():
         N_("Apply"), N_("Cancel"), N_("Reset Windows"), 0
     };
     int x = width;
-    for (const char **curBtn = buttonNames; *curBtn; ++curBtn) {
+    for (const char **curBtn = buttonNames; *curBtn; ++curBtn)
+    {
         Button *btn = new Button(gettext(*curBtn), *curBtn, this);
         x -= btn->getWidth() + 5;
         btn->setPosition(x, height - btn->getHeight() - 5);
@@ -90,6 +93,10 @@ Setup::Setup():
     panel->addTab(_("Keyboard"), tab);
     mTabs.push_back(tab);
 
+    tab = new Setup_Colours();
+    panel->addTab(_("Colors"), tab);
+    mTabs.push_back(tab);
+
     tab = new Setup_Players();
     panel->addTab(_("Players"), tab);
     mTabs.push_back(tab);
@@ -131,6 +138,8 @@ void Setup::action(const gcn::ActionEvent &event)
         helpWindow->resetToDefaultSize();
         skillDialog->resetToDefaultSize();
         itemShortcutWindow->resetToDefaultSize();
+        emoteShortcutWindow->resetToDefaultSize();
+        emoteWindow->resetToDefaultSize();
         tradeWindow->resetToDefaultSize();
     }
 }