diff options
| author | Michael VanOverbeek <[email protected]> | 2017-03-07 22:08:55 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-03-07 22:08:55 -0500 |
| commit | dfeaeea3ab22d5864569f8c303c248ab046db9e1 (patch) | |
| tree | 5bc2a134d8bae6edac4fbb4757f2eb325addb7c4 | |
| parent | cf15e379d3d29f5289fc80e0bcd6c6de025d17a4 (diff) | |
| parent | 369aefc5e81eba25e31d52c1031f3e8ec750cb04 (diff) | |
| download | shiftos_thereturn-dfeaeea3ab22d5864569f8c303c248ab046db9e1.tar.gz shiftos_thereturn-dfeaeea3ab22d5864569f8c303c248ab046db9e1.tar.bz2 shiftos_thereturn-dfeaeea3ab22d5864569f8c303c248ab046db9e1.zip | |
Merge pull request #106 from AShifter/master
Added ShiftLotto Icon
| -rw-r--r-- | ShiftOS.WinForms/Applications/ShiftLotto.Designer.cs | 26 | ||||
| -rw-r--r-- | ShiftOS.WinForms/Applications/ShiftLotto.cs | 1 | ||||
| -rw-r--r-- | ShiftOS.WinForms/Properties/Resources.Designer.cs | 24 | ||||
| -rw-r--r-- | ShiftOS.WinForms/Properties/Resources.resx | 3 | ||||
| -rw-r--r-- | ShiftOS.WinForms/ShiftOS.WinForms.csproj | 1 | ||||
| -rw-r--r-- | ShiftOS.WinForms/SystemIcons/iconShiftLotto.png | bin | 0 -> 299 bytes |
6 files changed, 45 insertions, 10 deletions
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 @@ -732,6 +732,16 @@ namespace ShiftOS.WinForms.Properties { /// <summary> /// Looks up a localized resource of type System.Drawing.Bitmap. /// </summary> + internal static System.Drawing.Bitmap iconShiftLotto { + get { + object obj = ResourceManager.GetObject("iconShiftLotto", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> internal static System.Drawing.Bitmap iconShiftnet { get { object obj = ResourceManager.GetObject("iconShiftnet", resourceCulture); @@ -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]";. /// </summary> 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 @@ <data name="ShiftnetServices" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\ShiftnetServices.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value> </data> + <data name="iconShiftLotto" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\systemicons\iconshiftlotto.png;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/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj index 4f21b04..62df12a 100644 --- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj +++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj @@ -618,6 +618,7 @@ <Content Include="SystemIcons\iconPong.png" /> <Content Include="SystemIcons\iconShifter.png" /> <None Include="SystemIcons\iconShiftLetters.png" /> + <Content Include="SystemIcons\iconShiftLotto.png" /> <Content Include="SystemIcons\iconShiftnet.png" /> <Content Include="SystemIcons\iconShiftorium.png" /> <None Include="SystemIcons\iconShiftSweeper.png" /> diff --git a/ShiftOS.WinForms/SystemIcons/iconShiftLotto.png b/ShiftOS.WinForms/SystemIcons/iconShiftLotto.png Binary files differnew file mode 100644 index 0000000..b2a3ad5 --- /dev/null +++ b/ShiftOS.WinForms/SystemIcons/iconShiftLotto.png |
