From 76d3b5a425261eb237bcc5cd3d96b1addd0bc41c Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 21 Oct 2020 02:17:24 +0100 Subject: [PATCH] Changed: clean-up --- FizzyLauncher.UI/FizzyLauncher.UI.csproj | 76 +++-- FizzyLauncher.UI/FizzyLauncher.UI.csproj.user | 6 + ...es.Designer.cs => Resources16.Designer.cs} | 70 ++--- .../{Resources.resx => Resources16.resx} | 64 ++-- .../Properties/Resources20.Designer.cs | 133 ++++++++ .../Resources20.resx} | 22 ++ .../Resources/16}/arrow_down.png | Bin .../Resources/16}/arrow_down2.png | Bin .../Resources/16}/arrow_up.png | Bin .../Resources/16}/arrow_up2.png | Bin .../Resources/{close16_a.png => 16/close.png} | Bin .../{close16_b.png => 16/close2.png} | Bin .../Resources/16}/edit.png | Bin .../Resources/16}/edit2.png | Bin .../Resources/16}/file.png | Bin .../Resources/16}/file2.png | Bin .../Resources/16}/folder.png | Bin .../Resources/16}/folder2.png | Bin .../Resources/16}/minus.png | Bin .../Resources/16}/minus2.png | Bin .../Resources/16}/plus.png | Bin .../Resources/16}/plus2.png | Bin .../Resources/20/close.png | Bin .../Resources/20/close2.png | Bin .../Resources/20/maximise.png | Bin .../Resources/20/maximise2.png | Bin .../Resources/20/maximise3.png | Bin .../Resources/20/minimise.png | Bin .../Resources/20/minimise2.png | Bin FizzyLauncher.UI/Resources/arrow_down16_a.png | Bin 601 -> 0 bytes FizzyLauncher.UI/Resources/arrow_down16_b.png | Bin 417 -> 0 bytes FizzyLauncher.UI/Resources/arrow_up16_a.png | Bin 590 -> 0 bytes FizzyLauncher.UI/Resources/arrow_up16_b.png | Bin 410 -> 0 bytes FizzyLauncher.UI/Resources/edit16_a.png | Bin 612 -> 0 bytes FizzyLauncher.UI/Resources/edit16_b.png | Bin 419 -> 0 bytes FizzyLauncher.UI/Resources/file16_a.png | Bin 372 -> 0 bytes FizzyLauncher.UI/Resources/file16_b.png | Bin 323 -> 0 bytes FizzyLauncher.UI/Resources/folder16_a.png | Bin 352 -> 0 bytes FizzyLauncher.UI/Resources/folder16_b.png | Bin 288 -> 0 bytes FizzyLauncher.UI/Resources/minus16_a.png | Bin 532 -> 0 bytes FizzyLauncher.UI/Resources/minus16_b.png | Bin 380 -> 0 bytes FizzyLauncher.UI/Resources/plus16_a.png | Bin 559 -> 0 bytes FizzyLauncher.UI/Resources/plus16_b.png | Bin 398 -> 0 bytes .../RyzStudio/Windows/Forms/TForm.cs | 35 ++- .../RyzStudio/Windows/Forms/TForm.resx | 0 .../ThemedForms/TDialogForm.Designer.cs | 4 +- .../Windows/ThemedForms/TDialogForm.cs | 11 +- .../Windows/ThemedForms/TFolderTextBox.cs | 6 +- .../Windows/ThemedForms/TForm.Designer.cs | 52 ---- .../RyzStudio/Windows/ThemedForms/TForm.cs | 173 ----------- .../Windows/ThemedForms/TListBox.designer.cs | 30 +- .../Windows/ThemedForms/TOpenFileTextBox.cs | 6 +- FizzyLauncher.csproj | 15 - MainForm.cs | 3 +- Resource1.Designer.cs | 293 ------------------ Resource1.resx | 190 ------------ .../Windows/Forms/Resources/close2_16.png | Bin 468 -> 0 bytes .../Windows/Forms/Resources/close_16.png | Bin 367 -> 0 bytes installer.iss | 51 --- 59 files changed, 335 insertions(+), 905 deletions(-) create mode 100644 FizzyLauncher.UI/FizzyLauncher.UI.csproj.user rename FizzyLauncher.UI/Properties/{Resources.Designer.cs => Resources16.Designer.cs} (75%) rename FizzyLauncher.UI/Properties/{Resources.resx => Resources16.resx} (71%) create mode 100644 FizzyLauncher.UI/Properties/Resources20.Designer.cs rename FizzyLauncher.UI/{RyzStudio/Windows/ThemedForms/TForm.resx => Properties/Resources20.resx} (75%) rename {RyzStudio/Windows/Forms/Resources => FizzyLauncher.UI/Resources/16}/arrow_down.png (100%) rename {RyzStudio/Windows/Forms/Resources => FizzyLauncher.UI/Resources/16}/arrow_down2.png (100%) rename {RyzStudio/Windows/Forms/Resources => FizzyLauncher.UI/Resources/16}/arrow_up.png (100%) rename {RyzStudio/Windows/Forms/Resources => FizzyLauncher.UI/Resources/16}/arrow_up2.png (100%) rename FizzyLauncher.UI/Resources/{close16_a.png => 16/close.png} (100%) rename FizzyLauncher.UI/Resources/{close16_b.png => 16/close2.png} (100%) rename {RyzStudio/Windows/Forms/Resources => FizzyLauncher.UI/Resources/16}/edit.png (100%) rename {RyzStudio/Windows/Forms/Resources => FizzyLauncher.UI/Resources/16}/edit2.png (100%) rename {RyzStudio/Windows/Forms/Resources => FizzyLauncher.UI/Resources/16}/file.png (100%) rename {RyzStudio/Windows/Forms/Resources => FizzyLauncher.UI/Resources/16}/file2.png (100%) rename {RyzStudio/Windows/Forms/Resources => FizzyLauncher.UI/Resources/16}/folder.png (100%) rename {RyzStudio/Windows/Forms/Resources => FizzyLauncher.UI/Resources/16}/folder2.png (100%) rename {RyzStudio/Windows/Forms/Resources => FizzyLauncher.UI/Resources/16}/minus.png (100%) rename {RyzStudio/Windows/Forms/Resources => FizzyLauncher.UI/Resources/16}/minus2.png (100%) rename {RyzStudio/Windows/Forms/Resources => FizzyLauncher.UI/Resources/16}/plus.png (100%) rename {RyzStudio/Windows/Forms/Resources => FizzyLauncher.UI/Resources/16}/plus2.png (100%) rename RyzStudio/Windows/Forms/Resources/close_20.png => FizzyLauncher.UI/Resources/20/close.png (100%) rename RyzStudio/Windows/Forms/Resources/close2_20.png => FizzyLauncher.UI/Resources/20/close2.png (100%) rename RyzStudio/Windows/Forms/Resources/maximise_20.png => FizzyLauncher.UI/Resources/20/maximise.png (100%) rename RyzStudio/Windows/Forms/Resources/maximise2_20.png => FizzyLauncher.UI/Resources/20/maximise2.png (100%) rename RyzStudio/Windows/Forms/Resources/maximise3_20.png => FizzyLauncher.UI/Resources/20/maximise3.png (100%) rename RyzStudio/Windows/Forms/Resources/minimise_20.png => FizzyLauncher.UI/Resources/20/minimise.png (100%) rename RyzStudio/Windows/Forms/Resources/minimise2_20.png => FizzyLauncher.UI/Resources/20/minimise2.png (100%) delete mode 100644 FizzyLauncher.UI/Resources/arrow_down16_a.png delete mode 100644 FizzyLauncher.UI/Resources/arrow_down16_b.png delete mode 100644 FizzyLauncher.UI/Resources/arrow_up16_a.png delete mode 100644 FizzyLauncher.UI/Resources/arrow_up16_b.png delete mode 100644 FizzyLauncher.UI/Resources/edit16_a.png delete mode 100644 FizzyLauncher.UI/Resources/edit16_b.png delete mode 100644 FizzyLauncher.UI/Resources/file16_a.png delete mode 100644 FizzyLauncher.UI/Resources/file16_b.png delete mode 100644 FizzyLauncher.UI/Resources/folder16_a.png delete mode 100644 FizzyLauncher.UI/Resources/folder16_b.png delete mode 100644 FizzyLauncher.UI/Resources/minus16_a.png delete mode 100644 FizzyLauncher.UI/Resources/minus16_b.png delete mode 100644 FizzyLauncher.UI/Resources/plus16_a.png delete mode 100644 FizzyLauncher.UI/Resources/plus16_b.png rename Windows/Forms/AForm.cs => FizzyLauncher.UI/RyzStudio/Windows/Forms/TForm.cs (92%) rename Windows/Forms/AForm.resx => FizzyLauncher.UI/RyzStudio/Windows/Forms/TForm.resx (100%) delete mode 100644 FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TForm.Designer.cs delete mode 100644 FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TForm.cs delete mode 100644 Resource1.Designer.cs delete mode 100644 Resource1.resx delete mode 100644 RyzStudio/Windows/Forms/Resources/close2_16.png delete mode 100644 RyzStudio/Windows/Forms/Resources/close_16.png delete mode 100644 installer.iss diff --git a/FizzyLauncher.UI/FizzyLauncher.UI.csproj b/FizzyLauncher.UI/FizzyLauncher.UI.csproj index 23e9e57..34ecce2 100644 --- a/FizzyLauncher.UI/FizzyLauncher.UI.csproj +++ b/FizzyLauncher.UI/FizzyLauncher.UI.csproj @@ -47,12 +47,20 @@ - + True True - Resources.resx + Resources16.resx + + + True + True + Resources20.resx + + Form + UserControl @@ -122,9 +130,16 @@ - + ResXFileCodeGenerator - Resources.Designer.cs + Resources16.Designer.cs + + + ResXFileCodeGenerator + Resources20.Designer.cs + + + TForm.cs TButton.cs @@ -146,52 +161,73 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FizzyLauncher.UI/FizzyLauncher.UI.csproj.user b/FizzyLauncher.UI/FizzyLauncher.UI.csproj.user new file mode 100644 index 0000000..c10e84b --- /dev/null +++ b/FizzyLauncher.UI/FizzyLauncher.UI.csproj.user @@ -0,0 +1,6 @@ + + + + ProjectFiles + + \ No newline at end of file diff --git a/FizzyLauncher.UI/Properties/Resources.Designer.cs b/FizzyLauncher.UI/Properties/Resources16.Designer.cs similarity index 75% rename from FizzyLauncher.UI/Properties/Resources.Designer.cs rename to FizzyLauncher.UI/Properties/Resources16.Designer.cs index 40f0b6b..a48b080 100644 --- a/FizzyLauncher.UI/Properties/Resources.Designer.cs +++ b/FizzyLauncher.UI/Properties/Resources16.Designer.cs @@ -22,14 +22,14 @@ namespace AppLauncher.Properties { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { + internal class Resources16 { private static global::System.Resources.ResourceManager resourceMan; private static global::System.Globalization.CultureInfo resourceCulture; [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { + internal Resources16() { } /// @@ -39,7 +39,7 @@ namespace AppLauncher.Properties { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AppLauncher.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AppLauncher.Properties.Resources16", typeof(Resources16).Assembly); resourceMan = temp; } return resourceMan; @@ -63,9 +63,9 @@ namespace AppLauncher.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap arrow_down16_a { + internal static System.Drawing.Bitmap arrow_down { get { - object obj = ResourceManager.GetObject("arrow_down16_a", resourceCulture); + object obj = ResourceManager.GetObject("arrow_down", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -73,9 +73,9 @@ namespace AppLauncher.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap arrow_down16_b { + internal static System.Drawing.Bitmap arrow_down2 { get { - object obj = ResourceManager.GetObject("arrow_down16_b", resourceCulture); + object obj = ResourceManager.GetObject("arrow_down2", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -83,9 +83,9 @@ namespace AppLauncher.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap arrow_up16_a { + internal static System.Drawing.Bitmap arrow_up { get { - object obj = ResourceManager.GetObject("arrow_up16_a", resourceCulture); + object obj = ResourceManager.GetObject("arrow_up", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -93,9 +93,9 @@ namespace AppLauncher.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap arrow_up16_b { + internal static System.Drawing.Bitmap arrow_up2 { get { - object obj = ResourceManager.GetObject("arrow_up16_b", resourceCulture); + object obj = ResourceManager.GetObject("arrow_up2", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -103,9 +103,9 @@ namespace AppLauncher.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap close16_a { + internal static System.Drawing.Bitmap close { get { - object obj = ResourceManager.GetObject("close16_a", resourceCulture); + object obj = ResourceManager.GetObject("close", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -113,9 +113,9 @@ namespace AppLauncher.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap close16_b { + internal static System.Drawing.Bitmap close2 { get { - object obj = ResourceManager.GetObject("close16_b", resourceCulture); + object obj = ResourceManager.GetObject("close2", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -123,9 +123,9 @@ namespace AppLauncher.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap edit16_a { + internal static System.Drawing.Bitmap edit { get { - object obj = ResourceManager.GetObject("edit16_a", resourceCulture); + object obj = ResourceManager.GetObject("edit", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -133,9 +133,9 @@ namespace AppLauncher.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap edit16_b { + internal static System.Drawing.Bitmap edit2 { get { - object obj = ResourceManager.GetObject("edit16_b", resourceCulture); + object obj = ResourceManager.GetObject("edit2", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -143,9 +143,9 @@ namespace AppLauncher.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap file16_a { + internal static System.Drawing.Bitmap file { get { - object obj = ResourceManager.GetObject("file16_a", resourceCulture); + object obj = ResourceManager.GetObject("file", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -153,9 +153,9 @@ namespace AppLauncher.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap file16_b { + internal static System.Drawing.Bitmap file2 { get { - object obj = ResourceManager.GetObject("file16_b", resourceCulture); + object obj = ResourceManager.GetObject("file2", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -163,9 +163,9 @@ namespace AppLauncher.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap folder16_a { + internal static System.Drawing.Bitmap folder { get { - object obj = ResourceManager.GetObject("folder16_a", resourceCulture); + object obj = ResourceManager.GetObject("folder", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -173,9 +173,9 @@ namespace AppLauncher.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap folder16_b { + internal static System.Drawing.Bitmap folder2 { get { - object obj = ResourceManager.GetObject("folder16_b", resourceCulture); + object obj = ResourceManager.GetObject("folder2", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -183,9 +183,9 @@ namespace AppLauncher.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap minus16_a { + internal static System.Drawing.Bitmap minus { get { - object obj = ResourceManager.GetObject("minus16_a", resourceCulture); + object obj = ResourceManager.GetObject("minus", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -193,9 +193,9 @@ namespace AppLauncher.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap minus16_b { + internal static System.Drawing.Bitmap minus2 { get { - object obj = ResourceManager.GetObject("minus16_b", resourceCulture); + object obj = ResourceManager.GetObject("minus2", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -203,9 +203,9 @@ namespace AppLauncher.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap plus16_a { + internal static System.Drawing.Bitmap plus { get { - object obj = ResourceManager.GetObject("plus16_a", resourceCulture); + object obj = ResourceManager.GetObject("plus", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -213,9 +213,9 @@ namespace AppLauncher.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap plus16_b { + internal static System.Drawing.Bitmap plus2 { get { - object obj = ResourceManager.GetObject("plus16_b", resourceCulture); + object obj = ResourceManager.GetObject("plus2", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } diff --git a/FizzyLauncher.UI/Properties/Resources.resx b/FizzyLauncher.UI/Properties/Resources16.resx similarity index 71% rename from FizzyLauncher.UI/Properties/Resources.resx rename to FizzyLauncher.UI/Properties/Resources16.resx index a71d849..78ba89b 100644 --- a/FizzyLauncher.UI/Properties/Resources.resx +++ b/FizzyLauncher.UI/Properties/Resources16.resx @@ -118,52 +118,52 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\arrow_down16_a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\16\arrow_down.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\arrow_down16_b.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\16\arrow_down2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\arrow_up16_a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\16\arrow_up.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\arrow_up16_b.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\16\arrow_up2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\close16_a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\16\close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\close16_b.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\16\close2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\edit16_a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\16\edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\edit16_b.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\16\edit2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\file16_a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\16\file.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\file16_b.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\16\file2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\folder16_a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\16\folder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\folder16_b.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\16\folder2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\minus16_a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\16\minus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\minus16_b.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\16\minus2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\plus16_a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\16\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\plus16_b.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\16\plus2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/FizzyLauncher.UI/Properties/Resources20.Designer.cs b/FizzyLauncher.UI/Properties/Resources20.Designer.cs new file mode 100644 index 0000000..8614271 --- /dev/null +++ b/FizzyLauncher.UI/Properties/Resources20.Designer.cs @@ -0,0 +1,133 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace AppLauncher.Properties { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources20 { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources20() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AppLauncher.Properties.Resources20", typeof(Resources20).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap close { + get { + object obj = ResourceManager.GetObject("close", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap close2 { + get { + object obj = ResourceManager.GetObject("close2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap maximise { + get { + object obj = ResourceManager.GetObject("maximise", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap maximise2 { + get { + object obj = ResourceManager.GetObject("maximise2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap maximise3 { + get { + object obj = ResourceManager.GetObject("maximise3", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap minimise { + get { + object obj = ResourceManager.GetObject("minimise", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap minimise2 { + get { + object obj = ResourceManager.GetObject("minimise2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + } +} diff --git a/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TForm.resx b/FizzyLauncher.UI/Properties/Resources20.resx similarity index 75% rename from FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TForm.resx rename to FizzyLauncher.UI/Properties/Resources20.resx index 1af7de1..ec8e6d8 100644 --- a/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TForm.resx +++ b/FizzyLauncher.UI/Properties/Resources20.resx @@ -117,4 +117,26 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\20\close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\20\close2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\20\maximise.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\20\maximise2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\20\maximise3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\20\minimise.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\20\minimise2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RyzStudio/Windows/Forms/Resources/arrow_down.png b/FizzyLauncher.UI/Resources/16/arrow_down.png similarity index 100% rename from RyzStudio/Windows/Forms/Resources/arrow_down.png rename to FizzyLauncher.UI/Resources/16/arrow_down.png diff --git a/RyzStudio/Windows/Forms/Resources/arrow_down2.png b/FizzyLauncher.UI/Resources/16/arrow_down2.png similarity index 100% rename from RyzStudio/Windows/Forms/Resources/arrow_down2.png rename to FizzyLauncher.UI/Resources/16/arrow_down2.png diff --git a/RyzStudio/Windows/Forms/Resources/arrow_up.png b/FizzyLauncher.UI/Resources/16/arrow_up.png similarity index 100% rename from RyzStudio/Windows/Forms/Resources/arrow_up.png rename to FizzyLauncher.UI/Resources/16/arrow_up.png diff --git a/RyzStudio/Windows/Forms/Resources/arrow_up2.png b/FizzyLauncher.UI/Resources/16/arrow_up2.png similarity index 100% rename from RyzStudio/Windows/Forms/Resources/arrow_up2.png rename to FizzyLauncher.UI/Resources/16/arrow_up2.png diff --git a/FizzyLauncher.UI/Resources/close16_a.png b/FizzyLauncher.UI/Resources/16/close.png similarity index 100% rename from FizzyLauncher.UI/Resources/close16_a.png rename to FizzyLauncher.UI/Resources/16/close.png diff --git a/FizzyLauncher.UI/Resources/close16_b.png b/FizzyLauncher.UI/Resources/16/close2.png similarity index 100% rename from FizzyLauncher.UI/Resources/close16_b.png rename to FizzyLauncher.UI/Resources/16/close2.png diff --git a/RyzStudio/Windows/Forms/Resources/edit.png b/FizzyLauncher.UI/Resources/16/edit.png similarity index 100% rename from RyzStudio/Windows/Forms/Resources/edit.png rename to FizzyLauncher.UI/Resources/16/edit.png diff --git a/RyzStudio/Windows/Forms/Resources/edit2.png b/FizzyLauncher.UI/Resources/16/edit2.png similarity index 100% rename from RyzStudio/Windows/Forms/Resources/edit2.png rename to FizzyLauncher.UI/Resources/16/edit2.png diff --git a/RyzStudio/Windows/Forms/Resources/file.png b/FizzyLauncher.UI/Resources/16/file.png similarity index 100% rename from RyzStudio/Windows/Forms/Resources/file.png rename to FizzyLauncher.UI/Resources/16/file.png diff --git a/RyzStudio/Windows/Forms/Resources/file2.png b/FizzyLauncher.UI/Resources/16/file2.png similarity index 100% rename from RyzStudio/Windows/Forms/Resources/file2.png rename to FizzyLauncher.UI/Resources/16/file2.png diff --git a/RyzStudio/Windows/Forms/Resources/folder.png b/FizzyLauncher.UI/Resources/16/folder.png similarity index 100% rename from RyzStudio/Windows/Forms/Resources/folder.png rename to FizzyLauncher.UI/Resources/16/folder.png diff --git a/RyzStudio/Windows/Forms/Resources/folder2.png b/FizzyLauncher.UI/Resources/16/folder2.png similarity index 100% rename from RyzStudio/Windows/Forms/Resources/folder2.png rename to FizzyLauncher.UI/Resources/16/folder2.png diff --git a/RyzStudio/Windows/Forms/Resources/minus.png b/FizzyLauncher.UI/Resources/16/minus.png similarity index 100% rename from RyzStudio/Windows/Forms/Resources/minus.png rename to FizzyLauncher.UI/Resources/16/minus.png diff --git a/RyzStudio/Windows/Forms/Resources/minus2.png b/FizzyLauncher.UI/Resources/16/minus2.png similarity index 100% rename from RyzStudio/Windows/Forms/Resources/minus2.png rename to FizzyLauncher.UI/Resources/16/minus2.png diff --git a/RyzStudio/Windows/Forms/Resources/plus.png b/FizzyLauncher.UI/Resources/16/plus.png similarity index 100% rename from RyzStudio/Windows/Forms/Resources/plus.png rename to FizzyLauncher.UI/Resources/16/plus.png diff --git a/RyzStudio/Windows/Forms/Resources/plus2.png b/FizzyLauncher.UI/Resources/16/plus2.png similarity index 100% rename from RyzStudio/Windows/Forms/Resources/plus2.png rename to FizzyLauncher.UI/Resources/16/plus2.png diff --git a/RyzStudio/Windows/Forms/Resources/close_20.png b/FizzyLauncher.UI/Resources/20/close.png similarity index 100% rename from RyzStudio/Windows/Forms/Resources/close_20.png rename to FizzyLauncher.UI/Resources/20/close.png diff --git a/RyzStudio/Windows/Forms/Resources/close2_20.png b/FizzyLauncher.UI/Resources/20/close2.png similarity index 100% rename from RyzStudio/Windows/Forms/Resources/close2_20.png rename to FizzyLauncher.UI/Resources/20/close2.png diff --git a/RyzStudio/Windows/Forms/Resources/maximise_20.png b/FizzyLauncher.UI/Resources/20/maximise.png similarity index 100% rename from RyzStudio/Windows/Forms/Resources/maximise_20.png rename to FizzyLauncher.UI/Resources/20/maximise.png diff --git a/RyzStudio/Windows/Forms/Resources/maximise2_20.png b/FizzyLauncher.UI/Resources/20/maximise2.png similarity index 100% rename from RyzStudio/Windows/Forms/Resources/maximise2_20.png rename to FizzyLauncher.UI/Resources/20/maximise2.png diff --git a/RyzStudio/Windows/Forms/Resources/maximise3_20.png b/FizzyLauncher.UI/Resources/20/maximise3.png similarity index 100% rename from RyzStudio/Windows/Forms/Resources/maximise3_20.png rename to FizzyLauncher.UI/Resources/20/maximise3.png diff --git a/RyzStudio/Windows/Forms/Resources/minimise_20.png b/FizzyLauncher.UI/Resources/20/minimise.png similarity index 100% rename from RyzStudio/Windows/Forms/Resources/minimise_20.png rename to FizzyLauncher.UI/Resources/20/minimise.png diff --git a/RyzStudio/Windows/Forms/Resources/minimise2_20.png b/FizzyLauncher.UI/Resources/20/minimise2.png similarity index 100% rename from RyzStudio/Windows/Forms/Resources/minimise2_20.png rename to FizzyLauncher.UI/Resources/20/minimise2.png diff --git a/FizzyLauncher.UI/Resources/arrow_down16_a.png b/FizzyLauncher.UI/Resources/arrow_down16_a.png deleted file mode 100644 index cccf233e96a5deccc73a84bdfff320ebbdfafc31..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 601 zcmV-f0;c_mP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10p>|W zK~y-6eN#PaR6!Iy=Mro-30PSKiIpPraGR~|R%2l*e}HHL+OCNp+H6D%i7rT@MYhmh z(i)A;{sSL-=OJm7fImQkE@*a-h4bX)1w7SoKjxlu?hH{wQ52b^B}r`n^C|oVz%I#t z2q9MMSsr4HCnWU%+yd|oz>cIn03dl5zyirxNiRv>2_gLYcR^}?3*aKjhojMGz13>{ ztWL`FykTamX7)hRfaI0(61e-OyZ?6gt940r#26Q2jEBSF@Hqf5Y5oXcErhUEE4~H* zA%r*8xVv{r-Uo2Ol40LRqtSYOnxth(%k}tpJbohSK+=*Ww|DBA|A%I?`2&AVZX1Bp zrQ0R#;c)m^l2w>kjPX$^DPfP~{1hsyOqeEluPBOBBnbdTQEW-N0pNO_%@lzBv}XW7 z2;r5xpOo~BpF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10WL{I zK~y-6jnlm@#8D6h@SlxrVbQ8YCtB8ZG=hYV6`zG(JOYKMKq6{25g!Gc zP~6$wzw0k?l1XmP%$dxcdoI5*fj!*fHR1+M)brw=!nqnn3wXu_?jtvfX$;~7%lMFq zukeXA^p#9j!#Y|~TP-G!LOfF<%+ZJ@`)y((h_#a9*@zq)p&2JF?D3DWFC%i)@Pyq8 zCZ&bF|6}|%-a<23!LaVO+hcE|Qs64s^7A_P80q!%DWM;$7%JpWF^{>jac*&zaZC8Z zL&R5bMVw0p)0CE2`=d#jxL;aglVs19WRe^QI4t2eL({SLVGxay;vBz>MAynK$t3x8 z1lKlD$IAI<+QA}TBm><=ZVXcxz%f>2pQ(sCc5xkzUgO*p)-B>2nOsV+E0#r300000 LNkvXXu0mjf{w}h~ diff --git a/FizzyLauncher.UI/Resources/arrow_up16_a.png b/FizzyLauncher.UI/Resources/arrow_up16_a.png deleted file mode 100644 index a08438ba358ad09ba06ed091b453a749822880e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 590 zcmV-U0pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10ozGL zK~y-6jZ?d7R8bUNYa=#e@&^(t#e2kQrnVc6h4}>q6HrW}CN{B|2nrHM@L9~@7lgD% zV>5r?W%d~)jS|QQXp9#$bC=DTaC22~Rhxa*eynxQA!-Dwn+9v z2(ilNB#1E{m-H0C4FF#OY)aY&0FtKx%#xgz^qS<|5W>&H2C4WhfD0ra6h*PtYPEh; zC*^tGFtcSdyDw=#^75n!-2J7y|8n;$bxC!^80TV)2gBj;82~V8{s>?-gs@sAyZdu9 zW0qx$wS0%<3V`#L4Et6T#afMY8^B^&mbX%Ti1B#*Skj)Pc}s3@RyC)BF3DYzy8yb? zCe3DZKbhP%04FDICym!q@f!dm0HYLl-Ti81k!_MQhRRhYe3$en%d!O}WLdUA@*&Cn zx~azi?4)}J0E7_M0jwt}005FDfR$fQf^7~=^^mjG-T$v(+x zGh40`N%lzg>Ul}`NKTRLBdz)(#&{58ocoXIM;?-;Np~a-0BpE>=WlZIJa4#r2f&7; zftf7Q?WoAo9K2vSQAnCfKHpx=}DCslF4pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10VhdB zK~y-6jnlm@#6c7V@E?&aEFMGR<2l&IR(cuSj8oi2Z4ea<-~bDFQy^dB z9n0v=oUDu$w4%4vS=&NS~}Hj#!a|`7in~jti1KTYl=$#$-ehYr*-l_HHDq|JePPk@&W9OHwy?ow9EOeObBq znKm$o7fHO^s10EZ{n*E%!e{Elh~%)V7}Sh)O<1=RpFN&JP;!hkk{ zRVu+~Z1NxY$nNDxqXYy=r$G`A&=uh-v}Ty`Xl)F_Rz z44c^_NkL{SvR@t;JdFsO8D5|@|IhypJ#m5!Q1H8FZd#HA7)3J*ZxDUgU4a4Co} z6%!PDjXBPkVI?QoXRZBTXYKENoA#K*7Oqi`=L%I!pUHfp1o!65dr zj5j&>0`DlJ@0ZDnSVJTB7P7_NfaiVz^D!SywwsB`NR+!kQ#inIyjOx5Ckgh{VQeVj z0iQU{9OoIEB(;zJ0Y6|iQ#-~b)Fg5Kf){f23TnN6{>m)8g&{m*6^9+BY&*gz?lWI5 zb>L1UgQ-d)7Nbzc2kyGS{gQ}Pl06$*IxI$$kxnCHJ(zE6??ht03)GA@Bhj*QLsGZc z&M9gc=-bNq%d~+dyy6@;Q5(ZF2C#<}xyzJ|3CUrX(WoBls<3W0z5w(WQ9cjxl3D-& N002ovPDHLkV1gdCtIYra diff --git a/FizzyLauncher.UI/Resources/file16_a.png b/FizzyLauncher.UI/Resources/file16_a.png deleted file mode 100644 index d0c9e5830ade13c518f1a0a7fb5c4e4f20407e41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1en1E;5pV~B-+@}K|z?GJx_eO>q8-{0o#jg5}n z9g>X_tOiC#_t=80Zr!@IUqOk7N1;}M!R*1StE;a!K12(Z}++-JXWeQ&xW63z>H+#w~#;bXZn+`j)9pFh|njA5wmragwuLSFoy^UXf z-QJ$R*||lK?E$O9ZJ!1+Yvz}S9d3O--Y>s=VUUaD2I&+{T?OdXq84umfFr?P-?xdad}WKNiL#_{XZGGItC Nc)I$ztaD0e0s!%Bg1i6# diff --git a/FizzyLauncher.UI/Resources/file16_b.png b/FizzyLauncher.UI/Resources/file16_b.png deleted file mode 100644 index f3e9f6d2179af7121d2314669151bada83185afe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 323 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1en@P?<0V~B_mzch1Gq$$e+;8eZOfUvhDuXxoI>Z<;4FSAKHgGum`mj9+JAe$xE~D$Gfb_Ufni z7#v^{&B$rov*qGpw%RufHG>j*wWC%%Y+_q<#CAgOdiK0!6}xON-0+;gM&xay`G2PQ zOt+G*wXB{cw|r8~q%TRk64!0sue^WDo$FTu|J0^hdJ9TEnV5RN^Ixw)1@p4T61G!! S%?<z-+dbOt}?FI(5&63 z!&xxsRAc6>xjSk&zt`3`Z)|F7-J~QH5X=#{UFURYn3YI@fwwJ_jttCAK*V_`Ki{a*MzIbzRjOhYh_C1ebkJR#jNvvd?fa!=5|A|9&sX=bBqw z_}4JvZ^yzP0u8$9uV$_TjT-wL<FVdQ&MBb@0I8Ogm;e9( diff --git a/FizzyLauncher.UI/Resources/folder16_b.png b/FizzyLauncher.UI/Resources/folder16_b.png deleted file mode 100644 index d21178aa8cafb22ebfe50bf0379772d84075e671..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDEfH31!Z9ZwB;8sr;#}Etux0m z`({cN-g>d1b*@z9#RhA)7pn!Ax7qqdta#{pJI^3+VJW*+#mk31-fh|?`8{_S-y0oW z`^Bn$it?(JjOTVb)$O~faH{@5KU<52yXeMiVqQy{0_Lhp%~1Zkc=O`wSeX!(3x_|< hFBYubZFY>sKU2UnWXUOwlRytJc)I$ztaD0e0suaOZf^hp diff --git a/FizzyLauncher.UI/Resources/minus16_a.png b/FizzyLauncher.UI/Resources/minus16_a.png deleted file mode 100644 index 6b396d43dcd620706ec9a4eb0662e997b8117f02..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 532 zcmV+v0_**WP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10ij7m zK~y-6om0JPltC0d=MrqzO5kdSx+&3_!H6}Lu z1`a!Sku(W;0}b&5&CapNM814RT|CwN+1jj7FnNlIA6K0h}$zI{-FG_Cp9> zkLS_C-A_q+2H-A$F96mhZ2vZTIqB;-|9*+ z#+I2an%N^s1CrN|NRU!`nNs?ZQo7l+)P%dwx%$fHRWb)jZzHIo~-c(ahe2 z5LU}}i{uSMt(E_SDFC~r&j5g;u=?keLy){6Y1aU30GN$2wkB0|_tTQD0oXK>eUdX~ zwm2z)q$QHmB>Mn>l+p`#KXCWC3Dl2$BrAUIOBw)JODXkEvJ+!$rIdOA)+7zgYytRv zn4XfnCuxu5hn(~0a($8HRg%*==T~O7aBP?wPYjZ7OX`w52Y`~cNq!{xHiR&$$NvNo W{^Fg|2zLko0000?$b diff --git a/FizzyLauncher.UI/Resources/minus16_b.png b/FizzyLauncher.UI/Resources/minus16_b.png deleted file mode 100644 index 9bb41283a7f3e8d7bdf81467b5391984bea3e424..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 380 zcmV-?0fYXDP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10SQS& zK~y-6ozqP&Ltzxg@gI>6wCuoCLc0!;h?>{~#$wuF&J`hI14vi^39BfHbP+^!LbHDi&}exebH)(CK42f-|p2KH8R>@rpHj$_iauf~A; zx<-2j3%Jb{HnCL#UE(g{4%Vjq|CJMI(kt9Z29rrctd0TKq#u!B!L;5BMXSiziR`#punlviDHSUVQ#Mw|)j a=Jf+%ay>&=(wun!0000pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10lY~> zK~y-6om0zdR6!6urwDGwONgnr%qKDk=bN2xg=>pQV+n{1b+cAA~_5p z#HK$F4l%}4lAZ&&3*ak&O-b7TK=M3*Ig&Gy-jI9{Lil-@AO&v#xJvR#RaL9qZudu% zsVIt;nJt^yV@YF@*AJ4w-Cw!;FL%G0OUfCsYmi00808y@&n012w~Fn{|yw|_65H@(}Ms2002ovPDHLkV1jc+^1c87 diff --git a/FizzyLauncher.UI/Resources/plus16_b.png b/FizzyLauncher.UI/Resources/plus16_b.png deleted file mode 100644 index 0c29081e25aa7911ea1e9793e66094cb06efb9df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 398 zcmV;90df9`P)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10UJp~ zK~y-6ozp!|LQxO};7KRYlk!JoJaAu%jMV?+z3 zuy_MJAMYjTNhY~>X3o7cbI)ZOHJqY{L0A_ZRI|x*sdYJ$_V9*V^dq*4Z7ksm2l$d9 zKjIrr%;!{AK?}pkEvJJQLEgzBX3>a4&PI+}IGQ=hyJ1-z1!tXPU@rw_--TsS!7JJ& z)FlJ^oT2;?K7vy(VcBHbqp}~uHo`{xbUS^ll>C0mf1!u#f>_ZE;0E0i?j<6r{Nd6C zY)RTul{`r+C$Z=mkApLo_IWrOGu%EUBqmZGN<@;^PQ^q(V<~4p(+T$RE*ai)#MZEh sMO@-g<};;HMH^3X&>+?wA>A~70F4SmZKJ&MYXATM07*qoM6N<$f>mIi`~Uy| diff --git a/Windows/Forms/AForm.cs b/FizzyLauncher.UI/RyzStudio/Windows/Forms/TForm.cs similarity index 92% rename from Windows/Forms/AForm.cs rename to FizzyLauncher.UI/RyzStudio/Windows/Forms/TForm.cs index 4e1e9ac..c660ca1 100644 --- a/Windows/Forms/AForm.cs +++ b/FizzyLauncher.UI/RyzStudio/Windows/Forms/TForm.cs @@ -5,7 +5,7 @@ using System.Windows.Forms; namespace AppLauncher.Windows.Forms { - public class AForm : Form + public class TForm : Form { protected readonly Color borderColour = Color.FromArgb(232, 231, 236); protected readonly int borderWidth = 1; @@ -31,7 +31,7 @@ namespace AppLauncher.Windows.Forms private ToolStripMenuItem exitToolStripMenuItem; private IContainer components; - public AForm() : base() + public TForm() : base() { InitializeComponent(); @@ -161,7 +161,7 @@ namespace AppLauncher.Windows.Forms g.FillRectangle(new SolidBrush(titleBarColour), area.X, area.Y, (area.Width + area.X), titleBarHeight); g.DrawLine(new Pen(titleBorderColour, 1), area.X, (titleBarHeight + 1), (area.Width + area.X), (titleBarHeight + 1)); - if (!DesignMode) g.DrawImageUnscaled(Properties.Resources.app_icon_24, 17, 17); + if (!DesignMode) g.DrawImageUnscaled(this.AppIcon, 17, 17); if (!DesignMode) TextRenderer.DrawText(g, Application.ProductName, new Font(this.Font.FontFamily, 14F), new Point(58, 17), titleColour); @@ -186,6 +186,9 @@ namespace AppLauncher.Windows.Forms [Category("Appearance")] public ContextMenuStrip TitleContextMenuStrip { get; set; } = null; + [Browsable(false)] + public Image AppIcon { get; set; } = null; + protected Point DefaultLocation { get @@ -204,7 +207,7 @@ namespace AppLauncher.Windows.Forms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AForm)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TForm)); this.imageBox3 = new RyzStudio.Windows.Forms.TImageBox(); this.imageBox2 = new RyzStudio.Windows.Forms.TImageBox(); this.imageBox1 = new RyzStudio.Windows.Forms.TImageBox(); @@ -223,9 +226,9 @@ namespace AppLauncher.Windows.Forms this.imageBox3.BackColor = System.Drawing.Color.Transparent; this.imageBox3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; this.imageBox3.ErrorImage = null; - this.imageBox3.Image = global::AppLauncher.Resource1.close_20; - this.imageBox3.ImageHover = global::AppLauncher.Resource1.close2_20; - this.imageBox3.ImageNormal = global::AppLauncher.Resource1.close_20; + this.imageBox3.Image = global::AppLauncher.Properties.Resources20.close; + this.imageBox3.ImageHover = global::AppLauncher.Properties.Resources20.close2; + this.imageBox3.ImageNormal = global::AppLauncher.Properties.Resources20.close; this.imageBox3.ImageSelected = null; this.imageBox3.InitialImage = null; this.imageBox3.IsSelected = false; @@ -242,10 +245,10 @@ namespace AppLauncher.Windows.Forms this.imageBox2.BackColor = System.Drawing.Color.Transparent; this.imageBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; this.imageBox2.ErrorImage = null; - this.imageBox2.Image = global::AppLauncher.Resource1.maximise_20; - this.imageBox2.ImageHover = global::AppLauncher.Resource1.maximise_20; - this.imageBox2.ImageNormal = global::AppLauncher.Resource1.maximise_20; - this.imageBox2.ImageSelected = global::AppLauncher.Resource1.maximise2_20; + this.imageBox2.Image = global::AppLauncher.Properties.Resources20.maximise; + this.imageBox2.ImageHover = global::AppLauncher.Properties.Resources20.maximise; + this.imageBox2.ImageNormal = global::AppLauncher.Properties.Resources20.maximise; + this.imageBox2.ImageSelected = global::AppLauncher.Properties.Resources20.maximise2; this.imageBox2.InitialImage = null; this.imageBox2.IsSelected = false; this.imageBox2.Location = new System.Drawing.Point(139, 12); @@ -261,9 +264,9 @@ namespace AppLauncher.Windows.Forms this.imageBox1.BackColor = System.Drawing.Color.Transparent; this.imageBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; this.imageBox1.ErrorImage = null; - this.imageBox1.Image = global::AppLauncher.Resource1.minimise_20; - this.imageBox1.ImageHover = global::AppLauncher.Resource1.minimise2_20; - this.imageBox1.ImageNormal = global::AppLauncher.Resource1.minimise_20; + this.imageBox1.Image = global::AppLauncher.Properties.Resources20.minimise; + this.imageBox1.ImageHover = global::AppLauncher.Properties.Resources20.minimise2; + this.imageBox1.ImageNormal = global::AppLauncher.Properties.Resources20.minimise; this.imageBox1.ImageSelected = null; this.imageBox1.InitialImage = null; this.imageBox1.IsSelected = false; @@ -351,11 +354,11 @@ namespace AppLauncher.Windows.Forms if (this.TopMost) { - imageBox2.Image = imageBox2.ImageNormal = Resource1.maximise3_20; + imageBox2.Image = imageBox2.ImageNormal = Properties.Resources20.maximise3; } else { - imageBox2.Image = imageBox2.ImageNormal = Resource1.maximise_20; + imageBox2.Image = imageBox2.ImageNormal = Properties.Resources20.maximise; } } } diff --git a/Windows/Forms/AForm.resx b/FizzyLauncher.UI/RyzStudio/Windows/Forms/TForm.resx similarity index 100% rename from Windows/Forms/AForm.resx rename to FizzyLauncher.UI/RyzStudio/Windows/Forms/TForm.resx diff --git a/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TDialogForm.Designer.cs b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TDialogForm.Designer.cs index f0ec21a..5ee7579 100644 --- a/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TDialogForm.Designer.cs +++ b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TDialogForm.Designer.cs @@ -50,12 +50,12 @@ this.imgbxClose.BackColor = System.Drawing.Color.Transparent; this.imgbxClose.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; this.imgbxClose.ErrorImage = null; - this.imgbxClose.ImageHover = global::AppLauncher.Properties.Resources.close16_b; + this.imgbxClose.ImageHover = global::AppLauncher.Properties.Resources16.close2; this.imgbxClose.Image = null; this.imgbxClose.InitialImage = null; this.imgbxClose.Location = new System.Drawing.Point(308, 4); this.imgbxClose.Name = "imgbxClose"; - this.imgbxClose.ImageNormal = global::AppLauncher.Properties.Resources.close16_a; + this.imgbxClose.ImageNormal = global::AppLauncher.Properties.Resources16.close; this.imgbxClose.Size = new System.Drawing.Size(24, 24); this.imgbxClose.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.imgbxClose.TabIndex = 145; diff --git a/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TDialogForm.cs b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TDialogForm.cs index 2f2b440..d85c999 100644 --- a/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TDialogForm.cs +++ b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TDialogForm.cs @@ -3,15 +3,15 @@ using System; using System.ComponentModel; using System.Drawing; - using System.Drawing.Design; using System.Windows.Forms; -// using Resources = AppLauncher.Properties.Resources; public partial class TDialogForm : System.Windows.Forms.Form { - //protected readonly Color borderColour = Color.FromArgb(232, 231, 236); protected readonly Color borderColour = Color.FromArgb(77, 84, 100); protected readonly int borderWidth = 1; + + protected readonly Color backColour = Color.FromArgb(254, 254, 254); + protected readonly Color titleBarColour = Color.FromArgb(152, 175, 206); protected readonly Color titleBarForeColour = Color.White; protected readonly Font titleBarFont = new Font("Segoe UI", 8.25F, FontStyle.Bold, GraphicsUnit.Point, 0); @@ -31,6 +31,9 @@ this.TopMost = true; imgbxClose.Click += pictureBox3_Click; + + this.BackColor = backColour; + this.Padding = new Padding(0); } protected override void OnClosing(CancelEventArgs e) @@ -101,7 +104,7 @@ } [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override Color BackColor { get => base.BackColor; set => base.BackColor = Color.FromArgb(254, 254, 254); } + public override Color BackColor { get => base.BackColor; set => base.BackColor = value; } [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] public new FormBorderStyle FormBorderStyle { get => base.FormBorderStyle; set => base.FormBorderStyle = value; } diff --git a/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TFolderTextBox.cs b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TFolderTextBox.cs index ec17cc5..0c2b9ae 100644 --- a/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TFolderTextBox.cs +++ b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TFolderTextBox.cs @@ -1,7 +1,7 @@ using System; using System.IO; using System.Windows.Forms; -using Resources = AppLauncher.Properties.Resources; +using Resources = AppLauncher.Properties.Resources16; namespace RyzStudio.Windows.ThemedForms { @@ -9,8 +9,8 @@ namespace RyzStudio.Windows.ThemedForms { public TFolderTextBox() : base() { - this.NormalImage = Resources.folder16_a; - this.HighlightImage = Resources.folder16_b; + this.NormalImage = Resources.folder; + this.HighlightImage = Resources.folder2; this.Text = string.Empty; } diff --git a/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TForm.Designer.cs b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TForm.Designer.cs deleted file mode 100644 index 75f5bf1..0000000 --- a/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TForm.Designer.cs +++ /dev/null @@ -1,52 +0,0 @@ -namespace RyzStudio.Windows.ThemedForms -{ - partial class TForm - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.SuspendLayout(); - // - // Form - // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.BackColor = System.Drawing.Color.WhiteSmoke; - this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.ClientSize = new System.Drawing.Size(584, 381); - this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ForeColor = System.Drawing.Color.Black; - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.MaximizeBox = false; - this.MinimumSize = new System.Drawing.Size(600, 420); - this.Name = "Form"; - this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; - this.ResumeLayout(false); - - } - - #endregion - } -} \ No newline at end of file diff --git a/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TForm.cs b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TForm.cs deleted file mode 100644 index 541e75f..0000000 --- a/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TForm.cs +++ /dev/null @@ -1,173 +0,0 @@ -namespace RyzStudio.Windows.ThemedForms -{ - using System; - using System.ComponentModel; - using System.Drawing; - using System.Windows.Forms; - - public partial class TForm : System.Windows.Forms.Form - { - protected Color topFillColour = Color.FromArgb(15, 15, 15); - protected int topFillHeight = 52; - - protected Color bottomFillColour = Color.FromArgb(15, 15, 15); - protected int bottomFillMargin = 19; - - protected int borderWidth = 1; - - public TForm() - { - this.InitializeComponent(); - - this.BackColor = Color.FromArgb(246, 246, 246); - } - - protected override void OnResize(EventArgs e) - { - base.OnResize(e); - - this.Invalidate(); - } - - protected override void OnPaint(PaintEventArgs e) - { - base.OnPaint(e); - - Graphics g = e.Graphics; - - Rectangle areaTop = new Rectangle(this.DisplayRectangle.Left, this.Padding.Top, this.DisplayRectangle.Width, topFillHeight); - Rectangle areaBottom = new Rectangle(this.DisplayRectangle.Left, (this.DisplayRectangle.Height - bottomFillMargin), this.DisplayRectangle.Width, bottomFillMargin); - Rectangle areaBorder = new Rectangle(this.ClientRectangle.X, this.ClientRectangle.Y, this.ClientRectangle.Width - borderWidth, this.ClientRectangle.Height - borderWidth); - - // draw header - if (topFillHeight > 0) - { - g.FillRectangle(new SolidBrush(topFillColour), areaTop); - } - - // draw footer - if (bottomFillMargin > 0) - { - g.FillRectangle(new SolidBrush(bottomFillColour), areaBottom); - } - - // draw logo - if (this.TitleLogo != null) - { - g.DrawImageUnscaled(this.TitleLogo, this.Padding.Left, this.Padding.Top); - } - - if (this.Banner != null) - { - g.DrawImageUnscaled(this.Banner, this.Padding.Left, (this.DisplayRectangle.Height - this.Banner.Height - bottomFillMargin), (this.DisplayRectangle.Width - (this.Padding.Left + this.Padding.Right)), this.Banner.Height); - } - - g.DrawRectangle(new Pen(Color.Black, borderWidth), areaBorder); - } - - [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new Color BackColor { get => base.BackColor; set { base.BackColor = value; } } - - [Category("Appearance"), Browsable(true)] - public Image TitleLogo { get; set; } - - [Category("Appearance"), Browsable(true)] - public Image Banner { get; set; } - - public void SetValue(Label sender, string value) - { - if (sender.InvokeRequired) - { - sender.Invoke(new MethodInvoker(() => { sender.Text = value; })); - } - else - { - sender.Text = value; - } - } - - public void SetValue(GroupBox sender, string value) - { - if (sender.InvokeRequired) - { - sender.Invoke(new MethodInvoker(() => { sender.Text = value; })); - } - else - { - sender.Text = value; - } - } - - public void AddValue(ListBox sender, string value) - { - if (sender.InvokeRequired) - { - sender.Invoke(new MethodInvoker(() => { sender.Items.Add(value); })); - } - else - { - sender.Items.Add(value); - } - } - - public void ClearValues(ListBox sender) - { - if (sender.InvokeRequired) - { - sender.Invoke(new MethodInvoker(() => { sender.Items.Clear(); })); - } - else - { - sender.Items.Clear(); - } - } - - public string GetValue(ListBox sender) - { - string rv = string.Empty; - - if (sender.InvokeRequired) - { - sender.Invoke(new MethodInvoker(() => { rv = (sender.SelectedItem == null) ? string.Empty : sender.SelectedItem.ToString(); })); - } - else - { - rv = (sender.SelectedItem == null) ? string.Empty : sender.SelectedItem.ToString(); - } - - return rv; - } - - public string GetValue(TTextBox sender) - { - string rv = string.Empty; - - if (sender.InvokeRequired) - { - sender.Invoke(new MethodInvoker(() => { rv = sender.Text.Trim(); })); - } - else - { - rv = sender.Text.Trim(); - } - - return rv; - } - - public int GetValue(NumericUpDown sender) - { - int rv = 0; - - if (sender.InvokeRequired) - { - sender.Invoke(new MethodInvoker(() => { rv = (int)sender.Value; })); - } - else - { - rv = (int)sender.Value; - } - - return rv; - } - } -} \ No newline at end of file diff --git a/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TListBox.designer.cs b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TListBox.designer.cs index bab75f5..81bff0f 100644 --- a/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TListBox.designer.cs +++ b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TListBox.designer.cs @@ -60,12 +60,12 @@ this.imageBox5.BackColor = System.Drawing.Color.Transparent; this.imageBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; this.imageBox5.ErrorImage = null; - this.imageBox5.ImageHover = global::AppLauncher.Properties.Resources.edit16_b; - this.imageBox5.Image = global::AppLauncher.Properties.Resources.edit16_a; + this.imageBox5.ImageHover = global::AppLauncher.Properties.Resources16.edit2; + this.imageBox5.Image = global::AppLauncher.Properties.Resources16.edit; this.imageBox5.InitialImage = null; this.imageBox5.Location = new System.Drawing.Point(52, 94); this.imageBox5.Name = "imageBox5"; - this.imageBox5.ImageNormal = global::AppLauncher.Properties.Resources.edit16_a; + this.imageBox5.ImageNormal = global::AppLauncher.Properties.Resources16.edit; this.imageBox5.Size = new System.Drawing.Size(18, 25); this.imageBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.imageBox5.TabIndex = 6; @@ -79,12 +79,12 @@ this.imageBox4.BackColor = System.Drawing.Color.Transparent; this.imageBox4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; this.imageBox4.ErrorImage = null; - this.imageBox4.ImageHover = global::AppLauncher.Properties.Resources.arrow_down16_b; - this.imageBox4.Image = global::AppLauncher.Properties.Resources.arrow_down16_a; + this.imageBox4.ImageHover = global::AppLauncher.Properties.Resources16.arrow_down2; + this.imageBox4.Image = global::AppLauncher.Properties.Resources16.arrow_down; this.imageBox4.InitialImage = null; this.imageBox4.Location = new System.Drawing.Point(100, 94); this.imageBox4.Name = "imageBox4"; - this.imageBox4.ImageNormal = global::AppLauncher.Properties.Resources.arrow_down16_a; + this.imageBox4.ImageNormal = global::AppLauncher.Properties.Resources16.arrow_down; this.imageBox4.Size = new System.Drawing.Size(18, 25); this.imageBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.imageBox4.TabIndex = 5; @@ -98,12 +98,12 @@ this.imageBox3.BackColor = System.Drawing.Color.Transparent; this.imageBox3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; this.imageBox3.ErrorImage = null; - this.imageBox3.ImageHover = global::AppLauncher.Properties.Resources.arrow_up16_b; - this.imageBox3.Image = global::AppLauncher.Properties.Resources.arrow_up16_a; + this.imageBox3.ImageHover = global::AppLauncher.Properties.Resources16.arrow_up2; + this.imageBox3.Image = global::AppLauncher.Properties.Resources16.arrow_up; this.imageBox3.InitialImage = null; this.imageBox3.Location = new System.Drawing.Point(76, 94); this.imageBox3.Name = "imageBox3"; - this.imageBox3.ImageNormal = global::AppLauncher.Properties.Resources.arrow_up16_a; + this.imageBox3.ImageNormal = global::AppLauncher.Properties.Resources16.arrow_up; this.imageBox3.Size = new System.Drawing.Size(18, 25); this.imageBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.imageBox3.TabIndex = 4; @@ -117,12 +117,12 @@ this.imageBox2.BackColor = System.Drawing.Color.Transparent; this.imageBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; this.imageBox2.ErrorImage = null; - this.imageBox2.ImageHover = global::AppLauncher.Properties.Resources.minus16_b; - this.imageBox2.Image = global::AppLauncher.Properties.Resources.minus16_a; + this.imageBox2.ImageHover = global::AppLauncher.Properties.Resources16.minus2; + this.imageBox2.Image = global::AppLauncher.Properties.Resources16.minus; this.imageBox2.InitialImage = null; this.imageBox2.Location = new System.Drawing.Point(28, 94); this.imageBox2.Name = "imageBox2"; - this.imageBox2.ImageNormal = global::AppLauncher.Properties.Resources.minus16_a; + this.imageBox2.ImageNormal = global::AppLauncher.Properties.Resources16.minus; this.imageBox2.Size = new System.Drawing.Size(18, 25); this.imageBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.imageBox2.TabIndex = 3; @@ -136,12 +136,12 @@ this.imageBox1.BackColor = System.Drawing.Color.Transparent; this.imageBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; this.imageBox1.ErrorImage = null; - this.imageBox1.ImageHover = global::AppLauncher.Properties.Resources.plus16_b; - this.imageBox1.Image = global::AppLauncher.Properties.Resources.plus16_a; + this.imageBox1.ImageHover = global::AppLauncher.Properties.Resources16.plus2; + this.imageBox1.Image = global::AppLauncher.Properties.Resources16.plus; this.imageBox1.InitialImage = null; this.imageBox1.Location = new System.Drawing.Point(4, 94); this.imageBox1.Name = "imageBox1"; - this.imageBox1.ImageNormal = global::AppLauncher.Properties.Resources.plus16_a; + this.imageBox1.ImageNormal = global::AppLauncher.Properties.Resources16.plus; this.imageBox1.Size = new System.Drawing.Size(18, 25); this.imageBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.imageBox1.TabIndex = 2; diff --git a/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TOpenFileTextBox.cs b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TOpenFileTextBox.cs index cca78a3..16a0d11 100644 --- a/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TOpenFileTextBox.cs +++ b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TOpenFileTextBox.cs @@ -1,7 +1,7 @@ using System; using System.IO; using System.Windows.Forms; -using Resources = AppLauncher.Properties.Resources; +using Resources = AppLauncher.Properties.Resources16; namespace RyzStudio.Windows.ThemedForms { @@ -9,8 +9,8 @@ namespace RyzStudio.Windows.ThemedForms { public TOpenFileTextBox() : base() { - this.NormalImage = Resources.file16_a; - this.HighlightImage = Resources.file16_b; + this.NormalImage = Resources.file; + this.HighlightImage = Resources.file2; this.Text = string.Empty; } diff --git a/FizzyLauncher.csproj b/FizzyLauncher.csproj index c39b609..0c659be 100644 --- a/FizzyLauncher.csproj +++ b/FizzyLauncher.csproj @@ -73,11 +73,6 @@ True Resources.resx - - True - True - Resource1.resx - Form @@ -96,9 +91,6 @@ Form - - Form - UserControl @@ -118,13 +110,6 @@ ResXFileCodeGenerator Resources.Designer.cs - - ResXFileCodeGenerator - Resource1.Designer.cs - - - AForm.cs - AddTileForm.cs diff --git a/MainForm.cs b/MainForm.cs index da19af2..e434b0b 100644 --- a/MainForm.cs +++ b/MainForm.cs @@ -13,7 +13,7 @@ using System.Windows.Forms; namespace AppLauncher { - public partial class MainForm : AForm + public partial class MainForm : TForm { [DllImport("user32.dll")] protected static extern bool RegisterHotKey(IntPtr hWnd, int id, int fsModifiers, int vk); @@ -34,6 +34,7 @@ namespace AppLauncher { InitializeComponent(); + this.AppIcon = Properties.Resources.app_icon_24; this.StartPosition = FormStartPosition.WindowsDefaultBounds; } diff --git a/Resource1.Designer.cs b/Resource1.Designer.cs deleted file mode 100644 index 529722f..0000000 --- a/Resource1.Designer.cs +++ /dev/null @@ -1,293 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace AppLauncher { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resource1 { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resource1() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AppLauncher.Resource1", typeof(Resource1).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap arrow_down { - get { - object obj = ResourceManager.GetObject("arrow_down", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap arrow_down2 { - get { - object obj = ResourceManager.GetObject("arrow_down2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap arrow_up { - get { - object obj = ResourceManager.GetObject("arrow_up", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap arrow_up2 { - get { - object obj = ResourceManager.GetObject("arrow_up2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap close_16 { - get { - object obj = ResourceManager.GetObject("close_16", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap close_20 { - get { - object obj = ResourceManager.GetObject("close_20", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap close2_16 { - get { - object obj = ResourceManager.GetObject("close2_16", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap close2_20 { - get { - object obj = ResourceManager.GetObject("close2_20", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap edit { - get { - object obj = ResourceManager.GetObject("edit", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap edit2 { - get { - object obj = ResourceManager.GetObject("edit2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap file { - get { - object obj = ResourceManager.GetObject("file", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap file2 { - get { - object obj = ResourceManager.GetObject("file2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap folder { - get { - object obj = ResourceManager.GetObject("folder", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap folder2 { - get { - object obj = ResourceManager.GetObject("folder2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap maximise_20 { - get { - object obj = ResourceManager.GetObject("maximise_20", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap maximise2_20 { - get { - object obj = ResourceManager.GetObject("maximise2_20", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap maximise3_20 { - get { - object obj = ResourceManager.GetObject("maximise3_20", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap minimise_20 { - get { - object obj = ResourceManager.GetObject("minimise_20", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap minimise2_20 { - get { - object obj = ResourceManager.GetObject("minimise2_20", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap minus { - get { - object obj = ResourceManager.GetObject("minus", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap minus2 { - get { - object obj = ResourceManager.GetObject("minus2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap plus { - get { - object obj = ResourceManager.GetObject("plus", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap plus2 { - get { - object obj = ResourceManager.GetObject("plus2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - } -} diff --git a/Resource1.resx b/Resource1.resx deleted file mode 100644 index 236baac..0000000 --- a/Resource1.resx +++ /dev/null @@ -1,190 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - RyzStudio\Windows\Forms\Resources\arrow_down.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - RyzStudio\Windows\Forms\Resources\arrow_down2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - RyzStudio\Windows\Forms\Resources\arrow_up.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - RyzStudio\Windows\Forms\Resources\arrow_up2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - RyzStudio\Windows\Forms\Resources\close2_16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - RyzStudio\Windows\Forms\Resources\close2_20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - RyzStudio\Windows\Forms\Resources\close_16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - RyzStudio\Windows\Forms\Resources\close_20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - RyzStudio\Windows\Forms\Resources\edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - RyzStudio\Windows\Forms\Resources\edit2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - RyzStudio\Windows\Forms\Resources\file.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - RyzStudio\Windows\Forms\Resources\file2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - RyzStudio\Windows\Forms\Resources\folder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - RyzStudio\Windows\Forms\Resources\folder2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - RyzStudio\Windows\Forms\Resources\maximise2_20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - RyzStudio\Windows\Forms\Resources\maximise3_20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - RyzStudio\Windows\Forms\Resources\maximise_20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - RyzStudio\Windows\Forms\Resources\minimise2_20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - RyzStudio\Windows\Forms\Resources\minimise_20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - RyzStudio\Windows\Forms\Resources\minus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - RyzStudio\Windows\Forms\Resources\minus2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - RyzStudio\Windows\Forms\Resources\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - RyzStudio\Windows\Forms\Resources\plus2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - \ No newline at end of file diff --git a/RyzStudio/Windows/Forms/Resources/close2_16.png b/RyzStudio/Windows/Forms/Resources/close2_16.png deleted file mode 100644 index c02cdf0e09c2d9a8c5c6283505b31c941f7b7f5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 468 zcmV;_0W1EAP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10bxl* zK~y-6jgwDG!(b4_e=m)Hj-UilO2wT^H#X2qR7$HOD^ccms&;z)#hy{b* zK+rVfq7iFbYTj;U-kW(de4moz(*yIY0~`T9#gGCISjqXh_|U|)P+CN7m@nf5Wmi6M zWa4_~wtrD@IsmU>Q^1)A_(doGfxIuk_m0<*a9lIrOvvdcW( z3*!BYpKdExm?9FgjTzb|^+zpZE;uky5r(URtmZ|W$qhAV}!e^5dtj$0000< KMNUMnLSTZlBh&@} diff --git a/RyzStudio/Windows/Forms/Resources/close_16.png b/RyzStudio/Windows/Forms/Resources/close_16.png deleted file mode 100644 index 25fc63244c4ebb4d67ac4fe0f893e9c281eb1584..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 367 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5he4R}c>anMprB-l zYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt+E%T^vI!dZ$iy^gC=I;CkO> z<|#+zzjR7P%Dh^VpUb|W zuaP%kWos0J=myW7@>