From 9322701aa1eae9596a8586ef19a0fe1d1b3ab66b Mon Sep 17 00:00:00 2001
From: MichaelTheShifter <michaelshiftos@gmail.com>
Date: Tue, 19 Jul 2016 14:04:41 -0400
Subject: Initial commit.

---
 .../WindowsFormsApplication1/SkinEngine/skins.cs   | 33 +++++++++-------------
 1 file changed, 13 insertions(+), 20 deletions(-)

(limited to 'source/WindowsFormsApplication1/SkinEngine')

diff --git a/source/WindowsFormsApplication1/SkinEngine/skins.cs b/source/WindowsFormsApplication1/SkinEngine/skins.cs
index 206646f..8dcaea2 100644
--- a/source/WindowsFormsApplication1/SkinEngine/skins.cs
+++ b/source/WindowsFormsApplication1/SkinEngine/skins.cs
@@ -10,6 +10,7 @@ using System.Drawing.Imaging;
 
 namespace Skinning
 {
+    [Obsolete("ShiftOS is moving to the new ShiftUI framework which has a built-in skinning engine. This Skin class is mostly un-needed now.")]
     public class Skin {
         //Widget Positions
         public string ALPosition = "Top";
@@ -561,29 +562,21 @@ namespace Skinning
         /// </summary>
         public static void loadskin()
         {
-            if(Directory.Exists(Paths.LoadedSkin))
+            if (Directory.Exists(Paths.LoadedSkin))
             {
-                try {
-                    string rawData = File.ReadAllText(Paths.LoadedSkin + "data.json");
-                    loadedSkin = JsonConvert.DeserializeObject<Skin>(rawData);
-                    if (File.Exists(Paths.LoadedSkin + "panels.json"))
-                    {
-                        string panels = File.ReadAllText(Paths.LoadedSkin + "panels.json");
-                        loadedSkin.DesktopPanels = JsonConvert.DeserializeObject<List<DesktopPanel>>(panels);
-                        LoadPanels();
-                    }
-                    loadimages();
-                    LoadEmbeddedNamePack();
-                }
-                catch
+                string rawData = File.ReadAllText(Paths.LoadedSkin + "data.json");
+                loadedSkin = JsonConvert.DeserializeObject<Skin>(rawData);
+                if (File.Exists(Paths.LoadedSkin + "panels.json"))
                 {
-                    //No skin to load.
-                    loadedSkin = new Skin();
-                    loadedskin_images = new Images();
-                    saveskin();
-
+                    string panels = File.ReadAllText(Paths.LoadedSkin + "panels.json");
+                    loadedSkin.DesktopPanels = JsonConvert.DeserializeObject<List<DesktopPanel>>(panels);
+                    LoadPanels();
                 }
-            } else
+                loadimages();
+                LoadEmbeddedNamePack();
+
+            }
+            else
             {
                 loadedSkin = new Skin();
                 loadedskin_images = new Images();
-- 
cgit v1.2.3