Merge branch 'aethyra/master'

Conflicts:
	src/beingmanager.cpp
	src/gui/confirm_dialog.cpp
	src/gui/inventorywindow.cpp
	src/gui/inventorywindow.h
	src/gui/label.cpp
	src/gui/label.h
	src/gui/popup.cpp
	src/gui/popup.h
	src/gui/scrollarea.cpp
	src/gui/skin.cpp
	src/gui/skin.h
	src/gui/speechbubble.cpp
	src/gui/window.cpp
	src/gui/window.h
	src/localplayer.h
	src/main.cpp
	src/net/ea/playerhandler.cpp
	src/resources/ambientoverlay.h
	src/resources/dye.cpp
	src/resources/imagewriter.cpp
	src/resources/itemdb.cpp
	src/shopitem.cpp

1 files changed, 22 insertions, 32 deletions

diff --git a/src/gui/window.h b/src/gui/window.h
index 46744699..c41a4221 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -29,7 +29,6 @@
 #include "../graphics.h"
 #include "../guichanfwd.h"
 
-class ConfigListener;
 class ContainerPlacer;
 class Layout;
 class LayoutCell;
@@ -47,8 +46,6 @@ class WindowContainer;
 class Window : public gcn::Window, gcn::WidgetListener
 {
     public:
-        friend class WindowConfigListener;
-
         /**
          * Constructor. Initializes the title to the given text and hooks
          * itself into the window container.
@@ -320,35 +317,28 @@ class Window : public gcn::Window, gcn::WidgetListener
          */
         int getResizeHandles(gcn::MouseEvent &event);
 
-        void setGuiAlpha();
-
-        ResizeGrip *mGrip;         /**< Resize grip */
-        Window *mParent;           /**< The parent window */
-        Layout *mLayout;           /**< Layout handler */
-        std::string mWindowName;   /**< Name of the window */
-        bool mShowTitle;           /**< Window has a title bar */
-        bool mModal;               /**< Window is modal */
-        bool mCloseButton;         /**< Window has a close button */
-        bool mSticky;              /**< Window resists minimization */
-        static bool mAlphaChanged; /**< Whether the alpha percent was changed */
-        int mMinWinWidth;          /**< Minimum window width */
-        int mMinWinHeight;         /**< Minimum window height */
-        int mMaxWinWidth;          /**< Maximum window width */
-        int mMaxWinHeight;         /**< Maximum window height */
-        int mDefaultX;             /**< Default window X position */
-        int mDefaultY;             /**< Default window Y position */
-        int mDefaultWidth;         /**< Default window width */
-        int mDefaultHeight;        /**< Default window height */
-
-        /**
-         * The config listener that listens to changes relevant to all windows.
-         */
-        static ConfigListener *windowConfigListener;
-
-        static int mouseResize;    /**< Active resize handles */
-        static int instances;      /**< Number of Window instances */
-
-        Skin* mSkin;               /**< Skin in use by this window */
+        ResizeGrip *mGrip;            /**< Resize grip */
+        Window *mParent;              /**< The parent window */
+        Layout *mLayout;              /**< Layout handler */
+        std::string mWindowName;      /**< Name of the window */
+        std::string mDefaultSkinPath; /**< Default skin path for this window */
+        bool mShowTitle;              /**< Window has a title bar */
+        bool mModal;                  /**< Window is modal */
+        bool mCloseButton;            /**< Window has a close button */
+        bool mSticky;                 /**< Window resists minimization */
+        int mMinWinWidth;             /**< Minimum window width */
+        int mMinWinHeight;            /**< Minimum window height */
+        int mMaxWinWidth;             /**< Maximum window width */
+        int mMaxWinHeight;            /**< Maximum window height */
+        int mDefaultX;                /**< Default window X position */
+        int mDefaultY;                /**< Default window Y position */
+        int mDefaultWidth;            /**< Default window width */
+        int mDefaultHeight;           /**< Default window height */
+
+        static int mouseResize;       /**< Active resize handles */
+        static int instances;         /**< Number of Window instances */
+
+        Skin* mSkin;                  /**< Skin in use by this window */
 
         /**
          * The width of the resize border. Is independent of the actual window