CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-09-28 23:42:13 +12:00
Code Issues Projects Releases Packages Wiki Activity

Rename DarkTheme to CustomTheme

Browse source
This commit is contained in:
Jaex 2020-02-08 18:07:17 +03:00
parent 8984e25564
commit efcca39ae6
13 changed files with 79 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ShareX.HelpersLib/Extensions/Extensions.cs
View file

@ -715,7 +715,7 @@ public static void SetFontBold(this RichTextBox rtb)
rtb.SelectionFont = new Font(rtb.Font, FontStyle.Bold);
}
public static void SupportDarkTheme(this ListView lv)
public static void SupportCustomTheme(this ListView lv)
{
if (!lv.OwnerDraw)
{

2
ShareX.HelpersLib/Forms/ClipboardContentViewer.cs
View file

@ -43,7 +43,7 @@ public ClipboardContentViewer(bool showCheckBox = false)
InitializeComponent();
ShareXResources.ApplyTheme(this);
if (ShareXResources.ExperimentalDarkTheme)
if (ShareXResources.ExperimentalCustomTheme)
{
lblQuestion.BackColor = ShareXResources.Theme.BorderColor;
}

2
ShareX.HelpersLib/Forms/MyMessageBox.cs
View file

@ -149,7 +149,7 @@ public MyMessageBox(string text, string caption, MessageBoxButtons buttons = Mes
ShareXResources.ApplyTheme(this);
if (ShareXResources.ExperimentalDarkTheme)
if (ShareXResources.ExperimentalCustomTheme)
{
panel.BackColor = ShareXResources.Theme.BorderColor;
}

2
ShareX.HelpersLib/NameParser/CodeMenu.cs
View file

@ -65,7 +65,7 @@ public static ContextMenuStrip Create(TextBoxBase tb, CodeMenuItem[] items)
ShowImageMargin = false
};
if (ShareXResources.ExperimentalDarkTheme)
if (ShareXResources.ExperimentalCustomTheme)
{
cms.Renderer = new ToolStripDarkRenderer();
}

42
ShareX.HelpersLib/ShareXResources.cs
View file

@ -41,31 +41,31 @@ public static string UserAgent
}
}
private static bool useDarkTheme;
private static bool useCustomTheme;
public static bool UseCustomTheme
{
get
{
return useDarkTheme && Theme != null;
return useCustomTheme && Theme != null;
}
set
{
useDarkTheme = value;
useCustomTheme = value;
}
}
private static bool experimentalDarkTheme;
private static bool experimentalCustomTheme;
public static bool ExperimentalDarkTheme
public static bool ExperimentalCustomTheme
{
get
{
return UseCustomTheme && experimentalDarkTheme;
return UseCustomTheme && experimentalCustomTheme;
}
set
{
experimentalDarkTheme = value;
experimentalCustomTheme = value;
}
}
@ -84,9 +84,9 @@ public static void ApplyTheme(Form form, bool setIcon = true)
form.Icon = Icon;
}
if (ExperimentalDarkTheme)
if (ExperimentalCustomTheme)
{
ApplyDarkThemeToControl(form);
ApplyCustomThemeToControl(form);
if (form.IsHandleCreated)
{
@ -99,16 +99,16 @@ public static void ApplyTheme(Form form, bool setIcon = true)
}
}
private static void ApplyDarkThemeToControl(Control control)
private static void ApplyCustomThemeToControl(Control control)
{
if (control.ContextMenuStrip != null)
{
ApplyDarkThemeToContextMenuStrip(control.ContextMenuStrip);
ApplyCustomThemeToContextMenuStrip(control.ContextMenuStrip);
}
if (control is MenuButton mb && mb.Menu != null)
{
ApplyDarkThemeToContextMenuStrip(mb.Menu);
ApplyCustomThemeToContextMenuStrip(mb.Menu);
}
switch (control)
@ -142,7 +142,7 @@ private static void ApplyDarkThemeToControl(Control control)
case ListView lv:
lv.ForeColor = Theme.TextColor;
lv.BackColor = Theme.LightBackgroundColor;
lv.SupportDarkTheme();
lv.SupportCustomTheme();
return;
case SplitContainer sc:
sc.Panel1.BackColor = Theme.BackgroundColor;
@ -175,11 +175,11 @@ private static void ApplyDarkThemeToControl(Control control)
dgv.EnableHeadersVisualStyles = false;
break;
case ContextMenuStrip cms:
ApplyDarkThemeToContextMenuStrip(cms);
ApplyCustomThemeToContextMenuStrip(cms);
return;
case ToolStrip ts:
ts.Renderer = new ToolStripDarkRenderer();
ApplyDarkThemeToToolStripItemCollection(ts.Items);
ApplyCustomThemeToToolStripItemCollection(ts.Items);
return;
case LinkLabel ll:
ll.LinkColor = Theme.LinkColor;
@ -191,31 +191,31 @@ private static void ApplyDarkThemeToControl(Control control)
foreach (Control child in control.Controls)
{
ApplyDarkThemeToControl(child);
ApplyCustomThemeToControl(child);
}
}
public static void ApplyDarkThemeToContextMenuStrip(ContextMenuStrip cms)
public static void ApplyCustomThemeToContextMenuStrip(ContextMenuStrip cms)
{
cms.Renderer = new ToolStripDarkRenderer();
cms.Opacity = Theme.ContextMenuOpacityDouble;
ApplyDarkThemeToToolStripItemCollection(cms.Items);
ApplyCustomThemeToToolStripItemCollection(cms.Items);
}
private static void ApplyDarkThemeToToolStripItemCollection(ToolStripItemCollection collection)
private static void ApplyCustomThemeToToolStripItemCollection(ToolStripItemCollection collection)
{
foreach (ToolStripItem tsi in collection)
{
switch (tsi)
{
case ToolStripControlHost tsch:
ApplyDarkThemeToControl(tsch.Control);
ApplyCustomThemeToControl(tsch.Control);
break;
case ToolStripDropDownItem tsddi:
if (tsddi.DropDown != null)
{
tsddi.DropDown.Opacity = Theme.ContextMenuOpacityDouble;
ApplyDarkThemeToToolStripItemCollection(tsddi.DropDownItems);
ApplyCustomThemeToToolStripItemCollection(tsddi.DropDownItems);
}
break;
}

2
ShareX.HistoryLib/Forms/ImageHistoryForm.cs
View file

@ -56,7 +56,7 @@ public ImageHistoryForm(string historyPath, ImageHistorySettings settings, Actio
ilvImages.View = (View)Settings.ViewMode;
ilvImages.ThumbnailSize = Settings.ThumbnailSize;
if (ShareXResources.ExperimentalDarkTheme)
if (ShareXResources.ExperimentalCustomTheme)
{
ilvImages.BorderStyle = BorderStyle.None;
ilvImages.Colors.BackColor = ShareXResources.Theme.LightBackgroundColor;

2
ShareX.ScreenCaptureLib/Forms/StickerImageListViewRenderer.cs
View file

@ -43,7 +43,7 @@ public override void InitializeGraphics(Graphics g)
ImageListView.Colors.SelectedColor1 = ImageListView.Colors.HoverColor1 = ImageListView.Colors.UnFocusedColor1 = Color.FromArgb(252, 221, 132);
ImageListView.Colors.SelectedColor2 = ImageListView.Colors.HoverColor2 = ImageListView.Colors.UnFocusedColor2 = Color.Transparent;
if (ShareXResources.ExperimentalDarkTheme)
if (ShareXResources.ExperimentalCustomTheme)
{
ImageListView.BackColor = ShareXResources.Theme.BackgroundColor;
ImageListView.Colors.BackColor = ShareXResources.Theme.LightBackgroundColor;

2
ShareX/ApplicationConfig.cs
View file

@ -92,7 +92,7 @@ public ApplicationConfig()
public bool UseDarkTheme = true;
public bool UseCustomTheme = true;
public bool ExperimentalDarkTheme = true;
public bool ExperimentalCustomTheme = true;
public List<ShareXTheme> Themes = ShareXTheme.GetPresets();
public int SelectedTheme = 0;

20
ShareX/Forms/ApplicationSettingsForm.Designer.cs generated
View file

@ -58,7 +58,6 @@ private void InitializeComponent()
this.btnThemeRemove = new System.Windows.Forms.Button();
this.btnThemeAdd = new System.Windows.Forms.Button();
this.cbThemes = new System.Windows.Forms.ComboBox();
this.cbExperimentalDarkTheme = new System.Windows.Forms.CheckBox();
this.btnApplyTheme = new System.Windows.Forms.Button();
this.pgTheme = new System.Windows.Forms.PropertyGrid();
this.cbUseCustomTheme = new System.Windows.Forms.CheckBox();
@ -156,6 +155,7 @@ private void InitializeComponent()
this.tpAdvanced = new System.Windows.Forms.TabPage();
this.pgSettings = new System.Windows.Forms.PropertyGrid();
this.tttvMain = new ShareX.HelpersLib.TabToTreeView();
this.cbExperimentalCustomTheme = new System.Windows.Forms.CheckBox();
this.tcSettings.SuspendLayout();
this.tpGeneral.SuspendLayout();
this.tpTheme.SuspendLayout();
@ -355,12 +355,12 @@ private void InitializeComponent()
//
// tpTheme
//
this.tpTheme.Controls.Add(this.cbExperimentalCustomTheme);
this.tpTheme.Controls.Add(this.btnThemeReset);
this.tpTheme.Controls.Add(this.eiTheme);
this.tpTheme.Controls.Add(this.btnThemeRemove);
this.tpTheme.Controls.Add(this.btnThemeAdd);
this.tpTheme.Controls.Add(this.cbThemes);
this.tpTheme.Controls.Add(this.cbExperimentalDarkTheme);
this.tpTheme.Controls.Add(this.btnApplyTheme);
this.tpTheme.Controls.Add(this.pgTheme);
this.tpTheme.Controls.Add(this.cbUseCustomTheme);
@ -406,13 +406,6 @@ private void InitializeComponent()
this.cbThemes.Name = "cbThemes";
this.cbThemes.SelectedIndexChanged += new System.EventHandler(this.CbThemes_SelectedIndexChanged);
//
// cbExperimentalDarkTheme
//
resources.ApplyResources(this.cbExperimentalDarkTheme, "cbExperimentalDarkTheme");
this.cbExperimentalDarkTheme.Name = "cbExperimentalDarkTheme";
this.cbExperimentalDarkTheme.UseVisualStyleBackColor = true;
this.cbExperimentalDarkTheme.CheckedChanged += new System.EventHandler(this.CbExperimentalDarkTheme_CheckedChanged);
//
// btnApplyTheme
//
resources.ApplyResources(this.btnApplyTheme, "btnApplyTheme");
@ -1163,6 +1156,13 @@ private void InitializeComponent()
this.tttvMain.TreeViewSize = 175;
this.tttvMain.TabChanged += new ShareX.HelpersLib.TabToTreeView.TabChangedEventHandler(this.tttvMain_TabChanged);
//
// cbExperimentalCustomTheme
//
resources.ApplyResources(this.cbExperimentalCustomTheme, "cbExperimentalCustomTheme");
this.cbExperimentalCustomTheme.Name = "cbExperimentalCustomTheme";
this.cbExperimentalCustomTheme.UseVisualStyleBackColor = true;
this.cbExperimentalCustomTheme.CheckedChanged += new System.EventHandler(this.cbExperimentalCustomTheme_CheckedChanged);
//
// ApplicationSettingsForm
//
resources.ApplyResources(this, "$this");
@ -1338,7 +1338,6 @@ private void InitializeComponent()
private System.Windows.Forms.Button btnPersonalFolderPathApply;
private System.Windows.Forms.CheckBox cbUseCustomTheme;
private System.Windows.Forms.CheckBox cbUseWhiteShareXIcon;
private System.Windows.Forms.CheckBox cbExperimentalDarkTheme;
private System.Windows.Forms.TabPage tpTheme;
private System.Windows.Forms.Button btnApplyTheme;
private System.Windows.Forms.PropertyGrid pgTheme;
@ -1350,5 +1349,6 @@ private void InitializeComponent()
private System.Windows.Forms.Label lblExportImportNote;
private System.Windows.Forms.CheckBox cbExportHistory;
private System.Windows.Forms.CheckBox cbExportSettings;
private System.Windows.Forms.CheckBox cbExperimentalCustomTheme;
}
}

10
ShareX/Forms/ApplicationSettingsForm.cs
View file

@ -104,8 +104,8 @@ private void UpdateControls()
cbTaskbarProgressEnabled.Enabled = TaskbarManager.IsPlatformSupported;
cbTaskbarProgressEnabled.Checked = Program.Settings.TaskbarProgressEnabled;
cbUseCustomTheme.Checked = Program.Settings.UseCustomTheme;
cbExperimentalDarkTheme.Enabled = Program.Settings.UseCustomTheme;
cbExperimentalDarkTheme.Checked = Program.Settings.ExperimentalDarkTheme;
cbExperimentalCustomTheme.Enabled = Program.Settings.UseCustomTheme;
cbExperimentalCustomTheme.Checked = Program.Settings.ExperimentalCustomTheme;
cbUseWhiteShareXIcon.Checked = Program.Settings.UseWhiteShareXIcon;
cbRememberMainFormPosition.Checked = Program.Settings.RememberMainFormPosition;
cbRememberMainFormSize.Checked = Program.Settings.RememberMainFormSize;
@ -434,7 +434,7 @@ private void btnCheckDevBuild_Click(object sender, EventArgs e)
private void UpdateThemeControls()
{
cbExperimentalDarkTheme.Enabled = btnThemeAdd.Enabled = btnThemeReset.Enabled = pgTheme.Enabled = eiTheme.Enabled = Program.Settings.UseCustomTheme;
cbExperimentalCustomTheme.Enabled = btnThemeAdd.Enabled = btnThemeReset.Enabled = pgTheme.Enabled = eiTheme.Enabled = Program.Settings.UseCustomTheme;
cbThemes.Enabled = btnThemeRemove.Enabled = btnApplyTheme.Enabled = Program.Settings.UseCustomTheme && cbThemes.Items.Count > 0;
}
@ -464,9 +464,9 @@ private void CbUseCustomTheme_CheckedChanged(object sender, EventArgs e)
ApplySelectedTheme();
}
private void CbExperimentalDarkTheme_CheckedChanged(object sender, EventArgs e)
private void cbExperimentalCustomTheme_CheckedChanged(object sender, EventArgs e)
{
Program.Settings.ExperimentalDarkTheme = cbExperimentalDarkTheme.Checked;
Program.Settings.ExperimentalCustomTheme = cbExperimentalCustomTheme.Checked;
UpdateThemeControls();
ApplySelectedTheme();
}

65
ShareX/Forms/ApplicationSettingsForm.resx
View file

@ -672,6 +672,33 @@
<data name="&gt;&gt;tpGeneral.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="cbExperimentalCustomTheme.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cbExperimentalCustomTheme.Location" type="System.Drawing.Point, System.Drawing">
<value>208, 16</value>
</data>
<data name="cbExperimentalCustomTheme.Size" type="System.Drawing.Size, System.Drawing">
<value>190, 17</value>
</data>
<data name="cbExperimentalCustomTheme.TabIndex" type="System.Int32, mscorlib">
<value>26</value>
</data>
<data name="cbExperimentalCustomTheme.Text" xml:space="preserve">
<value>Apply custom theme to all windows</value>
</data>
<data name="&gt;&gt;cbExperimentalCustomTheme.Name" xml:space="preserve">
<value>cbExperimentalCustomTheme</value>
</data>
<data name="&gt;&gt;cbExperimentalCustomTheme.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;cbExperimentalCustomTheme.Parent" xml:space="preserve">
<value>tpTheme</value>
</data>
<data name="&gt;&gt;cbExperimentalCustomTheme.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="btnThemeReset.Location" type="System.Drawing.Point, System.Drawing">
<value>384, 40</value>
</data>
@ -694,7 +721,7 @@
<value>tpTheme</value>
</data>
<data name="&gt;&gt;btnThemeReset.ZOrder" xml:space="preserve">
<value>0</value>
<value>1</value>
</data>
<data name="eiTheme.Location" type="System.Drawing.Point, System.Drawing">
<value>280, 352</value>
@ -715,7 +742,7 @@
<value>tpTheme</value>
</data>
<data name="&gt;&gt;eiTheme.ZOrder" xml:space="preserve">
<value>1</value>
<value>2</value>
</data>
<data name="btnThemeRemove.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
@ -742,7 +769,7 @@
<value>tpTheme</value>
</data>
<data name="&gt;&gt;btnThemeRemove.ZOrder" xml:space="preserve">
<value>2</value>
<value>3</value>
</data>
<data name="btnThemeAdd.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
@ -769,7 +796,7 @@
<value>tpTheme</value>
</data>
<data name="&gt;&gt;btnThemeAdd.ZOrder" xml:space="preserve">
<value>3</value>
<value>4</value>
</data>
<data name="cbThemes.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 40</value>
@ -790,36 +817,6 @@
<value>tpTheme</value>
</data>
<data name="&gt;&gt;cbThemes.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="cbExperimentalDarkTheme.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cbExperimentalDarkTheme.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="cbExperimentalDarkTheme.Location" type="System.Drawing.Point, System.Drawing">
<value>208, 16</value>
</data>
<data name="cbExperimentalDarkTheme.Size" type="System.Drawing.Size, System.Drawing">
<value>155, 17</value>
</data>
<data name="cbExperimentalDarkTheme.TabIndex" type="System.Int32, mscorlib">
<value>20</value>
</data>
<data name="cbExperimentalDarkTheme.Text" xml:space="preserve">
<value>Experimental custom theme</value>
</data>
<data name="&gt;&gt;cbExperimentalDarkTheme.Name" xml:space="preserve">
<value>cbExperimentalDarkTheme</value>
</data>
<data name="&gt;&gt;cbExperimentalDarkTheme.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;cbExperimentalDarkTheme.Parent" xml:space="preserve">
<value>tpTheme</value>
</data>
<data name="&gt;&gt;cbExperimentalDarkTheme.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="btnApplyTheme.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">

8
ShareX/Forms/MainForm.cs
View file

@ -156,7 +156,7 @@ private void InitializeControls()
tsmiShareSelectedURL.DropDownItems.Add(tsmi);
}
lvUploads.SupportDarkTheme();
lvUploads.SupportCustomTheme();
ImageList il = new ImageList();
il.ColorDepth = ColorDepth.Depth32Bit;
@ -794,7 +794,7 @@ public void UpdateTheme()
ShareXResources.Theme = Program.Settings.Themes[Program.Settings.SelectedTheme];
ShareXResources.UseCustomTheme = Program.Settings.UseCustomTheme;
ShareXResources.ExperimentalDarkTheme = Program.Settings.ExperimentalDarkTheme;
ShareXResources.ExperimentalCustomTheme = Program.Settings.ExperimentalCustomTheme;
if (IsHandleCreated)
{
@ -807,8 +807,8 @@ public void UpdateTheme()
tsMain.DrawCustomBorder = false;
tsSocialButtons.Renderer = new ToolStripDarkRenderer();
tsSocialButtons.DrawCustomBorder = false;
ShareXResources.ApplyDarkThemeToContextMenuStrip(cmsTray);
ShareXResources.ApplyDarkThemeToContextMenuStrip(cmsTaskInfo);
ShareXResources.ApplyCustomThemeToContextMenuStrip(cmsTray);
ShareXResources.ApplyCustomThemeToContextMenuStrip(cmsTaskInfo);
ttMain.BackColor = ShareXResources.Theme.BackgroundColor;
ttMain.ForeColor = ShareXResources.Theme.TextColor;
lvUploads.BackColor = ShareXResources.Theme.BackgroundColor;

2
ShareX/QuickTaskMenu.cs
View file

@ -43,7 +43,7 @@ public void ShowMenu()
AutoClose = false
};
if (ShareXResources.ExperimentalDarkTheme)
if (ShareXResources.ExperimentalCustomTheme)
{
cms.Renderer = new ToolStripDarkRenderer();
}