Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

* Resolves #596 - Pt. 1 #597

Merged
merged 2 commits into from
Jan 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -323,3 +323,4 @@ Installer Project Files/Krypton Toolkit Suite/Krypton Toolkit Suite-cache/cacheI
Installer Project Files/Krypton Toolkit Suite/Krypton Toolkit Suite-cache/part1/Krypton Toolkit Suite1.cab
Installer Project Files/Krypton Toolkit Suite/Krypton Toolkit Suite-cache/part1/output-info.ini
Source\Miscellaneous Toolkit Items\Krypton Toolkit Documentation\Help
*.bak
1 change: 1 addition & 0 deletions Documents/Help/Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
* Versions have now been changed to the following format `Major.yy.MM.dayofyear`, i.e. `60.22.02.32`, but for convenience, builds will still be referenced as `yyMM` in documentation
* Overhauled `run.cmd`
* Build scripts are now stored in the `Scripts` folder, though it is now recommended to utilise `run.cmd`
* Resolved [#596](https://github.com/Krypton-Suite/Standard-Toolkit/issues/596), ActionLists do not reflect the recommended or possible settings in the designer properties
* Resolved [#562](https://github.com/Krypton-Suite/Standard-Toolkit/issues/562), Help Icon is not clearly visible in a lot of themes
* Resolved [#380](https://github.com/Krypton-Suite/Standard-Toolkit/issues/380), MDI Child form not fully maximizing not merging on the ribbon
* Resolved [#571](https://github.com/Krypton-Suite/Standard-Toolkit/issues/571), CenterScreen start on Form is no longer respected
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,23 +54,6 @@ public ButtonStyle ButtonStyle
}
}

/// <summary>Gets or sets the context menu strip.</summary>
/// <value>The context menu strip.</value>
public ContextMenuStrip ContextMenuStrip
{
get => _button.ContextMenuStrip;

set
{
if (_button.ContextMenuStrip != value)
{
_service.OnComponentChanged(_button, null, _button.ContextMenuStrip, value);

_button.ContextMenuStrip = value;
}
}
}

/// <summary>Gets or sets the krypton context menu.</summary>
/// <value>The krypton context menu.</value>
public KryptonContextMenu KryptonContextMenu
Expand Down Expand Up @@ -175,7 +158,7 @@ public PaletteMode PaletteMode

/// <summary>Gets or sets the font.</summary>
/// <value>The font.</value>
public Font ShortTextFont
public Font StateCommonShortTextFont
{
get => _button.StateCommon.Content.ShortText.Font;

Expand All @@ -192,7 +175,7 @@ public Font ShortTextFont

/// <summary>Gets or sets the font.</summary>
/// <value>The font.</value>
public Font LongTextFont
public Font StateCommonLongTextFont
{
get => _button.StateCommon.Content.LongText.Font;

Expand All @@ -210,7 +193,7 @@ public Font LongTextFont
/// <summary>Gets or sets the corner radius.</summary>
/// <value>The corner radius.</value>
[DefaultValue(GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE)]
public float CornerRadius
public float StateCommonCornerRoundingRadius
{
get => _button.StateCommon.Border.Rounding;

Expand Down Expand Up @@ -261,13 +244,11 @@ public override DesignerActionItemCollection GetSortedActionItems()
// Add the list of button specific actions
actions.Add(new DesignerActionHeaderItem(@"Appearance"));
actions.Add(new DesignerActionPropertyItem(@"ButtonStyle", @"Style", @"Appearance", @"Button style"));
actions.Add(new DesignerActionPropertyItem(@"ContextMenuStrip", @"Context Menu Strip", @"Appearance", @"The context menu strip for the control."));
actions.Add(new DesignerActionPropertyItem(@"KryptonContextMenu", @"Krypton Context Menu", @"Appearance",
"The krypton context menu strip for the control."));
actions.Add(new DesignerActionPropertyItem(@"KryptonContextMenu", @"Krypton Context Menu", @"Appearance", @"The Krypton Context Menu for the control."));
actions.Add(new DesignerActionPropertyItem(@"Orientation", @"Orientation", @"Appearance", @"Button orientation"));
actions.Add(new DesignerActionPropertyItem(@"ShortTextFont", @"Short Text Font", @"Appearance", @"The short text font."));
actions.Add(new DesignerActionPropertyItem(@"LongTextFont", @"Long Text Font", @"Appearance", @"The long text font."));
actions.Add(new DesignerActionPropertyItem(@"CornerRadius", @"Corner Rounding Radius", @"Appearance", @"The corner rounding radius of the control."));
actions.Add(new DesignerActionPropertyItem(@"StateCommonShortTextFont", @"State Common Short Text Font", @"Appearance", @"The State Common Short Text Font."));
actions.Add(new DesignerActionPropertyItem(@"StateCommonLongTextFont", @"State Common State Common Long Text Font", @"Appearance", @"The State Common State Common Long Text Font."));
actions.Add(new DesignerActionPropertyItem(@"StateCommonCornerRoundingRadius", @"State Common Corner Rounding Radius", @"Appearance", @"The corner rounding radius of the control."));
actions.Add(new DesignerActionHeaderItem(@"Values"));
actions.Add(new DesignerActionPropertyItem(@"Text", @"Text", @"Values", @"Button text"));
actions.Add(new DesignerActionPropertyItem(@"ExtraText", @"ExtraText", @"Values", @"Button extra text"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,19 +105,19 @@ public bool AutoCheck
}
}

/// <summary>Gets or sets the context menu strip.</summary>
/// <value>The context menu strip.</value>
public ContextMenuStrip ContextMenuStrip
/// <summary>Gets or sets the Krypton Context Menu.</summary>
/// <value>The Krypton Context Menu.</value>
public KryptonContextMenu KryptonContextMenu
{
get => _checkBox.ContextMenuStrip;
get => _checkBox.KryptonContextMenu;

set
{
if (_checkBox.ContextMenuStrip != value)
if (_checkBox.KryptonContextMenu != value)
{
_service.OnComponentChanged(_checkBox, null, _checkBox.ContextMenuStrip, value);
_service.OnComponentChanged(_checkBox, null, _checkBox.KryptonContextMenu, value);

_checkBox.ContextMenuStrip = value;
_checkBox.KryptonContextMenu = value;
}
}
}
Expand Down Expand Up @@ -226,7 +226,7 @@ public PaletteMode PaletteMode

/// <summary>Gets or sets the font.</summary>
/// <value>The font.</value>
public Font ShortTextFont
public Font StateCommonShortTextFont
{
get => _checkBox.StateCommon.ShortText.Font;

Expand All @@ -243,7 +243,7 @@ public Font ShortTextFont

/// <summary>Gets or sets the font.</summary>
/// <value>The font.</value>
public Font LongTextFont
public Font StateCommonLongTextFont
{
get => _checkBox.StateCommon.LongText.Font;

Expand Down Expand Up @@ -314,11 +314,11 @@ public override DesignerActionItemCollection GetSortedActionItems()
actions.Add(new DesignerActionHeaderItem(@"Appearance"));
actions.Add(new DesignerActionPropertyItem(@"LabelStyle", @"Style", @"Appearance", @"Label style"));
actions.Add(new DesignerActionPropertyItem(@"Orientation", @"Orientation", @"Appearance", @"Visual orientation"));
actions.Add(new DesignerActionPropertyItem(@"ShortTextFont", @"Short Text Font", @"Appearance", @"The short text font."));
actions.Add(new DesignerActionPropertyItem(@"StateCommonShortTextFont", @"State Common Short Text Font", @"Appearance", @"The State Common Short Text Font."));
actions.Add(new DesignerActionPropertyItem(@"ShortTextTrim", @"Short Text Trim", @"Appearance", @"The trim mode of the short text."));
actions.Add(new DesignerActionPropertyItem(@"LongTextFont", @"Long Text Font", @"Appearance", @"The long text font."));
actions.Add(new DesignerActionPropertyItem(@"StateCommonLongTextFont", @"State Common State Common Long Text Font", @"Appearance", @"The State Common State Common Long Text Font."));
actions.Add(new DesignerActionPropertyItem(@"LongTextTrim", @"Long Text Trim", @"Appearance", @"The trim mode of the long text."));
actions.Add(new DesignerActionPropertyItem(@"ContextMenuStrip", @"Context Menu Strip", @"Appearance", @"The context menu strip for the control."));
actions.Add(new DesignerActionPropertyItem(@"KryptonContextMenu", @"Krypton Context Menu", @"Appearance", @"The Krypton Context Menu for the control."));
actions.Add(new DesignerActionHeaderItem(@"Values"));
actions.Add(new DesignerActionPropertyItem(@"Text", @"Text", @"Values", @"Checkbox text"));
actions.Add(new DesignerActionPropertyItem(@"ExtraText", @"ExtraText", @"Values", @"Checkbox extra text"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public KryptonCheckSetActionList(KryptonCheckSetDesigner owner)
/*
/// <summary>Gets or sets the font.</summary>
/// <value>The font.</value>
public Font ShortTextFont
public Font StateCommonShortTextFont
{
get => _set..StateCommon.Content.ShortText.Font;

Expand All @@ -52,7 +52,7 @@ public Font ShortTextFont

/// <summary>Gets or sets the font.</summary>
/// <value>The font.</value>
public Font LongTextFont
public Font StateCommonLongTextFont
{
get => _button.StateCommon.Content.LongText.Font;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,19 +88,19 @@ public PaletteBorderStyle BorderStyle
}
}

/// <summary>Gets or sets the context menu strip.</summary>
/// <value>The context menu strip.</value>
public ContextMenuStrip ContextMenuStrip
/// <summary>Gets or sets the Krypton Context Menu.</summary>
/// <value>The Krypton Context Menu.</value>
public KryptonContextMenu KryptonContextMenu
{
get => _checkedListBox.ContextMenuStrip;
get => _checkedListBox.KryptonContextMenu;

set
{
if (_checkedListBox.ContextMenuStrip != value)
if (_checkedListBox.KryptonContextMenu != value)
{
_service.OnComponentChanged(_checkedListBox, null, _checkedListBox.ContextMenuStrip, value);
_service.OnComponentChanged(_checkedListBox, null, _checkedListBox.KryptonContextMenu, value);

_checkedListBox.ContextMenuStrip = value;
_checkedListBox.KryptonContextMenu = value;
}
}
}
Expand Down Expand Up @@ -175,7 +175,7 @@ public PaletteMode PaletteMode

/// <summary>Gets or sets the font.</summary>
/// <value>The font.</value>
public Font ShortTextFont
public Font StateCommonShortTextFont
{
get => _checkedListBox.StateCommon.Item.Content.ShortText.Font;

Expand All @@ -192,7 +192,7 @@ public Font ShortTextFont

/// <summary>Gets or sets the font.</summary>
/// <value>The font.</value>
public Font LongTextFont
public Font StateCommonLongTextFont
{
get => _checkedListBox.StateCommon.Item.Content.LongText.Font;

Expand All @@ -210,7 +210,7 @@ public Font LongTextFont
/// <summary>Gets or sets the corner radius.</summary>
/// <value>The corner radius.</value>
[DefaultValue(GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE)]
public float CornerRadius
public float StateCommonCornerRoundingRadius
{
get => _checkedListBox.StateCommon.Border.Rounding;

Expand Down Expand Up @@ -243,11 +243,11 @@ public override DesignerActionItemCollection GetSortedActionItems()
actions.Add(new DesignerActionHeaderItem(@"Appearance"));
actions.Add(new DesignerActionPropertyItem(@"BackStyle", @"Back Style", @"Appearance", @"Style used to draw background."));
actions.Add(new DesignerActionPropertyItem(@"BorderStyle", @"Border Style", @"Appearance", @"Style used to draw the border."));
actions.Add(new DesignerActionPropertyItem(@"ContextMenuStrip", @"Context Menu Strip", @"Appearance", @"The context menu strip for the control."));
actions.Add(new DesignerActionPropertyItem(@"KryptonContextMenu", @"Krypton Context Menu", @"Appearance", @"The Krypton Context Menu for the control."));
actions.Add(new DesignerActionPropertyItem(@"ItemStyle", @"Item Style", @"Appearance", @"How to display list items."));
actions.Add(new DesignerActionPropertyItem(@"ShortTextFont", @"Short Text Font", @"Appearance", @"The short text font."));
actions.Add(new DesignerActionPropertyItem(@"LongTextFont", @"Long Text Font", @"Appearance", @"The long text font."));
actions.Add(new DesignerActionPropertyItem(@"CornerRadius", @"Corner Rounding Radius", @"Appearance", @"The corner rounding radius of the control."));
actions.Add(new DesignerActionPropertyItem(@"StateCommonShortTextFont", @"State Common Short Text Font", @"Appearance", @"The State Common Short Text Font."));
actions.Add(new DesignerActionPropertyItem(@"StateCommonLongTextFont", @"State Common State Common Long Text Font", @"Appearance", @"The State Common State Common Long Text Font."));
actions.Add(new DesignerActionPropertyItem(@"StateCommonCornerRoundingRadius", @"State Common Corner Rounding Radius", @"Appearance", @"The corner rounding radius of the control."));
actions.Add(new DesignerActionHeaderItem(@"Behavior"));
actions.Add(new DesignerActionPropertyItem(@"SelectionMode", @"Selection Mode", @"Behavior", @"Determines the selection mode."));
actions.Add(new DesignerActionPropertyItem(@"Sorted", @"Sorted", @"Behavior", @"Should items be sorted according to string."));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ public PaletteMode PaletteMode

/// <summary>Gets or sets the font.</summary>
/// <value>The font.</value>
public Font ShortTextFont
public Font StateCommonShortTextFont
{
get => _colorButton.StateCommon.Content.ShortText.Font;

Expand All @@ -226,7 +226,7 @@ public Font ShortTextFont

/// <summary>Gets or sets the font.</summary>
/// <value>The font.</value>
public Font LongTextFont
public Font StateCommonLongTextFont
{
get => _colorButton.StateCommon.Content.LongText.Font;

Expand All @@ -244,7 +244,7 @@ public Font LongTextFont
/// <summary>Gets or sets the corner radius.</summary>
/// <value>The corner radius.</value>
[DefaultValue(GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE)]
public float CornerRadius
public float StateCommonCornerRoundingRadius
{
get => _colorButton.StateCommon.Border.Rounding;

Expand Down Expand Up @@ -310,9 +310,9 @@ public override DesignerActionItemCollection GetSortedActionItems()
actions.Add(new DesignerActionPropertyItem(@"ButtonOrientation", @"ButtonOrientation", @"Appearance", @"Button orientation"));
actions.Add(new DesignerActionPropertyItem(@"DropDownPosition", @"DropDownPosition", @"Appearance", @"DropDown position"));
actions.Add(new DesignerActionPropertyItem(@"DropDownOrientation", @"DropDownOrientation", @"Appearance", @"DropDown orientation"));
actions.Add(new DesignerActionPropertyItem(@"ShortTextFont", @"Short Text Font", @"Appearance", @"The short text font."));
actions.Add(new DesignerActionPropertyItem(@"LongTextFont", @"Long Text Font", @"Appearance", @"The long text font."));
actions.Add(new DesignerActionPropertyItem(@"CornerRadius", @"Corner Rounding Radius", @"Appearance", @"The corner rounding radius of the control."));
actions.Add(new DesignerActionPropertyItem(@"StateCommonShortTextFont", @"State Common Short Text Font", @"Appearance", @"The State Common Short Text Font."));
actions.Add(new DesignerActionPropertyItem(@"StateCommonLongTextFont", @"State Common State Common Long Text Font", @"Appearance", @"The State Common State Common Long Text Font."));
actions.Add(new DesignerActionPropertyItem(@"StateCommonCornerRoundingRadius", @"State Common Corner Rounding Radius", @"Appearance", @"The corner rounding radius of the control."));
actions.Add(new DesignerActionHeaderItem(@"Values"));
actions.Add(new DesignerActionPropertyItem(@"Text", @"Text", @"Values", @"Button text"));
actions.Add(new DesignerActionPropertyItem(@"ExtraText", @"ExtraText", @"Values", @"Button extra text"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,19 @@ public KryptonComboBoxActionList(KryptonComboBoxDesigner owner)
#endregion

#region Public
/// <summary>Gets or sets the context menu strip.</summary>
/// <value>The context menu strip.</value>
public ContextMenuStrip ContextMenuStrip
/// <summary>Gets or sets the Krypton Context Menu.</summary>
/// <value>The Krypton Context Menu.</value>
public KryptonContextMenu KryptonContextMenu
{
get => _comboBox.ContextMenuStrip;
get => _comboBox.KryptonContextMenu;

set
{
if (_comboBox.ContextMenuStrip != value)
if (_comboBox.KryptonContextMenu != value)
{
_service.OnComponentChanged(_comboBox, null, _comboBox.ContextMenuStrip, value);
_service.OnComponentChanged(_comboBox, null, _comboBox.KryptonContextMenu, value);

_comboBox.ContextMenuStrip = value;
_comboBox.KryptonContextMenu = value;
}
}
}
Expand Down Expand Up @@ -125,7 +125,7 @@ public Font Font
/// <summary>Gets or sets the corner radius.</summary>
/// <value>The corner radius.</value>
[DefaultValue(GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE)]
public float CornerRadius
public float StateCommonCornerRoundingRadius
{
get => _comboBox.StateCommon.ComboBox.Border.Rounding;

Expand Down Expand Up @@ -156,11 +156,11 @@ public override DesignerActionItemCollection GetSortedActionItems()
{
// Add the list of label specific actions
actions.Add(new DesignerActionHeaderItem(@"Appearance"));
actions.Add(new DesignerActionPropertyItem(@"ContextMenuStrip", @"Context Menu Strip", @"Appearance", @"The context menu strip for the control."));
actions.Add(new DesignerActionPropertyItem(@"KryptonContextMenu", @"Krypton Context Menu", @"Appearance", @"The Krypton Context Menu for the control."));
actions.Add(new DesignerActionPropertyItem(@"DropDownStyle", @"Drop Down Style", @"Appearance", @"The combobox drop down style."));
actions.Add(new DesignerActionPropertyItem(@"InputControlStyle", @"Style", @"Appearance", @"ComboBox display style."));
actions.Add(new DesignerActionPropertyItem(@"Font", @"Font", @"Appearance", @"The font for the combobox."));
actions.Add(new DesignerActionPropertyItem(@"CornerRadius", @"Corner Rounding Radius", @"Appearance", @"The corner rounding radius of the control."));
actions.Add(new DesignerActionPropertyItem(@"StateCommonCornerRoundingRadius", @"State Common Corner Rounding Radius", @"Appearance", @"The corner rounding radius of the control."));
actions.Add(new DesignerActionHeaderItem(@"Visuals"));
actions.Add(new DesignerActionPropertyItem(@"PaletteMode", @"Palette", @"Visuals", @"Palette applied to drawing"));
}
Expand Down
Loading