Added defaulticonattribute.

42 files changed, 40 insertions, 0 deletions

diff --git a/ShiftOS.WinForms/Program.cs b/ShiftOS.WinForms/Program.cs
index 0ed5b02..06f495f 100644
--- a/ShiftOS.WinForms/Program.cs
+++ b/ShiftOS.WinForms/Program.cs
@@ -33,6 +33,7 @@ using Newtonsoft.Json;
 using static ShiftOS.Objects.ShiftFS.Utils;
 using ShiftOS.WinForms.Applications;
 using ShiftOS.WinForms.Tools;
+using System.Reflection;
 
 namespace ShiftOS.WinForms
 {
@@ -71,6 +72,26 @@ namespace ShiftOS.WinForms
         }
     }
 
+    internal class ShiftOSIconProvider : IIconProber
+    {
+        public Image GetIcon(DefaultIconAttribute attr)
+        {
+            
+            var res = typeof(Properties.Resources);
+            foreach(var prop in res.GetProperties(BindingFlags.NonPublic | BindingFlags.Static))
+            {
+                if(prop.PropertyType.BaseType == typeof(Image))
+                {
+                    if(prop.Name == attr.ID)
+                    {
+                        return prop.GetValue(null) as Image;
+                    }
+                }
+            }
+            return new Bitmap(16, 16);
+        }
+    }
+
     internal class WinformsShiftoriumProvider : IShiftoriumProvider
     {
         public List<ShiftoriumUpgrade> GetDefaults()
diff --git a/ShiftOS.WinForms/Properties/Resources.Designer.cs b/ShiftOS.WinForms/Properties/Resources.Designer.cs
index 7fc4cd7..f0a5e03 100644
--- a/ShiftOS.WinForms/Properties/Resources.Designer.cs
+++ b/ShiftOS.WinForms/Properties/Resources.Designer.cs
@@ -490,6 +490,16 @@ namespace ShiftOS.WinForms.Properties {
         }
         
         /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap IconTerminal {
+            get {
+                object obj = ResourceManager.GetObject("IconTerminal", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to [
         ///	&quot;english&quot;
         ///	&quot;deutsch - in beta&quot;
diff --git a/ShiftOS.WinForms/Properties/Resources.resx b/ShiftOS.WinForms/Properties/Resources.resx
index 8efe1d1..604a466 100644
--- a/ShiftOS.WinForms/Properties/Resources.resx
+++ b/ShiftOS.WinForms/Properties/Resources.resx
@@ -268,4 +268,7 @@
   <data name="DefaultMouse" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\DefaultMouse.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="IconTerminal" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\IconTerminal.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ShiftOS.WinForms/Resources/IconTerminal.bmp b/ShiftOS.WinForms/Resources/IconTerminal.bmp
new file mode 100644
index 0000000..9a5d373
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/IconTerminal.bmp
diff --git a/ShiftOS.WinForms/Resources/Shiftorium.txt b/ShiftOS.WinForms/Resources/Shiftorium.txt
index cf637f4..af30613 100644
--- a/ShiftOS.WinForms/Resources/Shiftorium.txt
+++ b/ShiftOS.WinForms/Resources/Shiftorium.txt
@@ -6,6 +6,11 @@
 		Dependencies: null
 	},
 	{
+		Name: "Audio Volume",
+		Cost: 50,
+		Description: "Want to adjust the volume of ShiftOS's audio? This upgrade will let you."
+	},
+	{
 		Name: "Color Depth Dithering",
 		Cost: 1000,
 		Description: "Right now, if you try to display images on the screen, with a low color depth like we have, the image will be totally unrecognizable! With this upgrade, we can adapt a simple 1-dimensional dithering algorithm into the video driver to hopefully smooth out the transition between colors.",
diff --git a/ShiftOS.WinForms/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
index d86e502..f2a65ac 100644
--- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj
+++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
@@ -463,6 +463,7 @@
     <None Include="Resources\strings_en.txt" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Resources\IconTerminal.bmp" />
     <None Include="Resources\sys_shiftoriumstory.txt" />
     <None Include="Resources\DefaultMouse.bmp" />
     <Content Include="Resources\hello.txt" />
diff --git a/ShiftOS.WinForms/SystemIcons/iconArtpad.png b/ShiftOS.WinForms/SystemIcons/iconArtpad.png
new file mode 100644
index 0000000..103eef8
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconArtpad.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconAudioPlayer.png b/ShiftOS.WinForms/SystemIcons/iconAudioPlayer.png
new file mode 100644
index 0000000..a445af4
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconAudioPlayer.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconBitnoteDigger.png b/ShiftOS.WinForms/SystemIcons/iconBitnoteDigger.png
new file mode 100644
index 0000000..42cbae3
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconBitnoteDigger.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconBitnoteWallet.png b/ShiftOS.WinForms/SystemIcons/iconBitnoteWallet.png
new file mode 100644
index 0000000..1f06a17
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconBitnoteWallet.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconCalculator.png b/ShiftOS.WinForms/SystemIcons/iconCalculator.png
new file mode 100644
index 0000000..4a15583
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconCalculator.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconClock.png b/ShiftOS.WinForms/SystemIcons/iconClock.png
new file mode 100644
index 0000000..2bcd19a
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconClock.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconColourPicker.fw.png b/ShiftOS.WinForms/SystemIcons/iconColourPicker.fw.png
new file mode 100644
index 0000000..ece25ab
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconColourPicker.fw.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconDodge.png b/ShiftOS.WinForms/SystemIcons/iconDodge.png
new file mode 100644
index 0000000..9a23b57
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconDodge.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconDownloader.png b/ShiftOS.WinForms/SystemIcons/iconDownloader.png
new file mode 100644
index 0000000..9a3ef2b
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconDownloader.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconFileOpener.fw.png b/ShiftOS.WinForms/SystemIcons/iconFileOpener.fw.png
new file mode 100644
index 0000000..578d499
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconFileOpener.fw.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconFileSaver.fw.png b/ShiftOS.WinForms/SystemIcons/iconFileSaver.fw.png
new file mode 100644
index 0000000..351b5d4
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconFileSaver.fw.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconFileSkimmer.png b/ShiftOS.WinForms/SystemIcons/iconFileSkimmer.png
new file mode 100644
index 0000000..cb4262b
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconFileSkimmer.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconIconManager.png b/ShiftOS.WinForms/SystemIcons/iconIconManager.png
new file mode 100644
index 0000000..99246e9
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconIconManager.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconInfoBox.fw.png b/ShiftOS.WinForms/SystemIcons/iconInfoBox.fw.png
new file mode 100644
index 0000000..0c9ebbd
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconInfoBox.fw.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconKnowledgeInput.png b/ShiftOS.WinForms/SystemIcons/iconKnowledgeInput.png
new file mode 100644
index 0000000..b5e513f
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconKnowledgeInput.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconNameChanger.png b/ShiftOS.WinForms/SystemIcons/iconNameChanger.png
new file mode 100644
index 0000000..7d94b21
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconNameChanger.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconPong.png b/ShiftOS.WinForms/SystemIcons/iconPong.png
new file mode 100644
index 0000000..c96cd58
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconPong.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconShifter.png b/ShiftOS.WinForms/SystemIcons/iconShifter.png
new file mode 100644
index 0000000..07344bf
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconShifter.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconShiftnet.png b/ShiftOS.WinForms/SystemIcons/iconShiftnet.png
new file mode 100644
index 0000000..405662d
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconShiftnet.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconShiftorium.png b/ShiftOS.WinForms/SystemIcons/iconShiftorium.png
new file mode 100644
index 0000000..a72239e
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconShiftorium.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconSkinLoader.png b/ShiftOS.WinForms/SystemIcons/iconSkinLoader.png
new file mode 100644
index 0000000..1df8f53
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconSkinLoader.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconSkinShifter.png b/ShiftOS.WinForms/SystemIcons/iconSkinShifter.png
new file mode 100644
index 0000000..cccc0d1
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconSkinShifter.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconSnakey.png b/ShiftOS.WinForms/SystemIcons/iconSnakey.png
new file mode 100644
index 0000000..469367c
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconSnakey.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconSysinfo.png b/ShiftOS.WinForms/SystemIcons/iconSysinfo.png
new file mode 100644
index 0000000..0d1146b
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconSysinfo.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconTerminal.png b/ShiftOS.WinForms/SystemIcons/iconTerminal.png
new file mode 100644
index 0000000..df5e779
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconTerminal.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconTextPad.png b/ShiftOS.WinForms/SystemIcons/iconTextPad.png
new file mode 100644
index 0000000..0d536ce
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconTextPad.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconVideoPlayer.png b/ShiftOS.WinForms/SystemIcons/iconVideoPlayer.png
new file mode 100644
index 0000000..17a9043
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconVideoPlayer.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconWebBrowser.png b/ShiftOS.WinForms/SystemIcons/iconWebBrowser.png
new file mode 100644
index 0000000..e22117f
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconWebBrowser.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconfloodgate.png b/ShiftOS.WinForms/SystemIcons/iconfloodgate.png
new file mode 100644
index 0000000..2a7c483
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconfloodgate.png
diff --git a/ShiftOS.WinForms/SystemIcons/icongraphicpicker.png b/ShiftOS.WinForms/SystemIcons/icongraphicpicker.png
new file mode 100644
index 0000000..59ded9f
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/icongraphicpicker.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconmaze.png b/ShiftOS.WinForms/SystemIcons/iconmaze.png
new file mode 100644
index 0000000..18c3c3f
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconmaze.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconoctocat.bmp b/ShiftOS.WinForms/SystemIcons/iconoctocat.bmp
new file mode 100644
index 0000000..b1addaa
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconoctocat.bmp
diff --git a/ShiftOS.WinForms/SystemIcons/iconorcwrite.png b/ShiftOS.WinForms/SystemIcons/iconorcwrite.png
new file mode 100644
index 0000000..e1c2862
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconorcwrite.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconshutdown.png b/ShiftOS.WinForms/SystemIcons/iconshutdown.png
new file mode 100644
index 0000000..d4959c2
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconshutdown.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconunitytoggle.png b/ShiftOS.WinForms/SystemIcons/iconunitytoggle.png
new file mode 100644
index 0000000..450b092
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconunitytoggle.png
diff --git a/ShiftOS.WinForms/SystemIcons/iconvirusscanner.png b/ShiftOS.WinForms/SystemIcons/iconvirusscanner.png
new file mode 100644
index 0000000..5fcb50c
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconvirusscanner.png