Skip to content

Commit

Permalink
Merge branch 'alpha' into alpha-827-ExposeIPalette
Browse files Browse the repository at this point in the history
  • Loading branch information
@Smurf-IV
Smurf-IV authored Dec 21, 2022
2 parents 0ebfcae + 1d0f560 commit e9f7298
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 33 deletions.
1 change: 1 addition & 0 deletions Documents/Help/Changelog.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

## 2023-11-xx - Build 2311 - November 2023
* Fixed the display of the initial selected theme in the "ThemeSelection ComboBox"
* Resolved [#876](https://github.com/Krypton-Suite/Standard-Toolkit/issues/876), `Office 365 - Black` does not display text correctly
* Resolved [#874](https://github.com/Krypton-Suite/Standard-Toolkit/issues/874), 80.xx Canary Nuget text is incorrrect
* Implemented [#866](https://github.com/Krypton-Suite/Standard-Toolkit/issues/866), `KryptonMessageBox` Option to use system icons
* New `Application``KryptonMessageBoxIcon` type, specify your application icon to show in the `KryptonMessageBox` (recommended image size is 32 x 32)
Expand Down
19 changes: 17 additions & 2 deletions ...Krypton.Toolkit/Palette Builtin/Microsoft 365/Official Themes/PaletteMicrosoft365Black.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,22 @@ namespace Krypton.Toolkit
public class PaletteMicrosoft365Black : PaletteMicrosoft365BlackThemeBase
{
#region Static Fields

#region ImageLists

private static readonly ImageList _checkBoxList;
private static readonly ImageList _galleryButtonList;

#endregion

#region Image Array

private static readonly Image[] _radioButtonArray;

#endregion

#region Images

private static readonly Image _blackDropDownButton = Office2010Arrows._2010BlackDropDownButton;
private static readonly Image _contextMenuSubMenu = Office2010Arrows._2010BlackContextMenuSub;
private static readonly Image _formCloseNormal = Office2010ControlBoxResources.Office2010BlackCloseNormal_25_x_23;
Expand Down Expand Up @@ -48,6 +61,8 @@ public class PaletteMicrosoft365Black : PaletteMicrosoft365BlackThemeBase
private static readonly Image _buttonSpecPendantRestore = Office2010ControlBoxResources._2010ButtonMDIRestoreBlack;
private static readonly Image _buttonSpecRibbonMinimize = RibbonArrowImageResources.RibbonUp2010Black;
private static readonly Image _buttonSpecRibbonExpand = RibbonArrowImageResources.RibbonDown2010Black;

#endregion
//private static readonly Color _disabledRibbonText = Color.White; // Color.FromArgb(205, 205, 205);
private static readonly Color[] _trackBarColors = { Color.FromArgb( 17, 17, 17), // Tick marks
Color.FromArgb( 37, 37, 37), // Top track
Expand All @@ -56,7 +71,7 @@ public class PaletteMicrosoft365Black : PaletteMicrosoft365BlackThemeBase
Color.FromArgb(64, Color.White), // Outside position
Color.FromArgb(35, 35, 35) // Border (normal) position
};
private static readonly Color[] _schemeOfficeColors = { Color.FromArgb/*(76, 83, 92)*/(255, 255, 255), // TextLabelControl
private static readonly Color[] _schemeOfficeColors = { Color.FromArgb(76, 83, 92)/*(255, 255, 255)*/, // TextLabelControl
Color.Black, // TextButtonNormal
Color.Black, // TextButtonChecked
Color.FromArgb(106, 106, 106), // ButtonNormalBorder1
Expand Down Expand Up @@ -5048,4 +5063,4 @@ protected override void OnUserPreferenceChanged(object sender, UserPreferenceCha

#endregion

}
}
62 changes: 31 additions & 31 deletions Source/Krypton Components/Krypton.Toolkit/Rendering/ThemeManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,27 +73,27 @@ public class ThemeManager

"Office 2013 - Dark Gray",

"Office 365 - Black",
"Microsoft 365 - Black",

"Office 365 - Black (Dark Mode)",
"Microsoft 365 - Black (Dark Mode)",

//"Office 365 - Black (Light Mode)",
//"Microsoft 365 - Black (Light Mode)",

"Office 365 - Blue",
"Microsoft 365 - Blue",

"Office 365 - Blue (Dark Mode)",
"Microsoft 365 - Blue (Dark Mode)",

"Office 365 - Blue (Light Mode)",
"Microsoft 365 - Blue (Light Mode)",

"Office 365 - Dark Gray",
"Microsoft 365 - Dark Gray",

"Office 365 - Silver",
"Microsoft 365 - Silver",

"Office 365 - Silver (Dark Mode)",
"Microsoft 365 - Silver (Dark Mode)",

"Office 365 - Silver (Light Mode)",
"Microsoft 365 - Silver (Light Mode)",

"Office 365 - White",
"Microsoft 365 - White",

"Sparkle - Blue",

Expand Down Expand Up @@ -372,34 +372,34 @@ public static void ApplyTheme(string themeName, KryptonManager manager)
case @"Sparkle - Purple (Light Mode)":
ApplyTheme(PaletteModeManager.SparklePurpleLightMode, manager);
break;
case @"Office 365 - Blue":
case @"Microsoft 365 - Blue":
ApplyTheme(PaletteModeManager.Microsoft365Blue, manager);
break;
case @"Office 365 - Blue (Dark Mode)":
case @"Microsoft 365 - Blue (Dark Mode)":
ApplyTheme(PaletteModeManager.Microsoft365BlueDarkMode, manager);
break;
case @"Office 365 - Blue (Light Mode)":
case @"Microsoft 365 - Blue (Light Mode)":
ApplyTheme(PaletteModeManager.Microsoft365BlueLightMode, manager);
break;
case @"Office 365 - Silver":
case @"Microsoft 365 - Silver":
ApplyTheme(PaletteModeManager.Microsoft365Silver, manager);
break;
case @"Office 365 - Silver (Dark Mode)":
case @"Microsoft 365 - Silver (Dark Mode)":
ApplyTheme(PaletteModeManager.Microsoft365SilverDarkMode, manager);
break;
case @"Office 365 - Silver (Light Mode)":
case @"Microsoft 365 - Silver (Light Mode)":
ApplyTheme(PaletteModeManager.Microsoft365SilverLightMode, manager);
break;
case @"Office 365 - White":
case @"Microsoft 365 - White":
ApplyTheme(PaletteModeManager.Microsoft365White, manager);
break;
case @"Office 365 - Black":
case @"Microsoft 365 - Black":
ApplyTheme(PaletteModeManager.Microsoft365Black, manager);
break;
case @"Office 365 - Black (Dark Mode)":
case @"Microsoft 365 - Black (Dark Mode)":
ApplyTheme(PaletteModeManager.Microsoft365BlackDarkMode, manager);
break;
case @"Office 365 - Dark Gray":
case @"Microsoft 365 - Dark Gray":
ApplyTheme(PaletteModeManager.Microsoft365DarkGray, manager);
break;
default:
Expand Down Expand Up @@ -468,16 +468,16 @@ public static string ReturnPaletteModeManagerAsString(PaletteModeManager palette
PaletteModeManager.SparkleBlue => "Sparkle - Blue",
PaletteModeManager.SparkleOrange => "Sparkle - Orange",
PaletteModeManager.SparklePurple => "Sparkle - Purple",
PaletteModeManager.Microsoft365Blue => "Office 365 - Blue",
PaletteModeManager.Microsoft365BlueDarkMode => "Office 365 - Blue (Dark Mode)",
PaletteModeManager.Microsoft365BlueLightMode => "Office 365 - Blue (Light Mode)",
PaletteModeManager.Microsoft365Silver => "Office 365 - Silver",
PaletteModeManager.Microsoft365SilverDarkMode => "Office 365 - Silver (Dark Mode)",
PaletteModeManager.Microsoft365SilverLightMode => "Office 365 - Silver (Light Mode)",
PaletteModeManager.Microsoft365White => "Office 365 - White",
PaletteModeManager.Microsoft365Black => "Office 365 - Black",
PaletteModeManager.Microsoft365BlackDarkMode => "Office 365 - Black (Dark Mode)",
PaletteModeManager.Microsoft365DarkGray => "Office 365 - Dark Gray",
PaletteModeManager.Microsoft365Blue => "Microsoft 365 - Blue",
PaletteModeManager.Microsoft365BlueDarkMode => "Microsoft 365 - Blue (Dark Mode)",
PaletteModeManager.Microsoft365BlueLightMode => "Microsoft 365 - Blue (Light Mode)",
PaletteModeManager.Microsoft365Silver => "Microsoft 365 - Silver",
PaletteModeManager.Microsoft365SilverDarkMode => "Microsoft 365 - Silver (Dark Mode)",
PaletteModeManager.Microsoft365SilverLightMode => "Microsoft 365 - Silver (Light Mode)",
PaletteModeManager.Microsoft365White => "Microsoft 365 - White",
PaletteModeManager.Microsoft365Black => "Microsoft 365 - Black",
PaletteModeManager.Microsoft365BlackDarkMode => "Microsoft 365 - Black (Dark Mode)",
PaletteModeManager.Microsoft365DarkGray => "Microsoft 365 - Dark Gray",
_ => null
};
}
Expand Down

0 comments on commit e9f7298

Please sign in to comment.