Merge branch 'aethyra/master'

Conflicts:
	Many files.

1 files changed, 26 insertions, 13 deletions

diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 872596b0..849a30c2 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -34,16 +34,23 @@
 #include "../utils/gettext.h"
 
 extern Window *chatWindow;
-extern Window *equipmentWindow;
-extern Window *helpWindow;
+extern Window *statusWindow;
+extern Window *buyDialog;
+extern Window *sellDialog;
+extern Window *buySellDialog;
 extern Window *inventoryWindow;
-extern Window *minimap;
+extern Window *emoteWindow;
+extern Window *npcTextDialog;
+extern Window *npcStringDialog;
 extern Window *skillDialog;
-extern Window *statusWindow;
+extern Window *minimap;
+extern Window *equipmentWindow;
+extern Window *tradeWindow;
+extern Window *helpWindow;
+extern Window *debugWindow;
 extern Window *itemShortcutWindow;
 extern Window *emoteShortcutWindow;
-extern Window *emoteWindow;
-extern Window *tradeWindow;
+extern Window *storageWindow;
 
 Setup::Setup():
     Window(_("Setup"))
@@ -65,9 +72,8 @@ Setup::Setup():
         add(btn);
 
         // Store this button, as it needs to be enabled/disabled
-        if (!strcmp(*curBtn, "Reset Windows")) {
+        if (!strcmp(*curBtn, "Reset Windows"))
             mResetWindows = btn;
-        }
     }
 
     TabbedArea *panel = new TabbedArea;
@@ -130,17 +136,24 @@ void Setup::action(const gcn::ActionEvent &event)
         if (!statusWindow)
             return;
 
-        statusWindow->resetToDefaultSize();
-        minimap->resetToDefaultSize();
         chatWindow->resetToDefaultSize();
+        statusWindow->resetToDefaultSize();
+        buyDialog->resetToDefaultSize();
+        sellDialog->resetToDefaultSize();
+        buySellDialog->resetToDefaultSize();
         inventoryWindow->resetToDefaultSize();
+        emoteWindow->resetToDefaultSize();
+        npcTextDialog->resetToDefaultSize();
+        npcStringDialog->resetToDefaultSize();
+        skillDialog->resetToDefaultSize();
+        minimap->resetToDefaultSize();
         equipmentWindow->resetToDefaultSize();
+        tradeWindow->resetToDefaultSize();
         helpWindow->resetToDefaultSize();
-        skillDialog->resetToDefaultSize();
+        debugWindow->resetToDefaultSize();
         itemShortcutWindow->resetToDefaultSize();
         emoteShortcutWindow->resetToDefaultSize();
-        emoteWindow->resetToDefaultSize();
-        tradeWindow->resetToDefaultSize();
+        storageWindow->resetToDefaultSize();
     }
 }