From c34e4f054bbe001b073a73ca293eb10fce86fd81 Mon Sep 17 00:00:00 2001 From: Ray Date: Sun, 10 May 2020 11:45:54 +0100 Subject: [PATCH] Changed: clean-up --- LinearAppLauncher.csproj | 81 ++++++------ .../Windows/ThemedForms/BorderlessToolForm.cs | 2 +- .../ThemedForms/{Button.cs => TButton.cs} | 4 +- ...Button.designer.cs => TButton.designer.cs} | 2 +- .../ThemedForms/{Button.resx => TButton.resx} | 0 .../{ButtonTextBox.cs => TButtonTextBox.cs} | 6 +- ...designer.cs => TButtonTextBox.designer.cs} | 2 +- ...ButtonTextBox.resx => TButtonTextBox.resx} | 0 ...rm.Designer.cs => TDialogForm.Designer.cs} | 2 +- .../{DialogForm.cs => TDialogForm.cs} | 6 +- .../{DialogForm.resx => TDialogForm.resx} | 0 .../{Form.Designer.cs => TForm.Designer.cs} | 2 +- .../Windows/ThemedForms/{Form.cs => TForm.cs} | 6 +- .../ThemedForms/{Form.resx => TForm.resx} | 0 .../ThemedForms/{PickerBox.cs => TListBox.cs} | 6 +- ...erBox.designer.cs => TListBox.designer.cs} | 2 +- .../{PickerBox.resx => TListBox.resx} | 0 RyzStudio/Windows/ThemedForms/TPickerBox.cs | 98 ++++++++++++++ .../ThemedForms/TPickerBox.designer.cs | 59 +++++++++ .../{TextBox.resx => TPickerBox.resx} | 0 .../ThemedForms/{TextBox.cs => TTextBox.cs} | 6 +- ...xtBox.designer.cs => TTextBox.designer.cs} | 2 +- RyzStudio/Windows/ThemedForms/TTextBox.resx | 120 ++++++++++++++++++ .../{UserControl.cs => TUserControl.cs} | 4 +- ...l.designer.cs => TUserControl.designer.cs} | 2 +- Windows/Forms/Tile/AddListTileForm.cs | 16 +-- Windows/Forms/Tile/AddTileForm.cs | 36 +++--- Windows/Forms/Tile/EditGroupForm.cs | 14 +- Windows/Forms/Tile/EditListTileForm.cs | 98 ++++++++------ Windows/Forms/Tile/EditTileForm.cs | 30 ++--- 30 files changed, 446 insertions(+), 160 deletions(-) rename RyzStudio/Windows/ThemedForms/{Button.cs => TButton.cs} (96%) rename RyzStudio/Windows/ThemedForms/{Button.designer.cs => TButton.designer.cs} (98%) rename RyzStudio/Windows/ThemedForms/{Button.resx => TButton.resx} (100%) rename RyzStudio/Windows/ThemedForms/{ButtonTextBox.cs => TButtonTextBox.cs} (96%) rename RyzStudio/Windows/ThemedForms/{ButtonTextBox.designer.cs => TButtonTextBox.designer.cs} (98%) rename RyzStudio/Windows/ThemedForms/{ButtonTextBox.resx => TButtonTextBox.resx} (100%) rename RyzStudio/Windows/ThemedForms/{DialogForm.Designer.cs => TDialogForm.Designer.cs} (99%) rename RyzStudio/Windows/ThemedForms/{DialogForm.cs => TDialogForm.cs} (98%) rename RyzStudio/Windows/ThemedForms/{DialogForm.resx => TDialogForm.resx} (100%) rename RyzStudio/Windows/ThemedForms/{Form.Designer.cs => TForm.Designer.cs} (98%) rename RyzStudio/Windows/ThemedForms/{Form.cs => TForm.cs} (97%) rename RyzStudio/Windows/ThemedForms/{Form.resx => TForm.resx} (100%) rename RyzStudio/Windows/ThemedForms/{PickerBox.cs => TListBox.cs} (95%) rename RyzStudio/Windows/ThemedForms/{PickerBox.designer.cs => TListBox.designer.cs} (98%) rename RyzStudio/Windows/ThemedForms/{PickerBox.resx => TListBox.resx} (100%) create mode 100644 RyzStudio/Windows/ThemedForms/TPickerBox.cs create mode 100644 RyzStudio/Windows/ThemedForms/TPickerBox.designer.cs rename RyzStudio/Windows/ThemedForms/{TextBox.resx => TPickerBox.resx} (100%) rename RyzStudio/Windows/ThemedForms/{TextBox.cs => TTextBox.cs} (95%) rename RyzStudio/Windows/ThemedForms/{TextBox.designer.cs => TTextBox.designer.cs} (98%) create mode 100644 RyzStudio/Windows/ThemedForms/TTextBox.resx rename RyzStudio/Windows/ThemedForms/{UserControl.cs => TUserControl.cs} (97%) rename RyzStudio/Windows/ThemedForms/{UserControl.designer.cs => TUserControl.designer.cs} (97%) diff --git a/LinearAppLauncher.csproj b/LinearAppLauncher.csproj index d79493d..f2c1c7a 100644 --- a/LinearAppLauncher.csproj +++ b/LinearAppLauncher.csproj @@ -80,53 +80,47 @@ Component - + UserControl - - Button.cs + + TButton.cs - + Form - - DialogForm.cs + + TDialogForm.cs - - Form - - - BorderlessToolForm.cs - - - Form - - - Form.cs - - + UserControl - - PickerBox.cs + + TListBox.cs - + UserControl - - TextBox.cs + + TPickerBox.cs - + UserControl - - TextButtonBox.cs + + TTextBox.cs - + UserControl - - UserControl.cs + + TButtonTextBox.cs + + + UserControl + + + TUserControl.cs Form @@ -183,26 +177,23 @@ ResXFileCodeGenerator Resources.Designer.cs - - Button.cs + + TButton.cs - - DialogForm.cs + + TDialogForm.cs - - BorderlessToolForm.cs + + TListBox.cs - - Form.cs + + TPickerBox.cs - - PickerBox.cs + + TTextBox.cs - - TextBox.cs - - - TextButtonBox.cs + + TButtonTextBox.cs AddListTileForm.cs diff --git a/RyzStudio/Windows/ThemedForms/BorderlessToolForm.cs b/RyzStudio/Windows/ThemedForms/BorderlessToolForm.cs index 7508a90..3c17b0b 100644 --- a/RyzStudio/Windows/ThemedForms/BorderlessToolForm.cs +++ b/RyzStudio/Windows/ThemedForms/BorderlessToolForm.cs @@ -259,7 +259,7 @@ return rv; } - public string GetValue(TextBox sender) + public string GetValue(TTextBox sender) { string rv = string.Empty; diff --git a/RyzStudio/Windows/ThemedForms/Button.cs b/RyzStudio/Windows/ThemedForms/TButton.cs similarity index 96% rename from RyzStudio/Windows/ThemedForms/Button.cs rename to RyzStudio/Windows/ThemedForms/TButton.cs index 36fc99e..1996e87 100644 --- a/RyzStudio/Windows/ThemedForms/Button.cs +++ b/RyzStudio/Windows/ThemedForms/TButton.cs @@ -4,7 +4,7 @@ using System.ComponentModel; using System.Drawing; - public partial class Button : RyzStudio.Windows.ThemedForms.UserControl + public partial class TButton : RyzStudio.Windows.ThemedForms.TUserControl { public class Style { @@ -22,7 +22,7 @@ protected State controlState = State.Idle; - public Button() : base() + public TButton() : base() { InitializeComponent(); diff --git a/RyzStudio/Windows/ThemedForms/Button.designer.cs b/RyzStudio/Windows/ThemedForms/TButton.designer.cs similarity index 98% rename from RyzStudio/Windows/ThemedForms/Button.designer.cs rename to RyzStudio/Windows/ThemedForms/TButton.designer.cs index 0e6b247..5bf79d6 100644 --- a/RyzStudio/Windows/ThemedForms/Button.designer.cs +++ b/RyzStudio/Windows/ThemedForms/TButton.designer.cs @@ -1,6 +1,6 @@ namespace RyzStudio.Windows.ThemedForms { - partial class Button + partial class TButton { /// /// Required designer variable. diff --git a/RyzStudio/Windows/ThemedForms/Button.resx b/RyzStudio/Windows/ThemedForms/TButton.resx similarity index 100% rename from RyzStudio/Windows/ThemedForms/Button.resx rename to RyzStudio/Windows/ThemedForms/TButton.resx diff --git a/RyzStudio/Windows/ThemedForms/ButtonTextBox.cs b/RyzStudio/Windows/ThemedForms/TButtonTextBox.cs similarity index 96% rename from RyzStudio/Windows/ThemedForms/ButtonTextBox.cs rename to RyzStudio/Windows/ThemedForms/TButtonTextBox.cs index a362faa..dba1e52 100644 --- a/RyzStudio/Windows/ThemedForms/ButtonTextBox.cs +++ b/RyzStudio/Windows/ThemedForms/TButtonTextBox.cs @@ -6,11 +6,11 @@ using System.Drawing; using System.Windows.Forms; - public partial class ButtonTextBox : RyzStudio.Windows.ThemedForms.UserControl + public partial class TButtonTextBox : RyzStudio.Windows.ThemedForms.TUserControl { protected readonly Padding textboxPadding = new Padding(6, 6, 6, 6); - public ButtonTextBox() : base() + public TButtonTextBox() : base() { InitializeComponent(); @@ -107,7 +107,7 @@ [Browsable(true), EditorBrowsable(EditorBrowsableState.Advanced)] [Category("Appearance")] - public Button SubmitButton { get; set; } = null; + public TButton SubmitButton { get; set; } = null; [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] public new Padding Margin { get { return base.Margin; } set { base.Margin = value; } } diff --git a/RyzStudio/Windows/ThemedForms/ButtonTextBox.designer.cs b/RyzStudio/Windows/ThemedForms/TButtonTextBox.designer.cs similarity index 98% rename from RyzStudio/Windows/ThemedForms/ButtonTextBox.designer.cs rename to RyzStudio/Windows/ThemedForms/TButtonTextBox.designer.cs index e42c10b..7859c87 100644 --- a/RyzStudio/Windows/ThemedForms/ButtonTextBox.designer.cs +++ b/RyzStudio/Windows/ThemedForms/TButtonTextBox.designer.cs @@ -1,6 +1,6 @@ namespace RyzStudio.Windows.ThemedForms { - partial class ButtonTextBox + partial class TButtonTextBox { /// /// Required designer variable. diff --git a/RyzStudio/Windows/ThemedForms/ButtonTextBox.resx b/RyzStudio/Windows/ThemedForms/TButtonTextBox.resx similarity index 100% rename from RyzStudio/Windows/ThemedForms/ButtonTextBox.resx rename to RyzStudio/Windows/ThemedForms/TButtonTextBox.resx diff --git a/RyzStudio/Windows/ThemedForms/DialogForm.Designer.cs b/RyzStudio/Windows/ThemedForms/TDialogForm.Designer.cs similarity index 99% rename from RyzStudio/Windows/ThemedForms/DialogForm.Designer.cs rename to RyzStudio/Windows/ThemedForms/TDialogForm.Designer.cs index 7eb9bf3..592da20 100644 --- a/RyzStudio/Windows/ThemedForms/DialogForm.Designer.cs +++ b/RyzStudio/Windows/ThemedForms/TDialogForm.Designer.cs @@ -1,6 +1,6 @@ namespace RyzStudio.Windows.ThemedForms { - partial class DialogForm + partial class TDialogForm { /// /// Required designer variable. diff --git a/RyzStudio/Windows/ThemedForms/DialogForm.cs b/RyzStudio/Windows/ThemedForms/TDialogForm.cs similarity index 98% rename from RyzStudio/Windows/ThemedForms/DialogForm.cs rename to RyzStudio/Windows/ThemedForms/TDialogForm.cs index f990153..d46a55c 100644 --- a/RyzStudio/Windows/ThemedForms/DialogForm.cs +++ b/RyzStudio/Windows/ThemedForms/TDialogForm.cs @@ -7,7 +7,7 @@ using System.Windows.Forms; using Resources = AppLauncher.Properties.Resources; - public partial class DialogForm : System.Windows.Forms.Form + public partial class TDialogForm : System.Windows.Forms.Form { protected bool isBusy = false; @@ -19,7 +19,7 @@ private Point windowOffset = new Point(); private Point windowSize = new Point(); - public DialogForm() : base() + public TDialogForm() : base() { this.InitializeComponent(); @@ -187,7 +187,7 @@ return rv; } - public string GetValue(TextBox sender) + public string GetValue(TTextBox sender) { string rv = string.Empty; diff --git a/RyzStudio/Windows/ThemedForms/DialogForm.resx b/RyzStudio/Windows/ThemedForms/TDialogForm.resx similarity index 100% rename from RyzStudio/Windows/ThemedForms/DialogForm.resx rename to RyzStudio/Windows/ThemedForms/TDialogForm.resx diff --git a/RyzStudio/Windows/ThemedForms/Form.Designer.cs b/RyzStudio/Windows/ThemedForms/TForm.Designer.cs similarity index 98% rename from RyzStudio/Windows/ThemedForms/Form.Designer.cs rename to RyzStudio/Windows/ThemedForms/TForm.Designer.cs index a50fcc7..75f5bf1 100644 --- a/RyzStudio/Windows/ThemedForms/Form.Designer.cs +++ b/RyzStudio/Windows/ThemedForms/TForm.Designer.cs @@ -1,6 +1,6 @@ namespace RyzStudio.Windows.ThemedForms { - partial class Form + partial class TForm { /// /// Required designer variable. diff --git a/RyzStudio/Windows/ThemedForms/Form.cs b/RyzStudio/Windows/ThemedForms/TForm.cs similarity index 97% rename from RyzStudio/Windows/ThemedForms/Form.cs rename to RyzStudio/Windows/ThemedForms/TForm.cs index 3a9dfa9..541e75f 100644 --- a/RyzStudio/Windows/ThemedForms/Form.cs +++ b/RyzStudio/Windows/ThemedForms/TForm.cs @@ -5,7 +5,7 @@ using System.Drawing; using System.Windows.Forms; - public partial class Form : System.Windows.Forms.Form + public partial class TForm : System.Windows.Forms.Form { protected Color topFillColour = Color.FromArgb(15, 15, 15); protected int topFillHeight = 52; @@ -15,7 +15,7 @@ protected int borderWidth = 1; - public Form() + public TForm() { this.InitializeComponent(); @@ -138,7 +138,7 @@ return rv; } - public string GetValue(TextBox sender) + public string GetValue(TTextBox sender) { string rv = string.Empty; diff --git a/RyzStudio/Windows/ThemedForms/Form.resx b/RyzStudio/Windows/ThemedForms/TForm.resx similarity index 100% rename from RyzStudio/Windows/ThemedForms/Form.resx rename to RyzStudio/Windows/ThemedForms/TForm.resx diff --git a/RyzStudio/Windows/ThemedForms/PickerBox.cs b/RyzStudio/Windows/ThemedForms/TListBox.cs similarity index 95% rename from RyzStudio/Windows/ThemedForms/PickerBox.cs rename to RyzStudio/Windows/ThemedForms/TListBox.cs index 94ad28c..8649a44 100644 --- a/RyzStudio/Windows/ThemedForms/PickerBox.cs +++ b/RyzStudio/Windows/ThemedForms/TListBox.cs @@ -6,11 +6,11 @@ using System.Drawing; using System.Windows.Forms; - public partial class PickerBox : RyzStudio.Windows.ThemedForms.UserControl + public partial class TListBox : RyzStudio.Windows.ThemedForms.TUserControl { protected readonly Padding textboxPadding = new Padding(6, 2, 4, 2); - public PickerBox() : base() + public TListBox() : base() { InitializeComponent(); @@ -78,7 +78,7 @@ [Browsable(true), EditorBrowsable(EditorBrowsableState.Advanced)] [Category("Appearance")] - public Button SubmitButton { get; set; } = null; + public TButton SubmitButton { get; set; } = null; [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] public new Padding Margin { get => base.Margin; set => base.Margin = value; } diff --git a/RyzStudio/Windows/ThemedForms/PickerBox.designer.cs b/RyzStudio/Windows/ThemedForms/TListBox.designer.cs similarity index 98% rename from RyzStudio/Windows/ThemedForms/PickerBox.designer.cs rename to RyzStudio/Windows/ThemedForms/TListBox.designer.cs index 5b8a324..eb7c0ac 100644 --- a/RyzStudio/Windows/ThemedForms/PickerBox.designer.cs +++ b/RyzStudio/Windows/ThemedForms/TListBox.designer.cs @@ -1,6 +1,6 @@ namespace RyzStudio.Windows.ThemedForms { - partial class PickerBox + partial class TListBox { /// /// Required designer variable. diff --git a/RyzStudio/Windows/ThemedForms/PickerBox.resx b/RyzStudio/Windows/ThemedForms/TListBox.resx similarity index 100% rename from RyzStudio/Windows/ThemedForms/PickerBox.resx rename to RyzStudio/Windows/ThemedForms/TListBox.resx diff --git a/RyzStudio/Windows/ThemedForms/TPickerBox.cs b/RyzStudio/Windows/ThemedForms/TPickerBox.cs new file mode 100644 index 0000000..e9b7c6b --- /dev/null +++ b/RyzStudio/Windows/ThemedForms/TPickerBox.cs @@ -0,0 +1,98 @@ +namespace RyzStudio.Windows.ThemedForms +{ + using RyzStudio.Drawing; + using System; + using System.ComponentModel; + using System.Drawing; + using System.Windows.Forms; + + public partial class TPickerBox : RyzStudio.Windows.ThemedForms.TUserControl + { + protected readonly Padding textboxPadding = new Padding(6, 2, 4, 2); + + public TPickerBox() : base() + { + InitializeComponent(); + + this.Font = new Font(this.Font, FontStyle.Regular); + this.Margin = new Padding(10, 4, 10, 4); + + comboBox1.Font = this.Font; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; + comboBox1.PreviewKeyDown += textBox_PreviewKeyDown; + } + + protected override void OnResize(EventArgs e) + { + base.OnResize(e); + + int b = (styleActive.BorderWidth + 1) + styleActive.BorderPadding; + + this.Height = comboBox1.Height + (b + textboxPadding.Top) + ((b - 1) + textboxPadding.Bottom); + } + + protected override void OnGotFocus(EventArgs e) + { + base.OnGotFocus(e); + + comboBox1.Focus(); + } + + protected void textBox_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e) + { + switch (e.KeyCode) + { + case Keys.Enter: + if (this.SubmitButton != null) + { + this.SubmitButton.PerformClick(); + } + + break; + case Keys.Escape: + close(); + break; + default: break; + } + } + + [Browsable(true), EditorBrowsable(EditorBrowsableState.Advanced)] + [Category("Appearance")] + public System.Windows.Forms.ComboBox ComboBox { get => comboBox1; set => comboBox1 = value; } + + //[Browsable(true), EditorBrowsable(EditorBrowsableState.Advanced)] + //[Category("Appearance")] + //public new string Text + //{ + // get => textBox1.Text; + // set + // { + // textBox1.Text = value; + // textBox1.SelectionStart = textBox1.Text.Length; + // } + //} + + //[Browsable(true)] + //[Category("Appearance")] + //public ComboBox.ObjectCollection Items { get => comboBox1.Items; set => comboBox1.Items = value; } + + [Browsable(true), EditorBrowsable(EditorBrowsableState.Advanced)] + [Category("Appearance")] + public TButton SubmitButton { get; set; } = null; + + [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] + public new Padding Margin { get => base.Margin; set => base.Margin = value; } + + protected override void updateBackground(Graphics g, Style style) + { + int b = (styleActive.BorderWidth + 1) + styleActive.BorderPadding; + + this.Padding = new Padding((b + textboxPadding.Left), (b + textboxPadding.Top), ((b - 1) + textboxPadding.Right), ((b - 1) + textboxPadding.Bottom)); + + Rectangoid area = new Rectangoid(this.ClientRectangle, style.BorderRadius, style.BorderWidth); + g.FillPath(new SolidBrush(style.BackColour), area.ToGraphicsPath()); + g.DrawPath(new Pen(new SolidBrush(style.BorderColour), style.BorderWidth), area.ToGraphicsPath()); + } + + } +} \ No newline at end of file diff --git a/RyzStudio/Windows/ThemedForms/TPickerBox.designer.cs b/RyzStudio/Windows/ThemedForms/TPickerBox.designer.cs new file mode 100644 index 0000000..760329f --- /dev/null +++ b/RyzStudio/Windows/ThemedForms/TPickerBox.designer.cs @@ -0,0 +1,59 @@ +namespace RyzStudio.Windows.ThemedForms +{ + partial class TPickerBox + { + /// + /// 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() + { + this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.SuspendLayout(); + // + // comboBox1 + // + this.comboBox1.Dock = System.Windows.Forms.DockStyle.Fill; + this.comboBox1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Location = new System.Drawing.Point(4, 4); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.Size = new System.Drawing.Size(121, 21); + this.comboBox1.TabIndex = 0; + // + // PickerBox + // + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.Controls.Add(this.comboBox1); + this.Name = "PickerBox"; + this.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3); + this.Size = new System.Drawing.Size(128, 32); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.ComboBox comboBox1; + } +} diff --git a/RyzStudio/Windows/ThemedForms/TextBox.resx b/RyzStudio/Windows/ThemedForms/TPickerBox.resx similarity index 100% rename from RyzStudio/Windows/ThemedForms/TextBox.resx rename to RyzStudio/Windows/ThemedForms/TPickerBox.resx diff --git a/RyzStudio/Windows/ThemedForms/TextBox.cs b/RyzStudio/Windows/ThemedForms/TTextBox.cs similarity index 95% rename from RyzStudio/Windows/ThemedForms/TextBox.cs rename to RyzStudio/Windows/ThemedForms/TTextBox.cs index 5e276ae..00597f1 100644 --- a/RyzStudio/Windows/ThemedForms/TextBox.cs +++ b/RyzStudio/Windows/ThemedForms/TTextBox.cs @@ -6,11 +6,11 @@ using System.Drawing; using System.Windows.Forms; - public partial class TextBox : RyzStudio.Windows.ThemedForms.UserControl + public partial class TTextBox : RyzStudio.Windows.ThemedForms.TUserControl { protected readonly Padding textboxPadding = new Padding(6, 6, 6, 6); - public TextBox() : base() + public TTextBox() : base() { InitializeComponent(); @@ -77,7 +77,7 @@ [Browsable(true), EditorBrowsable(EditorBrowsableState.Advanced)] [Category("Appearance")] - public Button SubmitButton { get; set; } = null; + public TButton SubmitButton { get; set; } = null; [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] public new Padding Margin { get { return base.Margin; } set { base.Margin = value; } } diff --git a/RyzStudio/Windows/ThemedForms/TextBox.designer.cs b/RyzStudio/Windows/ThemedForms/TTextBox.designer.cs similarity index 98% rename from RyzStudio/Windows/ThemedForms/TextBox.designer.cs rename to RyzStudio/Windows/ThemedForms/TTextBox.designer.cs index 29231b0..752557d 100644 --- a/RyzStudio/Windows/ThemedForms/TextBox.designer.cs +++ b/RyzStudio/Windows/ThemedForms/TTextBox.designer.cs @@ -1,6 +1,6 @@ namespace RyzStudio.Windows.ThemedForms { - partial class TextBox + partial class TTextBox { /// /// Required designer variable. diff --git a/RyzStudio/Windows/ThemedForms/TTextBox.resx b/RyzStudio/Windows/ThemedForms/TTextBox.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/RyzStudio/Windows/ThemedForms/TTextBox.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file diff --git a/RyzStudio/Windows/ThemedForms/UserControl.cs b/RyzStudio/Windows/ThemedForms/TUserControl.cs similarity index 97% rename from RyzStudio/Windows/ThemedForms/UserControl.cs rename to RyzStudio/Windows/ThemedForms/TUserControl.cs index 72670e7..8423200 100644 --- a/RyzStudio/Windows/ThemedForms/UserControl.cs +++ b/RyzStudio/Windows/ThemedForms/TUserControl.cs @@ -6,7 +6,7 @@ using System.ComponentModel; namespace RyzStudio.Windows.ThemedForms { - public partial class UserControl : System.Windows.Forms.UserControl + public partial class TUserControl : System.Windows.Forms.UserControl { public class Style { @@ -40,7 +40,7 @@ namespace RyzStudio.Windows.ThemedForms protected Style styleActive = new Style(1, 3, 2, Color.FromArgb(212, 212, 212), Color.White); - public UserControl() + public TUserControl() { InitializeComponent(); } diff --git a/RyzStudio/Windows/ThemedForms/UserControl.designer.cs b/RyzStudio/Windows/ThemedForms/TUserControl.designer.cs similarity index 97% rename from RyzStudio/Windows/ThemedForms/UserControl.designer.cs rename to RyzStudio/Windows/ThemedForms/TUserControl.designer.cs index ea91b3c..6f57544 100644 --- a/RyzStudio/Windows/ThemedForms/UserControl.designer.cs +++ b/RyzStudio/Windows/ThemedForms/TUserControl.designer.cs @@ -1,6 +1,6 @@ namespace RyzStudio.Windows.ThemedForms { - partial class UserControl + partial class TUserControl { /// /// Required designer variable. diff --git a/Windows/Forms/Tile/AddListTileForm.cs b/Windows/Forms/Tile/AddListTileForm.cs index cbf5794..9400e2c 100644 --- a/Windows/Forms/Tile/AddListTileForm.cs +++ b/Windows/Forms/Tile/AddListTileForm.cs @@ -4,7 +4,7 @@ using System; namespace AppLauncher.Windows.Forms { - public class AddListTileForm : DialogForm + public class AddListTileForm : TDialogForm { public static void ShowDialog(TileLayoutPanel panel) { @@ -13,9 +13,9 @@ namespace AppLauncher.Windows.Forms } private System.Windows.Forms.Label label1; - private Button button1; + private TButton button1; private RyzStudio.Windows.Forms.HorizontalSeparator horizontalSeparator1; - private TextBox textBox1; + private TTextBox textBox1; protected TileLayoutPanel parentPanel = null; public AddListTileForm() : base() @@ -33,12 +33,12 @@ namespace AppLauncher.Windows.Forms private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AddListTileForm)); - RyzStudio.Windows.ThemedForms.Button.Style style4 = new RyzStudio.Windows.ThemedForms.Button.Style(); - RyzStudio.Windows.ThemedForms.Button.Style style5 = new RyzStudio.Windows.ThemedForms.Button.Style(); - RyzStudio.Windows.ThemedForms.Button.Style style6 = new RyzStudio.Windows.ThemedForms.Button.Style(); - this.textBox1 = new RyzStudio.Windows.ThemedForms.TextBox(); + RyzStudio.Windows.ThemedForms.TButton.Style style4 = new RyzStudio.Windows.ThemedForms.TButton.Style(); + RyzStudio.Windows.ThemedForms.TButton.Style style5 = new RyzStudio.Windows.ThemedForms.TButton.Style(); + RyzStudio.Windows.ThemedForms.TButton.Style style6 = new RyzStudio.Windows.ThemedForms.TButton.Style(); + this.textBox1 = new RyzStudio.Windows.ThemedForms.TTextBox(); this.label1 = new System.Windows.Forms.Label(); - this.button1 = new RyzStudio.Windows.ThemedForms.Button(); + this.button1 = new RyzStudio.Windows.ThemedForms.TButton(); this.horizontalSeparator1 = new RyzStudio.Windows.Forms.HorizontalSeparator(); ((System.ComponentModel.ISupportInitialize)(this.imgbxClose)).BeginInit(); this.SuspendLayout(); diff --git a/Windows/Forms/Tile/AddTileForm.cs b/Windows/Forms/Tile/AddTileForm.cs index c7188a2..e2a2be4 100644 --- a/Windows/Forms/Tile/AddTileForm.cs +++ b/Windows/Forms/Tile/AddTileForm.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; namespace AppLauncher.Windows.Forms { - public class AddTileForm : DialogForm + public class AddTileForm : TDialogForm { public static void ShowDialog(TileLayoutPanel panel) { @@ -23,15 +23,15 @@ namespace AppLauncher.Windows.Forms private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label1; - private ButtonTextBox textBox2; - private TextBox textBox3; - private ButtonTextBox textBox4; - private Button button1; - private PickerBox pickerBox1; - private PickerBox pickerBox2; + private TButtonTextBox textBox2; + private TTextBox textBox3; + private TButtonTextBox textBox4; + private TButton button1; + private TPickerBox pickerBox1; + private TPickerBox pickerBox2; private RyzStudio.Windows.Forms.HorizontalSeparator horizontalSeparator1; private RyzStudio.Windows.Forms.HorizontalSeparator horizontalSeparator2; - private TextBox textBox1; + private TTextBox textBox1; private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1; private System.Windows.Forms.OpenFileDialog openFileDialog1; protected TileLayoutPanel parentPanel = null; @@ -53,22 +53,22 @@ namespace AppLauncher.Windows.Forms private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AddTileForm)); - RyzStudio.Windows.ThemedForms.Button.Style style1 = new RyzStudio.Windows.ThemedForms.Button.Style(); - RyzStudio.Windows.ThemedForms.Button.Style style2 = new RyzStudio.Windows.ThemedForms.Button.Style(); - RyzStudio.Windows.ThemedForms.Button.Style style3 = new RyzStudio.Windows.ThemedForms.Button.Style(); - this.textBox1 = new RyzStudio.Windows.ThemedForms.TextBox(); + RyzStudio.Windows.ThemedForms.TButton.Style style1 = new RyzStudio.Windows.ThemedForms.TButton.Style(); + RyzStudio.Windows.ThemedForms.TButton.Style style2 = new RyzStudio.Windows.ThemedForms.TButton.Style(); + RyzStudio.Windows.ThemedForms.TButton.Style style3 = new RyzStudio.Windows.ThemedForms.TButton.Style(); + this.textBox1 = new RyzStudio.Windows.ThemedForms.TTextBox(); this.label6 = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); - this.textBox2 = new RyzStudio.Windows.ThemedForms.ButtonTextBox(); - this.textBox3 = new RyzStudio.Windows.ThemedForms.TextBox(); - this.textBox4 = new RyzStudio.Windows.ThemedForms.ButtonTextBox(); - this.button1 = new RyzStudio.Windows.ThemedForms.Button(); - this.pickerBox1 = new RyzStudio.Windows.ThemedForms.PickerBox(); - this.pickerBox2 = new RyzStudio.Windows.ThemedForms.PickerBox(); + this.textBox2 = new RyzStudio.Windows.ThemedForms.TButtonTextBox(); + this.textBox3 = new RyzStudio.Windows.ThemedForms.TTextBox(); + this.textBox4 = new RyzStudio.Windows.ThemedForms.TButtonTextBox(); + this.button1 = new RyzStudio.Windows.ThemedForms.TButton(); + this.pickerBox1 = new RyzStudio.Windows.ThemedForms.TPickerBox(); + this.pickerBox2 = new RyzStudio.Windows.ThemedForms.TPickerBox(); this.horizontalSeparator1 = new RyzStudio.Windows.Forms.HorizontalSeparator(); this.horizontalSeparator2 = new RyzStudio.Windows.Forms.HorizontalSeparator(); this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog(); diff --git a/Windows/Forms/Tile/EditGroupForm.cs b/Windows/Forms/Tile/EditGroupForm.cs index eecc3d3..6abd291 100644 --- a/Windows/Forms/Tile/EditGroupForm.cs +++ b/Windows/Forms/Tile/EditGroupForm.cs @@ -4,13 +4,13 @@ using System; namespace AppLauncher.Windows.Forms { - public class EditGroupForm : DialogForm + public class EditGroupForm : TDialogForm { private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label1; - private Button button1; - private PickerBox pickerBox1; - private TextBox textBox1; + private TButton button1; + private TPickerBox pickerBox1; + private TTextBox textBox1; protected TileLayoutContainer parentContainer = null; public EditGroupForm() : base() @@ -30,11 +30,11 @@ namespace AppLauncher.Windows.Forms private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EditGroupForm)); - this.textBox1 = new RyzStudio.Windows.ThemedForms.TextBox(); + this.textBox1 = new RyzStudio.Windows.ThemedForms.TTextBox(); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); - this.button1 = new RyzStudio.Windows.ThemedForms.Button(); - this.pickerBox1 = new RyzStudio.Windows.ThemedForms.PickerBox(); + this.button1 = new RyzStudio.Windows.ThemedForms.TButton(); + this.pickerBox1 = new RyzStudio.Windows.ThemedForms.TPickerBox(); ((System.ComponentModel.ISupportInitialize)(this.imgbxClose)).BeginInit(); this.SuspendLayout(); // diff --git a/Windows/Forms/Tile/EditListTileForm.cs b/Windows/Forms/Tile/EditListTileForm.cs index e5f8e6e..868da2d 100644 --- a/Windows/Forms/Tile/EditListTileForm.cs +++ b/Windows/Forms/Tile/EditListTileForm.cs @@ -4,7 +4,7 @@ using System; namespace AppLauncher.Windows.Forms { - public class EditListTileForm : DialogForm + public class EditListTileForm : TDialogForm { public static void ShowDialog(TilePanel panel) { @@ -13,9 +13,10 @@ namespace AppLauncher.Windows.Forms } private System.Windows.Forms.Label label1; - private Button button1; + private TButton button1; private RyzStudio.Windows.Forms.HorizontalSeparator horizontalSeparator2; - private TextBox textBox1; + private TTextBox textBox1; + private TPickerBox pickerBox1; protected TilePanel parentPanel = null; public EditListTileForm() : base() @@ -33,38 +34,39 @@ namespace AppLauncher.Windows.Forms private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EditListTileForm)); - RyzStudio.Windows.ThemedForms.Button.Style style4 = new RyzStudio.Windows.ThemedForms.Button.Style(); - RyzStudio.Windows.ThemedForms.Button.Style style5 = new RyzStudio.Windows.ThemedForms.Button.Style(); - RyzStudio.Windows.ThemedForms.Button.Style style6 = new RyzStudio.Windows.ThemedForms.Button.Style(); - this.textBox1 = new RyzStudio.Windows.ThemedForms.TextBox(); + RyzStudio.Windows.ThemedForms.TButton.Style style1 = new RyzStudio.Windows.ThemedForms.TButton.Style(); + RyzStudio.Windows.ThemedForms.TButton.Style style2 = new RyzStudio.Windows.ThemedForms.TButton.Style(); + RyzStudio.Windows.ThemedForms.TButton.Style style3 = new RyzStudio.Windows.ThemedForms.TButton.Style(); + this.textBox1 = new RyzStudio.Windows.ThemedForms.TTextBox(); this.label1 = new System.Windows.Forms.Label(); - this.button1 = new RyzStudio.Windows.ThemedForms.Button(); + this.button1 = new RyzStudio.Windows.ThemedForms.TButton(); this.horizontalSeparator2 = new RyzStudio.Windows.Forms.HorizontalSeparator(); + this.pickerBox1 = new RyzStudio.Windows.ThemedForms.TPickerBox(); ((System.ComponentModel.ISupportInitialize)(this.imgbxClose)).BeginInit(); this.SuspendLayout(); - // + // // imgbxClose - // + // this.imgbxClose.Image = ((System.Drawing.Image)(resources.GetObject("imgbxClose.Image"))); this.imgbxClose.Location = new System.Drawing.Point(367, 5); - // + // // lblDescription - // + // this.lblDescription.Size = new System.Drawing.Size(359, 30); this.lblDescription.Text = "Edit List Tile"; - // + // // panel1 - // + // this.panel1.Location = new System.Drawing.Point(394, 474); - // + // // area1 - // + // this.area1.Location = new System.Drawing.Point(1, 474); this.area1.Size = new System.Drawing.Size(392, 5); - // + // // textBox1 - // - this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + // + this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.textBox1.BackColor = System.Drawing.Color.Transparent; this.textBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); @@ -76,9 +78,9 @@ namespace AppLauncher.Windows.Forms this.textBox1.SubmitButton = null; this.textBox1.TabIndex = 152; this.textBox1.UseSystemPasswordChar = false; - // + // // label1 - // + // this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(95)))), ((int)(((byte)(99)))), ((int)(((byte)(104))))); this.label1.Location = new System.Drawing.Point(18, 50); @@ -88,9 +90,9 @@ namespace AppLauncher.Windows.Forms this.label1.TabIndex = 153; this.label1.Text = "Title"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // + // // button1 - // + // this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.button1.BackColor = System.Drawing.Color.Transparent; this.button1.DefaultImage = null; @@ -101,34 +103,49 @@ namespace AppLauncher.Windows.Forms this.button1.OverImage = null; this.button1.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3); this.button1.Size = new System.Drawing.Size(128, 32); - style4.BackColour = System.Drawing.Color.White; - style4.ForeImage = null; - style4.PenColour = System.Drawing.Color.Black; - this.button1.StyleDefault = style4; - style5.BackColour = System.Drawing.Color.FromArgb(((int)(((byte)(179)))), ((int)(((byte)(179)))), ((int)(((byte)(179))))); - style5.ForeImage = null; - style5.PenColour = System.Drawing.Color.Black; - this.button1.StyleDown = style5; - style6.BackColour = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); - style6.ForeImage = null; - style6.PenColour = System.Drawing.Color.White; - this.button1.StyleOver = style6; + style1.BackColour = System.Drawing.Color.White; + style1.ForeImage = null; + style1.PenColour = System.Drawing.Color.Black; + this.button1.StyleDefault = style1; + style2.BackColour = System.Drawing.Color.FromArgb(((int)(((byte)(179)))), ((int)(((byte)(179)))), ((int)(((byte)(179))))); + style2.ForeImage = null; + style2.PenColour = System.Drawing.Color.Black; + this.button1.StyleDown = style2; + style3.BackColour = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + style3.ForeImage = null; + style3.PenColour = System.Drawing.Color.White; + this.button1.StyleOver = style3; this.button1.TabIndex = 173; this.button1.Click += new System.EventHandler(this.button1_Click); - // + // // horizontalSeparator2 - // - this.horizontalSeparator2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + // + this.horizontalSeparator2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.horizontalSeparator2.Location = new System.Drawing.Point(10, 92); this.horizontalSeparator2.MaximumSize = new System.Drawing.Size(4920, 2); this.horizontalSeparator2.Name = "horizontalSeparator2"; this.horizontalSeparator2.Size = new System.Drawing.Size(380, 2); this.horizontalSeparator2.TabIndex = 177; - // + // + // pickerBox1 + // + this.pickerBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.pickerBox1.BackColor = System.Drawing.Color.Transparent; + this.pickerBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.pickerBox1.Location = new System.Drawing.Point(159, 173); + this.pickerBox1.Margin = new System.Windows.Forms.Padding(10, 4, 10, 4); + this.pickerBox1.Name = "pickerBox1"; + this.pickerBox1.Padding = new System.Windows.Forms.Padding(10, 6, 7, 5); + this.pickerBox1.Size = new System.Drawing.Size(220, 32); + this.pickerBox1.SubmitButton = null; + this.pickerBox1.TabIndex = 178; + // // EditListTileForm - // + // this.ClientSize = new System.Drawing.Size(400, 480); + this.Controls.Add(this.pickerBox1); this.Controls.Add(this.horizontalSeparator2); this.Controls.Add(this.button1); this.Controls.Add(this.label1); @@ -143,6 +160,7 @@ namespace AppLauncher.Windows.Forms this.Controls.SetChildIndex(this.label1, 0); this.Controls.SetChildIndex(this.button1, 0); this.Controls.SetChildIndex(this.horizontalSeparator2, 0); + this.Controls.SetChildIndex(this.pickerBox1, 0); ((System.ComponentModel.ISupportInitialize)(this.imgbxClose)).EndInit(); this.ResumeLayout(false); diff --git a/Windows/Forms/Tile/EditTileForm.cs b/Windows/Forms/Tile/EditTileForm.cs index 1482fb0..13f10ed 100644 --- a/Windows/Forms/Tile/EditTileForm.cs +++ b/Windows/Forms/Tile/EditTileForm.cs @@ -5,7 +5,7 @@ using System.IO; namespace AppLauncher.Windows.Forms { - public class EditTileForm : DialogForm + public class EditTileForm : TDialogForm { public static void ShowDialog(TilePanel panel) { @@ -19,15 +19,15 @@ namespace AppLauncher.Windows.Forms private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label1; - private ButtonTextBox textBox2; - private TextBox textBox3; - private ButtonTextBox textBox4; - private Button button1; - private PickerBox pickerBox1; - private PickerBox pickerBox2; + private TButtonTextBox textBox2; + private TTextBox textBox3; + private TButtonTextBox textBox4; + private TButton button1; + private TPickerBox pickerBox1; + private TPickerBox pickerBox2; private RyzStudio.Windows.Forms.HorizontalSeparator horizontalSeparator1; private RyzStudio.Windows.Forms.HorizontalSeparator horizontalSeparator2; - private TextBox textBox1; + private TTextBox textBox1; private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1; private System.Windows.Forms.OpenFileDialog openFileDialog1; protected TilePanel parentPanel = null; @@ -49,19 +49,19 @@ namespace AppLauncher.Windows.Forms private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EditTileForm)); - this.textBox1 = new RyzStudio.Windows.ThemedForms.TextBox(); + this.textBox1 = new RyzStudio.Windows.ThemedForms.TTextBox(); this.label6 = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); - this.textBox2 = new RyzStudio.Windows.ThemedForms.ButtonTextBox(); - this.textBox3 = new RyzStudio.Windows.ThemedForms.TextBox(); - this.textBox4 = new RyzStudio.Windows.ThemedForms.ButtonTextBox(); - this.button1 = new RyzStudio.Windows.ThemedForms.Button(); - this.pickerBox1 = new RyzStudio.Windows.ThemedForms.PickerBox(); - this.pickerBox2 = new RyzStudio.Windows.ThemedForms.PickerBox(); + this.textBox2 = new RyzStudio.Windows.ThemedForms.TButtonTextBox(); + this.textBox3 = new RyzStudio.Windows.ThemedForms.TTextBox(); + this.textBox4 = new RyzStudio.Windows.ThemedForms.TButtonTextBox(); + this.button1 = new RyzStudio.Windows.ThemedForms.TButton(); + this.pickerBox1 = new RyzStudio.Windows.ThemedForms.TPickerBox(); + this.pickerBox2 = new RyzStudio.Windows.ThemedForms.TPickerBox(); this.horizontalSeparator1 = new RyzStudio.Windows.Forms.HorizontalSeparator(); this.horizontalSeparator2 = new RyzStudio.Windows.Forms.HorizontalSeparator(); this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();