diff --git a/LinearAppLauncher.csproj b/LinearAppLauncher.csproj index f2c1c7a..c2ea81a 100644 --- a/LinearAppLauncher.csproj +++ b/LinearAppLauncher.csproj @@ -67,6 +67,11 @@ True Resources.resx + + True + True + Resource1.resx + Component @@ -98,6 +103,12 @@ TListBox.cs + + UserControl + + + UserControl + UserControl @@ -177,6 +188,10 @@ ResXFileCodeGenerator Resources.Designer.cs + + ResXFileCodeGenerator + Resource1.Designer.cs + TButton.cs @@ -241,19 +256,11 @@ - - - - - - - - @@ -302,5 +309,11 @@ + + + + + + \ No newline at end of file diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index c9399a3..825d8b3 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -70,56 +70,6 @@ namespace AppLauncher.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap button16_file_add { - get { - object obj = ResourceManager.GetObject("button16_file_add", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap button16_file_add2 { - get { - object obj = ResourceManager.GetObject("button16_file_add2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap button16_folder_add { - get { - object obj = ResourceManager.GetObject("button16_folder_add", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap button16_folder_add2 { - get { - object obj = ResourceManager.GetObject("button16_folder_add2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap chrome_ea_32 { - get { - object obj = ResourceManager.GetObject("chrome_ea_32", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -240,16 +190,6 @@ namespace AppLauncher.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap mail_ea_32 { - get { - object obj = ResourceManager.GetObject("mail_ea_32", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/Properties/Resources.resx b/Properties/Resources.resx index c5a52dd..4bcc2b3 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -121,21 +121,6 @@ ..\Resources\arrow-right-ea-16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\button16_file_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\button16_file_add2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\button16_folder_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\button16_folder_add2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\chrome-ea-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\folder-ea-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -172,9 +157,6 @@ ..\Resources\grid-ea-24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\mail-ea-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\toggle-left-ea-16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/Resource1.Designer.cs b/Resource1.Designer.cs new file mode 100644 index 0000000..fcc731f --- /dev/null +++ b/Resource1.Designer.cs @@ -0,0 +1,203 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace AppLauncher { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resource1 { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resource1() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AppLauncher.Resource1", typeof(Resource1).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap arrow_down { + get { + object obj = ResourceManager.GetObject("arrow_down", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap arrow_down2 { + get { + object obj = ResourceManager.GetObject("arrow_down2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap arrow_up { + get { + object obj = ResourceManager.GetObject("arrow_up", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap arrow_up2 { + get { + object obj = ResourceManager.GetObject("arrow_up2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap edit { + get { + object obj = ResourceManager.GetObject("edit", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap edit2 { + get { + object obj = ResourceManager.GetObject("edit2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap file { + get { + object obj = ResourceManager.GetObject("file", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap file2 { + get { + object obj = ResourceManager.GetObject("file2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap folder { + get { + object obj = ResourceManager.GetObject("folder", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap folder2 { + get { + object obj = ResourceManager.GetObject("folder2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap minus { + get { + object obj = ResourceManager.GetObject("minus", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap minus2 { + get { + object obj = ResourceManager.GetObject("minus2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap plus { + get { + object obj = ResourceManager.GetObject("plus", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap plus2 { + get { + object obj = ResourceManager.GetObject("plus2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + } +} diff --git a/Resource1.resx b/Resource1.resx new file mode 100644 index 0000000..43e9f46 --- /dev/null +++ b/Resource1.resx @@ -0,0 +1,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + RyzStudio\Windows\Forms\Resources\arrow_down.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + RyzStudio\Windows\Forms\Resources\arrow_down2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + RyzStudio\Windows\Forms\Resources\arrow_up.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + RyzStudio\Windows\Forms\Resources\arrow_up2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + RyzStudio\Windows\Forms\Resources\edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + RyzStudio\Windows\Forms\Resources\edit2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + RyzStudio\Windows\Forms\Resources\file.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + RyzStudio\Windows\Forms\Resources\file2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + RyzStudio\Windows\Forms\Resources\folder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + RyzStudio\Windows\Forms\Resources\folder2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + RyzStudio\Windows\Forms\Resources\minus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + RyzStudio\Windows\Forms\Resources\minus2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + RyzStudio\Windows\Forms\Resources\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + RyzStudio\Windows\Forms\Resources\plus2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + \ No newline at end of file diff --git a/Resources/raw/listbox.svg b/Resources/raw/listbox.svg new file mode 100644 index 0000000..dc7147a --- /dev/null +++ b/Resources/raw/listbox.svg @@ -0,0 +1,420 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/RyzStudio/Windows/Forms/FlatButton.cs b/RyzStudio/Windows/Forms/FlatButton.cs index 9864c47..9dc12ff 100644 --- a/RyzStudio/Windows/Forms/FlatButton.cs +++ b/RyzStudio/Windows/Forms/FlatButton.cs @@ -11,20 +11,20 @@ namespace RyzStudio.Windows.Forms { public class FlatButton : Label { - public class Style + public class FlatButtonStyle { public Color BackColour { get; set; } = Color.Transparent; public Color PenColour { get; set; } = Color.Transparent; } - public enum State + public enum FlatButtonState { Idle = 0, Hover, Down } - protected State controlState = State.Idle; + protected FlatButtonState controlState = FlatButtonState.Idle; public FlatButton() : base() { @@ -33,40 +33,40 @@ namespace RyzStudio.Windows.Forms this.TextAlign = ContentAlignment.MiddleCenter; // customise - this.StyleOver = new Style() + this.StyleOver = new FlatButtonStyle() { BackColour = Color.FromArgb(51, 51, 51), PenColour = Color.White }; - this.StyleDown = new Style() + this.StyleDown = new FlatButtonStyle() { BackColour = Color.FromArgb(179, 179, 179), PenColour = Color.Black }; - this.StyleDefault = new Style() + this.StyleDefault = new FlatButtonStyle() { BackColour = Color.White, PenColour = Color.Black }; - this.VisualState = State.Idle; + this.VisualState = FlatButtonState.Idle; this.Click += delegate { this.OnClick(null); }; - this.MouseEnter += delegate { this.VisualState = State.Hover; }; - this.MouseLeave += delegate { this.VisualState = State.Idle; }; - this.MouseDown += delegate { this.VisualState = State.Down; }; - this.MouseUp += delegate { this.VisualState = State.Idle; }; + this.MouseEnter += delegate { this.VisualState = FlatButtonState.Hover; }; + this.MouseLeave += delegate { this.VisualState = FlatButtonState.Idle; }; + this.MouseDown += delegate { this.VisualState = FlatButtonState.Down; }; + this.MouseUp += delegate { this.VisualState = FlatButtonState.Idle; }; } - protected State VisualState + protected FlatButtonState VisualState { get { return controlState; } set { switch (value) { - case State.Idle: - if (this.VisualState == State.Down) + case FlatButtonState.Idle: + if (this.VisualState == FlatButtonState.Down) { updateButton(StyleOver); } @@ -76,10 +76,10 @@ namespace RyzStudio.Windows.Forms } break; - case State.Hover: + case FlatButtonState.Hover: updateButton(StyleOver); break; - case State.Down: + case FlatButtonState.Down: updateButton(StyleDown); break; default: @@ -91,20 +91,20 @@ namespace RyzStudio.Windows.Forms } } - protected void updateButton(Style style) + protected void updateButton(FlatButtonStyle style) { this.ForeColor = style.PenColour; this.BackColor = style.BackColour; } [Browsable(false)] - public Style StyleOver { get; set; } = new Style(); + public FlatButtonStyle StyleOver { get; set; } = new FlatButtonStyle(); [Browsable(false)] - public Style StyleDown { get; set; } = new Style(); + public FlatButtonStyle StyleDown { get; set; } = new FlatButtonStyle(); [Browsable(false)] - public Style StyleDefault { get; set; } = new Style(); + public FlatButtonStyle StyleDefault { get; set; } = new FlatButtonStyle(); public void PerformClick() { diff --git a/RyzStudio/Windows/Forms/HorizontalSeparator.cs b/RyzStudio/Windows/Forms/HorizontalSeparator.cs index 1c7aeba..7a4dfee 100644 --- a/RyzStudio/Windows/Forms/HorizontalSeparator.cs +++ b/RyzStudio/Windows/Forms/HorizontalSeparator.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Drawing; -using System.Data; -using System.Linq; -using System.Text; +using System.Drawing; using System.Windows.Forms; namespace RyzStudio.Windows.Forms diff --git a/RyzStudio/Windows/Forms/Resources/arrow_down.png b/RyzStudio/Windows/Forms/Resources/arrow_down.png new file mode 100644 index 0000000..cccf233 Binary files /dev/null and b/RyzStudio/Windows/Forms/Resources/arrow_down.png differ diff --git a/RyzStudio/Windows/Forms/Resources/arrow_down2.png b/RyzStudio/Windows/Forms/Resources/arrow_down2.png new file mode 100644 index 0000000..5b0b115 Binary files /dev/null and b/RyzStudio/Windows/Forms/Resources/arrow_down2.png differ diff --git a/RyzStudio/Windows/Forms/Resources/arrow_up.png b/RyzStudio/Windows/Forms/Resources/arrow_up.png new file mode 100644 index 0000000..a08438b Binary files /dev/null and b/RyzStudio/Windows/Forms/Resources/arrow_up.png differ diff --git a/RyzStudio/Windows/Forms/Resources/arrow_up2.png b/RyzStudio/Windows/Forms/Resources/arrow_up2.png new file mode 100644 index 0000000..07c1797 Binary files /dev/null and b/RyzStudio/Windows/Forms/Resources/arrow_up2.png differ diff --git a/RyzStudio/Windows/Forms/Resources/edit.png b/RyzStudio/Windows/Forms/Resources/edit.png new file mode 100644 index 0000000..031e3f6 Binary files /dev/null and b/RyzStudio/Windows/Forms/Resources/edit.png differ diff --git a/RyzStudio/Windows/Forms/Resources/edit2.png b/RyzStudio/Windows/Forms/Resources/edit2.png new file mode 100644 index 0000000..b9e93ab Binary files /dev/null and b/RyzStudio/Windows/Forms/Resources/edit2.png differ diff --git a/RyzStudio/Windows/Forms/Resources/file.png b/RyzStudio/Windows/Forms/Resources/file.png new file mode 100644 index 0000000..d0c9e58 Binary files /dev/null and b/RyzStudio/Windows/Forms/Resources/file.png differ diff --git a/RyzStudio/Windows/Forms/Resources/file2.png b/RyzStudio/Windows/Forms/Resources/file2.png new file mode 100644 index 0000000..f3e9f6d Binary files /dev/null and b/RyzStudio/Windows/Forms/Resources/file2.png differ diff --git a/RyzStudio/Windows/Forms/Resources/folder.png b/RyzStudio/Windows/Forms/Resources/folder.png new file mode 100644 index 0000000..a97c4e0 Binary files /dev/null and b/RyzStudio/Windows/Forms/Resources/folder.png differ diff --git a/RyzStudio/Windows/Forms/Resources/folder2.png b/RyzStudio/Windows/Forms/Resources/folder2.png new file mode 100644 index 0000000..d21178a Binary files /dev/null and b/RyzStudio/Windows/Forms/Resources/folder2.png differ diff --git a/RyzStudio/Windows/Forms/Resources/minus.png b/RyzStudio/Windows/Forms/Resources/minus.png new file mode 100644 index 0000000..6b396d4 Binary files /dev/null and b/RyzStudio/Windows/Forms/Resources/minus.png differ diff --git a/RyzStudio/Windows/Forms/Resources/minus2.png b/RyzStudio/Windows/Forms/Resources/minus2.png new file mode 100644 index 0000000..9bb4128 Binary files /dev/null and b/RyzStudio/Windows/Forms/Resources/minus2.png differ diff --git a/RyzStudio/Windows/Forms/Resources/plus.png b/RyzStudio/Windows/Forms/Resources/plus.png new file mode 100644 index 0000000..f63ace9 Binary files /dev/null and b/RyzStudio/Windows/Forms/Resources/plus.png differ diff --git a/RyzStudio/Windows/Forms/Resources/plus2.png b/RyzStudio/Windows/Forms/Resources/plus2.png new file mode 100644 index 0000000..0c29081 Binary files /dev/null and b/RyzStudio/Windows/Forms/Resources/plus2.png differ diff --git a/RyzStudio/Windows/ThemedForms/TButton.cs b/RyzStudio/Windows/ThemedForms/TButton.cs index 1996e87..563de25 100644 --- a/RyzStudio/Windows/ThemedForms/TButton.cs +++ b/RyzStudio/Windows/ThemedForms/TButton.cs @@ -6,21 +6,21 @@ public partial class TButton : RyzStudio.Windows.ThemedForms.TUserControl { - public class Style + public class ButtonStyle { public Color BackColour { get; set; } = Color.Transparent; public Color PenColour { get; set; } = Color.Transparent; public Image ForeImage { get; set; } = null; } - public enum State + public enum ButtonState { Idle = 0, Hover, Down } - protected State controlState = State.Idle; + protected ButtonState controlState = ButtonState.Idle; public TButton() : base() { @@ -29,10 +29,10 @@ label1.ImageAlign = ContentAlignment.MiddleCenter; label1.Click += delegate { this.OnClick(null); }; - label1.MouseEnter += delegate { this.VisualState = State.Hover; }; - label1.MouseLeave += delegate { this.VisualState = State.Idle; }; - label1.MouseDown += delegate { this.VisualState = State.Down; }; - label1.MouseUp += delegate { this.VisualState = State.Idle; }; + label1.MouseEnter += delegate { this.VisualState = ButtonState.Hover; }; + label1.MouseLeave += delegate { this.VisualState = ButtonState.Idle; }; + label1.MouseDown += delegate { this.VisualState = ButtonState.Down; }; + label1.MouseUp += delegate { this.VisualState = ButtonState.Idle; }; } protected override void OnLoad(EventArgs e) @@ -40,37 +40,37 @@ base.OnLoad(e); // customise - this.StyleOver = new Style() + this.StyleOver = new ButtonStyle() { BackColour = Color.FromArgb(51, 51, 51), PenColour = Color.White, ForeImage = this.OverImage }; - this.StyleDown = new Style() + this.StyleDown = new ButtonStyle() { BackColour = Color.FromArgb(179, 179, 179), PenColour = Color.Black, ForeImage = this.DownImage }; - this.StyleDefault = new Style() + this.StyleDefault = new ButtonStyle() { BackColour = Color.White, PenColour = Color.Black, ForeImage = this.DefaultImage }; - this.VisualState = State.Idle; + this.VisualState = ButtonState.Idle; } - protected State VisualState + protected ButtonState VisualState { get { return controlState; } set { switch (value) { - case State.Idle: - if (this.VisualState == State.Down) + case ButtonState.Idle: + if (this.VisualState == ButtonState.Down) { updateButton(StyleOver); } @@ -80,10 +80,10 @@ } break; - case State.Hover: + case ButtonState.Hover: updateButton(StyleOver); break; - case State.Down: + case ButtonState.Down: updateButton(StyleDown); break; default: @@ -95,7 +95,7 @@ } } - protected void updateButton(Style style) + protected void updateButton(ButtonStyle style) { label1.ForeColor = style.PenColour; label1.BackColor = style.BackColour; @@ -119,13 +119,13 @@ public Image DefaultImage { get; set; } = null; [Browsable(false)] - public Style StyleOver { get; set; } = new Style(); + public ButtonStyle StyleOver { get; set; } = new ButtonStyle(); [Browsable(false)] - public Style StyleDown { get; set; } = new Style(); + public ButtonStyle StyleDown { get; set; } = new ButtonStyle(); [Browsable(false)] - public Style StyleDefault { get; set; } = new Style(); + public ButtonStyle StyleDefault { get; set; } = new ButtonStyle(); public void PerformClick() => this.OnClick(null); } diff --git a/RyzStudio/Windows/ThemedForms/TButtonTextBox.cs b/RyzStudio/Windows/ThemedForms/TButtonTextBox.cs index dba1e52..f995110 100644 --- a/RyzStudio/Windows/ThemedForms/TButtonTextBox.cs +++ b/RyzStudio/Windows/ThemedForms/TButtonTextBox.cs @@ -69,7 +69,7 @@ } } - private void imageBox1_Click(object sender, EventArgs e) => OnButtonClick?.Invoke(sender, e); + protected virtual void imageBox1_Click(object sender, EventArgs e) => OnButtonClick?.Invoke(sender, e); [Category("Action")] [Browsable(true)] @@ -110,9 +110,9 @@ public TButton SubmitButton { get; set; } = null; [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new Padding Margin { get { return base.Margin; } set { base.Margin = value; } } + public new Padding Margin { get => base.Margin; set => base.Margin = value; } - protected override void updateBackground(Graphics g, Style style) + protected override void updateBackground(Graphics g, ThemeStyle style) { int b = (styleActive.BorderWidth + 1) + styleActive.BorderPadding; diff --git a/RyzStudio/Windows/ThemedForms/TFolderTextBox.cs b/RyzStudio/Windows/ThemedForms/TFolderTextBox.cs new file mode 100644 index 0000000..1327b26 --- /dev/null +++ b/RyzStudio/Windows/ThemedForms/TFolderTextBox.cs @@ -0,0 +1,41 @@ +using System; +using System.IO; +using System.Windows.Forms; + +namespace RyzStudio.Windows.ThemedForms +{ + public class TFolderTextBox : TButtonTextBox + { + public TFolderTextBox() : base() + { + this.NormalImage = AppLauncher.Resource1.folder; + this.HighlightImage = AppLauncher.Resource1.folder2; + this.Text = string.Empty; + } + + public FolderBrowserDialog FolderDialog { get; set; } = null; + + protected override void imageBox1_Click(object sender, EventArgs e) + { + if (this.FolderDialog == null) + { + this.FolderDialog = new FolderBrowserDialog(); + this.FolderDialog.Description = "Choose a directory"; + } + + if (!string.IsNullOrWhiteSpace(this.Text)) + { + if (Directory.Exists(this.Text)) + { + this.FolderDialog.SelectedPath = this.Text; + } + } + + if (this.FolderDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK) + { + this.Text = this.FolderDialog.SelectedPath; + } + } + + } +} diff --git a/RyzStudio/Windows/ThemedForms/TListBox.cs b/RyzStudio/Windows/ThemedForms/TListBox.cs index 8649a44..73db9bb 100644 --- a/RyzStudio/Windows/ThemedForms/TListBox.cs +++ b/RyzStudio/Windows/ThemedForms/TListBox.cs @@ -17,28 +17,192 @@ 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; + listBox1.Items.Add("one"); + listBox1.Items.Add("two"); + listBox1.Items.Add("three"); + listBox1.Items.Add("four"); + listBox1.Items.Add("five"); + + listBox1.Font = this.Font; + listBox1.BorderStyle = BorderStyle.None; } protected override void OnResize(EventArgs e) { base.OnResize(e); - int b = (styleActive.BorderWidth + 1) + styleActive.BorderPadding; + //int b = (styleActive.BorderWidth + 1) + styleActive.BorderPadding; - this.Height = comboBox1.Height + (b + textboxPadding.Top) + ((b - 1) + textboxPadding.Bottom); + //this.Height = comboBox1.Height + (b + textboxPadding.Top) + ((b - 1) + textboxPadding.Bottom); } protected override void OnGotFocus(EventArgs e) { base.OnGotFocus(e); - comboBox1.Focus(); + listBox1.Focus(); } - protected void textBox_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e) + [Browsable(true), EditorBrowsable(EditorBrowsableState.Advanced)] + [Category("Appearance")] + public System.Windows.Forms.ListBox ListBox { get => listBox1; set => listBox1 = 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; } + + [Category("Action")] + [Browsable(true)] + public event EventHandler OnAdd; + + [Category("Action")] + [Browsable(true)] + public event EventHandler OnEdit; + + protected override void updateBackground(Graphics g, ThemeStyle 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()); + } + + /// + /// Add + /// + /// + /// + private void imageBox1_MouseClick(object sender, MouseEventArgs e) + { + if (e.Button != MouseButtons.Left) + { + return; + } + + this.OnAdd?.Invoke(sender, e); + } + + /// + /// Edit + /// + /// + /// + private void imageBox5_MouseClick(object sender, MouseEventArgs e) + { + if (e.Button != MouseButtons.Left) + { + return; + } + + this.OnEdit?.Invoke(sender, e); + } + + /// + /// Remove + /// + /// + /// + private void imageBox2_MouseClick(object sender, MouseEventArgs e) + { + if (e.Button != MouseButtons.Left) + { + return; + } + + if (listBox1.SelectedIndex < 0) + { + return; + } + + int pos = listBox1.SelectedIndex; + + listBox1.Items.RemoveAt(pos); + + if (pos > (listBox1.Items.Count - 1)) + { + pos = (listBox1.Items.Count - 1); + } + + listBox1.SelectedIndex = pos; + } + + /// + /// Move up + /// + /// + /// + private void imageBox3_MouseClick(object sender, MouseEventArgs e) + { + if (e != null) + { + if (e.Button != MouseButtons.Left) + { + return; + } + } + + if (listBox1.SelectedIndex <= 0) + { + return; + } + + if (listBox1.SelectedItem == null) + { + return; + } + + object item = listBox1.SelectedItem; + int pos = listBox1.SelectedIndex; + + listBox1.Items.RemoveAt(pos); + listBox1.Items.Insert((pos - 1), item); + + listBox1.SelectedIndex = (pos - 1); + } + + /// + /// Move down + /// + /// + /// + private void imageBox4_MouseClick(object sender, MouseEventArgs e) + { + if (e != null) + { + if (e.Button != MouseButtons.Left) + { + return; + } + } + + if (listBox1.SelectedIndex >= (listBox1.Items.Count - 1)) + { + return; + } + + if (listBox1.SelectedItem == null) + { + return; + } + + object item = listBox1.SelectedItem; + int pos = listBox1.SelectedIndex; + + listBox1.Items.RemoveAt(pos); + listBox1.Items.Insert((pos + 1), item); + + listBox1.SelectedIndex = (pos + 1); + } + + private void listBox1_MouseDoubleClick(object sender, MouseEventArgs e) => imageBox5_MouseClick(sender, e); + + private void listBox1_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e) { switch (e.KeyCode) { @@ -51,48 +215,24 @@ break; case Keys.Escape: close(); + break; + case Keys.Up: + if (e.Alt) + { + imageBox3_MouseClick(sender, null); + } + + break; + case Keys.Down: + if (e.Alt) + { + imageBox4_MouseClick(sender, null); + } + 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/TListBox.designer.cs b/RyzStudio/Windows/ThemedForms/TListBox.designer.cs index eb7c0ac..eff99b6 100644 --- a/RyzStudio/Windows/ThemedForms/TListBox.designer.cs +++ b/RyzStudio/Windows/ThemedForms/TListBox.designer.cs @@ -28,32 +28,155 @@ /// private void InitializeComponent() { - this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.listBox1 = new System.Windows.Forms.ListBox(); + this.imageBox5 = new RyzStudio.Windows.Forms.ImageBox(); + this.imageBox4 = new RyzStudio.Windows.Forms.ImageBox(); + this.imageBox3 = new RyzStudio.Windows.Forms.ImageBox(); + this.imageBox2 = new RyzStudio.Windows.Forms.ImageBox(); + this.imageBox1 = new RyzStudio.Windows.Forms.ImageBox(); + ((System.ComponentModel.ISupportInitialize)(this.imageBox5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.imageBox4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.imageBox3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.imageBox2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.imageBox1)).BeginInit(); this.SuspendLayout(); // - // comboBox1 + // listBox1 // - 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; + this.listBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.listBox1.FormattingEnabled = true; + this.listBox1.Location = new System.Drawing.Point(4, 4); + this.listBox1.Name = "listBox1"; + this.listBox1.Size = new System.Drawing.Size(121, 82); + this.listBox1.TabIndex = 0; + this.listBox1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.listBox1_MouseDoubleClick); + this.listBox1.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.listBox1_PreviewKeyDown); // - // PickerBox + // imageBox5 + // + this.imageBox5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.imageBox5.BackColor = System.Drawing.Color.Transparent; + this.imageBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.imageBox5.ErrorImage = null; + this.imageBox5.HighlightImage = global::AppLauncher.Resource1.edit2; + this.imageBox5.Image = global::AppLauncher.Resource1.edit; + this.imageBox5.InitialImage = null; + this.imageBox5.Location = new System.Drawing.Point(52, 94); + this.imageBox5.Name = "imageBox5"; + this.imageBox5.NormalImage = global::AppLauncher.Resource1.edit; + this.imageBox5.Size = new System.Drawing.Size(18, 25); + this.imageBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.imageBox5.TabIndex = 6; + this.imageBox5.TabStop = false; + this.imageBox5.MouseClick += new System.Windows.Forms.MouseEventHandler(this.imageBox5_MouseClick); + this.imageBox5.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.imageBox5_MouseClick); + // + // imageBox4 + // + this.imageBox4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.imageBox4.BackColor = System.Drawing.Color.Transparent; + this.imageBox4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.imageBox4.ErrorImage = null; + this.imageBox4.HighlightImage = global::AppLauncher.Resource1.arrow_down2; + this.imageBox4.Image = global::AppLauncher.Resource1.arrow_down; + this.imageBox4.InitialImage = null; + this.imageBox4.Location = new System.Drawing.Point(100, 94); + this.imageBox4.Name = "imageBox4"; + this.imageBox4.NormalImage = global::AppLauncher.Resource1.arrow_down; + this.imageBox4.Size = new System.Drawing.Size(18, 25); + this.imageBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.imageBox4.TabIndex = 5; + this.imageBox4.TabStop = false; + this.imageBox4.MouseClick += new System.Windows.Forms.MouseEventHandler(this.imageBox4_MouseClick); + this.imageBox4.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.imageBox4_MouseClick); + // + // imageBox3 + // + this.imageBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.imageBox3.BackColor = System.Drawing.Color.Transparent; + this.imageBox3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.imageBox3.ErrorImage = null; + this.imageBox3.HighlightImage = global::AppLauncher.Resource1.arrow_up2; + this.imageBox3.Image = global::AppLauncher.Resource1.arrow_up; + this.imageBox3.InitialImage = null; + this.imageBox3.Location = new System.Drawing.Point(76, 94); + this.imageBox3.Name = "imageBox3"; + this.imageBox3.NormalImage = global::AppLauncher.Resource1.arrow_up; + this.imageBox3.Size = new System.Drawing.Size(18, 25); + this.imageBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.imageBox3.TabIndex = 4; + this.imageBox3.TabStop = false; + this.imageBox3.MouseClick += new System.Windows.Forms.MouseEventHandler(this.imageBox3_MouseClick); + this.imageBox3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.imageBox3_MouseClick); + // + // imageBox2 + // + this.imageBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.imageBox2.BackColor = System.Drawing.Color.Transparent; + this.imageBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.imageBox2.ErrorImage = null; + this.imageBox2.HighlightImage = global::AppLauncher.Resource1.minus2; + this.imageBox2.Image = global::AppLauncher.Resource1.minus; + this.imageBox2.InitialImage = null; + this.imageBox2.Location = new System.Drawing.Point(28, 94); + this.imageBox2.Name = "imageBox2"; + this.imageBox2.NormalImage = global::AppLauncher.Resource1.minus; + this.imageBox2.Size = new System.Drawing.Size(18, 25); + this.imageBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.imageBox2.TabIndex = 3; + this.imageBox2.TabStop = false; + this.imageBox2.MouseClick += new System.Windows.Forms.MouseEventHandler(this.imageBox2_MouseClick); + this.imageBox2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.imageBox2_MouseClick); + // + // imageBox1 + // + this.imageBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.imageBox1.BackColor = System.Drawing.Color.Transparent; + this.imageBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.imageBox1.ErrorImage = null; + this.imageBox1.HighlightImage = global::AppLauncher.Resource1.plus2; + this.imageBox1.Image = global::AppLauncher.Resource1.plus; + this.imageBox1.InitialImage = null; + this.imageBox1.Location = new System.Drawing.Point(4, 94); + this.imageBox1.Name = "imageBox1"; + this.imageBox1.NormalImage = global::AppLauncher.Resource1.plus; + this.imageBox1.Size = new System.Drawing.Size(18, 25); + this.imageBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.imageBox1.TabIndex = 2; + this.imageBox1.TabStop = false; + this.imageBox1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.imageBox1_MouseClick); + this.imageBox1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.imageBox1_MouseClick); + // + // TListBox // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.Controls.Add(this.comboBox1); - this.Name = "PickerBox"; + this.Controls.Add(this.imageBox5); + this.Controls.Add(this.imageBox4); + this.Controls.Add(this.imageBox3); + this.Controls.Add(this.imageBox2); + this.Controls.Add(this.imageBox1); + this.Controls.Add(this.listBox1); + this.Name = "TListBox"; this.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3); - this.Size = new System.Drawing.Size(128, 32); + this.Size = new System.Drawing.Size(128, 120); + ((System.ComponentModel.ISupportInitialize)(this.imageBox5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.imageBox4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.imageBox3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.imageBox2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.imageBox1)).EndInit(); this.ResumeLayout(false); } #endregion - private System.Windows.Forms.ComboBox comboBox1; + private System.Windows.Forms.ListBox listBox1; + private Forms.ImageBox imageBox1; + private Forms.ImageBox imageBox2; + private Forms.ImageBox imageBox3; + private Forms.ImageBox imageBox4; + private Forms.ImageBox imageBox5; } } diff --git a/RyzStudio/Windows/ThemedForms/TOpenFileTextBox.cs b/RyzStudio/Windows/ThemedForms/TOpenFileTextBox.cs new file mode 100644 index 0000000..12bfa8b --- /dev/null +++ b/RyzStudio/Windows/ThemedForms/TOpenFileTextBox.cs @@ -0,0 +1,42 @@ +using System; +using System.IO; +using System.Windows.Forms; + +namespace RyzStudio.Windows.ThemedForms +{ + public class TOpenFileTextBox : TButtonTextBox + { + public TOpenFileTextBox() : base() + { + this.NormalImage = AppLauncher.Resource1.file; + this.HighlightImage = AppLauncher.Resource1.file2; + this.Text = string.Empty; + } + + public OpenFileDialog FileDialog { get; set; } = null; + + protected override void imageBox1_Click(object sender, EventArgs e) + { + if (this.FileDialog == null) + { + this.FileDialog = new OpenFileDialog(); + this.FileDialog.Title = "Choose a file"; + this.FileDialog.Filter = "All files|*"; + } + + if (!string.IsNullOrWhiteSpace(this.Text)) + { + if (File.Exists(this.Text)) + { + this.FileDialog.InitialDirectory = Path.GetDirectoryName(this.Text); + } + } + + if (this.FileDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK) + { + this.Text = this.FileDialog.FileName; + } + } + + } +} diff --git a/RyzStudio/Windows/ThemedForms/TPickerBox.cs b/RyzStudio/Windows/ThemedForms/TPickerBox.cs index e9b7c6b..255f98c 100644 --- a/RyzStudio/Windows/ThemedForms/TPickerBox.cs +++ b/RyzStudio/Windows/ThemedForms/TPickerBox.cs @@ -83,7 +83,7 @@ [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] public new Padding Margin { get => base.Margin; set => base.Margin = value; } - protected override void updateBackground(Graphics g, Style style) + protected override void updateBackground(Graphics g, ThemeStyle style) { int b = (styleActive.BorderWidth + 1) + styleActive.BorderPadding; diff --git a/RyzStudio/Windows/ThemedForms/TTextBox.cs b/RyzStudio/Windows/ThemedForms/TTextBox.cs index 00597f1..48a68d8 100644 --- a/RyzStudio/Windows/ThemedForms/TTextBox.cs +++ b/RyzStudio/Windows/ThemedForms/TTextBox.cs @@ -82,7 +82,7 @@ [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] public new Padding Margin { get { return base.Margin; } set { base.Margin = value; } } - protected override void updateBackground(Graphics g, Style style) + protected override void updateBackground(Graphics g, ThemeStyle style) { int b = (styleActive.BorderWidth + 1) + styleActive.BorderPadding; diff --git a/RyzStudio/Windows/ThemedForms/TUserControl.cs b/RyzStudio/Windows/ThemedForms/TUserControl.cs index 8423200..dad5723 100644 --- a/RyzStudio/Windows/ThemedForms/TUserControl.cs +++ b/RyzStudio/Windows/ThemedForms/TUserControl.cs @@ -8,7 +8,7 @@ namespace RyzStudio.Windows.ThemedForms { public partial class TUserControl : System.Windows.Forms.UserControl { - public class Style + public class ThemeStyle { public int BorderWidth; public int BorderRadius; @@ -17,7 +17,7 @@ namespace RyzStudio.Windows.ThemedForms public Color BackColour; public Color ForeColour; - public Style(int borderWidth, int borderRadius, int borderPadding, Color borderColour, Color backColour) + public ThemeStyle(int borderWidth, int borderRadius, int borderPadding, Color borderColour, Color backColour) { this.BorderWidth = borderWidth; this.BorderRadius = borderRadius; @@ -27,7 +27,7 @@ namespace RyzStudio.Windows.ThemedForms this.ForeColour = Color.Black; } - public Style(int borderWidth, int borderRadius, int borderPadding, Color borderColour, Color backColour, Color foreColour) + public ThemeStyle(int borderWidth, int borderRadius, int borderPadding, Color borderColour, Color backColour, Color foreColour) { this.BorderWidth = borderWidth; this.BorderRadius = borderRadius; @@ -38,7 +38,7 @@ namespace RyzStudio.Windows.ThemedForms } } - protected Style styleActive = new Style(1, 3, 2, Color.FromArgb(212, 212, 212), Color.White); + protected ThemeStyle styleActive = new ThemeStyle(1, 3, 2, Color.FromArgb(212, 212, 212), Color.White); public TUserControl() { @@ -68,7 +68,7 @@ namespace RyzStudio.Windows.ThemedForms [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] public new Padding Padding { get => base.Padding; set => base.Padding = value; } - protected virtual void updateBackground(Graphics g, Style style) + protected virtual void updateBackground(Graphics g, ThemeStyle style) { int b = (styleActive.BorderWidth + 1) + styleActive.BorderPadding; diff --git a/Windows/Forms/Tile/AddListTileForm.cs b/Windows/Forms/Tile/AddListTileForm.cs index 9400e2c..b79d1b6 100644 --- a/Windows/Forms/Tile/AddListTileForm.cs +++ b/Windows/Forms/Tile/AddListTileForm.cs @@ -33,9 +33,9 @@ namespace AppLauncher.Windows.Forms private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AddListTileForm)); - 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(); + RyzStudio.Windows.ThemedForms.TButton.ButtonStyle style4 = new RyzStudio.Windows.ThemedForms.TButton.ButtonStyle(); + RyzStudio.Windows.ThemedForms.TButton.ButtonStyle style5 = new RyzStudio.Windows.ThemedForms.TButton.ButtonStyle(); + RyzStudio.Windows.ThemedForms.TButton.ButtonStyle style6 = new RyzStudio.Windows.ThemedForms.TButton.ButtonStyle(); this.textBox1 = new RyzStudio.Windows.ThemedForms.TTextBox(); this.label1 = new System.Windows.Forms.Label(); this.button1 = new RyzStudio.Windows.ThemedForms.TButton(); diff --git a/Windows/Forms/Tile/AddTileForm.cs b/Windows/Forms/Tile/AddTileForm.cs index e2a2be4..46d52f4 100644 --- a/Windows/Forms/Tile/AddTileForm.cs +++ b/Windows/Forms/Tile/AddTileForm.cs @@ -23,17 +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 TButtonTextBox textBox2; + private TOpenFileTextBox textBox2; private TTextBox textBox3; - private TButtonTextBox textBox4; + private TFolderTextBox textBox4; private TButton button1; private TPickerBox pickerBox1; private TPickerBox pickerBox2; private RyzStudio.Windows.Forms.HorizontalSeparator horizontalSeparator1; private RyzStudio.Windows.Forms.HorizontalSeparator horizontalSeparator2; private TTextBox textBox1; - private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1; - private System.Windows.Forms.OpenFileDialog openFileDialog1; protected TileLayoutPanel parentPanel = null; public AddTileForm() : base() @@ -53,9 +51,9 @@ namespace AppLauncher.Windows.Forms private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AddTileForm)); - 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(); + RyzStudio.Windows.ThemedForms.TButton.ButtonStyle buttonStyle1 = new RyzStudio.Windows.ThemedForms.TButton.ButtonStyle(); + RyzStudio.Windows.ThemedForms.TButton.ButtonStyle buttonStyle2 = new RyzStudio.Windows.ThemedForms.TButton.ButtonStyle(); + RyzStudio.Windows.ThemedForms.TButton.ButtonStyle buttonStyle3 = new RyzStudio.Windows.ThemedForms.TButton.ButtonStyle(); this.textBox1 = new RyzStudio.Windows.ThemedForms.TTextBox(); this.label6 = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label(); @@ -63,41 +61,39 @@ namespace AppLauncher.Windows.Forms 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.TButtonTextBox(); + this.textBox2 = new RyzStudio.Windows.ThemedForms.TOpenFileTextBox(); this.textBox3 = new RyzStudio.Windows.ThemedForms.TTextBox(); - this.textBox4 = new RyzStudio.Windows.ThemedForms.TButtonTextBox(); + this.textBox4 = new RyzStudio.Windows.ThemedForms.TFolderTextBox(); 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(); - this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); ((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 = "Add 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); @@ -109,9 +105,9 @@ namespace AppLauncher.Windows.Forms this.textBox1.SubmitButton = null; this.textBox1.TabIndex = 152; this.textBox1.UseSystemPasswordChar = false; - // + // // label6 - // + // this.label6.BackColor = System.Drawing.Color.Transparent; this.label6.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(95)))), ((int)(((byte)(99)))), ((int)(((byte)(104))))); this.label6.Location = new System.Drawing.Point(18, 268); @@ -120,9 +116,9 @@ namespace AppLauncher.Windows.Forms this.label6.TabIndex = 163; this.label6.Text = "Run As Admin"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // + // // label7 - // + // this.label7.BackColor = System.Drawing.Color.Transparent; this.label7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(95)))), ((int)(((byte)(99)))), ((int)(((byte)(104))))); this.label7.Location = new System.Drawing.Point(18, 227); @@ -131,9 +127,9 @@ namespace AppLauncher.Windows.Forms this.label7.TabIndex = 161; this.label7.Text = "Window Style"; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // + // // label4 - // + // this.label4.BackColor = System.Drawing.Color.Transparent; this.label4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(95)))), ((int)(((byte)(99)))), ((int)(((byte)(104))))); this.label4.Location = new System.Drawing.Point(18, 173); @@ -142,9 +138,9 @@ namespace AppLauncher.Windows.Forms this.label4.TabIndex = 159; this.label4.Text = "Working Directory"; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // + // // label3 - // + // this.label3.BackColor = System.Drawing.Color.Transparent; this.label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(95)))), ((int)(((byte)(99)))), ((int)(((byte)(104))))); this.label3.Location = new System.Drawing.Point(18, 132); @@ -153,9 +149,9 @@ namespace AppLauncher.Windows.Forms this.label3.TabIndex = 157; this.label3.Text = "Argument"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // + // // label2 - // + // this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(95)))), ((int)(((byte)(99)))), ((int)(((byte)(104))))); this.label2.Location = new System.Drawing.Point(18, 91); @@ -164,9 +160,9 @@ namespace AppLauncher.Windows.Forms this.label2.TabIndex = 155; this.label2.Text = "Filename"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // + // // 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); @@ -176,28 +172,28 @@ namespace AppLauncher.Windows.Forms this.label1.TabIndex = 153; this.label1.Text = "Title"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // + // // textBox2 - // - this.textBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + // + this.textBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.textBox2.BackColor = System.Drawing.Color.Transparent; + this.textBox2.FileDialog = null; this.textBox2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); - this.textBox2.HighlightImage = global::AppLauncher.Properties.Resources.button16_file_add2; + this.textBox2.HighlightImage = ((System.Drawing.Image)(resources.GetObject("textBox2.HighlightImage"))); this.textBox2.Location = new System.Drawing.Point(159, 91); this.textBox2.Margin = new System.Windows.Forms.Padding(10, 3, 3, 3); this.textBox2.Name = "textBox2"; - this.textBox2.NormalImage = global::AppLauncher.Properties.Resources.button16_file_add; + this.textBox2.NormalImage = ((System.Drawing.Image)(resources.GetObject("textBox2.NormalImage"))); this.textBox2.Padding = new System.Windows.Forms.Padding(10, 10, 9, 9); this.textBox2.Size = new System.Drawing.Size(220, 32); this.textBox2.SubmitButton = null; this.textBox2.TabIndex = 170; this.textBox2.UseSystemPasswordChar = false; - this.textBox2.OnButtonClick += new System.EventHandler(this.textBox2_OnButtonClick); - // + // // textBox3 - // - this.textBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + // + this.textBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.textBox3.BackColor = System.Drawing.Color.Transparent; this.textBox3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); @@ -209,27 +205,27 @@ namespace AppLauncher.Windows.Forms this.textBox3.SubmitButton = null; this.textBox3.TabIndex = 171; this.textBox3.UseSystemPasswordChar = false; - // + // // textBox4 - // - this.textBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + // + this.textBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.textBox4.BackColor = System.Drawing.Color.Transparent; + this.textBox4.FolderDialog = null; this.textBox4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); - this.textBox4.HighlightImage = global::AppLauncher.Properties.Resources.button16_folder_add2; + this.textBox4.HighlightImage = ((System.Drawing.Image)(resources.GetObject("textBox4.HighlightImage"))); this.textBox4.Location = new System.Drawing.Point(159, 173); this.textBox4.Margin = new System.Windows.Forms.Padding(10, 3, 3, 3); this.textBox4.Name = "textBox4"; - this.textBox4.NormalImage = global::AppLauncher.Properties.Resources.button16_folder_add; + this.textBox4.NormalImage = ((System.Drawing.Image)(resources.GetObject("textBox4.NormalImage"))); this.textBox4.Padding = new System.Windows.Forms.Padding(10, 10, 9, 9); this.textBox4.Size = new System.Drawing.Size(220, 32); this.textBox4.SubmitButton = null; this.textBox4.TabIndex = 172; this.textBox4.UseSystemPasswordChar = false; - this.textBox4.OnButtonClick += new System.EventHandler(this.textBox4_OnButtonClick); - // + // // 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; @@ -240,24 +236,24 @@ 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); - 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; + buttonStyle1.BackColour = System.Drawing.Color.White; + buttonStyle1.ForeImage = null; + buttonStyle1.PenColour = System.Drawing.Color.Black; + this.button1.StyleDefault = buttonStyle1; + buttonStyle2.BackColour = System.Drawing.Color.FromArgb(((int)(((byte)(179)))), ((int)(((byte)(179)))), ((int)(((byte)(179))))); + buttonStyle2.ForeImage = null; + buttonStyle2.PenColour = System.Drawing.Color.Black; + this.button1.StyleDown = buttonStyle2; + buttonStyle3.BackColour = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + buttonStyle3.ForeImage = null; + buttonStyle3.PenColour = System.Drawing.Color.White; + this.button1.StyleOver = buttonStyle3; this.button1.TabIndex = 173; this.button1.Click += new System.EventHandler(this.button1_Click); - // + // // pickerBox1 - // - this.pickerBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + // + 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); @@ -268,10 +264,10 @@ namespace AppLauncher.Windows.Forms this.pickerBox1.Size = new System.Drawing.Size(140, 32); this.pickerBox1.SubmitButton = null; this.pickerBox1.TabIndex = 174; - // + // // pickerBox2 - // - this.pickerBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + // + this.pickerBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.pickerBox2.BackColor = System.Drawing.Color.Transparent; this.pickerBox2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); @@ -282,38 +278,29 @@ namespace AppLauncher.Windows.Forms this.pickerBox2.Size = new System.Drawing.Size(140, 32); this.pickerBox2.SubmitButton = null; this.pickerBox2.TabIndex = 175; - // + // // horizontalSeparator1 - // - this.horizontalSeparator1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + // + this.horizontalSeparator1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.horizontalSeparator1.Location = new System.Drawing.Point(10, 215); this.horizontalSeparator1.MaximumSize = new System.Drawing.Size(4920, 2); this.horizontalSeparator1.Name = "horizontalSeparator1"; this.horizontalSeparator1.Size = new System.Drawing.Size(380, 2); this.horizontalSeparator1.TabIndex = 176; - // + // // 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, 310); 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; - // - // folderBrowserDialog1 - // - this.folderBrowserDialog1.Description = "Choose a directory"; - // - // openFileDialog1 - // - this.openFileDialog1.Filter = "All files|*"; - this.openFileDialog1.Title = "Choose a file"; - // + // // AddTileForm - // + // this.ClientSize = new System.Drawing.Size(400, 480); this.Controls.Add(this.horizontalSeparator2); this.Controls.Add(this.horizontalSeparator1); @@ -367,21 +354,6 @@ namespace AppLauncher.Windows.Forms if (pickerBox2.ComboBox.Items.Count > 0) pickerBox2.ComboBox.SelectedIndex = 0; } - //protected override void OnShown(EventArgs e) - //{ - // base.OnShown(e); - - // if (parentPanel != null) - // { - // textBox1.Text = parentPanel.ModelInfo.Title; - // textBox2.Text = parentPanel.ModelInfo.ProcessFilename; - // textBox3.Text = parentPanel.ModelInfo.ProcessArgument; - // textBox4.Text = parentPanel.ModelInfo.ProcessWorkingDirectory; - // pickerBox1.ComboBox.SelectedIndex = (int)parentPanel.ModelInfo.ProcessWindowStyle; - // pickerBox2.ComboBox.SelectedIndex = (parentPanel.ModelInfo.ProcessAsAdmin ? 1 : 0); - // } - //} - private void button1_Click(object sender, EventArgs e) { TileModel model = new TileModel() @@ -399,37 +371,5 @@ namespace AppLauncher.Windows.Forms this.Close(); } - private void textBox2_OnButtonClick(object sender, EventArgs e) - { - if (!string.IsNullOrWhiteSpace(textBox2.Text)) - { - if (File.Exists(textBox2.Text)) - { - openFileDialog1.InitialDirectory = Path.GetDirectoryName(textBox2.Text); - } - } - - if (openFileDialog1.ShowDialog() == System.Windows.Forms.DialogResult.OK) - { - textBox2.Text = openFileDialog1.FileName; - } - } - - private void textBox4_OnButtonClick(object sender, EventArgs e) - { - if (!string.IsNullOrWhiteSpace(textBox4.Text)) - { - if (Directory.Exists(textBox4.Text)) - { - folderBrowserDialog1.SelectedPath = textBox4.Text; - } - } - - if (folderBrowserDialog1.ShowDialog() == System.Windows.Forms.DialogResult.OK) - { - textBox4.Text = folderBrowserDialog1.SelectedPath; - } - } - } } diff --git a/Windows/Forms/Tile/AddTileForm.resx b/Windows/Forms/Tile/AddTileForm.resx index 0a8d684..e6f3e1a 100644 --- a/Windows/Forms/Tile/AddTileForm.resx +++ b/Windows/Forms/Tile/AddTileForm.resx @@ -128,10 +128,40 @@ 6dGYH+UCHCTQ9SfV+7pMvJIIaLL0Oudd1x2eUQ8MyeAeq0cAAAAASUVORK5CYII= - - 17, 17 - - - 326, 17 - + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAK9JREFUOE/t0zsKwkAURuGp1BWJK3EhIrgAV+EOLLWwtRQLwQdiIbbiIkwynj+O + IVwnyhR2XvjyInNIkXHee8f0cEQBPbDOaKEarSvXhsAJO4wirlB4jipiA3phoIvIrLFChhnKiA3o8Ckw + RR93LNBODVwwwRL62kNKYIxNzQ1FSsDOEHk08HrYJMw/8KtA06/cCef6KJDZgDbTFrHNZO3x9idqOyui + m2+07bvPgHcPXOhtG3D6cUIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAMZJREFUOE/tk7sNwjAQQF3BRohJGAQhMQBTsAElFLSUiAKJTxIXhBZlCILNuyRG + iXEQKeg46fmsO/slhU9Za5XWehiXYcD6JElygZ6qhdwTioVDGo4wDXDjsohXdYkvMDTHVa8R9Hb0tpCz + XzqJL5Df/CRYRFE0Yn8nr9M07XcSwBXmXN6QDfncRTCjt6+Rgfla4Adfn3D+ERS4Yht/wY8FxVN2xTac + gLP5qyYLAhmmA4SGyeeEoPkSq3EWydsoB4gRDEqBVU/p15ajstHKCgAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + xAAADsQBlSsOGwAAAJtJREFUOE/t0zEKwkAQheEpvILHSLySlTeJ6AnEzpPYi0ERPIKWKtZKNv9LNS5x + E6xS+OCDJew8tsgYmeCECsGZo1dKXLBwtnghQ2fe0JDPGHecsW6xwgwjNM8tdIgyxQ0qij2gORV9LejK + Bk8dfi3QjGY/C0IISS7/gkEVtP3KfbKEZm0PLZM++IVK0d0rdrAcR8TrnKK7BzPLa7Wb+WX/Nb8PAAAA + AElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + xAAADsQBlSsOGwAAALZJREFUOE/tkzEKwjAYRjt4BY9hvZKTN1HsCYqbJzGzKBGb9gY6qjgrxvdJK7ZS + Gpwc/ODBnzTvg0AT5Xk+hB3cwVc456ZRSIqi2MAeafbGEq5Zlg3KY+1Bvkkql89Ya/vsnUCZN8FJYWyM + 6ekKnsWkdF9hb8S3I6ioyRnkpa0FXcFbwOXrAjlyawXe+06q/At+qoDh41cOCU4iV8OaQY8pUVEgOnuA + VcSzjRm2UHvOHeisdc7FDwDnJKIbLgP9AAAAAElFTkSuQmCC + + \ No newline at end of file diff --git a/Windows/Forms/Tile/EditListTileForm.cs b/Windows/Forms/Tile/EditListTileForm.cs index 868da2d..ff12612 100644 --- a/Windows/Forms/Tile/EditListTileForm.cs +++ b/Windows/Forms/Tile/EditListTileForm.cs @@ -16,7 +16,12 @@ namespace AppLauncher.Windows.Forms private TButton button1; private RyzStudio.Windows.Forms.HorizontalSeparator horizontalSeparator2; private TTextBox textBox1; - private TPickerBox pickerBox1; + private TListBox tListBox1; + private System.Windows.Forms.Label label2; + private TButton tButton1; + private TButton tButton2; + private TButton tButton3; + private TButton tButton4; protected TilePanel parentPanel = null; public EditListTileForm() : base() @@ -34,14 +39,31 @@ namespace AppLauncher.Windows.Forms private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EditListTileForm)); - 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(); + RyzStudio.Windows.ThemedForms.TButton.ButtonStyle buttonStyle1 = new RyzStudio.Windows.ThemedForms.TButton.ButtonStyle(); + RyzStudio.Windows.ThemedForms.TButton.ButtonStyle buttonStyle2 = new RyzStudio.Windows.ThemedForms.TButton.ButtonStyle(); + RyzStudio.Windows.ThemedForms.TButton.ButtonStyle buttonStyle3 = new RyzStudio.Windows.ThemedForms.TButton.ButtonStyle(); + RyzStudio.Windows.ThemedForms.TButton.ButtonStyle buttonStyle4 = new RyzStudio.Windows.ThemedForms.TButton.ButtonStyle(); + RyzStudio.Windows.ThemedForms.TButton.ButtonStyle buttonStyle5 = new RyzStudio.Windows.ThemedForms.TButton.ButtonStyle(); + RyzStudio.Windows.ThemedForms.TButton.ButtonStyle buttonStyle6 = new RyzStudio.Windows.ThemedForms.TButton.ButtonStyle(); + RyzStudio.Windows.ThemedForms.TButton.ButtonStyle buttonStyle7 = new RyzStudio.Windows.ThemedForms.TButton.ButtonStyle(); + RyzStudio.Windows.ThemedForms.TButton.ButtonStyle buttonStyle8 = new RyzStudio.Windows.ThemedForms.TButton.ButtonStyle(); + RyzStudio.Windows.ThemedForms.TButton.ButtonStyle buttonStyle9 = new RyzStudio.Windows.ThemedForms.TButton.ButtonStyle(); + RyzStudio.Windows.ThemedForms.TButton.ButtonStyle buttonStyle10 = new RyzStudio.Windows.ThemedForms.TButton.ButtonStyle(); + RyzStudio.Windows.ThemedForms.TButton.ButtonStyle buttonStyle11 = new RyzStudio.Windows.ThemedForms.TButton.ButtonStyle(); + RyzStudio.Windows.ThemedForms.TButton.ButtonStyle buttonStyle12 = new RyzStudio.Windows.ThemedForms.TButton.ButtonStyle(); + RyzStudio.Windows.ThemedForms.TButton.ButtonStyle buttonStyle13 = new RyzStudio.Windows.ThemedForms.TButton.ButtonStyle(); + RyzStudio.Windows.ThemedForms.TButton.ButtonStyle buttonStyle14 = new RyzStudio.Windows.ThemedForms.TButton.ButtonStyle(); + RyzStudio.Windows.ThemedForms.TButton.ButtonStyle buttonStyle15 = new RyzStudio.Windows.ThemedForms.TButton.ButtonStyle(); this.textBox1 = new RyzStudio.Windows.ThemedForms.TTextBox(); this.label1 = new System.Windows.Forms.Label(); this.button1 = new RyzStudio.Windows.ThemedForms.TButton(); this.horizontalSeparator2 = new RyzStudio.Windows.Forms.HorizontalSeparator(); - this.pickerBox1 = new RyzStudio.Windows.ThemedForms.TPickerBox(); + this.tListBox1 = new RyzStudio.Windows.ThemedForms.TListBox(); + this.label2 = new System.Windows.Forms.Label(); + this.tButton1 = new RyzStudio.Windows.ThemedForms.TButton(); + this.tButton2 = new RyzStudio.Windows.ThemedForms.TButton(); + this.tButton3 = new RyzStudio.Windows.ThemedForms.TButton(); + this.tButton4 = new RyzStudio.Windows.ThemedForms.TButton(); ((System.ComponentModel.ISupportInitialize)(this.imgbxClose)).BeginInit(); this.SuspendLayout(); // @@ -103,18 +125,18 @@ 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); - 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; + buttonStyle1.BackColour = System.Drawing.Color.White; + buttonStyle1.ForeImage = null; + buttonStyle1.PenColour = System.Drawing.Color.Black; + this.button1.StyleDefault = buttonStyle1; + buttonStyle2.BackColour = System.Drawing.Color.FromArgb(((int)(((byte)(179)))), ((int)(((byte)(179)))), ((int)(((byte)(179))))); + buttonStyle2.ForeImage = null; + buttonStyle2.PenColour = System.Drawing.Color.Black; + this.button1.StyleDown = buttonStyle2; + buttonStyle3.BackColour = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + buttonStyle3.ForeImage = null; + buttonStyle3.PenColour = System.Drawing.Color.White; + this.button1.StyleOver = buttonStyle3; this.button1.TabIndex = 173; this.button1.Click += new System.EventHandler(this.button1_Click); // @@ -128,24 +150,140 @@ namespace AppLauncher.Windows.Forms this.horizontalSeparator2.Size = new System.Drawing.Size(380, 2); this.horizontalSeparator2.TabIndex = 177; // - // pickerBox1 + // tListBox1 // - this.pickerBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.tListBox1.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; + this.tListBox1.BackColor = System.Drawing.Color.Transparent; + this.tListBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.tListBox1.Location = new System.Drawing.Point(159, 101); + this.tListBox1.Margin = new System.Windows.Forms.Padding(10, 4, 10, 4); + this.tListBox1.Name = "tListBox1"; + this.tListBox1.Padding = new System.Windows.Forms.Padding(10, 6, 7, 5); + this.tListBox1.Size = new System.Drawing.Size(220, 180); + this.tListBox1.SubmitButton = null; + this.tListBox1.TabIndex = 180; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(95)))), ((int)(((byte)(99)))), ((int)(((byte)(104))))); + this.label2.Location = new System.Drawing.Point(18, 104); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(131, 32); + this.label2.TabIndex = 181; + this.label2.Text = "List"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // tButton1 + // + this.tButton1.BackColor = System.Drawing.Color.Transparent; + this.tButton1.DefaultImage = global::AppLauncher.Resource1.plus; + this.tButton1.DownImage = global::AppLauncher.Resource1.plus2; + this.tButton1.LabelText = ""; + this.tButton1.Location = new System.Drawing.Point(159, 288); + this.tButton1.Name = "tButton1"; + this.tButton1.OverImage = global::AppLauncher.Resource1.plus2; + this.tButton1.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3); + this.tButton1.Size = new System.Drawing.Size(32, 32); + buttonStyle4.BackColour = System.Drawing.Color.White; + buttonStyle4.ForeImage = null; + buttonStyle4.PenColour = System.Drawing.Color.Black; + this.tButton1.StyleDefault = buttonStyle4; + buttonStyle5.BackColour = System.Drawing.Color.FromArgb(((int)(((byte)(179)))), ((int)(((byte)(179)))), ((int)(((byte)(179))))); + buttonStyle5.ForeImage = null; + buttonStyle5.PenColour = System.Drawing.Color.Black; + this.tButton1.StyleDown = buttonStyle5; + buttonStyle6.BackColour = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + buttonStyle6.ForeImage = null; + buttonStyle6.PenColour = System.Drawing.Color.White; + this.tButton1.StyleOver = buttonStyle6; + this.tButton1.TabIndex = 182; + // + // tButton2 + // + this.tButton2.BackColor = System.Drawing.Color.Transparent; + this.tButton2.DefaultImage = null; + this.tButton2.DownImage = null; + this.tButton2.LabelText = ""; + this.tButton2.Location = new System.Drawing.Point(197, 288); + this.tButton2.Name = "tButton2"; + this.tButton2.OverImage = null; + this.tButton2.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3); + this.tButton2.Size = new System.Drawing.Size(32, 32); + buttonStyle7.BackColour = System.Drawing.Color.White; + buttonStyle7.ForeImage = null; + buttonStyle7.PenColour = System.Drawing.Color.Black; + this.tButton2.StyleDefault = buttonStyle7; + buttonStyle8.BackColour = System.Drawing.Color.FromArgb(((int)(((byte)(179)))), ((int)(((byte)(179)))), ((int)(((byte)(179))))); + buttonStyle8.ForeImage = null; + buttonStyle8.PenColour = System.Drawing.Color.Black; + this.tButton2.StyleDown = buttonStyle8; + buttonStyle9.BackColour = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + buttonStyle9.ForeImage = null; + buttonStyle9.PenColour = System.Drawing.Color.White; + this.tButton2.StyleOver = buttonStyle9; + this.tButton2.TabIndex = 183; + // + // tButton3 + // + this.tButton3.BackColor = System.Drawing.Color.Transparent; + this.tButton3.DefaultImage = null; + this.tButton3.DownImage = null; + this.tButton3.LabelText = ""; + this.tButton3.Location = new System.Drawing.Point(235, 288); + this.tButton3.Name = "tButton3"; + this.tButton3.OverImage = null; + this.tButton3.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3); + this.tButton3.Size = new System.Drawing.Size(32, 32); + buttonStyle10.BackColour = System.Drawing.Color.White; + buttonStyle10.ForeImage = null; + buttonStyle10.PenColour = System.Drawing.Color.Black; + this.tButton3.StyleDefault = buttonStyle10; + buttonStyle11.BackColour = System.Drawing.Color.FromArgb(((int)(((byte)(179)))), ((int)(((byte)(179)))), ((int)(((byte)(179))))); + buttonStyle11.ForeImage = null; + buttonStyle11.PenColour = System.Drawing.Color.Black; + this.tButton3.StyleDown = buttonStyle11; + buttonStyle12.BackColour = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + buttonStyle12.ForeImage = null; + buttonStyle12.PenColour = System.Drawing.Color.White; + this.tButton3.StyleOver = buttonStyle12; + this.tButton3.TabIndex = 184; + // + // tButton4 + // + this.tButton4.BackColor = System.Drawing.Color.Transparent; + this.tButton4.DefaultImage = null; + this.tButton4.DownImage = null; + this.tButton4.LabelText = ""; + this.tButton4.Location = new System.Drawing.Point(273, 288); + this.tButton4.Name = "tButton4"; + this.tButton4.OverImage = null; + this.tButton4.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3); + this.tButton4.Size = new System.Drawing.Size(32, 32); + buttonStyle13.BackColour = System.Drawing.Color.White; + buttonStyle13.ForeImage = null; + buttonStyle13.PenColour = System.Drawing.Color.Black; + this.tButton4.StyleDefault = buttonStyle13; + buttonStyle14.BackColour = System.Drawing.Color.FromArgb(((int)(((byte)(179)))), ((int)(((byte)(179)))), ((int)(((byte)(179))))); + buttonStyle14.ForeImage = null; + buttonStyle14.PenColour = System.Drawing.Color.Black; + this.tButton4.StyleDown = buttonStyle14; + buttonStyle15.BackColour = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + buttonStyle15.ForeImage = null; + buttonStyle15.PenColour = System.Drawing.Color.White; + this.tButton4.StyleOver = buttonStyle15; + this.tButton4.TabIndex = 185; // // EditListTileForm // this.ClientSize = new System.Drawing.Size(400, 480); - this.Controls.Add(this.pickerBox1); + this.Controls.Add(this.tButton4); + this.Controls.Add(this.tButton3); + this.Controls.Add(this.tButton2); + this.Controls.Add(this.tButton1); + this.Controls.Add(this.label2); + this.Controls.Add(this.tListBox1); this.Controls.Add(this.horizontalSeparator2); this.Controls.Add(this.button1); this.Controls.Add(this.label1); @@ -160,7 +298,12 @@ 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); + this.Controls.SetChildIndex(this.tListBox1, 0); + this.Controls.SetChildIndex(this.label2, 0); + this.Controls.SetChildIndex(this.tButton1, 0); + this.Controls.SetChildIndex(this.tButton2, 0); + this.Controls.SetChildIndex(this.tButton3, 0); + this.Controls.SetChildIndex(this.tButton4, 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 13f10ed..fa345e0 100644 --- a/Windows/Forms/Tile/EditTileForm.cs +++ b/Windows/Forms/Tile/EditTileForm.cs @@ -19,17 +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 TButtonTextBox textBox2; + private TOpenFileTextBox textBox2; private TTextBox textBox3; - private TButtonTextBox textBox4; + private TFolderTextBox textBox4; private TButton button1; private TPickerBox pickerBox1; private TPickerBox pickerBox2; private RyzStudio.Windows.Forms.HorizontalSeparator horizontalSeparator1; private RyzStudio.Windows.Forms.HorizontalSeparator horizontalSeparator2; private TTextBox textBox1; - private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1; - private System.Windows.Forms.OpenFileDialog openFileDialog1; protected TilePanel parentPanel = null; public EditTileForm() : base() @@ -49,6 +47,9 @@ namespace AppLauncher.Windows.Forms private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EditTileForm)); + RyzStudio.Windows.ThemedForms.TButton.ButtonStyle buttonStyle1 = new RyzStudio.Windows.ThemedForms.TButton.ButtonStyle(); + RyzStudio.Windows.ThemedForms.TButton.ButtonStyle buttonStyle2 = new RyzStudio.Windows.ThemedForms.TButton.ButtonStyle(); + RyzStudio.Windows.ThemedForms.TButton.ButtonStyle buttonStyle3 = new RyzStudio.Windows.ThemedForms.TButton.ButtonStyle(); this.textBox1 = new RyzStudio.Windows.ThemedForms.TTextBox(); this.label6 = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label(); @@ -56,16 +57,14 @@ namespace AppLauncher.Windows.Forms 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.TButtonTextBox(); + this.textBox2 = new RyzStudio.Windows.ThemedForms.TOpenFileTextBox(); this.textBox3 = new RyzStudio.Windows.ThemedForms.TTextBox(); - this.textBox4 = new RyzStudio.Windows.ThemedForms.TButtonTextBox(); + this.textBox4 = new RyzStudio.Windows.ThemedForms.TFolderTextBox(); 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(); - this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); ((System.ComponentModel.ISupportInitialize)(this.imgbxClose)).BeginInit(); this.SuspendLayout(); // @@ -175,18 +174,18 @@ namespace AppLauncher.Windows.Forms this.textBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.textBox2.BackColor = System.Drawing.Color.Transparent; + this.textBox2.FileDialog = null; this.textBox2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); - this.textBox2.HighlightImage = global::AppLauncher.Properties.Resources.button16_file_add2; + this.textBox2.HighlightImage = ((System.Drawing.Image)(resources.GetObject("textBox2.HighlightImage"))); this.textBox2.Location = new System.Drawing.Point(159, 91); this.textBox2.Margin = new System.Windows.Forms.Padding(10, 3, 3, 3); this.textBox2.Name = "textBox2"; - this.textBox2.NormalImage = global::AppLauncher.Properties.Resources.button16_file_add; + this.textBox2.NormalImage = ((System.Drawing.Image)(resources.GetObject("textBox2.NormalImage"))); this.textBox2.Padding = new System.Windows.Forms.Padding(10, 10, 9, 9); this.textBox2.Size = new System.Drawing.Size(220, 32); this.textBox2.SubmitButton = null; this.textBox2.TabIndex = 170; this.textBox2.UseSystemPasswordChar = false; - this.textBox2.OnButtonClick += new System.EventHandler(this.textBox2_OnButtonClick); // // textBox3 // @@ -208,18 +207,18 @@ namespace AppLauncher.Windows.Forms this.textBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.textBox4.BackColor = System.Drawing.Color.Transparent; + this.textBox4.FolderDialog = null; this.textBox4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); - this.textBox4.HighlightImage = global::AppLauncher.Properties.Resources.button16_folder_add2; + this.textBox4.HighlightImage = ((System.Drawing.Image)(resources.GetObject("textBox4.HighlightImage"))); this.textBox4.Location = new System.Drawing.Point(159, 173); this.textBox4.Margin = new System.Windows.Forms.Padding(10, 3, 3, 3); this.textBox4.Name = "textBox4"; - this.textBox4.NormalImage = global::AppLauncher.Properties.Resources.button16_folder_add; + this.textBox4.NormalImage = ((System.Drawing.Image)(resources.GetObject("textBox4.NormalImage"))); this.textBox4.Padding = new System.Windows.Forms.Padding(10, 10, 9, 9); this.textBox4.Size = new System.Drawing.Size(220, 32); this.textBox4.SubmitButton = null; this.textBox4.TabIndex = 172; this.textBox4.UseSystemPasswordChar = false; - this.textBox4.OnButtonClick += new System.EventHandler(this.textBox4_OnButtonClick); // // button1 // @@ -233,6 +232,18 @@ 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); + buttonStyle1.BackColour = System.Drawing.Color.White; + buttonStyle1.ForeImage = null; + buttonStyle1.PenColour = System.Drawing.Color.Black; + this.button1.StyleDefault = buttonStyle1; + buttonStyle2.BackColour = System.Drawing.Color.FromArgb(((int)(((byte)(179)))), ((int)(((byte)(179)))), ((int)(((byte)(179))))); + buttonStyle2.ForeImage = null; + buttonStyle2.PenColour = System.Drawing.Color.Black; + this.button1.StyleDown = buttonStyle2; + buttonStyle3.BackColour = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51))))); + buttonStyle3.ForeImage = null; + buttonStyle3.PenColour = System.Drawing.Color.White; + this.button1.StyleOver = buttonStyle3; this.button1.TabIndex = 173; this.button1.Click += new System.EventHandler(this.button1_Click); // @@ -284,15 +295,6 @@ namespace AppLauncher.Windows.Forms this.horizontalSeparator2.Size = new System.Drawing.Size(380, 2); this.horizontalSeparator2.TabIndex = 177; // - // folderBrowserDialog1 - // - this.folderBrowserDialog1.Description = "Choose a directory"; - // - // openFileDialog1 - // - this.openFileDialog1.Filter = "All files|*"; - this.openFileDialog1.Title = "Choose a file"; - // // EditTileForm // this.ClientSize = new System.Drawing.Size(400, 480); @@ -388,37 +390,5 @@ namespace AppLauncher.Windows.Forms this.Close(); } - private void textBox2_OnButtonClick(object sender, EventArgs e) - { - if (!string.IsNullOrWhiteSpace(textBox2.Text)) - { - if (File.Exists(textBox2.Text)) - { - openFileDialog1.InitialDirectory = Path.GetDirectoryName(textBox2.Text); - } - } - - if (openFileDialog1.ShowDialog() == System.Windows.Forms.DialogResult.OK) - { - textBox2.Text = openFileDialog1.FileName; - } - } - - private void textBox4_OnButtonClick(object sender, EventArgs e) - { - if (!string.IsNullOrWhiteSpace(textBox4.Text)) - { - if (Directory.Exists(textBox4.Text)) - { - folderBrowserDialog1.SelectedPath = textBox4.Text; - } - } - - if (folderBrowserDialog1.ShowDialog() == System.Windows.Forms.DialogResult.OK) - { - textBox4.Text = folderBrowserDialog1.SelectedPath; - } - } - } } diff --git a/Windows/Forms/Tile/EditTileForm.resx b/Windows/Forms/Tile/EditTileForm.resx index 3d0e307..e6f3e1a 100644 --- a/Windows/Forms/Tile/EditTileForm.resx +++ b/Windows/Forms/Tile/EditTileForm.resx @@ -128,10 +128,40 @@ 6dGYH+UCHCTQ9SfV+7pMvJIIaLL0Oudd1x2eUQ8MyeAeq0cAAAAASUVORK5CYII= - - 17, 17 - - - 186, 17 - + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAK9JREFUOE/t0zsKwkAURuGp1BWJK3EhIrgAV+EOLLWwtRQLwQdiIbbiIkwynj+O + IVwnyhR2XvjyInNIkXHee8f0cEQBPbDOaKEarSvXhsAJO4wirlB4jipiA3phoIvIrLFChhnKiA3o8Ckw + RR93LNBODVwwwRL62kNKYIxNzQ1FSsDOEHk08HrYJMw/8KtA06/cCef6KJDZgDbTFrHNZO3x9idqOyui + m2+07bvPgHcPXOhtG3D6cUIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAMZJREFUOE/tk7sNwjAQQF3BRohJGAQhMQBTsAElFLSUiAKJTxIXhBZlCILNuyRG + iXEQKeg46fmsO/slhU9Za5XWehiXYcD6JElygZ6qhdwTioVDGo4wDXDjsohXdYkvMDTHVa8R9Hb0tpCz + XzqJL5Df/CRYRFE0Yn8nr9M07XcSwBXmXN6QDfncRTCjt6+Rgfla4Adfn3D+ERS4Yht/wY8FxVN2xTac + gLP5qyYLAhmmA4SGyeeEoPkSq3EWydsoB4gRDEqBVU/p15ajstHKCgAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + xAAADsQBlSsOGwAAAJtJREFUOE/t0zEKwkAQheEpvILHSLySlTeJ6AnEzpPYi0ERPIKWKtZKNv9LNS5x + E6xS+OCDJew8tsgYmeCECsGZo1dKXLBwtnghQ2fe0JDPGHecsW6xwgwjNM8tdIgyxQ0qij2gORV9LejK + Bk8dfi3QjGY/C0IISS7/gkEVtP3KfbKEZm0PLZM++IVK0d0rdrAcR8TrnKK7BzPLa7Wb+WX/Nb8PAAAA + AElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + xAAADsQBlSsOGwAAALZJREFUOE/tkzEKwjAYRjt4BY9hvZKTN1HsCYqbJzGzKBGb9gY6qjgrxvdJK7ZS + Gpwc/ODBnzTvg0AT5Xk+hB3cwVc456ZRSIqi2MAeafbGEq5Zlg3KY+1Bvkkql89Ya/vsnUCZN8FJYWyM + 6ekKnsWkdF9hb8S3I6ioyRnkpa0FXcFbwOXrAjlyawXe+06q/At+qoDh41cOCU4iV8OaQY8pUVEgOnuA + VcSzjRm2UHvOHeisdc7FDwDnJKIbLgP9AAAAAElFTkSuQmCC + + \ No newline at end of file