1berry/ShareX
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed "Use custom theme" checkbox

Browse Source
This commit is contained in:
Jaex 2025-05-22 15:15:55 +03:00
parent ec56715b3b
commit 262970d344
23 changed files with 120 additions and 315 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ShareX.HelpersLib/Controls/MyPictureBox.cs
View File

@ -195,18 +195,10 @@ namespace ShareX.HelpersLib
public void UpdateTheme()
{
if (ShareXResources.UseCustomTheme)
{
lblImageSize.BackColor = ShareXResources.Theme.BackgroundColor;
lblImageSize.ForeColor = ShareXResources.Theme.TextColor;
lblImageSize.BackColor = ShareXResources.Theme.BackgroundColor;
lblImageSize.ForeColor = ShareXResources.Theme.TextColor;
ShareXResources.ApplyCustomThemeToContextMenuStrip(cmsMenu);
}
else
{
lblImageSize.BackColor = SystemColors.Window;
lblImageSize.ForeColor = SystemColors.ControlText;
}
ShareXResources.ApplyCustomThemeToContextMenuStrip(cmsMenu);
}
public void UpdateCheckers(bool forceUpdate = false)

33
ShareX.HelpersLib/Extensions/FormExtensions.cs
View File

@ -286,29 +286,22 @@ namespace ShareX.HelpersLib
lv.DrawColumnHeader += (sender, e) =>
{
if (ShareXResources.UseCustomTheme)
using (Brush brush = new SolidBrush(ShareXResources.Theme.BackgroundColor))
{
using (Brush brush = new SolidBrush(ShareXResources.Theme.BackgroundColor))
{
e.Graphics.FillRectangle(brush, e.Bounds);
}
TextRenderer.DrawText(e.Graphics, e.Header.Text, e.Font, e.Bounds.LocationOffset(2, 0).SizeOffset(-4, 0), ShareXResources.Theme.TextColor,
TextFormatFlags.Left | TextFormatFlags.VerticalCenter | TextFormatFlags.EndEllipsis);
if (e.Bounds.Right < lv.ClientRectangle.Right)
{
using (Pen pen = new Pen(ShareXResources.Theme.SeparatorDarkColor))
using (Pen pen2 = new Pen(ShareXResources.Theme.SeparatorLightColor))
{
e.Graphics.DrawLine(pen, e.Bounds.Right - 2, e.Bounds.Top, e.Bounds.Right - 2, e.Bounds.Bottom - 1);
e.Graphics.DrawLine(pen2, e.Bounds.Right - 1, e.Bounds.Top, e.Bounds.Right - 1, e.Bounds.Bottom - 1);
}
}
e.Graphics.FillRectangle(brush, e.Bounds);
}
else
TextRenderer.DrawText(e.Graphics, e.Header.Text, e.Font, e.Bounds.LocationOffset(2, 0).SizeOffset(-4, 0), ShareXResources.Theme.TextColor,
TextFormatFlags.Left | TextFormatFlags.VerticalCenter | TextFormatFlags.EndEllipsis);
if (e.Bounds.Right < lv.ClientRectangle.Right)
{
e.DrawDefault = true;
using (Pen pen = new Pen(ShareXResources.Theme.SeparatorDarkColor))
using (Pen pen2 = new Pen(ShareXResources.Theme.SeparatorLightColor))
{
e.Graphics.DrawLine(pen, e.Bounds.Right - 2, e.Bounds.Top, e.Bounds.Right - 2, e.Bounds.Bottom - 1);
e.Graphics.DrawLine(pen2, e.Bounds.Right - 1, e.Bounds.Top, e.Bounds.Right - 1, e.Bounds.Bottom - 1);
}
}
};
}

5
ShareX.HelpersLib/Forms/MyMessageBox.cs
View File

@ -149,10 +149,7 @@ namespace ShareX.HelpersLib
ShareXResources.ApplyTheme(this);
if (ShareXResources.UseCustomTheme)
{
panel.BackColor = ShareXResources.Theme.BorderColor;
}
panel.BackColor = ShareXResources.Theme.BorderColor;
}
private void MyMessageBox_Shown(object sender, EventArgs e)

5
ShareX.HelpersLib/NameParser/CodeMenu.cs
View File

@ -105,10 +105,7 @@ namespace ShareX.HelpersLib
tsmiClose.Click += (sender, e) => Close();
Items.Add(tsmiClose);
if (ShareXResources.UseCustomTheme)
{
ShareXResources.ApplyCustomThemeToContextMenuStrip(this);
}
ShareXResources.ApplyCustomThemeToContextMenuStrip(this);
if (textBoxBase != null)
{

41
ShareX.HelpersLib/ShareXResources.cs
View File

@ -43,21 +43,7 @@ namespace ShareX.HelpersLib
}
}
private static bool useCustomTheme;
public static bool UseCustomTheme
{
get
{
return useCustomTheme && Theme != null;
}
set
{
useCustomTheme = value;
}
}
public static bool IsDarkTheme => UseCustomTheme && Theme.IsDarkTheme;
public static bool IsDarkTheme => Theme.IsDarkTheme;
private static bool useWhiteIcon;
@ -135,21 +121,18 @@ namespace ShareX.HelpersLib
form.Icon = Icon;
}
if (UseCustomTheme)
ApplyCustomThemeToControl(form);
IContainer components = form.GetType().GetField("components", BindingFlags.NonPublic | BindingFlags.Instance)?.GetValue(form) as IContainer;
ApplyCustomThemeToComponents(components);
if (form.IsHandleCreated)
{
ApplyCustomThemeToControl(form);
IContainer components = form.GetType().GetField("components", BindingFlags.NonPublic | BindingFlags.Instance)?.GetValue(form) as IContainer;
ApplyCustomThemeToComponents(components);
if (form.IsHandleCreated)
{
NativeMethods.UseImmersiveDarkMode(form.Handle, Theme.IsDarkTheme);
}
else
{
form.HandleCreated += (s, e) => NativeMethods.UseImmersiveDarkMode(form.Handle, Theme.IsDarkTheme);
}
NativeMethods.UseImmersiveDarkMode(form.Handle, Theme.IsDarkTheme);
}
else
{
form.HandleCreated += (s, e) => NativeMethods.UseImmersiveDarkMode(form.Handle, Theme.IsDarkTheme);
}
}

6
ShareX.HistoryLib/Forms/ImageHistoryForm.cs
View File

@ -57,11 +57,7 @@ namespace ShareX.HistoryLib
ilvImages.SetRenderer(new HistoryImageListViewRenderer());
ilvImages.ThumbnailSize = Settings.ThumbnailSize;
if (ShareXResources.UseCustomTheme)
{
ilvImages.BorderStyle = BorderStyle.None;
}
ilvImages.BorderStyle = BorderStyle.None;
him = new HistoryItemManager(uploadFile, editImage, pinToScreen);
him.GetHistoryItems += him_GetHistoryItems;

35
ShareX.HistoryLib/HistoryImageListViewRenderer.cs
View File

@ -40,33 +40,24 @@ namespace ShareX.HistoryLib
ItemDrawOrder = ItemDrawOrder.NormalSelectedHovered;
if (ShareXResources.UseCustomTheme)
{
ImageListView.BackColor = ShareXResources.Theme.BackgroundColor;
ImageListView.Colors.BackColor = ShareXResources.Theme.LightBackgroundColor;
ImageListView.Colors.BorderColor = ShareXResources.Theme.BorderColor;
ImageListView.Colors.ForeColor = ShareXResources.Theme.TextColor;
ImageListView.Colors.SelectedForeColor = ShareXResources.Theme.TextColor;
ImageListView.Colors.UnFocusedForeColor = ShareXResources.Theme.TextColor;
ImageListView.BackColor = ShareXResources.Theme.BackgroundColor;
ImageListView.Colors.BackColor = ShareXResources.Theme.LightBackgroundColor;
ImageListView.Colors.BorderColor = ShareXResources.Theme.BorderColor;
ImageListView.Colors.ForeColor = ShareXResources.Theme.TextColor;
ImageListView.Colors.SelectedForeColor = ShareXResources.Theme.TextColor;
ImageListView.Colors.UnFocusedForeColor = ShareXResources.Theme.TextColor;
Color hoverColor;
if (ShareXResources.IsDarkTheme)
{
hoverColor = ColorHelpers.LighterColor(ShareXResources.Theme.LightBackgroundColor, 0.1f);
}
else
{
hoverColor = ColorHelpers.DarkerColor(ShareXResources.Theme.LightBackgroundColor, 0.1f);
}
ImageListView.Colors.SelectedColor1 = ImageListView.Colors.HoverColor1 = ImageListView.Colors.UnFocusedColor1 =
ImageListView.Colors.SelectedColor2 = ImageListView.Colors.HoverColor2 = ImageListView.Colors.UnFocusedColor2 = hoverColor;
Color hoverColor;
if (ShareXResources.IsDarkTheme)
{
hoverColor = ColorHelpers.LighterColor(ShareXResources.Theme.LightBackgroundColor, 0.1f);
}
else
{
ImageListView.Colors.BackColor = SystemColors.Control;
ImageListView.Colors.SelectedColor1 = ImageListView.Colors.HoverColor1 = ImageListView.Colors.UnFocusedColor1 =
ImageListView.Colors.SelectedColor2 = ImageListView.Colors.HoverColor2 = ImageListView.Colors.UnFocusedColor2 = SystemColors.ControlLight;
hoverColor = ColorHelpers.DarkerColor(ShareXResources.Theme.LightBackgroundColor, 0.1f);
}
ImageListView.Colors.SelectedColor1 = ImageListView.Colors.HoverColor1 = ImageListView.Colors.UnFocusedColor1 =
ImageListView.Colors.SelectedColor2 = ImageListView.Colors.HoverColor2 = ImageListView.Colors.UnFocusedColor2 = hoverColor;
}
public override void DrawItem(Graphics g, ImageListViewItem item, ItemState state, Rectangle bounds)

11
ShareX.ImageEffectsLib/Forms/ImageEffectsForm.cs
View File

@ -376,16 +376,7 @@ namespace ShareX.ImageEffectsLib
if (PreviewImage != null) PreviewImage.Dispose();
PreviewImage = new Bitmap(size, size);
Color backgroundColor;
if (ShareXResources.UseCustomTheme)
{
backgroundColor = ShareXResources.Theme.BackgroundColor;
}
else
{
backgroundColor = Color.DarkGray;
}
Color backgroundColor = ShareXResources.Theme.BackgroundColor;
using (Graphics g = Graphics.FromImage(PreviewImage))
{

27
ShareX.ScreenCaptureLib/Forms/RegionCaptureForm.cs
View File

@ -162,26 +162,13 @@ namespace ShareX.ScreenCaptureLib
infoFontBig = new Font("Verdana", 16, FontStyle.Bold);
markerPen = new Pen(Color.FromArgb(200, Color.Red));
if (ShareXResources.UseCustomTheme)
{
canvasBackgroundColor = ShareXResources.Theme.BackgroundColor;
canvasBorderColor = ShareXResources.Theme.BorderColor;
textColor = ShareXResources.Theme.TextColor;
textShadowColor = ShareXResources.Theme.BorderColor;
textBackgroundColor = Color.FromArgb(200, ShareXResources.Theme.BackgroundColor);
textOuterBorderColor = Color.FromArgb(200, ShareXResources.Theme.SeparatorDarkColor);
textInnerBorderColor = Color.FromArgb(200, ShareXResources.Theme.SeparatorLightColor);
}
else
{
canvasBackgroundColor = Color.FromArgb(200, 200, 200);
canvasBorderColor = Color.FromArgb(176, 176, 176);
textColor = Color.White;
textShadowColor = Color.Black;
textBackgroundColor = Color.FromArgb(200, Color.FromArgb(42, 131, 199));
textOuterBorderColor = Color.FromArgb(200, Color.White);
textInnerBorderColor = Color.FromArgb(200, Color.FromArgb(0, 81, 145));
}
canvasBackgroundColor = ShareXResources.Theme.BackgroundColor;
canvasBorderColor = ShareXResources.Theme.BorderColor;
textColor = ShareXResources.Theme.TextColor;
textShadowColor = ShareXResources.Theme.BorderColor;
textBackgroundColor = Color.FromArgb(200, ShareXResources.Theme.BackgroundColor);
textOuterBorderColor = Color.FromArgb(200, ShareXResources.Theme.SeparatorDarkColor);
textInnerBorderColor = Color.FromArgb(200, ShareXResources.Theme.SeparatorLightColor);
canvasBorderPen = new Pen(canvasBorderColor);
textBrush = new SolidBrush(textColor);

2
ShareX.ScreenCaptureLib/Forms/ScreenRecordForm.cs
View File

@ -382,7 +382,7 @@ namespace ShareX.ScreenCaptureLib
protected override void OnPaint(PaintEventArgs e)
{
using (Pen pen1 = new Pen(ShareXResources.UseCustomTheme ? ShareXResources.Theme.BorderColor : Color.Black) { DashPattern = new float[] { 5, 5 } })
using (Pen pen1 = new Pen(ShareXResources.Theme.BorderColor) { DashPattern = new float[] { 5, 5 } })
using (Pen pen2 = new Pen(borderColor) { DashPattern = new float[] { 5, 5 }, DashOffset = 5 })
{
e.Graphics.DrawRectangleProper(pen1, borderRectangle0Based);

2
ShareX.ScreenCaptureLib/Forms/ScrollingCaptureRegionForm.cs
View File

@ -60,7 +60,7 @@ namespace ShareX.ScreenCaptureLib
protected override void OnPaint(PaintEventArgs e)
{
using (Pen pen1 = new Pen(ShareXResources.UseCustomTheme ? ShareXResources.Theme.BorderColor : Color.Black) { DashPattern = new float[] { 5, 5 } })
using (Pen pen1 = new Pen(ShareXResources.Theme.BorderColor) { DashPattern = new float[] { 5, 5 } })
using (Pen pen2 = new Pen(Color.Lime) { DashPattern = new float[] { 5, 5 }, DashOffset = 5 })
{
e.Graphics.DrawRectangleProper(pen1, borderRectangleClient);

15
ShareX.ScreenCaptureLib/Helpers/StickerImageListViewRenderer.cs
View File

@ -43,15 +43,12 @@ namespace ShareX.ScreenCaptureLib
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.UseCustomTheme)
{
ImageListView.BackColor = ShareXResources.Theme.BackgroundColor;
ImageListView.Colors.BackColor = ShareXResources.Theme.LightBackgroundColor;
ImageListView.Colors.BorderColor = ShareXResources.Theme.BorderColor;
ImageListView.Colors.ForeColor = ShareXResources.Theme.TextColor;
ImageListView.Colors.SelectedForeColor = ShareXResources.Theme.TextColor;
ImageListView.Colors.UnFocusedForeColor = ShareXResources.Theme.TextColor;
}
ImageListView.BackColor = ShareXResources.Theme.BackgroundColor;
ImageListView.Colors.BackColor = ShareXResources.Theme.LightBackgroundColor;
ImageListView.Colors.BorderColor = ShareXResources.Theme.BorderColor;
ImageListView.Colors.ForeColor = ShareXResources.Theme.TextColor;
ImageListView.Colors.SelectedForeColor = ShareXResources.Theme.TextColor;
ImageListView.Colors.UnFocusedForeColor = ShareXResources.Theme.TextColor;
}
public override void DrawItem(Graphics g, ImageListViewItem item, ItemState state, Rectangle bounds)

1
ShareX/ApplicationConfig.cs
View File

@ -81,7 +81,6 @@ namespace ShareX
#region Theme
public bool UseCustomTheme = true;
public List<ShareXTheme> Themes = ShareXTheme.GetDefaultThemes();
public int SelectedTheme = 0;

5
ShareX/Controls/HotkeySelectionControl.cs
View File

@ -72,10 +72,7 @@ namespace ShareX
}, cmsTask);
SetEnumCheckedContextMenu(HotkeySettings.TaskSettings.Job, cmsTask);
if (ShareXResources.UseCustomTheme)
{
ShareXResources.ApplyCustomThemeToControl(this);
}
ShareXResources.ApplyCustomThemeToControl(this);
UpdateHotkeyStatus();
}

33
ShareX/Controls/NewsListControl.cs
View File

@ -47,29 +47,16 @@ namespace ShareX
public void UpdateTheme()
{
if (ShareXResources.UseCustomTheme)
{
dgvNews.BackgroundColor = ShareXResources.Theme.BackgroundColor;
dgvNews.DefaultCellStyle.BackColor = dgvNews.DefaultCellStyle.SelectionBackColor = ShareXResources.Theme.BackgroundColor;
dgvNews.DefaultCellStyle.ForeColor = dgvNews.DefaultCellStyle.SelectionForeColor = ShareXResources.Theme.TextColor;
dgvNews.AlternatingRowsDefaultCellStyle.BackColor = dgvNews.AlternatingRowsDefaultCellStyle.SelectionBackColor =
ColorHelpers.LighterColor(ShareXResources.Theme.BackgroundColor, 0.02f);
dgvNews.GridColor = ShareXResources.Theme.BorderColor;
}
else
{
dgvNews.BackgroundColor = SystemColors.Window;
dgvNews.DefaultCellStyle.BackColor = dgvNews.DefaultCellStyle.SelectionBackColor = SystemColors.Window;
dgvNews.DefaultCellStyle.ForeColor = dgvNews.DefaultCellStyle.SelectionForeColor = SystemColors.ControlText;
dgvNews.AlternatingRowsDefaultCellStyle.BackColor = dgvNews.AlternatingRowsDefaultCellStyle.SelectionBackColor =
ColorHelpers.DarkerColor(SystemColors.Window, 0.02f);
dgvNews.GridColor = ProfessionalColors.SeparatorDark;
}
dgvNews.BackgroundColor = ShareXResources.Theme.BackgroundColor;
dgvNews.DefaultCellStyle.BackColor = dgvNews.DefaultCellStyle.SelectionBackColor = ShareXResources.Theme.BackgroundColor;
dgvNews.DefaultCellStyle.ForeColor = dgvNews.DefaultCellStyle.SelectionForeColor = ShareXResources.Theme.TextColor;
dgvNews.AlternatingRowsDefaultCellStyle.BackColor = dgvNews.AlternatingRowsDefaultCellStyle.SelectionBackColor =
ColorHelpers.LighterColor(ShareXResources.Theme.BackgroundColor, 0.02f);
dgvNews.GridColor = ShareXResources.Theme.BorderColor;
foreach (DataGridViewRow row in dgvNews.Rows)
{
row.Cells[2].Style.ForeColor = row.Cells[2].Style.SelectionForeColor =
ShareXResources.UseCustomTheme ? ShareXResources.Theme.TextColor : SystemColors.ControlText;
row.Cells[2].Style.ForeColor = row.Cells[2].Style.SelectionForeColor = ShareXResources.Theme.TextColor;
}
}
@ -179,8 +166,7 @@ namespace ShareX
if (row.Tag is NewsItem newsItem && !string.IsNullOrEmpty(newsItem.URL))
{
dgvNews.Cursor = Cursors.Hand;
row.Cells[e.ColumnIndex].Style.ForeColor = row.Cells[e.ColumnIndex].Style.SelectionForeColor =
ShareXResources.UseCustomTheme ? Color.White : SystemColors.HotTrack;
row.Cells[e.ColumnIndex].Style.ForeColor = row.Cells[e.ColumnIndex].Style.SelectionForeColor = Color.White;
}
}
}
@ -192,8 +178,7 @@ namespace ShareX
DataGridViewRow row = dgvNews.Rows[e.RowIndex];
if (row.Tag is NewsItem newsItem && !string.IsNullOrEmpty(newsItem.URL))
{
row.Cells[e.ColumnIndex].Style.ForeColor = row.Cells[e.ColumnIndex].Style.SelectionForeColor =
ShareXResources.UseCustomTheme ? ShareXResources.Theme.TextColor : SystemColors.ControlText;
row.Cells[e.ColumnIndex].Style.ForeColor = row.Cells[e.ColumnIndex].Style.SelectionForeColor = ShareXResources.Theme.TextColor;
}
}

27
ShareX/Controls/TaskThumbnailPanel.cs
View File

@ -250,26 +250,13 @@ namespace ShareX
public void UpdateTheme()
{
if (ShareXResources.UseCustomTheme)
{
lblTitle.ForeColor = ShareXResources.Theme.TextColor;
lblTitle.TextShadowColor = ShareXResources.Theme.DarkBackgroundColor;
pThumbnail.PanelColor = ShareXResources.Theme.DarkBackgroundColor;
ttMain.BackColor = ShareXResources.Theme.BackgroundColor;
ttMain.ForeColor = ShareXResources.Theme.TextColor;
lblCombineHorizontal.BorderColor = ShareXResources.Theme.BorderColor;
lblCombineVertical.BorderColor = ShareXResources.Theme.BorderColor;
}
else
{
lblTitle.ForeColor = SystemColors.ControlText;
lblTitle.TextShadowColor = Color.Transparent;
pThumbnail.PanelColor = SystemColors.ControlLight;
ttMain.BackColor = SystemColors.Window;
ttMain.ForeColor = SystemColors.ControlText;
lblCombineHorizontal.BorderColor = Color.Black;
lblCombineVertical.BorderColor = Color.Black;
}
lblTitle.ForeColor = ShareXResources.Theme.TextColor;
lblTitle.TextShadowColor = ShareXResources.Theme.DarkBackgroundColor;
pThumbnail.PanelColor = ShareXResources.Theme.DarkBackgroundColor;
ttMain.BackColor = ShareXResources.Theme.BackgroundColor;
ttMain.ForeColor = ShareXResources.Theme.TextColor;
lblCombineHorizontal.BorderColor = ShareXResources.Theme.BorderColor;
lblCombineVertical.BorderColor = ShareXResources.Theme.BorderColor;
}
public void UpdateTitle()

9
ShareX/Controls/TaskThumbnailView.cs
View File

@ -171,14 +171,7 @@ namespace ShareX
public void UpdateTheme()
{
if (ShareXResources.UseCustomTheme)
{
BackColor = ShareXResources.Theme.BackgroundColor;
}
else
{
BackColor = SystemColors.Window;
}
BackColor = ShareXResources.Theme.BackgroundColor;
foreach (TaskThumbnailPanel panel in Panels)
{

11
ShareX/Forms/ApplicationSettingsForm.Designer.cs generated
View File

@ -60,7 +60,6 @@ namespace ShareX
this.btnThemeAdd = new System.Windows.Forms.Button();
this.cbThemes = new System.Windows.Forms.ComboBox();
this.pgTheme = new System.Windows.Forms.PropertyGrid();
this.cbUseCustomTheme = new System.Windows.Forms.CheckBox();
this.eiTheme = new ShareX.HelpersLib.ExportImportControl();
this.tpIntegration = new System.Windows.Forms.TabPage();
this.gbFirefox = new System.Windows.Forms.GroupBox();
@ -407,7 +406,6 @@ namespace ShareX
this.tpTheme.Controls.Add(this.btnThemeAdd);
this.tpTheme.Controls.Add(this.cbThemes);
this.tpTheme.Controls.Add(this.pgTheme);
this.tpTheme.Controls.Add(this.cbUseCustomTheme);
this.tpTheme.Controls.Add(this.eiTheme);
resources.ApplyResources(this.tpTheme, "tpTheme");
this.tpTheme.Name = "tpTheme";
@ -450,13 +448,6 @@ namespace ShareX
this.pgTheme.ToolbarVisible = false;
this.pgTheme.PropertyValueChanged += new System.Windows.Forms.PropertyValueChangedEventHandler(this.pgTheme_PropertyValueChanged);
//
// cbUseCustomTheme
//
resources.ApplyResources(this.cbUseCustomTheme, "cbUseCustomTheme");
this.cbUseCustomTheme.Name = "cbUseCustomTheme";
this.cbUseCustomTheme.UseVisualStyleBackColor = true;
this.cbUseCustomTheme.CheckedChanged += new System.EventHandler(this.CbUseCustomTheme_CheckedChanged);
//
// eiTheme
//
this.eiTheme.DefaultFileName = null;
@ -1446,7 +1437,6 @@ namespace ShareX
this.tpGeneral.ResumeLayout(false);
this.tpGeneral.PerformLayout();
this.tpTheme.ResumeLayout(false);
this.tpTheme.PerformLayout();
this.tpIntegration.ResumeLayout(false);
this.gbFirefox.ResumeLayout(false);
this.gbFirefox.PerformLayout();
@ -1604,7 +1594,6 @@ namespace ShareX
private System.Windows.Forms.CheckBox cbEditWithShareX;
private System.Windows.Forms.Button btnCheckDevBuild;
private System.Windows.Forms.Button btnPersonalFolderPathApply;
private System.Windows.Forms.CheckBox cbUseCustomTheme;
private System.Windows.Forms.CheckBox cbUseWhiteShareXIcon;
private System.Windows.Forms.TabPage tpTheme;
private System.Windows.Forms.PropertyGrid pgTheme;

14
ShareX/Forms/ApplicationSettingsForm.cs
View File

@ -110,7 +110,6 @@ namespace ShareX
cbTrayIconProgressEnabled.Checked = Program.Settings.TrayIconProgressEnabled;
cbTaskbarProgressEnabled.Enabled = TaskbarManager.IsPlatformSupported;
cbTaskbarProgressEnabled.Checked = Program.Settings.TaskbarProgressEnabled;
cbUseCustomTheme.Checked = Program.Settings.UseCustomTheme;
cbUseWhiteShareXIcon.Checked = Program.Settings.UseWhiteShareXIcon;
cbRememberMainFormPosition.Checked = Program.Settings.RememberMainFormPosition;
cbRememberMainFormSize.Checked = Program.Settings.RememberMainFormSize;
@ -478,8 +477,7 @@ namespace ShareX
private void UpdateThemeControls()
{
btnThemeAdd.Enabled = eiTheme.Enabled = btnThemeReset.Enabled = pgTheme.Enabled = Program.Settings.UseCustomTheme;
cbThemes.Enabled = btnThemeRemove.Enabled = Program.Settings.UseCustomTheme && cbThemes.Items.Count > 0;
cbThemes.Enabled = btnThemeRemove.Enabled = cbThemes.Items.Count > 0;
}
private void ApplySelectedTheme()
@ -501,16 +499,6 @@ namespace ShareX
}
}
private void CbUseCustomTheme_CheckedChanged(object sender, EventArgs e)
{
if (ready)
{
Program.Settings.UseCustomTheme = cbUseCustomTheme.Checked;
UpdateThemeControls();
ApplySelectedTheme();
}
}
private void CbThemes_SelectedIndexChanged(object sender, EventArgs e)
{
if (ready)

80
ShareX/Forms/ApplicationSettingsForm.resx
View File

@ -532,7 +532,7 @@
<value>btnLanguages</value>
</data>
<data name="&gt;&gt;btnLanguages.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=16.0.2.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=17.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;btnLanguages.Parent" xml:space="preserve">
<value>tpGeneral</value>
@ -721,13 +721,13 @@
<value>NoControl</value>
</data>
<data name="btnThemeReset.Location" type="System.Drawing.Point, System.Drawing">
<value>400, 40</value>
<value>208, 48</value>
</data>
<data name="btnThemeReset.Size" type="System.Drawing.Size, System.Drawing">
<value>88, 24</value>
<value>104, 24</value>
</data>
<data name="btnThemeReset.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
<value>4</value>
</data>
<data name="btnThemeReset.Text" xml:space="preserve">
<value>Reset...</value>
@ -748,13 +748,13 @@
<value>NoControl</value>
</data>
<data name="btnThemeRemove.Location" type="System.Drawing.Point, System.Drawing">
<value>112, 40</value>
<value>128, 16</value>
</data>
<data name="btnThemeRemove.Size" type="System.Drawing.Size, System.Drawing">
<value>88, 24</value>
<value>104, 24</value>
</data>
<data name="btnThemeRemove.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
<value>1</value>
</data>
<data name="btnThemeRemove.Text" xml:space="preserve">
<value>Remove</value>
@ -775,13 +775,13 @@
<value>NoControl</value>
</data>
<data name="btnThemeAdd.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 40</value>
<value>16, 16</value>
</data>
<data name="btnThemeAdd.Size" type="System.Drawing.Size, System.Drawing">
<value>88, 24</value>
<value>104, 24</value>
</data>
<data name="btnThemeAdd.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
<value>0</value>
</data>
<data name="btnThemeAdd.Text" xml:space="preserve">
<value>Add</value>
@ -799,13 +799,13 @@
<value>2</value>
</data>
<data name="cbThemes.Location" type="System.Drawing.Point, System.Drawing">
<value>208, 14</value>
<value>240, 18</value>
</data>
<data name="cbThemes.Size" type="System.Drawing.Size, System.Drawing">
<value>280, 21</value>
<value>304, 21</value>
</data>
<data name="cbThemes.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
<value>2</value>
</data>
<data name="&gt;&gt;cbThemes.Name" xml:space="preserve">
<value>cbThemes</value>
@ -823,13 +823,13 @@
<value>False</value>
</data>
<data name="pgTheme.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 72</value>
<value>16, 80</value>
</data>
<data name="pgTheme.Size" type="System.Drawing.Size, System.Drawing">
<value>472, 312</value>
<value>528, 312</value>
</data>
<data name="pgTheme.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
<value>5</value>
</data>
<data name="&gt;&gt;pgTheme.Name" xml:space="preserve">
<value>pgTheme</value>
@ -843,56 +843,26 @@
<data name="&gt;&gt;pgTheme.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="cbUseCustomTheme.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cbUseCustomTheme.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="cbUseCustomTheme.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 16</value>
</data>
<data name="cbUseCustomTheme.Size" type="System.Drawing.Size, System.Drawing">
<value>114, 17</value>
</data>
<data name="cbUseCustomTheme.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="cbUseCustomTheme.Text" xml:space="preserve">
<value>Use custom theme</value>
</data>
<data name="&gt;&gt;cbUseCustomTheme.Name" xml:space="preserve">
<value>cbUseCustomTheme</value>
</data>
<data name="&gt;&gt;cbUseCustomTheme.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;cbUseCustomTheme.Parent" xml:space="preserve">
<value>tpTheme</value>
</data>
<data name="&gt;&gt;cbUseCustomTheme.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="eiTheme.Location" type="System.Drawing.Point, System.Drawing">
<value>208, 40</value>
<value>16, 48</value>
</data>
<data name="eiTheme.Size" type="System.Drawing.Size, System.Drawing">
<value>185, 24</value>
</data>
<data name="eiTheme.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
<value>3</value>
</data>
<data name="&gt;&gt;eiTheme.Name" xml:space="preserve">
<value>eiTheme</value>
</data>
<data name="&gt;&gt;eiTheme.Type" xml:space="preserve">
<value>ShareX.HelpersLib.ExportImportControl, ShareX.HelpersLib, Version=16.0.2.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.ExportImportControl, ShareX.HelpersLib, Version=17.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;eiTheme.Parent" xml:space="preserve">
<value>tpTheme</value>
</data>
<data name="&gt;&gt;eiTheme.ZOrder" xml:space="preserve">
<value>6</value>
<value>5</value>
</data>
<data name="tpTheme.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
@ -2785,7 +2755,7 @@
<value>lvClipboardFormats</value>
</data>
<data name="&gt;&gt;lvClipboardFormats.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=16.0.2.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=17.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvClipboardFormats.Parent" xml:space="preserve">
<value>tpClipboardFormats</value>
@ -2836,7 +2806,7 @@
<value>lvSecondaryFileUploaders</value>
</data>
<data name="&gt;&gt;lvSecondaryFileUploaders.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=16.0.2.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=17.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvSecondaryFileUploaders.Parent" xml:space="preserve">
<value>gbSecondaryFileUploaders</value>
@ -2917,7 +2887,7 @@
<value>lvSecondaryImageUploaders</value>
</data>
<data name="&gt;&gt;lvSecondaryImageUploaders.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=16.0.2.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=17.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvSecondaryImageUploaders.Parent" xml:space="preserve">
<value>gbSecondaryImageUploaders</value>
@ -2968,7 +2938,7 @@
<value>lvSecondaryTextUploaders</value>
</data>
<data name="&gt;&gt;lvSecondaryTextUploaders.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=16.0.2.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=17.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvSecondaryTextUploaders.Parent" xml:space="preserve">
<value>gbSecondaryTextUploaders</value>
@ -4078,7 +4048,7 @@
<value>tttvMain</value>
</data>
<data name="&gt;&gt;tttvMain.Type" xml:space="preserve">
<value>ShareX.HelpersLib.TabToTreeView, ShareX.HelpersLib, Version=16.0.2.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.TabToTreeView, ShareX.HelpersLib, Version=17.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;tttvMain.Parent" xml:space="preserve">
<value>$this</value>

5
ShareX/Forms/ClipboardUploadForm.cs
View File

@ -46,10 +46,7 @@ namespace ShareX
ShareXResources.ApplyTheme(this, true);
this.taskSettings = taskSettings;
if (ShareXResources.UseCustomTheme)
{
lblQuestion.BackColor = ShareXResources.Theme.BorderColor;
}
lblQuestion.BackColor = ShareXResources.Theme.BorderColor;
cbDontShowThisWindow.Visible = showCheckBox;

49
ShareX/Forms/MainForm.cs
View File

@ -815,47 +815,26 @@ namespace ShareX
}
ShareXResources.Theme = Program.Settings.Themes[Program.Settings.SelectedTheme];
ShareXResources.UseCustomTheme = Program.Settings.UseCustomTheme;
if (IsHandleCreated)
{
NativeMethods.UseImmersiveDarkMode(Handle, ShareXResources.IsDarkTheme);
}
if (ShareXResources.UseCustomTheme)
{
BackColor = ShareXResources.Theme.BackgroundColor;
tsMain.Font = ShareXResources.Theme.MenuFont;
tsMain.Renderer = new ToolStripDarkRenderer();
tsMain.DrawCustomBorder = false;
ShareXResources.ApplyCustomThemeToContextMenuStrip(cmsTray);
ShareXResources.ApplyCustomThemeToContextMenuStrip(cmsTaskInfo);
ttMain.BackColor = ShareXResources.Theme.BackgroundColor;
ttMain.ForeColor = ShareXResources.Theme.TextColor;
lvUploads.BackColor = ShareXResources.Theme.BackgroundColor;
lvUploads.ForeColor = ShareXResources.Theme.TextColor;
scMain.SplitterColor = ShareXResources.Theme.BackgroundColor;
scMain.SplitterLineColor = ShareXResources.Theme.BorderColor;
ShareXResources.ApplyCustomThemeToControl(dgvHotkeys);
dgvHotkeys.BackgroundColor = ShareXResources.Theme.BackgroundColor;
}
else
{
BackColor = SystemColors.Window;
tsMain.Renderer = new ToolStripCustomRenderer();
tsMain.DrawCustomBorder = true;
cmsTray.Renderer = new ToolStripCustomRenderer();
cmsTray.Opacity = 1;
cmsTaskInfo.Renderer = new ToolStripCustomRenderer();
cmsTaskInfo.Opacity = 1;
ttMain.BackColor = SystemColors.Window;
ttMain.ForeColor = SystemColors.ControlText;
lvUploads.BackColor = SystemColors.Window;
lvUploads.ForeColor = SystemColors.ControlText;
scMain.SplitterColor = Color.White;
scMain.SplitterLineColor = ProfessionalColors.SeparatorDark;
dgvHotkeys.BackgroundColor = SystemColors.Window;
}
BackColor = ShareXResources.Theme.BackgroundColor;
tsMain.Font = ShareXResources.Theme.MenuFont;
tsMain.Renderer = new ToolStripDarkRenderer();
tsMain.DrawCustomBorder = false;
ShareXResources.ApplyCustomThemeToContextMenuStrip(cmsTray);
ShareXResources.ApplyCustomThemeToContextMenuStrip(cmsTaskInfo);
ttMain.BackColor = ShareXResources.Theme.BackgroundColor;
ttMain.ForeColor = ShareXResources.Theme.TextColor;
lvUploads.BackColor = ShareXResources.Theme.BackgroundColor;
lvUploads.ForeColor = ShareXResources.Theme.TextColor;
scMain.SplitterColor = ShareXResources.Theme.BackgroundColor;
scMain.SplitterLineColor = ShareXResources.Theme.BorderColor;
ShareXResources.ApplyCustomThemeToControl(dgvHotkeys);
dgvHotkeys.BackgroundColor = ShareXResources.Theme.BackgroundColor;
tsmiTweetMessage.Image = TaskHelpers.FindMenuIcon(HotkeyType.TweetMessage);
tsmiTrayTweetMessage.Image = TaskHelpers.FindMenuIcon(HotkeyType.TweetMessage);

5
ShareX/QuickTaskMenu.cs
View File

@ -105,10 +105,7 @@ namespace ShareX
tsmiCancel.Click += (sender, e) => cms.Close();
cms.Items.Add(tsmiCancel);
if (ShareXResources.UseCustomTheme)
{
ShareXResources.ApplyCustomThemeToContextMenuStrip(cms);
}
ShareXResources.ApplyCustomThemeToContextMenuStrip(cms);
Point cursorPosition = CaptureHelpers.GetCursorPosition();
cursorPosition.Offset(-10, -10);