From 7a29121456747651bd27d75833e28d5f7d479a1e Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 7 Feb 2017 17:30:14 -0500 Subject: Added defaulticonattribute. --- ShiftOS.WinForms/Program.cs | 21 +++++++++++++++++++++ ShiftOS.WinForms/Properties/Resources.Designer.cs | 10 ++++++++++ ShiftOS.WinForms/Properties/Resources.resx | 3 +++ ShiftOS.WinForms/Resources/IconTerminal.bmp | Bin 0 -> 1334 bytes ShiftOS.WinForms/Resources/Shiftorium.txt | 5 +++++ ShiftOS.WinForms/ShiftOS.WinForms.csproj | 1 + ShiftOS.WinForms/SystemIcons/iconArtpad.png | Bin 0 -> 47778 bytes ShiftOS.WinForms/SystemIcons/iconAudioPlayer.png | Bin 0 -> 50565 bytes ShiftOS.WinForms/SystemIcons/iconBitnoteDigger.png | Bin 0 -> 49878 bytes ShiftOS.WinForms/SystemIcons/iconBitnoteWallet.png | Bin 0 -> 48562 bytes ShiftOS.WinForms/SystemIcons/iconCalculator.png | Bin 0 -> 50783 bytes ShiftOS.WinForms/SystemIcons/iconClock.png | Bin 0 -> 49533 bytes .../SystemIcons/iconColourPicker.fw.png | Bin 0 -> 47246 bytes ShiftOS.WinForms/SystemIcons/iconDodge.png | Bin 0 -> 237 bytes ShiftOS.WinForms/SystemIcons/iconDownloader.png | Bin 0 -> 51292 bytes ShiftOS.WinForms/SystemIcons/iconFileOpener.fw.png | Bin 0 -> 47956 bytes ShiftOS.WinForms/SystemIcons/iconFileSaver.fw.png | Bin 0 -> 47385 bytes ShiftOS.WinForms/SystemIcons/iconFileSkimmer.png | Bin 0 -> 47436 bytes ShiftOS.WinForms/SystemIcons/iconIconManager.png | Bin 0 -> 77559 bytes ShiftOS.WinForms/SystemIcons/iconInfoBox.fw.png | Bin 0 -> 47233 bytes .../SystemIcons/iconKnowledgeInput.png | Bin 0 -> 47435 bytes ShiftOS.WinForms/SystemIcons/iconNameChanger.png | Bin 0 -> 48858 bytes ShiftOS.WinForms/SystemIcons/iconPong.png | Bin 0 -> 47990 bytes ShiftOS.WinForms/SystemIcons/iconShifter.png | Bin 0 -> 47443 bytes ShiftOS.WinForms/SystemIcons/iconShiftnet.png | Bin 0 -> 49354 bytes ShiftOS.WinForms/SystemIcons/iconShiftorium.png | Bin 0 -> 64263 bytes ShiftOS.WinForms/SystemIcons/iconSkinLoader.png | Bin 0 -> 48047 bytes ShiftOS.WinForms/SystemIcons/iconSkinShifter.png | Bin 0 -> 51630 bytes ShiftOS.WinForms/SystemIcons/iconSnakey.png | Bin 0 -> 249 bytes ShiftOS.WinForms/SystemIcons/iconSysinfo.png | Bin 0 -> 318 bytes ShiftOS.WinForms/SystemIcons/iconTerminal.png | Bin 0 -> 48451 bytes ShiftOS.WinForms/SystemIcons/iconTextPad.png | Bin 0 -> 47563 bytes ShiftOS.WinForms/SystemIcons/iconVideoPlayer.png | Bin 0 -> 47879 bytes ShiftOS.WinForms/SystemIcons/iconWebBrowser.png | Bin 0 -> 50634 bytes ShiftOS.WinForms/SystemIcons/iconfloodgate.png | Bin 0 -> 260 bytes ShiftOS.WinForms/SystemIcons/icongraphicpicker.png | Bin 0 -> 47862 bytes ShiftOS.WinForms/SystemIcons/iconmaze.png | Bin 0 -> 256 bytes ShiftOS.WinForms/SystemIcons/iconoctocat.bmp | Bin 0 -> 1270 bytes ShiftOS.WinForms/SystemIcons/iconorcwrite.png | Bin 0 -> 377 bytes ShiftOS.WinForms/SystemIcons/iconshutdown.png | Bin 0 -> 47390 bytes ShiftOS.WinForms/SystemIcons/iconunitytoggle.png | Bin 0 -> 259 bytes ShiftOS.WinForms/SystemIcons/iconvirusscanner.png | Bin 0 -> 292 bytes 42 files changed, 40 insertions(+) create mode 100644 ShiftOS.WinForms/Resources/IconTerminal.bmp create mode 100644 ShiftOS.WinForms/SystemIcons/iconArtpad.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconAudioPlayer.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconBitnoteDigger.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconBitnoteWallet.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconCalculator.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconClock.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconColourPicker.fw.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconDodge.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconDownloader.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconFileOpener.fw.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconFileSaver.fw.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconFileSkimmer.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconIconManager.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconInfoBox.fw.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconKnowledgeInput.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconNameChanger.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconPong.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconShifter.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconShiftnet.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconShiftorium.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconSkinLoader.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconSkinShifter.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconSnakey.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconSysinfo.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconTerminal.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconTextPad.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconVideoPlayer.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconWebBrowser.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconfloodgate.png create mode 100644 ShiftOS.WinForms/SystemIcons/icongraphicpicker.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconmaze.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconoctocat.bmp create mode 100644 ShiftOS.WinForms/SystemIcons/iconorcwrite.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconshutdown.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconunitytoggle.png create mode 100644 ShiftOS.WinForms/SystemIcons/iconvirusscanner.png (limited to 'ShiftOS.WinForms') 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 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 @@ -489,6 +489,16 @@ namespace ShiftOS.WinForms.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap IconTerminal { + get { + object obj = ResourceManager.GetObject("IconTerminal", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized string similar to [ /// "english" 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 @@ ..\Resources\DefaultMouse.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\IconTerminal.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ 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 Binary files /dev/null and b/ShiftOS.WinForms/Resources/IconTerminal.bmp differ 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 @@ -5,6 +5,11 @@ Description: "Some basic commands for the terminal that'll help you out in the multi-user domain.", 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, 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 @@ + diff --git a/ShiftOS.WinForms/SystemIcons/iconArtpad.png b/ShiftOS.WinForms/SystemIcons/iconArtpad.png new file mode 100644 index 0000000..103eef8 Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconArtpad.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconAudioPlayer.png b/ShiftOS.WinForms/SystemIcons/iconAudioPlayer.png new file mode 100644 index 0000000..a445af4 Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconAudioPlayer.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconBitnoteDigger.png b/ShiftOS.WinForms/SystemIcons/iconBitnoteDigger.png new file mode 100644 index 0000000..42cbae3 Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconBitnoteDigger.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconBitnoteWallet.png b/ShiftOS.WinForms/SystemIcons/iconBitnoteWallet.png new file mode 100644 index 0000000..1f06a17 Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconBitnoteWallet.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconCalculator.png b/ShiftOS.WinForms/SystemIcons/iconCalculator.png new file mode 100644 index 0000000..4a15583 Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconCalculator.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconClock.png b/ShiftOS.WinForms/SystemIcons/iconClock.png new file mode 100644 index 0000000..2bcd19a Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconClock.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconColourPicker.fw.png b/ShiftOS.WinForms/SystemIcons/iconColourPicker.fw.png new file mode 100644 index 0000000..ece25ab Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconColourPicker.fw.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconDodge.png b/ShiftOS.WinForms/SystemIcons/iconDodge.png new file mode 100644 index 0000000..9a23b57 Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconDodge.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconDownloader.png b/ShiftOS.WinForms/SystemIcons/iconDownloader.png new file mode 100644 index 0000000..9a3ef2b Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconDownloader.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconFileOpener.fw.png b/ShiftOS.WinForms/SystemIcons/iconFileOpener.fw.png new file mode 100644 index 0000000..578d499 Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconFileOpener.fw.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconFileSaver.fw.png b/ShiftOS.WinForms/SystemIcons/iconFileSaver.fw.png new file mode 100644 index 0000000..351b5d4 Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconFileSaver.fw.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconFileSkimmer.png b/ShiftOS.WinForms/SystemIcons/iconFileSkimmer.png new file mode 100644 index 0000000..cb4262b Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconFileSkimmer.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconIconManager.png b/ShiftOS.WinForms/SystemIcons/iconIconManager.png new file mode 100644 index 0000000..99246e9 Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconIconManager.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconInfoBox.fw.png b/ShiftOS.WinForms/SystemIcons/iconInfoBox.fw.png new file mode 100644 index 0000000..0c9ebbd Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconInfoBox.fw.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconKnowledgeInput.png b/ShiftOS.WinForms/SystemIcons/iconKnowledgeInput.png new file mode 100644 index 0000000..b5e513f Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconKnowledgeInput.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconNameChanger.png b/ShiftOS.WinForms/SystemIcons/iconNameChanger.png new file mode 100644 index 0000000..7d94b21 Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconNameChanger.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconPong.png b/ShiftOS.WinForms/SystemIcons/iconPong.png new file mode 100644 index 0000000..c96cd58 Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconPong.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconShifter.png b/ShiftOS.WinForms/SystemIcons/iconShifter.png new file mode 100644 index 0000000..07344bf Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconShifter.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconShiftnet.png b/ShiftOS.WinForms/SystemIcons/iconShiftnet.png new file mode 100644 index 0000000..405662d Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconShiftnet.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconShiftorium.png b/ShiftOS.WinForms/SystemIcons/iconShiftorium.png new file mode 100644 index 0000000..a72239e Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconShiftorium.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconSkinLoader.png b/ShiftOS.WinForms/SystemIcons/iconSkinLoader.png new file mode 100644 index 0000000..1df8f53 Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconSkinLoader.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconSkinShifter.png b/ShiftOS.WinForms/SystemIcons/iconSkinShifter.png new file mode 100644 index 0000000..cccc0d1 Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconSkinShifter.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconSnakey.png b/ShiftOS.WinForms/SystemIcons/iconSnakey.png new file mode 100644 index 0000000..469367c Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconSnakey.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconSysinfo.png b/ShiftOS.WinForms/SystemIcons/iconSysinfo.png new file mode 100644 index 0000000..0d1146b Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconSysinfo.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconTerminal.png b/ShiftOS.WinForms/SystemIcons/iconTerminal.png new file mode 100644 index 0000000..df5e779 Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconTerminal.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconTextPad.png b/ShiftOS.WinForms/SystemIcons/iconTextPad.png new file mode 100644 index 0000000..0d536ce Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconTextPad.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconVideoPlayer.png b/ShiftOS.WinForms/SystemIcons/iconVideoPlayer.png new file mode 100644 index 0000000..17a9043 Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconVideoPlayer.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconWebBrowser.png b/ShiftOS.WinForms/SystemIcons/iconWebBrowser.png new file mode 100644 index 0000000..e22117f Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconWebBrowser.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconfloodgate.png b/ShiftOS.WinForms/SystemIcons/iconfloodgate.png new file mode 100644 index 0000000..2a7c483 Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconfloodgate.png differ diff --git a/ShiftOS.WinForms/SystemIcons/icongraphicpicker.png b/ShiftOS.WinForms/SystemIcons/icongraphicpicker.png new file mode 100644 index 0000000..59ded9f Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/icongraphicpicker.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconmaze.png b/ShiftOS.WinForms/SystemIcons/iconmaze.png new file mode 100644 index 0000000..18c3c3f Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconmaze.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconoctocat.bmp b/ShiftOS.WinForms/SystemIcons/iconoctocat.bmp new file mode 100644 index 0000000..b1addaa Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconoctocat.bmp differ diff --git a/ShiftOS.WinForms/SystemIcons/iconorcwrite.png b/ShiftOS.WinForms/SystemIcons/iconorcwrite.png new file mode 100644 index 0000000..e1c2862 Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconorcwrite.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconshutdown.png b/ShiftOS.WinForms/SystemIcons/iconshutdown.png new file mode 100644 index 0000000..d4959c2 Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconshutdown.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconunitytoggle.png b/ShiftOS.WinForms/SystemIcons/iconunitytoggle.png new file mode 100644 index 0000000..450b092 Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconunitytoggle.png differ diff --git a/ShiftOS.WinForms/SystemIcons/iconvirusscanner.png b/ShiftOS.WinForms/SystemIcons/iconvirusscanner.png new file mode 100644 index 0000000..5fcb50c Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconvirusscanner.png differ -- cgit v1.2.3