Modified skin loading to save and load a skin's XML path, as well as

modified the skin loading method to take a default value, in case the
value in the configuration file fails to load for one reason or another.

While this doesn't directly expose skinning on a per window basis to the
user at the moment, it does allow people to change what skins get loaded
with which windows now without needing to modify the code.

TODO: Determine a decent approach to allowing the user to change their
window skins in game, as well as moving all widget skin loading to the
skin class (for instance, the button skins, progressbar skins, etc.) so
that different skin configurations can use different widget skins.

Signed-off-by: Ira Rice <irarice@gmail.com>

1 files changed, 23 insertions, 23 deletions

diff --git a/src/gui/window.h b/src/gui/window.h
index b0b67ad8..66e73e12 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -320,29 +320,29 @@ class Window : public gcn::Window, gcn::WidgetListener
          */
         int getResizeHandles(gcn::MouseEvent &event);
 
-        GCContainer *mChrome;      /**< Contained container */
-        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 */
-        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 */
-
-        static int mouseResize;    /**< Active resize handles */
-        static int instances;      /**< Number of Window instances */
-
-        Skin* mSkin;               /**< Skin in use by this window */
+        GCContainer *mChrome;         /**< Contained container */
+        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