From 1c0c7c6fa8cbc2c20f4a25457b934c61ffe4ec43 Mon Sep 17 00:00:00 2001 From: AShifter Date: Tue, 7 Mar 2017 18:53:41 -0700 Subject: Added ShiftLotto Added ShiftLotto. It's a new shiftorium upgrade that lets you make (and lose) codepoints FAST. --- ShiftOS.WinForms/ShiftOS.WinForms.csproj | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'ShiftOS.WinForms/ShiftOS.WinForms.csproj') diff --git a/ShiftOS.WinForms/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj index 7f728d5..2c36f6c 100644 --- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj +++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj @@ -166,6 +166,12 @@ Shifter.cs + + UserControl + + + ShiftLotto.cs + UserControl @@ -335,6 +341,9 @@ Shifter.cs + + ShiftLotto.cs + Shiftnet.cs -- cgit v1.2.3 From 369aefc5e81eba25e31d52c1031f3e8ec750cb04 Mon Sep 17 00:00:00 2001 From: AShifter Date: Tue, 7 Mar 2017 20:04:59 -0700 Subject: Added ShiftLotto Icon I added a ShiftLotto Icon (and probably did other stuff) --- .../Applications/ShiftLotto.Designer.cs | 26 ++++++++++++++++++++- ShiftOS.WinForms/Applications/ShiftLotto.cs | 1 + ShiftOS.WinForms/Properties/Resources.Designer.cs | 24 ++++++++++++------- ShiftOS.WinForms/Properties/Resources.resx | 3 +++ ShiftOS.WinForms/ShiftOS.WinForms.csproj | 1 + ShiftOS.WinForms/SystemIcons/iconShiftLotto.png | Bin 0 -> 299 bytes 6 files changed, 45 insertions(+), 10 deletions(-) create mode 100644 ShiftOS.WinForms/SystemIcons/iconShiftLotto.png (limited to 'ShiftOS.WinForms/ShiftOS.WinForms.csproj') diff --git a/ShiftOS.WinForms/Applications/ShiftLotto.Designer.cs b/ShiftOS.WinForms/Applications/ShiftLotto.Designer.cs index 653e3db..943322e 100644 --- a/ShiftOS.WinForms/Applications/ShiftLotto.Designer.cs +++ b/ShiftOS.WinForms/Applications/ShiftLotto.Designer.cs @@ -1,4 +1,28 @@ -namespace ShiftOS.WinForms.Applications +/* + * MIT License + * + * Copyright (c) 2017 Michael VanOverbeek and ShiftOS devs + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +namespace ShiftOS.WinForms.Applications { partial class ShiftLotto { diff --git a/ShiftOS.WinForms/Applications/ShiftLotto.cs b/ShiftOS.WinForms/Applications/ShiftLotto.cs index cc38582..7acba3e 100644 --- a/ShiftOS.WinForms/Applications/ShiftLotto.cs +++ b/ShiftOS.WinForms/Applications/ShiftLotto.cs @@ -35,6 +35,7 @@ using ShiftOS.Engine; namespace ShiftOS.WinForms.Applications { [Launcher("ShiftLotto", true, "al_shiftlotto", "Games")] + [DefaultIcon("iconShiftLotto")] [RequiresUpgrade("shiftlotto")] [WinOpen("shiftlotto")] public partial class ShiftLotto : UserControl, IShiftOSWindow diff --git a/ShiftOS.WinForms/Properties/Resources.Designer.cs b/ShiftOS.WinForms/Properties/Resources.Designer.cs index 2df6f11..6628f0b 100644 --- a/ShiftOS.WinForms/Properties/Resources.Designer.cs +++ b/ShiftOS.WinForms/Properties/Resources.Designer.cs @@ -729,6 +729,16 @@ namespace ShiftOS.WinForms.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap iconShiftLotto { + get { + object obj = ResourceManager.GetObject("iconShiftLotto", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -923,15 +933,11 @@ namespace ShiftOS.WinForms.Properties { /// Company: "ShiftSoft" /// }, /// { - /// Company: "" - /// }, - /// { - /// - /// }, - /// { - /// - /// }, - ///]. + /// Company: "Shiftcast", + /// Name: "NetXtreme Hyper Edition", + /// CostPerMonth: 1500, + /// DownloadSpeed: 524288, //512 kb/s + /// Description: "It's time to supercharge your Shif [rest of string was truncated]";. /// internal static string ShiftnetServices { get { diff --git a/ShiftOS.WinForms/Properties/Resources.resx b/ShiftOS.WinForms/Properties/Resources.resx index 5100329..bef4f99 100644 --- a/ShiftOS.WinForms/Properties/Resources.resx +++ b/ShiftOS.WinForms/Properties/Resources.resx @@ -475,4 +475,7 @@ ..\Resources\ShiftnetServices.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + ..\systemicons\iconshiftlotto.png;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/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj index 2c36f6c..3a603db 100644 --- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj +++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj @@ -609,6 +609,7 @@ + diff --git a/ShiftOS.WinForms/SystemIcons/iconShiftLotto.png b/ShiftOS.WinForms/SystemIcons/iconShiftLotto.png new file mode 100644 index 0000000..b2a3ad5 Binary files /dev/null and b/ShiftOS.WinForms/SystemIcons/iconShiftLotto.png differ -- cgit v1.2.3