mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-01 09:47:22 +13:00
Preparation to add new themes
This commit is contained in:
parent
40164f9413
commit
adae87e658
5 changed files with 30 additions and 37 deletions
|
@ -65,7 +65,7 @@ public static bool UseCustomTheme
|
||||||
|
|
||||||
public static Bitmap Logo => Resources.ShareX_Logo;
|
public static Bitmap Logo => Resources.ShareX_Logo;
|
||||||
|
|
||||||
public static ShareXTheme Theme { get; set; } = new ShareXTheme();
|
public static ShareXTheme Theme { get; set; } = ShareXTheme.DarkTheme;
|
||||||
|
|
||||||
public static void ApplyTheme(Form form, bool setIcon = true)
|
public static void ApplyTheme(Form form, bool setIcon = true)
|
||||||
{
|
{
|
||||||
|
|
|
@ -148,12 +148,7 @@ public Color BorderColor
|
||||||
[Browsable(false)]
|
[Browsable(false)]
|
||||||
public bool IsDarkTheme => ColorHelpers.IsDarkColor(BackgroundColor);
|
public bool IsDarkTheme => ColorHelpers.IsDarkColor(BackgroundColor);
|
||||||
|
|
||||||
public ShareXTheme()
|
private ShareXTheme()
|
||||||
{
|
|
||||||
SetDarkTheme();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void SetDarkTheme()
|
|
||||||
{
|
{
|
||||||
Name = "Dark";
|
Name = "Dark";
|
||||||
BackgroundColor = Color.FromArgb(42, 47, 56);
|
BackgroundColor = Color.FromArgb(42, 47, 56);
|
||||||
|
@ -174,33 +169,32 @@ public void SetDarkTheme()
|
||||||
SeparatorDarkColor = Color.FromArgb(22, 26, 31);
|
SeparatorDarkColor = Color.FromArgb(22, 26, 31);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetLightTheme()
|
public static ShareXTheme DarkTheme => new ShareXTheme();
|
||||||
{
|
|
||||||
Name = "Light";
|
|
||||||
BackgroundColor = Color.FromArgb(242, 242, 242);
|
|
||||||
LightBackgroundColor = Color.FromArgb(247, 247, 247);
|
|
||||||
DarkBackgroundColor = Color.FromArgb(235, 235, 235);
|
|
||||||
TextColor = Color.FromArgb(69, 69, 69);
|
|
||||||
BorderColor = Color.FromArgb(201, 201, 201);
|
|
||||||
CheckerColor = Color.FromArgb(247, 247, 247);
|
|
||||||
CheckerColor2 = Color.FromArgb(235, 235, 235);
|
|
||||||
CheckerSize = 15;
|
|
||||||
LinkColor = Color.FromArgb(166, 212, 255);
|
|
||||||
MenuHighlightColor = Color.FromArgb(247, 247, 247);
|
|
||||||
MenuHighlightBorderColor = Color.FromArgb(96, 143, 226);
|
|
||||||
MenuBorderColor = Color.FromArgb(201, 201, 201);
|
|
||||||
MenuCheckBackgroundColor = Color.FromArgb(225, 233, 244);
|
|
||||||
ContextMenuOpacity = 100;
|
|
||||||
SeparatorLightColor = Color.FromArgb(253, 253, 253);
|
|
||||||
SeparatorDarkColor = Color.FromArgb(189, 189, 189);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static List<ShareXTheme> GetPresets()
|
public static ShareXTheme LightTheme => new ShareXTheme()
|
||||||
{
|
{
|
||||||
ShareXTheme darkTheme = new ShareXTheme();
|
Name = "Light",
|
||||||
ShareXTheme lightTheme = new ShareXTheme();
|
BackgroundColor = Color.FromArgb(242, 242, 242),
|
||||||
lightTheme.SetLightTheme();
|
LightBackgroundColor = Color.FromArgb(247, 247, 247),
|
||||||
return new List<ShareXTheme>() { darkTheme, lightTheme };
|
DarkBackgroundColor = Color.FromArgb(235, 235, 235),
|
||||||
|
TextColor = Color.FromArgb(69, 69, 69),
|
||||||
|
BorderColor = Color.FromArgb(201, 201, 201),
|
||||||
|
CheckerColor = Color.FromArgb(247, 247, 247),
|
||||||
|
CheckerColor2 = Color.FromArgb(235, 235, 235),
|
||||||
|
CheckerSize = 15,
|
||||||
|
LinkColor = Color.FromArgb(166, 212, 255),
|
||||||
|
MenuHighlightColor = Color.FromArgb(247, 247, 247),
|
||||||
|
MenuHighlightBorderColor = Color.FromArgb(96, 143, 226),
|
||||||
|
MenuBorderColor = Color.FromArgb(201, 201, 201),
|
||||||
|
MenuCheckBackgroundColor = Color.FromArgb(225, 233, 244),
|
||||||
|
ContextMenuOpacity = 100,
|
||||||
|
SeparatorLightColor = Color.FromArgb(253, 253, 253),
|
||||||
|
SeparatorDarkColor = Color.FromArgb(189, 189, 189)
|
||||||
|
};
|
||||||
|
|
||||||
|
public static List<ShareXTheme> GetDefaultThemes()
|
||||||
|
{
|
||||||
|
return new List<ShareXTheme>() { DarkTheme, LightTheme };
|
||||||
}
|
}
|
||||||
|
|
||||||
public override string ToString()
|
public override string ToString()
|
||||||
|
|
|
@ -94,7 +94,7 @@ public ApplicationConfig()
|
||||||
public bool UseDarkTheme = true;
|
public bool UseDarkTheme = true;
|
||||||
|
|
||||||
public bool UseCustomTheme = true;
|
public bool UseCustomTheme = true;
|
||||||
public List<ShareXTheme> Themes = ShareXTheme.GetPresets();
|
public List<ShareXTheme> Themes = ShareXTheme.GetDefaultThemes();
|
||||||
public int SelectedTheme = 0;
|
public int SelectedTheme = 0;
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
|
@ -481,8 +481,7 @@ private void CbThemes_SelectedIndexChanged(object sender, EventArgs e)
|
||||||
|
|
||||||
private void BtnThemeAdd_Click(object sender, EventArgs e)
|
private void BtnThemeAdd_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
ShareXTheme theme = new ShareXTheme();
|
AddTheme(ShareXTheme.DarkTheme);
|
||||||
AddTheme(theme);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void BtnThemeRemove_Click(object sender, EventArgs e)
|
private void BtnThemeRemove_Click(object sender, EventArgs e)
|
||||||
|
@ -521,7 +520,7 @@ private void BtnThemeReset_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
if (MessageBox.Show(Resources.WouldYouLikeToResetThemes, "ShareX - " + Resources.Confirmation, MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.Yes)
|
if (MessageBox.Show(Resources.WouldYouLikeToResetThemes, "ShareX - " + Resources.Confirmation, MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.Yes)
|
||||||
{
|
{
|
||||||
Program.Settings.Themes = ShareXTheme.GetPresets();
|
Program.Settings.Themes = ShareXTheme.GetDefaultThemes();
|
||||||
Program.Settings.SelectedTheme = 0;
|
Program.Settings.SelectedTheme = 0;
|
||||||
|
|
||||||
cbThemes.Items.Clear();
|
cbThemes.Items.Clear();
|
||||||
|
|
|
@ -819,7 +819,7 @@ public void UpdateTheme()
|
||||||
{
|
{
|
||||||
if (Program.Settings.Themes == null || Program.Settings.Themes.Count == 0)
|
if (Program.Settings.Themes == null || Program.Settings.Themes.Count == 0)
|
||||||
{
|
{
|
||||||
Program.Settings.Themes = ShareXTheme.GetPresets();
|
Program.Settings.Themes = ShareXTheme.GetDefaultThemes();
|
||||||
Program.Settings.SelectedTheme = 0;
|
Program.Settings.SelectedTheme = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue