From c18b408df28b081ab5f5a17e68fe7c7af1681323 Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 21 Oct 2020 01:54:00 +0100 Subject: [PATCH] WIP: simplifying UI --- .gitignore | 2 + FizzyLauncher.UI/FizzyLauncher.UI.csproj | 197 +++++++++++++ FizzyLauncher.UI/Properties/AssemblyInfo.cs | 36 +++ .../Properties/Resources.Designer.cs | 223 +++++++++++++++ FizzyLauncher.UI/Properties/Resources.resx | 169 ++++++++++++ FizzyLauncher.UI/Resources/arrow_down16_a.png | Bin 0 -> 601 bytes FizzyLauncher.UI/Resources/arrow_down16_b.png | Bin 0 -> 417 bytes FizzyLauncher.UI/Resources/arrow_up16_a.png | Bin 0 -> 590 bytes FizzyLauncher.UI/Resources/arrow_up16_b.png | Bin 0 -> 410 bytes FizzyLauncher.UI/Resources/close16_a.png | Bin 0 -> 367 bytes FizzyLauncher.UI/Resources/close16_b.png | Bin 0 -> 468 bytes FizzyLauncher.UI/Resources/edit16_a.png | Bin 0 -> 612 bytes FizzyLauncher.UI/Resources/edit16_b.png | Bin 0 -> 419 bytes FizzyLauncher.UI/Resources/file16_a.png | Bin 0 -> 372 bytes FizzyLauncher.UI/Resources/file16_b.png | Bin 0 -> 323 bytes FizzyLauncher.UI/Resources/folder16_a.png | Bin 0 -> 352 bytes FizzyLauncher.UI/Resources/folder16_b.png | Bin 0 -> 288 bytes FizzyLauncher.UI/Resources/minus16_a.png | Bin 0 -> 532 bytes FizzyLauncher.UI/Resources/minus16_b.png | Bin 0 -> 380 bytes FizzyLauncher.UI/Resources/plus16_a.png | Bin 0 -> 559 bytes FizzyLauncher.UI/Resources/plus16_b.png | Bin 0 -> 398 bytes .../RyzStudio}/Data/SQLite/SQLiteDatabase.cs | 0 .../RyzStudio}/Drawing/Rectangoid.cs | 0 .../RyzStudio}/IO/FileType.cs | 0 .../RyzStudio}/IO/SessionFileFormatBase.cs | 0 .../RyzStudio}/IO/SharpZipLib.cs | 0 .../RyzStudio}/Net/HttpWeb.cs | 0 .../RyzStudio/Windows/Forms/PanelBook.cs | 258 ++++++++++++++++++ .../Windows/Forms/StackLayoutPanel.cs | 0 .../RyzStudio}/Windows/Forms/TFlatButton.cs | 0 .../Forms/THorizontalSeparator.Designer.cs | 0 .../Windows/Forms/THorizontalSeparator.cs | 0 .../RyzStudio}/Windows/Forms/TImageBox.cs | 0 .../RyzStudio/Windows/Forms/TUserControl.cs | 8 +- .../RyzStudio}/Windows/Forms/ThreadControl.cs | 0 .../ThemedForms/BorderlessForm.Designer.cs | 0 .../Windows/ThemedForms/BorderlessForm.cs | 0 .../Windows/ThemedForms/BorderlessForm.resx | 0 .../BorderlessToolForm.Designer.cs | 0 .../Windows/ThemedForms/BorderlessToolForm.cs | 0 .../ThemedForms/BorderlessToolForm.resx | 0 .../RyzStudio}/Windows/ThemedForms/TButton.cs | 0 .../Windows/ThemedForms/TButton.designer.cs | 0 .../Windows/ThemedForms/TButton.resx | 0 .../Windows/ThemedForms/TButtonTextBox.cs | 0 .../ThemedForms/TButtonTextBox.designer.cs | 0 .../Windows/ThemedForms/TButtonTextBox.resx | 0 .../ThemedForms/TDialogForm.Designer.cs | 4 +- .../Windows/ThemedForms/TDialogForm.cs | 2 +- .../Windows/ThemedForms/TDialogForm.resx | 0 .../Windows/ThemedForms/TFolderTextBox.cs | 5 +- .../Windows/ThemedForms/TForm.Designer.cs | 0 .../RyzStudio}/Windows/ThemedForms/TForm.cs | 0 .../RyzStudio}/Windows/ThemedForms/TForm.resx | 0 .../Windows/ThemedForms/TListBox.cs | 0 .../Windows/ThemedForms/TListBox.designer.cs | 30 +- .../Windows/ThemedForms/TListBox.resx | 0 .../Windows/ThemedForms/TOpenFileTextBox.cs | 5 +- .../Windows/ThemedForms/TPickerBox.cs | 0 .../ThemedForms/TPickerBox.designer.cs | 0 .../Windows/ThemedForms/TPickerBox.resx | 0 .../Windows/ThemedForms/TTextBox.cs | 0 .../Windows/ThemedForms/TTextBox.designer.cs | 0 .../Windows/ThemedForms/TTextBox.resx | 0 .../Windows/ThemedForms/TUserControl.cs | 0 .../ThemedForms/TUserControl.designer.cs | 0 .../Windows/ThemedForms/TYesNoPickerBox.cs | 0 FizzyLauncher.csproj | 94 +------ RyzStudio/Windows/Forms/PanelBook.Designer.cs | 37 --- RyzStudio/Windows/Forms/PanelBook.cs | 159 ----------- RyzStudio/Windows/Forms/PanelCollection.cs | 80 ------ Windows/Forms/AForm.cs | 3 +- Windows/Forms/Tile/TTilePanel.cs | 2 +- Windows/Forms/Tile/TTilePanelLayout.cs | 2 +- skye.sln | 10 +- 75 files changed, 931 insertions(+), 395 deletions(-) create mode 100644 FizzyLauncher.UI/FizzyLauncher.UI.csproj create mode 100644 FizzyLauncher.UI/Properties/AssemblyInfo.cs create mode 100644 FizzyLauncher.UI/Properties/Resources.Designer.cs create mode 100644 FizzyLauncher.UI/Properties/Resources.resx create mode 100644 FizzyLauncher.UI/Resources/arrow_down16_a.png create mode 100644 FizzyLauncher.UI/Resources/arrow_down16_b.png create mode 100644 FizzyLauncher.UI/Resources/arrow_up16_a.png create mode 100644 FizzyLauncher.UI/Resources/arrow_up16_b.png create mode 100644 FizzyLauncher.UI/Resources/close16_a.png create mode 100644 FizzyLauncher.UI/Resources/close16_b.png create mode 100644 FizzyLauncher.UI/Resources/edit16_a.png create mode 100644 FizzyLauncher.UI/Resources/edit16_b.png create mode 100644 FizzyLauncher.UI/Resources/file16_a.png create mode 100644 FizzyLauncher.UI/Resources/file16_b.png create mode 100644 FizzyLauncher.UI/Resources/folder16_a.png create mode 100644 FizzyLauncher.UI/Resources/folder16_b.png create mode 100644 FizzyLauncher.UI/Resources/minus16_a.png create mode 100644 FizzyLauncher.UI/Resources/minus16_b.png create mode 100644 FizzyLauncher.UI/Resources/plus16_a.png create mode 100644 FizzyLauncher.UI/Resources/plus16_b.png rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Data/SQLite/SQLiteDatabase.cs (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Drawing/Rectangoid.cs (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/IO/FileType.cs (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/IO/SessionFileFormatBase.cs (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/IO/SharpZipLib.cs (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Net/HttpWeb.cs (100%) create mode 100644 FizzyLauncher.UI/RyzStudio/Windows/Forms/PanelBook.cs rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/Forms/StackLayoutPanel.cs (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/Forms/TFlatButton.cs (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/Forms/THorizontalSeparator.Designer.cs (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/Forms/THorizontalSeparator.cs (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/Forms/TImageBox.cs (100%) rename Windows/Forms/AUserControl.cs => FizzyLauncher.UI/RyzStudio/Windows/Forms/TUserControl.cs (95%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/Forms/ThreadControl.cs (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/BorderlessForm.Designer.cs (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/BorderlessForm.cs (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/BorderlessForm.resx (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/BorderlessToolForm.Designer.cs (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/BorderlessToolForm.cs (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/BorderlessToolForm.resx (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/TButton.cs (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/TButton.designer.cs (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/TButton.resx (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/TButtonTextBox.cs (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/TButtonTextBox.designer.cs (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/TButtonTextBox.resx (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/TDialogForm.Designer.cs (95%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/TDialogForm.cs (98%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/TDialogForm.resx (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/TFolderTextBox.cs (86%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/TForm.Designer.cs (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/TForm.cs (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/TForm.resx (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/TListBox.cs (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/TListBox.designer.cs (87%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/TListBox.resx (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/TOpenFileTextBox.cs (87%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/TPickerBox.cs (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/TPickerBox.designer.cs (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/TPickerBox.resx (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/TTextBox.cs (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/TTextBox.designer.cs (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/TTextBox.resx (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/TUserControl.cs (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/TUserControl.designer.cs (100%) rename {RyzStudio => FizzyLauncher.UI/RyzStudio}/Windows/ThemedForms/TYesNoPickerBox.cs (100%) delete mode 100644 RyzStudio/Windows/Forms/PanelBook.Designer.cs delete mode 100644 RyzStudio/Windows/Forms/PanelBook.cs delete mode 100644 RyzStudio/Windows/Forms/PanelCollection.cs diff --git a/.gitignore b/.gitignore index 7ca3e48..fb85c11 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ /packages /Installer/Debug /Installer/Release +/FizzyLauncher.UI/bin +/FizzyLauncher.UI/obj diff --git a/FizzyLauncher.UI/FizzyLauncher.UI.csproj b/FizzyLauncher.UI/FizzyLauncher.UI.csproj new file mode 100644 index 0000000..23e9e57 --- /dev/null +++ b/FizzyLauncher.UI/FizzyLauncher.UI.csproj @@ -0,0 +1,197 @@ + + + + + Debug + AnyCPU + {D9A49347-583F-41B4-AFE1-63EC80BBDB38} + Library + Properties + AppLauncher + fizzylauncher.ui + v4.7.2 + 512 + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + false + + + + + + + + + + + + + + + + + True + True + Resources.resx + + + + UserControl + + + Component + + + UserControl + + + THorizontalSeparator.cs + + + + Component + + + UserControl + + + TButton.cs + + + UserControl + + + TButtonTextBox.cs + + + Form + + + TDialogForm.cs + + + UserControl + + + UserControl + + + TListBox.cs + + + UserControl + + + UserControl + + + TPickerBox.cs + + + UserControl + + + TTextBox.cs + + + UserControl + + + TUserControl.cs + + + UserControl + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + TButton.cs + + + TButtonTextBox.cs + + + TDialogForm.cs + + + TListBox.cs + + + TPickerBox.cs + + + TTextBox.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FizzyLauncher.UI/Properties/AssemblyInfo.cs b/FizzyLauncher.UI/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..0ec23d9 --- /dev/null +++ b/FizzyLauncher.UI/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("FizzyLauncher.UI")] +[assembly: AssemblyDescription("UI")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("FizzyLauncher.UI")] +[assembly: AssemblyCopyright("Copyright © Ray Lam 2020")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("d9a49347-583f-41b4-afe1-63ec80bbdb38")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/FizzyLauncher.UI/Properties/Resources.Designer.cs b/FizzyLauncher.UI/Properties/Resources.Designer.cs new file mode 100644 index 0000000..40f0b6b --- /dev/null +++ b/FizzyLauncher.UI/Properties/Resources.Designer.cs @@ -0,0 +1,223 @@ +//------------------------------------------------------------------------------ +// +// 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 Resources { + + 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() { + } + + /// + /// 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.Resources", typeof(Resources).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_down16_a { + get { + object obj = ResourceManager.GetObject("arrow_down16_a", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap arrow_down16_b { + get { + object obj = ResourceManager.GetObject("arrow_down16_b", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap arrow_up16_a { + get { + object obj = ResourceManager.GetObject("arrow_up16_a", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap arrow_up16_b { + get { + object obj = ResourceManager.GetObject("arrow_up16_b", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap close16_a { + get { + object obj = ResourceManager.GetObject("close16_a", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap close16_b { + get { + object obj = ResourceManager.GetObject("close16_b", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap edit16_a { + get { + object obj = ResourceManager.GetObject("edit16_a", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap edit16_b { + get { + object obj = ResourceManager.GetObject("edit16_b", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap file16_a { + get { + object obj = ResourceManager.GetObject("file16_a", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap file16_b { + get { + object obj = ResourceManager.GetObject("file16_b", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap folder16_a { + get { + object obj = ResourceManager.GetObject("folder16_a", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap folder16_b { + get { + object obj = ResourceManager.GetObject("folder16_b", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap minus16_a { + get { + object obj = ResourceManager.GetObject("minus16_a", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap minus16_b { + get { + object obj = ResourceManager.GetObject("minus16_b", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap plus16_a { + get { + object obj = ResourceManager.GetObject("plus16_a", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap plus16_b { + get { + object obj = ResourceManager.GetObject("plus16_b", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + } +} diff --git a/FizzyLauncher.UI/Properties/Resources.resx b/FizzyLauncher.UI/Properties/Resources.resx new file mode 100644 index 0000000..a71d849 --- /dev/null +++ b/FizzyLauncher.UI/Properties/Resources.resx @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + ..\Resources\arrow_down16_a.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\arrow_up16_a.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\close16_a.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\edit16_a.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\file16_a.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\folder16_a.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\minus16_a.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\plus16_a.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 + + \ No newline at end of file diff --git a/FizzyLauncher.UI/Resources/arrow_down16_a.png b/FizzyLauncher.UI/Resources/arrow_down16_a.png new file mode 100644 index 0000000000000000000000000000000000000000..cccf233e96a5deccc73a84bdfff320ebbdfafc31 GIT binary patch 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~ literal 0 HcmV?d00001 diff --git a/FizzyLauncher.UI/Resources/arrow_up16_a.png b/FizzyLauncher.UI/Resources/arrow_up16_a.png new file mode 100644 index 0000000000000000000000000000000000000000..a08438ba358ad09ba06ed091b453a749822880e9 GIT binary patch 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=RpFanMprB-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@>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&@} literal 0 HcmV?d00001 diff --git a/FizzyLauncher.UI/Resources/edit16_a.png b/FizzyLauncher.UI/Resources/edit16_a.png new file mode 100644 index 0000000000000000000000000000000000000000..031e3f604221f0e7d68be875e68412c8b19e089e GIT binary patch literal 612 zcmV-q0-ODbP)N&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 literal 0 HcmV?d00001 diff --git a/FizzyLauncher.UI/Resources/file16_a.png b/FizzyLauncher.UI/Resources/file16_a.png new file mode 100644 index 0000000000000000000000000000000000000000..d0c9e5830ade13c518f1a0a7fb5c4e4f20407e41 GIT binary patch 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# literal 0 HcmV?d00001 diff --git a/FizzyLauncher.UI/Resources/file16_b.png b/FizzyLauncher.UI/Resources/file16_b.png new file mode 100644 index 0000000000000000000000000000000000000000..f3e9f6d2179af7121d2314669151bada83185afe GIT binary patch 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( literal 0 HcmV?d00001 diff --git a/FizzyLauncher.UI/Resources/folder16_b.png b/FizzyLauncher.UI/Resources/folder16_b.png new file mode 100644 index 0000000000000000000000000000000000000000..d21178aa8cafb22ebfe50bf0379772d84075e671 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/FizzyLauncher.UI/Resources/minus16_a.png b/FizzyLauncher.UI/Resources/minus16_a.png new file mode 100644 index 0000000000000000000000000000000000000000..6b396d43dcd620706ec9a4eb0662e997b8117f02 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/FizzyLauncher.UI/Resources/minus16_b.png b/FizzyLauncher.UI/Resources/minus16_b.png new file mode 100644 index 0000000000000000000000000000000000000000..9bb41283a7f3e8d7bdf81467b5391984bea3e424 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/FizzyLauncher.UI/Resources/plus16_b.png b/FizzyLauncher.UI/Resources/plus16_b.png new file mode 100644 index 0000000000000000000000000000000000000000..0c29081e25aa7911ea1e9793e66094cb06efb9df GIT binary patch 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| literal 0 HcmV?d00001 diff --git a/RyzStudio/Data/SQLite/SQLiteDatabase.cs b/FizzyLauncher.UI/RyzStudio/Data/SQLite/SQLiteDatabase.cs similarity index 100% rename from RyzStudio/Data/SQLite/SQLiteDatabase.cs rename to FizzyLauncher.UI/RyzStudio/Data/SQLite/SQLiteDatabase.cs diff --git a/RyzStudio/Drawing/Rectangoid.cs b/FizzyLauncher.UI/RyzStudio/Drawing/Rectangoid.cs similarity index 100% rename from RyzStudio/Drawing/Rectangoid.cs rename to FizzyLauncher.UI/RyzStudio/Drawing/Rectangoid.cs diff --git a/RyzStudio/IO/FileType.cs b/FizzyLauncher.UI/RyzStudio/IO/FileType.cs similarity index 100% rename from RyzStudio/IO/FileType.cs rename to FizzyLauncher.UI/RyzStudio/IO/FileType.cs diff --git a/RyzStudio/IO/SessionFileFormatBase.cs b/FizzyLauncher.UI/RyzStudio/IO/SessionFileFormatBase.cs similarity index 100% rename from RyzStudio/IO/SessionFileFormatBase.cs rename to FizzyLauncher.UI/RyzStudio/IO/SessionFileFormatBase.cs diff --git a/RyzStudio/IO/SharpZipLib.cs b/FizzyLauncher.UI/RyzStudio/IO/SharpZipLib.cs similarity index 100% rename from RyzStudio/IO/SharpZipLib.cs rename to FizzyLauncher.UI/RyzStudio/IO/SharpZipLib.cs diff --git a/RyzStudio/Net/HttpWeb.cs b/FizzyLauncher.UI/RyzStudio/Net/HttpWeb.cs similarity index 100% rename from RyzStudio/Net/HttpWeb.cs rename to FizzyLauncher.UI/RyzStudio/Net/HttpWeb.cs diff --git a/FizzyLauncher.UI/RyzStudio/Windows/Forms/PanelBook.cs b/FizzyLauncher.UI/RyzStudio/Windows/Forms/PanelBook.cs new file mode 100644 index 0000000..c6755c8 --- /dev/null +++ b/FizzyLauncher.UI/RyzStudio/Windows/Forms/PanelBook.cs @@ -0,0 +1,258 @@ +namespace RyzStudio.Windows.Forms +{ + using System; + using System.Collections; + using System.ComponentModel; + using System.Drawing; + using System.Windows.Forms; + + [ToolboxItem(true)] + public class PanelBook : UserControl + { + public class PanelCollection : CollectionBase + { + protected PanelBook panelBook = null; + + public PanelCollection(PanelBook parentPanelBook) : base() + { + panelBook = parentPanelBook; + } + + public PanelBook Parent => panelBook; + + public Panel this[int index] { get => (Panel)List[index]; set => List[index] = value; } + + public int Add(Panel value) => List.Add(value); + + public void AddRange(Panel[] pages) => Array.ForEach(pages, x => this.Add(x)); + + public bool Contains(Panel value) => List.Contains(value); + + public int IndexOf(Panel value) => List.IndexOf(value); + + public void Insert(int index, Panel value) => List.Insert(index, value); + + public void Remove(Panel value) => List.Remove(value); + + protected override void OnInsertComplete(int index, object value) + { + base.OnInsertComplete(index, value); + + if (panelBook != null) + { + panelBook.PageIndex = index; + } + } + + protected override void OnRemoveComplete(int index, object value) + { + base.OnRemoveComplete(index, value); + + if (panelBook != null) + { + if (panelBook.PageIndex == index) + { + if (index < InnerList.Count) + { + panelBook.PageIndex = index; + } + else + { + panelBook.PageIndex = InnerList.Count - 1; + } + } + } + } + + } + + private System.ComponentModel.IContainer components = null; + + protected PanelCollection panelCollection = null; + + public PanelBook() + { + InitializeComponent(); + + panelCollection = new PanelCollection(this); + } + + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + + base.Dispose(disposing); + } + + protected void InitializeComponent() + { + components = new System.ComponentModel.Container(); + } + + [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] + public Panel ActivePanel { get; protected set; } = null; + + [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] + public override bool AutoScroll { get => base.AutoScroll; set => base.AutoScroll = value; } + + [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] + public new Size AutoScrollMargin { get => base.AutoScrollMargin; set => base.AutoScrollMargin = value; } + + [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] + public new Size AutoScrollMinSize { get => base.AutoScrollMinSize; set => base.AutoScrollMinSize = value; } + + [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] + public override Image BackgroundImage { get => base.BackgroundImage; set => base.BackgroundImage = value; } + + [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] + public override ImageLayout BackgroundImageLayout { get => base.BackgroundImageLayout; set => base.BackgroundImageLayout = value; } + + [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] + public new ImeMode ImeMode { get => base.ImeMode; set => base.ImeMode = value; } + + [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] + public override RightToLeft RightToLeft { get => base.RightToLeft; set => base.RightToLeft = value; } + + [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] + public new bool UseWaitCursor { get => base.UseWaitCursor; set => base.UseWaitCursor = value; } + + [Category("Collection")] + [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] + public PanelCollection Pages => panelCollection; + + [Category("Collection")] + public int SelectedIndex + { + get => (panelCollection.Count <= 0) ? -1 : panelCollection.IndexOf(this.ActivePanel); + set + { + if (panelCollection.Count <= 0) return; + if (value < 0) return; + if (value > (panelCollection.Count - 1)) return; + if (value == this.SelectedIndex) return; + + ActivatePage(value); + } + } + + protected internal int PageIndex + { + get => panelCollection.IndexOf(this.ActivePanel); + set + { + if (panelCollection.Count <= 0) + { + ActivatePage(-1); + return; + } + + if ((value < -1) || (value >= panelCollection.Count)) + { + throw new ArgumentOutOfRangeException("PageIndex", value, "The page index must be between 0 and " + Convert.ToString(panelCollection.Count - 1)); + } + + ActivatePage(value); + } + } + + protected internal void ActivatePage(int index) + { + if ((panelCollection.Count == 0) && (index >= panelCollection.Count) && (index <= 0)) + { + return; + } + + Panel p = (Panel)panelCollection[index]; + + ActivatePage(p); + } + + protected internal void ActivatePage(Panel page) + { + if (this.ActivePanel != null) + { + if (this.ActivePanel.InvokeRequired) + { + this.ActivePanel.Invoke(new MethodInvoker(() => { + this.ActivePanel.Visible = false; + })); + } + else + { + this.ActivePanel.Visible = false; + } + } + + this.ActivePanel = page; + if (this.ActivePanel != null) + { + this.ActivePanel.Parent = this; + if (!this.Contains(this.ActivePanel)) + { + this.Container.Add(this.ActivePanel); + } + + if (this.ActivePanel.InvokeRequired) + { + this.ActivePanel.Invoke(new MethodInvoker(() => { + this.ActivePanel.Dock = DockStyle.Fill; + this.ActivePanel.Visible = true; + this.ActivePanel.BringToFront(); + })); + } + else + { + this.ActivePanel.Dock = DockStyle.Fill; + this.ActivePanel.Visible = true; + this.ActivePanel.BringToFront(); + } + } + + if (this.ActivePanel != null) + { + if (this.ActivePanel.InvokeRequired) + { + this.ActivePanel.Invoke(new MethodInvoker(() => { + this.ActivePanel.Invalidate(); + })); + } + else + { + this.ActivePanel.Invalidate(); + } + } + else + { + this.Invalidate(); + } + } + +#if DEBUG + + protected override void OnResize(EventArgs e) + { + base.OnResize(e); + + if (this.DesignMode) + { + this.Invalidate(); + } + } + +#endif + + protected override void DestroyHandle() + { + base.DestroyHandle(); + + foreach (Panel p in panelCollection) + { + p.Dispose(); + } + } + + } +} \ No newline at end of file diff --git a/RyzStudio/Windows/Forms/StackLayoutPanel.cs b/FizzyLauncher.UI/RyzStudio/Windows/Forms/StackLayoutPanel.cs similarity index 100% rename from RyzStudio/Windows/Forms/StackLayoutPanel.cs rename to FizzyLauncher.UI/RyzStudio/Windows/Forms/StackLayoutPanel.cs diff --git a/RyzStudio/Windows/Forms/TFlatButton.cs b/FizzyLauncher.UI/RyzStudio/Windows/Forms/TFlatButton.cs similarity index 100% rename from RyzStudio/Windows/Forms/TFlatButton.cs rename to FizzyLauncher.UI/RyzStudio/Windows/Forms/TFlatButton.cs diff --git a/RyzStudio/Windows/Forms/THorizontalSeparator.Designer.cs b/FizzyLauncher.UI/RyzStudio/Windows/Forms/THorizontalSeparator.Designer.cs similarity index 100% rename from RyzStudio/Windows/Forms/THorizontalSeparator.Designer.cs rename to FizzyLauncher.UI/RyzStudio/Windows/Forms/THorizontalSeparator.Designer.cs diff --git a/RyzStudio/Windows/Forms/THorizontalSeparator.cs b/FizzyLauncher.UI/RyzStudio/Windows/Forms/THorizontalSeparator.cs similarity index 100% rename from RyzStudio/Windows/Forms/THorizontalSeparator.cs rename to FizzyLauncher.UI/RyzStudio/Windows/Forms/THorizontalSeparator.cs diff --git a/RyzStudio/Windows/Forms/TImageBox.cs b/FizzyLauncher.UI/RyzStudio/Windows/Forms/TImageBox.cs similarity index 100% rename from RyzStudio/Windows/Forms/TImageBox.cs rename to FizzyLauncher.UI/RyzStudio/Windows/Forms/TImageBox.cs diff --git a/Windows/Forms/AUserControl.cs b/FizzyLauncher.UI/RyzStudio/Windows/Forms/TUserControl.cs similarity index 95% rename from Windows/Forms/AUserControl.cs rename to FizzyLauncher.UI/RyzStudio/Windows/Forms/TUserControl.cs index fef5b7a..8bb38d6 100644 --- a/Windows/Forms/AUserControl.cs +++ b/FizzyLauncher.UI/RyzStudio/Windows/Forms/TUserControl.cs @@ -2,12 +2,12 @@ using System.Drawing; using System.Windows.Forms; -namespace AppLauncher.Windows.Forms +namespace RyzStudio.Windows.Forms { - public class AUserControl : UserControl + public class TUserControl : System.Windows.Forms.UserControl { - public AUserControl() : base() + public TUserControl() : base() { } @@ -36,7 +36,6 @@ namespace AppLauncher.Windows.Forms [Browsable(false)] public new bool UseWaitCursor { get => base.UseWaitCursor; set => base.UseWaitCursor = value; } - [Browsable(false)] public override bool AllowDrop { get => base.AllowDrop; set => base.AllowDrop = value; } @@ -49,7 +48,6 @@ namespace AppLauncher.Windows.Forms [Browsable(false)] public new ImeMode ImeMode { get => base.ImeMode; set => base.ImeMode = value; } - [Browsable(false)] public override bool AutoScroll { get => base.AutoScroll; set => base.AutoScroll = value; } diff --git a/RyzStudio/Windows/Forms/ThreadControl.cs b/FizzyLauncher.UI/RyzStudio/Windows/Forms/ThreadControl.cs similarity index 100% rename from RyzStudio/Windows/Forms/ThreadControl.cs rename to FizzyLauncher.UI/RyzStudio/Windows/Forms/ThreadControl.cs diff --git a/RyzStudio/Windows/ThemedForms/BorderlessForm.Designer.cs b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/BorderlessForm.Designer.cs similarity index 100% rename from RyzStudio/Windows/ThemedForms/BorderlessForm.Designer.cs rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/BorderlessForm.Designer.cs diff --git a/RyzStudio/Windows/ThemedForms/BorderlessForm.cs b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/BorderlessForm.cs similarity index 100% rename from RyzStudio/Windows/ThemedForms/BorderlessForm.cs rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/BorderlessForm.cs diff --git a/RyzStudio/Windows/ThemedForms/BorderlessForm.resx b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/BorderlessForm.resx similarity index 100% rename from RyzStudio/Windows/ThemedForms/BorderlessForm.resx rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/BorderlessForm.resx diff --git a/RyzStudio/Windows/ThemedForms/BorderlessToolForm.Designer.cs b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/BorderlessToolForm.Designer.cs similarity index 100% rename from RyzStudio/Windows/ThemedForms/BorderlessToolForm.Designer.cs rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/BorderlessToolForm.Designer.cs diff --git a/RyzStudio/Windows/ThemedForms/BorderlessToolForm.cs b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/BorderlessToolForm.cs similarity index 100% rename from RyzStudio/Windows/ThemedForms/BorderlessToolForm.cs rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/BorderlessToolForm.cs diff --git a/RyzStudio/Windows/ThemedForms/BorderlessToolForm.resx b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/BorderlessToolForm.resx similarity index 100% rename from RyzStudio/Windows/ThemedForms/BorderlessToolForm.resx rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/BorderlessToolForm.resx diff --git a/RyzStudio/Windows/ThemedForms/TButton.cs b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TButton.cs similarity index 100% rename from RyzStudio/Windows/ThemedForms/TButton.cs rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TButton.cs diff --git a/RyzStudio/Windows/ThemedForms/TButton.designer.cs b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TButton.designer.cs similarity index 100% rename from RyzStudio/Windows/ThemedForms/TButton.designer.cs rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TButton.designer.cs diff --git a/RyzStudio/Windows/ThemedForms/TButton.resx b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TButton.resx similarity index 100% rename from RyzStudio/Windows/ThemedForms/TButton.resx rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TButton.resx diff --git a/RyzStudio/Windows/ThemedForms/TButtonTextBox.cs b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TButtonTextBox.cs similarity index 100% rename from RyzStudio/Windows/ThemedForms/TButtonTextBox.cs rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TButtonTextBox.cs diff --git a/RyzStudio/Windows/ThemedForms/TButtonTextBox.designer.cs b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TButtonTextBox.designer.cs similarity index 100% rename from RyzStudio/Windows/ThemedForms/TButtonTextBox.designer.cs rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TButtonTextBox.designer.cs diff --git a/RyzStudio/Windows/ThemedForms/TButtonTextBox.resx b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TButtonTextBox.resx similarity index 100% rename from RyzStudio/Windows/ThemedForms/TButtonTextBox.resx rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TButtonTextBox.resx diff --git a/RyzStudio/Windows/ThemedForms/TDialogForm.Designer.cs b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TDialogForm.Designer.cs similarity index 95% rename from RyzStudio/Windows/ThemedForms/TDialogForm.Designer.cs rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TDialogForm.Designer.cs index a2f2043..f0ec21a 100644 --- a/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.Resource1.close2_16; + this.imgbxClose.ImageHover = global::AppLauncher.Properties.Resources.close16_b; 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.Resource1.close_16; + this.imgbxClose.ImageNormal = global::AppLauncher.Properties.Resources.close16_a; this.imgbxClose.Size = new System.Drawing.Size(24, 24); this.imgbxClose.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.imgbxClose.TabIndex = 145; diff --git a/RyzStudio/Windows/ThemedForms/TDialogForm.cs b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TDialogForm.cs similarity index 98% rename from RyzStudio/Windows/ThemedForms/TDialogForm.cs rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TDialogForm.cs index f6d451e..2f2b440 100644 --- a/RyzStudio/Windows/ThemedForms/TDialogForm.cs +++ b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TDialogForm.cs @@ -5,7 +5,7 @@ using System.Drawing; using System.Drawing.Design; using System.Windows.Forms; - using Resources = AppLauncher.Properties.Resources; +// using Resources = AppLauncher.Properties.Resources; public partial class TDialogForm : System.Windows.Forms.Form { diff --git a/RyzStudio/Windows/ThemedForms/TDialogForm.resx b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TDialogForm.resx similarity index 100% rename from RyzStudio/Windows/ThemedForms/TDialogForm.resx rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TDialogForm.resx diff --git a/RyzStudio/Windows/ThemedForms/TFolderTextBox.cs b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TFolderTextBox.cs similarity index 86% rename from RyzStudio/Windows/ThemedForms/TFolderTextBox.cs rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TFolderTextBox.cs index 1327b26..ec17cc5 100644 --- a/RyzStudio/Windows/ThemedForms/TFolderTextBox.cs +++ b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TFolderTextBox.cs @@ -1,6 +1,7 @@ using System; using System.IO; using System.Windows.Forms; +using Resources = AppLauncher.Properties.Resources; namespace RyzStudio.Windows.ThemedForms { @@ -8,8 +9,8 @@ namespace RyzStudio.Windows.ThemedForms { public TFolderTextBox() : base() { - this.NormalImage = AppLauncher.Resource1.folder; - this.HighlightImage = AppLauncher.Resource1.folder2; + this.NormalImage = Resources.folder16_a; + this.HighlightImage = Resources.folder16_b; this.Text = string.Empty; } diff --git a/RyzStudio/Windows/ThemedForms/TForm.Designer.cs b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TForm.Designer.cs similarity index 100% rename from RyzStudio/Windows/ThemedForms/TForm.Designer.cs rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TForm.Designer.cs diff --git a/RyzStudio/Windows/ThemedForms/TForm.cs b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TForm.cs similarity index 100% rename from RyzStudio/Windows/ThemedForms/TForm.cs rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TForm.cs diff --git a/RyzStudio/Windows/ThemedForms/TForm.resx b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TForm.resx similarity index 100% rename from RyzStudio/Windows/ThemedForms/TForm.resx rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TForm.resx diff --git a/RyzStudio/Windows/ThemedForms/TListBox.cs b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TListBox.cs similarity index 100% rename from RyzStudio/Windows/ThemedForms/TListBox.cs rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TListBox.cs diff --git a/RyzStudio/Windows/ThemedForms/TListBox.designer.cs b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TListBox.designer.cs similarity index 87% rename from RyzStudio/Windows/ThemedForms/TListBox.designer.cs rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TListBox.designer.cs index 758ed83..bab75f5 100644 --- a/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.Resource1.edit2; - this.imageBox5.Image = global::AppLauncher.Resource1.edit; + this.imageBox5.ImageHover = global::AppLauncher.Properties.Resources.edit16_b; + this.imageBox5.Image = global::AppLauncher.Properties.Resources.edit16_a; this.imageBox5.InitialImage = null; this.imageBox5.Location = new System.Drawing.Point(52, 94); this.imageBox5.Name = "imageBox5"; - this.imageBox5.ImageNormal = global::AppLauncher.Resource1.edit; + this.imageBox5.ImageNormal = global::AppLauncher.Properties.Resources.edit16_a; 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.Resource1.arrow_down2; - this.imageBox4.Image = global::AppLauncher.Resource1.arrow_down; + this.imageBox4.ImageHover = global::AppLauncher.Properties.Resources.arrow_down16_b; + this.imageBox4.Image = global::AppLauncher.Properties.Resources.arrow_down16_a; this.imageBox4.InitialImage = null; this.imageBox4.Location = new System.Drawing.Point(100, 94); this.imageBox4.Name = "imageBox4"; - this.imageBox4.ImageNormal = global::AppLauncher.Resource1.arrow_down; + this.imageBox4.ImageNormal = global::AppLauncher.Properties.Resources.arrow_down16_a; 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.Resource1.arrow_up2; - this.imageBox3.Image = global::AppLauncher.Resource1.arrow_up; + this.imageBox3.ImageHover = global::AppLauncher.Properties.Resources.arrow_up16_b; + this.imageBox3.Image = global::AppLauncher.Properties.Resources.arrow_up16_a; this.imageBox3.InitialImage = null; this.imageBox3.Location = new System.Drawing.Point(76, 94); this.imageBox3.Name = "imageBox3"; - this.imageBox3.ImageNormal = global::AppLauncher.Resource1.arrow_up; + this.imageBox3.ImageNormal = global::AppLauncher.Properties.Resources.arrow_up16_a; 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.Resource1.minus2; - this.imageBox2.Image = global::AppLauncher.Resource1.minus; + this.imageBox2.ImageHover = global::AppLauncher.Properties.Resources.minus16_b; + this.imageBox2.Image = global::AppLauncher.Properties.Resources.minus16_a; this.imageBox2.InitialImage = null; this.imageBox2.Location = new System.Drawing.Point(28, 94); this.imageBox2.Name = "imageBox2"; - this.imageBox2.ImageNormal = global::AppLauncher.Resource1.minus; + this.imageBox2.ImageNormal = global::AppLauncher.Properties.Resources.minus16_a; 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.Resource1.plus2; - this.imageBox1.Image = global::AppLauncher.Resource1.plus; + this.imageBox1.ImageHover = global::AppLauncher.Properties.Resources.plus16_b; + this.imageBox1.Image = global::AppLauncher.Properties.Resources.plus16_a; this.imageBox1.InitialImage = null; this.imageBox1.Location = new System.Drawing.Point(4, 94); this.imageBox1.Name = "imageBox1"; - this.imageBox1.ImageNormal = global::AppLauncher.Resource1.plus; + this.imageBox1.ImageNormal = global::AppLauncher.Properties.Resources.plus16_a; this.imageBox1.Size = new System.Drawing.Size(18, 25); this.imageBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.imageBox1.TabIndex = 2; diff --git a/RyzStudio/Windows/ThemedForms/TListBox.resx b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TListBox.resx similarity index 100% rename from RyzStudio/Windows/ThemedForms/TListBox.resx rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TListBox.resx diff --git a/RyzStudio/Windows/ThemedForms/TOpenFileTextBox.cs b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TOpenFileTextBox.cs similarity index 87% rename from RyzStudio/Windows/ThemedForms/TOpenFileTextBox.cs rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TOpenFileTextBox.cs index 12bfa8b..cca78a3 100644 --- a/RyzStudio/Windows/ThemedForms/TOpenFileTextBox.cs +++ b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TOpenFileTextBox.cs @@ -1,6 +1,7 @@ using System; using System.IO; using System.Windows.Forms; +using Resources = AppLauncher.Properties.Resources; namespace RyzStudio.Windows.ThemedForms { @@ -8,8 +9,8 @@ namespace RyzStudio.Windows.ThemedForms { public TOpenFileTextBox() : base() { - this.NormalImage = AppLauncher.Resource1.file; - this.HighlightImage = AppLauncher.Resource1.file2; + this.NormalImage = Resources.file16_a; + this.HighlightImage = Resources.file16_b; this.Text = string.Empty; } diff --git a/RyzStudio/Windows/ThemedForms/TPickerBox.cs b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TPickerBox.cs similarity index 100% rename from RyzStudio/Windows/ThemedForms/TPickerBox.cs rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TPickerBox.cs diff --git a/RyzStudio/Windows/ThemedForms/TPickerBox.designer.cs b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TPickerBox.designer.cs similarity index 100% rename from RyzStudio/Windows/ThemedForms/TPickerBox.designer.cs rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TPickerBox.designer.cs diff --git a/RyzStudio/Windows/ThemedForms/TPickerBox.resx b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TPickerBox.resx similarity index 100% rename from RyzStudio/Windows/ThemedForms/TPickerBox.resx rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TPickerBox.resx diff --git a/RyzStudio/Windows/ThemedForms/TTextBox.cs b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TTextBox.cs similarity index 100% rename from RyzStudio/Windows/ThemedForms/TTextBox.cs rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TTextBox.cs diff --git a/RyzStudio/Windows/ThemedForms/TTextBox.designer.cs b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TTextBox.designer.cs similarity index 100% rename from RyzStudio/Windows/ThemedForms/TTextBox.designer.cs rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TTextBox.designer.cs diff --git a/RyzStudio/Windows/ThemedForms/TTextBox.resx b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TTextBox.resx similarity index 100% rename from RyzStudio/Windows/ThemedForms/TTextBox.resx rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TTextBox.resx diff --git a/RyzStudio/Windows/ThemedForms/TUserControl.cs b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TUserControl.cs similarity index 100% rename from RyzStudio/Windows/ThemedForms/TUserControl.cs rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TUserControl.cs diff --git a/RyzStudio/Windows/ThemedForms/TUserControl.designer.cs b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TUserControl.designer.cs similarity index 100% rename from RyzStudio/Windows/ThemedForms/TUserControl.designer.cs rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TUserControl.designer.cs diff --git a/RyzStudio/Windows/ThemedForms/TYesNoPickerBox.cs b/FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TYesNoPickerBox.cs similarity index 100% rename from RyzStudio/Windows/ThemedForms/TYesNoPickerBox.cs rename to FizzyLauncher.UI/RyzStudio/Windows/ThemedForms/TYesNoPickerBox.cs diff --git a/FizzyLauncher.csproj b/FizzyLauncher.csproj index f39eacc..c39b609 100644 --- a/FizzyLauncher.csproj +++ b/FizzyLauncher.csproj @@ -78,71 +78,6 @@ True Resource1.resx - - - Component - - - UserControl - - - THorizontalSeparator.cs - - - - Component - - - UserControl - - - TButton.cs - - - Form - - - TDialogForm.cs - - - UserControl - - - TListBox.cs - - - UserControl - - - UserControl - - - UserControl - - - TPickerBox.cs - - - UserControl - - - TTextBox.cs - - - UserControl - - - TButtonTextBox.cs - - - UserControl - - - TUserControl.cs - - - UserControl - Form @@ -164,9 +99,6 @@ Form - - UserControl - UserControl @@ -190,24 +122,6 @@ ResXFileCodeGenerator Resource1.Designer.cs - - TButton.cs - - - TDialogForm.cs - - - TListBox.cs - - - TPickerBox.cs - - - TTextBox.cs - - - TButtonTextBox.cs - AForm.cs @@ -260,7 +174,13 @@ - + + + {d9a49347-583f-41b4-afe1-63ec80bbdb38} + FizzyLauncher.UI + + + \ No newline at end of file diff --git a/RyzStudio/Windows/Forms/PanelBook.Designer.cs b/RyzStudio/Windows/Forms/PanelBook.Designer.cs deleted file mode 100644 index 576b43a..0000000 --- a/RyzStudio/Windows/Forms/PanelBook.Designer.cs +++ /dev/null @@ -1,37 +0,0 @@ -namespace RyzStudio.Windows.Forms -{ - partial class PanelBook - { - /// - /// 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 Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - components = new System.ComponentModel.Container(); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - } - - #endregion - } -} diff --git a/RyzStudio/Windows/Forms/PanelBook.cs b/RyzStudio/Windows/Forms/PanelBook.cs deleted file mode 100644 index 190ec28..0000000 --- a/RyzStudio/Windows/Forms/PanelBook.cs +++ /dev/null @@ -1,159 +0,0 @@ -namespace RyzStudio.Windows.Forms -{ - using System; - using System.ComponentModel; - using System.Windows.Forms; - - [ToolboxItem(true)] - public partial class PanelBook : UserControl - { - protected PanelCollection panelCollection = null; - - public PanelBook() - { - InitializeComponent(); - - panelCollection = new PanelCollection(this); - - } - - public Panel ActivePanel { get; set; } = null; - - [Category("Collection")] - [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] - public PanelCollection Pages - { - get { return panelCollection; } - } - - [Category("Collection")] - public int SelectedIndex - { - get - { - if (panelCollection.Count <= 0) - { - return -1; - } - - return panelCollection.IndexOf(this.ActivePanel); - } - set - { - if (panelCollection.Count <= 0) - { - return; - } - - if (value < 0) - { - return; - } - - if (value > (panelCollection.Count - 1)) - { - return; - } - - if (value == this.SelectedIndex) - { - return; - } - - ActivatePanel(value); - } - } - - protected internal int PageIndex - { - get - { - return panelCollection.IndexOf(this.ActivePanel); - } - set - { - if (panelCollection.Count <= 0) - { - ActivatePanel(-1); - return; - } - - if ((value < -1) || (value >= panelCollection.Count)) - { - throw new ArgumentOutOfRangeException("PageIndex", value, "The page index must be between 0 and " + Convert.ToString(panelCollection.Count - 1)); - } - - ActivatePanel(value); - } - } - - protected internal void ActivatePanel(int index) - { - if ((panelCollection.Count == 0) && (index >= panelCollection.Count) && (index <= 0)) - { - return; - } - - Panel p = (Panel)panelCollection[index]; - - ActivatePage(p); - } - - protected internal void ActivatePage(Panel page) - { - if (this.ActivePanel != null) - { - this.ActivePanel.Visible = false; - } - - this.ActivePanel = page; - if (this.ActivePanel != null) - { - this.ActivePanel.Parent = this; - if (!this.Contains(this.ActivePanel)) - { - this.Container.Add(this.ActivePanel); - } - - this.ActivePanel.Dock = DockStyle.Fill; - this.ActivePanel.Visible = true; - this.ActivePanel.BringToFront(); - } - - if (this.ActivePanel != null) - { - this.ActivePanel.Invalidate(); - } - else - { - this.Invalidate(); - } - } - -#if DEBUG - - protected override void OnResize(EventArgs e) - { - base.OnResize(e); - - if (this.DesignMode) - { - this.Invalidate(); - } - } - -#endif - - protected override void DestroyHandle() - { - base.DestroyHandle(); - - foreach (Panel p in panelCollection) - { - p.Dispose(); - } - } - - - } -} diff --git a/RyzStudio/Windows/Forms/PanelCollection.cs b/RyzStudio/Windows/Forms/PanelCollection.cs deleted file mode 100644 index af9838b..0000000 --- a/RyzStudio/Windows/Forms/PanelCollection.cs +++ /dev/null @@ -1,80 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace RyzStudio.Windows.Forms -{ - [ToolboxItem(true)] - public class PanelCollection : CollectionBase - { - protected PanelBook panelBook = null; - - public PanelCollection() - { - - } - - public PanelCollection(PanelBook parent) : base() - { - panelBook = parent; - } - - public PanelBook Parent => panelBook; - - public Panel this[int index] { get => (Panel)List[index]; set => List[index] = value; } - - public int Add(Panel value) => List.Add(value); - - public void AddRange(Panel[] pages) - { - foreach (Panel page in pages) - { - this.Add(page); - } - } - - public int IndexOf(Panel value) => (List.IndexOf(value)); - - public void Insert(int index, Panel value) => List.Insert(index, value); - - public void Remove(Panel value) => List.Remove(value); - - public bool Contains(Panel value) => List.Contains(value); - - protected override void OnInsertComplete(int index, object value) - { - base.OnInsertComplete(index, value); - - if (panelBook != null) - { - panelBook.PageIndex = index; - } - } - - protected override void OnRemoveComplete(int index, object value) - { - base.OnRemoveComplete(index, value); - - if (panelBook != null) - { - if (panelBook.PageIndex == index) - { - if (index < InnerList.Count) - { - panelBook.PageIndex = index; - } - else - { - panelBook.PageIndex = InnerList.Count - 1; - } - } - } - } - - } -} diff --git a/Windows/Forms/AForm.cs b/Windows/Forms/AForm.cs index 1d75d60..4e1e9ac 100644 --- a/Windows/Forms/AForm.cs +++ b/Windows/Forms/AForm.cs @@ -13,6 +13,7 @@ namespace AppLauncher.Windows.Forms protected readonly Color backColour = Color.FromArgb(254, 254, 254); protected readonly Color titleBarColour = Color.FromArgb(237, 240, 247); + protected readonly Color titleBorderColour = Color.FromArgb(232, 231, 236); protected readonly Color titleColour = Color.FromArgb(156, 158, 171); protected readonly int titleBarHeight = 56; @@ -158,7 +159,7 @@ namespace AppLauncher.Windows.Forms area.Inflate((-1 * borderWidth), (-1 * borderWidth)); g.FillRectangle(new SolidBrush(titleBarColour), area.X, area.Y, (area.Width + area.X), titleBarHeight); - g.DrawLine(new Pen(borderColour, 1), area.X, (titleBarHeight + 1), (area.Width + area.X), (titleBarHeight + 1)); + 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); diff --git a/Windows/Forms/Tile/TTilePanel.cs b/Windows/Forms/Tile/TTilePanel.cs index 8136700..48d2d8c 100644 --- a/Windows/Forms/Tile/TTilePanel.cs +++ b/Windows/Forms/Tile/TTilePanel.cs @@ -9,7 +9,7 @@ using System.Windows.Forms; namespace AppLauncher.Windows.Forms { - public partial class TTilePanel : AUserControl + public partial class TTilePanel : TUserControl { protected bool isDragging = false; protected Point startPosition = new Point(); diff --git a/Windows/Forms/Tile/TTilePanelLayout.cs b/Windows/Forms/Tile/TTilePanelLayout.cs index 5a2a515..64b5b1f 100644 --- a/Windows/Forms/Tile/TTilePanelLayout.cs +++ b/Windows/Forms/Tile/TTilePanelLayout.cs @@ -13,7 +13,7 @@ using System.Windows.Forms; namespace AppLauncher.Windows.Forms { - public partial class TTilePanelLayout : AUserControl + public partial class TTilePanelLayout : TUserControl { public class Item { diff --git a/skye.sln b/skye.sln index 3b21ce7..f67c029 100644 --- a/skye.sln +++ b/skye.sln @@ -1,10 +1,12 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.1022 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30523.141 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FizzyLauncher", "FizzyLauncher.csproj", "{66C1C75C-3612-4D23-B937-C3DE0D653292}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FizzyLauncher.UI", "FizzyLauncher.UI\FizzyLauncher.UI.csproj", "{D9A49347-583F-41B4-AFE1-63EC80BBDB38}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,6 +17,10 @@ Global {66C1C75C-3612-4D23-B937-C3DE0D653292}.Debug|Any CPU.Build.0 = Debug|Any CPU {66C1C75C-3612-4D23-B937-C3DE0D653292}.Release|Any CPU.ActiveCfg = Release|Any CPU {66C1C75C-3612-4D23-B937-C3DE0D653292}.Release|Any CPU.Build.0 = Release|Any CPU + {D9A49347-583F-41B4-AFE1-63EC80BBDB38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D9A49347-583F-41B4-AFE1-63EC80BBDB38}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D9A49347-583F-41B4-AFE1-63EC80BBDB38}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D9A49347-583F-41B4-AFE1-63EC80BBDB38}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE