From 2d23166d9d43bd2f5dbf614c4d4eda01f02e8e6b Mon Sep 17 00:00:00 2001
From: Serge <5920850+seerge@users.noreply.github.com>
Date: Sun, 10 Mar 2024 21:18:58 +0100
Subject: [PATCH] UI Tweaks
---
app/Properties/Strings.Designer.cs | 27 ++++++++++
app/Properties/Strings.resx | 9 ++++
app/Settings.Designer.cs | 80 +++++++++++++++---------------
app/Settings.cs | 8 +--
4 files changed, 80 insertions(+), 44 deletions(-)
diff --git a/app/Properties/Strings.Designer.cs b/app/Properties/Strings.Designer.cs
index 0c57f92b..55c13aef 100644
--- a/app/Properties/Strings.Designer.cs
+++ b/app/Properties/Strings.Designer.cs
@@ -726,6 +726,15 @@ namespace GHelper.Properties {
}
}
+ ///
+ /// Looks up a localized string similar to Download Color Profiles.
+ ///
+ internal static string DownloadColorProfiles {
+ get {
+ return ResourceManager.GetString("DownloadColorProfiles", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Download.
///
@@ -908,6 +917,15 @@ namespace GHelper.Properties {
}
}
+ ///
+ /// Looks up a localized string similar to Flicker-free Dimming.
+ ///
+ internal static string FlickerFreeDimming {
+ get {
+ return ResourceManager.GetString("FlickerFreeDimming", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Process Fn+F hotkeys without Fn.
///
@@ -1871,6 +1889,15 @@ namespace GHelper.Properties {
}
}
+ ///
+ /// Looks up a localized string similar to Visual Mode.
+ ///
+ internal static string ViualMode {
+ get {
+ return ResourceManager.GetString("ViualMode", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Volume Down.
///
diff --git a/app/Properties/Strings.resx b/app/Properties/Strings.resx
index 4855137b..ef5f01cd 100644
--- a/app/Properties/Strings.resx
+++ b/app/Properties/Strings.resx
@@ -339,6 +339,9 @@
Discharging
+
+ Download Color Profiles
+
Download
@@ -401,6 +404,9 @@ Do you still want to continue?
Fans + Power
+
+ Flicker-free Dimming
+
Process Fn+F hotkeys without Fn
@@ -722,6 +728,9 @@ Do you still want to continue?
Vibration Strength
+
+ Visual Mode
+
Volume Down
diff --git a/app/Settings.Designer.cs b/app/Settings.Designer.cs
index f9aac008..993dada6 100644
--- a/app/Settings.Designer.cs
+++ b/app/Settings.Designer.cs
@@ -125,8 +125,8 @@ namespace GHelper
panelGamma = new Panel();
tableVisual = new TableLayoutPanel();
buttonInstallColor = new RButton();
- comboColorTemp = new RComboBox();
comboVisual = new RComboBox();
+ comboColorTemp = new RComboBox();
comboGamut = new RComboBox();
sliderGamma = new Slider();
panelGammaTitle = new Panel();
@@ -187,7 +187,7 @@ namespace GHelper
panelMatrix.Controls.Add(tableLayoutMatrix);
panelMatrix.Controls.Add(panelMatrixTitle);
panelMatrix.Dock = DockStyle.Top;
- panelMatrix.Location = new Point(11, 1027);
+ panelMatrix.Location = new Point(11, 1007);
panelMatrix.Margin = new Padding(0);
panelMatrix.Name = "panelMatrix";
panelMatrix.Padding = new Padding(20, 20, 20, 10);
@@ -362,7 +362,7 @@ namespace GHelper
panelBattery.Controls.Add(sliderBattery);
panelBattery.Controls.Add(panelBatteryTitle);
panelBattery.Dock = DockStyle.Top;
- panelBattery.Location = new Point(11, 1703);
+ panelBattery.Location = new Point(11, 1683);
panelBattery.Margin = new Padding(0);
panelBattery.Name = "panelBattery";
panelBattery.Padding = new Padding(20, 20, 20, 10);
@@ -454,7 +454,7 @@ namespace GHelper
panelFooter.AutoSizeMode = AutoSizeMode.GrowAndShrink;
panelFooter.Controls.Add(tableButtons);
panelFooter.Dock = DockStyle.Top;
- panelFooter.Location = new Point(11, 1878);
+ panelFooter.Location = new Point(11, 1858);
panelFooter.Margin = new Padding(0);
panelFooter.Name = "panelFooter";
panelFooter.Padding = new Padding(20);
@@ -1033,8 +1033,8 @@ namespace GHelper
panelScreen.Location = new Point(11, 651);
panelScreen.Margin = new Padding(0);
panelScreen.Name = "panelScreen";
- panelScreen.Padding = new Padding(20, 20, 20, 0);
- panelScreen.Size = new Size(827, 176);
+ panelScreen.Padding = new Padding(20, 10, 20, 0);
+ panelScreen.Size = new Size(827, 166);
panelScreen.TabIndex = 2;
panelScreen.TabStop = true;
//
@@ -1042,7 +1042,7 @@ namespace GHelper
//
labelTipScreen.Dock = DockStyle.Top;
labelTipScreen.ForeColor = SystemColors.GrayText;
- labelTipScreen.Location = new Point(20, 140);
+ labelTipScreen.Location = new Point(20, 130);
labelTipScreen.Margin = new Padding(4, 0, 4, 0);
labelTipScreen.Name = "labelTipScreen";
labelTipScreen.Size = new Size(787, 36);
@@ -1062,7 +1062,7 @@ namespace GHelper
tableScreen.Controls.Add(button120Hz, 2, 0);
tableScreen.Controls.Add(buttonMiniled, 3, 0);
tableScreen.Dock = DockStyle.Top;
- tableScreen.Location = new Point(20, 60);
+ tableScreen.Location = new Point(20, 50);
tableScreen.Margin = new Padding(8, 4, 8, 4);
tableScreen.Name = "tableScreen";
tableScreen.RowCount = 1;
@@ -1154,7 +1154,7 @@ namespace GHelper
panelScreenTitle.Controls.Add(pictureScreen);
panelScreenTitle.Controls.Add(labelSreen);
panelScreenTitle.Dock = DockStyle.Top;
- panelScreenTitle.Location = new Point(20, 20);
+ panelScreenTitle.Location = new Point(20, 10);
panelScreenTitle.Margin = new Padding(4);
panelScreenTitle.Name = "panelScreenTitle";
panelScreenTitle.Size = new Size(787, 40);
@@ -1201,7 +1201,7 @@ namespace GHelper
panelKeyboard.Controls.Add(tableLayoutKeyboard);
panelKeyboard.Controls.Add(panelKeyboardTitle);
panelKeyboard.Dock = DockStyle.Top;
- panelKeyboard.Location = new Point(11, 1361);
+ panelKeyboard.Location = new Point(11, 1341);
panelKeyboard.Margin = new Padding(0);
panelKeyboard.Name = "panelKeyboard";
panelKeyboard.Padding = new Padding(20);
@@ -1377,7 +1377,7 @@ namespace GHelper
panelVersion.Controls.Add(labelCharge);
panelVersion.Controls.Add(checkStartup);
panelVersion.Dock = DockStyle.Top;
- panelVersion.Location = new Point(11, 1822);
+ panelVersion.Location = new Point(11, 1802);
panelVersion.Margin = new Padding(4);
panelVersion.Name = "panelVersion";
panelVersion.Size = new Size(827, 56);
@@ -1402,7 +1402,7 @@ namespace GHelper
panelPeripherals.Controls.Add(tableLayoutPeripherals);
panelPeripherals.Controls.Add(panelPeripheralsTile);
panelPeripherals.Dock = DockStyle.Top;
- panelPeripherals.Location = new Point(11, 1505);
+ panelPeripherals.Location = new Point(11, 1485);
panelPeripherals.Margin = new Padding(0);
panelPeripherals.Name = "panelPeripherals";
panelPeripherals.Padding = new Padding(20, 20, 20, 10);
@@ -1544,7 +1544,7 @@ namespace GHelper
panelAlly.Controls.Add(tableLayoutAlly);
panelAlly.Controls.Add(panelAllyTitle);
panelAlly.Dock = DockStyle.Top;
- panelAlly.Location = new Point(11, 1221);
+ panelAlly.Location = new Point(11, 1201);
panelAlly.Margin = new Padding(0);
panelAlly.Name = "panelAlly";
panelAlly.Padding = new Padding(20, 20, 20, 0);
@@ -1680,11 +1680,11 @@ namespace GHelper
panelGamma.Controls.Add(sliderGamma);
panelGamma.Controls.Add(panelGammaTitle);
panelGamma.Dock = DockStyle.Top;
- panelGamma.Location = new Point(11, 827);
+ panelGamma.Location = new Point(11, 817);
panelGamma.Margin = new Padding(0);
panelGamma.Name = "panelGamma";
- panelGamma.Padding = new Padding(20, 20, 20, 10);
- panelGamma.Size = new Size(827, 200);
+ panelGamma.Padding = new Padding(20, 10, 20, 10);
+ panelGamma.Size = new Size(827, 190);
panelGamma.TabIndex = 9;
panelGamma.Visible = false;
//
@@ -1697,11 +1697,11 @@ namespace GHelper
tableVisual.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F));
tableVisual.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F));
tableVisual.Controls.Add(buttonInstallColor, 0, 0);
- tableVisual.Controls.Add(comboColorTemp, 0, 0);
tableVisual.Controls.Add(comboVisual, 0, 0);
- tableVisual.Controls.Add(comboGamut, 0, 0);
+ tableVisual.Controls.Add(comboColorTemp, 1, 0);
+ tableVisual.Controls.Add(comboGamut, 2, 0);
tableVisual.Dock = DockStyle.Top;
- tableVisual.Location = new Point(20, 104);
+ tableVisual.Location = new Point(20, 94);
tableVisual.Margin = new Padding(8);
tableVisual.Name = "tableVisual";
tableVisual.RowCount = 1;
@@ -1722,33 +1722,17 @@ namespace GHelper
buttonInstallColor.FlatStyle = FlatStyle.Flat;
buttonInstallColor.Image = Properties.Resources.icons8_color_32;
buttonInstallColor.ImageAlign = ContentAlignment.MiddleRight;
- buttonInstallColor.Location = new Point(528, 8);
+ buttonInstallColor.Location = new Point(266, 8);
buttonInstallColor.Margin = new Padding(4, 8, 4, 8);
buttonInstallColor.Name = "buttonInstallColor";
buttonInstallColor.Secondary = true;
- buttonInstallColor.Size = new Size(255, 50);
+ buttonInstallColor.Size = new Size(254, 50);
buttonInstallColor.TabIndex = 38;
buttonInstallColor.Text = "Install Colors";
buttonInstallColor.TextImageRelation = TextImageRelation.ImageBeforeText;
buttonInstallColor.UseVisualStyleBackColor = false;
buttonInstallColor.Visible = false;
//
- // comboColorTemp
- //
- comboColorTemp.BorderColor = Color.White;
- comboColorTemp.ButtonColor = Color.FromArgb(255, 255, 255);
- comboColorTemp.Dock = DockStyle.Top;
- comboColorTemp.FlatStyle = FlatStyle.Flat;
- comboColorTemp.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point);
- comboColorTemp.FormattingEnabled = true;
- comboColorTemp.ItemHeight = 32;
- comboColorTemp.Location = new Point(4, 77);
- comboColorTemp.Margin = new Padding(4, 11, 4, 8);
- comboColorTemp.Name = "comboColorTemp";
- comboColorTemp.Size = new Size(254, 40);
- comboColorTemp.TabIndex = 15;
- comboColorTemp.Visible = false;
- //
// comboVisual
//
comboVisual.BorderColor = Color.White;
@@ -1765,6 +1749,22 @@ namespace GHelper
comboVisual.TabIndex = 14;
comboVisual.Visible = false;
//
+ // comboColorTemp
+ //
+ comboColorTemp.BorderColor = Color.White;
+ comboColorTemp.ButtonColor = Color.FromArgb(255, 255, 255);
+ comboColorTemp.Dock = DockStyle.Top;
+ comboColorTemp.FlatStyle = FlatStyle.Flat;
+ comboColorTemp.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point);
+ comboColorTemp.FormattingEnabled = true;
+ comboColorTemp.ItemHeight = 32;
+ comboColorTemp.Location = new Point(531, 11);
+ comboColorTemp.Margin = new Padding(7, 11, 7, 8);
+ comboColorTemp.Name = "comboColorTemp";
+ comboColorTemp.Size = new Size(249, 40);
+ comboColorTemp.TabIndex = 15;
+ comboColorTemp.Visible = false;
+ //
// comboGamut
//
comboGamut.BorderColor = Color.White;
@@ -1774,7 +1774,7 @@ namespace GHelper
comboGamut.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point);
comboGamut.FormattingEnabled = true;
comboGamut.ItemHeight = 32;
- comboGamut.Location = new Point(266, 11);
+ comboGamut.Location = new Point(4, 77);
comboGamut.Margin = new Padding(4, 11, 4, 8);
comboGamut.Name = "comboGamut";
comboGamut.Size = new Size(254, 40);
@@ -1784,7 +1784,7 @@ namespace GHelper
// sliderGamma
//
sliderGamma.Dock = DockStyle.Top;
- sliderGamma.Location = new Point(20, 64);
+ sliderGamma.Location = new Point(20, 54);
sliderGamma.Margin = new Padding(4);
sliderGamma.Max = 100;
sliderGamma.Min = 0;
@@ -1802,7 +1802,7 @@ namespace GHelper
panelGammaTitle.Controls.Add(pictureGamma);
panelGammaTitle.Controls.Add(labelGammaTitle);
panelGammaTitle.Dock = DockStyle.Top;
- panelGammaTitle.Location = new Point(20, 20);
+ panelGammaTitle.Location = new Point(20, 10);
panelGammaTitle.Margin = new Padding(4);
panelGammaTitle.Name = "panelGammaTitle";
panelGammaTitle.Padding = new Padding(0, 0, 0, 4);
diff --git a/app/Settings.cs b/app/Settings.cs
index 0b472d13..d4f9aa0d 100644
--- a/app/Settings.cs
+++ b/app/Settings.cs
@@ -269,15 +269,15 @@ namespace GHelper
if (AppConfig.IsOLED())
{
dimming = true;
- labelGammaTitle.Text = "Flicker-free Dimming";
+ labelGammaTitle.Text = Properties.Strings.FlickerFreeDimming;
panelGamma.Visible = true;
sliderGamma.Visible = true;
VisualiseBrightness();
sliderGamma.ValueChanged += SliderGamma_ValueChanged;
}
- if (!dimming) labelGammaTitle.Text = "Visual Mode";
- else labelGammaTitle.Text += " / Visual";
+ if (!dimming) labelGammaTitle.Text = Properties.Strings.ViualMode;
+ else labelGammaTitle.Text += " / " + Properties.Strings.ViualMode;
var gamuts = VisualControl.GetGamutModes();
@@ -287,7 +287,7 @@ namespace GHelper
{
tableVisual.ColumnCount = 2;
- buttonInstallColor.Text = "Download Color Profile(s)";
+ buttonInstallColor.Text = Properties.Strings.DownloadColorProfiles;
buttonInstallColor.Visible = true;
buttonInstallColor.Click += ButtonInstallColorProfile_Click;