jkocon/archived-g-helper
1
0
Fork 0
mirror of https://github.com/jkocon/g-helper.git synced 2026-02-23 13:00:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

UI Tweaks

Browse Source
This commit is contained in:
Serge
2024-03-10 21:18:58 +01:00
parent 7516735a0d
commit 2d23166d9d
4 changed files with 80 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/Properties/Strings.Designer.cs generated
View File

@@ -726,6 +726,15 @@ namespace GHelper.Properties {
} }
} }
/// <summary>
/// Looks up a localized string similar to Download Color Profiles.
/// </summary>
internal static string DownloadColorProfiles {
get {
return ResourceManager.GetString("DownloadColorProfiles", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Download. /// Looks up a localized string similar to Download.
/// </summary> /// </summary>
@@ -908,6 +917,15 @@ namespace GHelper.Properties {
} }
} }
/// <summary>
/// Looks up a localized string similar to Flicker-free Dimming.
/// </summary>
internal static string FlickerFreeDimming {
get {
return ResourceManager.GetString("FlickerFreeDimming", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Process Fn+F hotkeys without Fn. /// Looks up a localized string similar to Process Fn+F hotkeys without Fn.
/// </summary> /// </summary>
@@ -1871,6 +1889,15 @@ namespace GHelper.Properties {
} }
} }
/// <summary>
/// Looks up a localized string similar to Visual Mode.
/// </summary>
internal static string ViualMode {
get {
return ResourceManager.GetString("ViualMode", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Volume Down. /// Looks up a localized string similar to Volume Down.
/// </summary> /// </summary>

9
app/Properties/Strings.resx
View File

@@ -339,6 +339,9 @@
<data name="Discharging" xml:space="preserve"> <data name="Discharging" xml:space="preserve">
<value>Discharging</value> <value>Discharging</value>
</data> </data>
<data name="DownloadColorProfiles" xml:space="preserve">
<value>Download Color Profiles</value>
</data>
<data name="DownloadUpdate" xml:space="preserve"> <data name="DownloadUpdate" xml:space="preserve">
<value>Download</value> <value>Download</value>
</data> </data>
@@ -401,6 +404,9 @@ Do you still want to continue?</value>
<data name="FansPower" xml:space="preserve"> <data name="FansPower" xml:space="preserve">
<value>Fans + Power</value> <value>Fans + Power</value>
</data> </data>
<data name="FlickerFreeDimming" xml:space="preserve">
<value>Flicker-free Dimming</value>
</data>
<data name="FnLock" xml:space="preserve"> <data name="FnLock" xml:space="preserve">
<value>Process Fn+F hotkeys without Fn</value> <value>Process Fn+F hotkeys without Fn</value>
</data> </data>
@@ -722,6 +728,9 @@ Do you still want to continue?</value>
<data name="VibrationStrength" xml:space="preserve"> <data name="VibrationStrength" xml:space="preserve">
<value>Vibration Strength</value> <value>Vibration Strength</value>
</data> </data>
<data name="ViualMode" xml:space="preserve">
<value>Visual Mode</value>
</data>
<data name="VolumeDown" xml:space="preserve"> <data name="VolumeDown" xml:space="preserve">
<value>Volume Down</value> <value>Volume Down</value>
</data> </data>

80
app/Settings.Designer.cs generated
View File

@@ -125,8 +125,8 @@ namespace GHelper
panelGamma = new Panel(); panelGamma = new Panel();
tableVisual = new TableLayoutPanel(); tableVisual = new TableLayoutPanel();
buttonInstallColor = new RButton(); buttonInstallColor = new RButton();
comboColorTemp = new RComboBox();
comboVisual = new RComboBox(); comboVisual = new RComboBox();
comboColorTemp = new RComboBox();
comboGamut = new RComboBox(); comboGamut = new RComboBox();
sliderGamma = new Slider(); sliderGamma = new Slider();
panelGammaTitle = new Panel(); panelGammaTitle = new Panel();
@@ -187,7 +187,7 @@ namespace GHelper
panelMatrix.Controls.Add(tableLayoutMatrix); panelMatrix.Controls.Add(tableLayoutMatrix);
panelMatrix.Controls.Add(panelMatrixTitle); panelMatrix.Controls.Add(panelMatrixTitle);
panelMatrix.Dock = DockStyle.Top; panelMatrix.Dock = DockStyle.Top;
panelMatrix.Location = new Point(11, 1027); panelMatrix.Location = new Point(11, 1007);
panelMatrix.Margin = new Padding(0); panelMatrix.Margin = new Padding(0);
panelMatrix.Name = "panelMatrix"; panelMatrix.Name = "panelMatrix";
panelMatrix.Padding = new Padding(20, 20, 20, 10); panelMatrix.Padding = new Padding(20, 20, 20, 10);
@@ -362,7 +362,7 @@ namespace GHelper
panelBattery.Controls.Add(sliderBattery); panelBattery.Controls.Add(sliderBattery);
panelBattery.Controls.Add(panelBatteryTitle); panelBattery.Controls.Add(panelBatteryTitle);
panelBattery.Dock = DockStyle.Top; panelBattery.Dock = DockStyle.Top;
panelBattery.Location = new Point(11, 1703); panelBattery.Location = new Point(11, 1683);
panelBattery.Margin = new Padding(0); panelBattery.Margin = new Padding(0);
panelBattery.Name = "panelBattery"; panelBattery.Name = "panelBattery";
panelBattery.Padding = new Padding(20, 20, 20, 10); panelBattery.Padding = new Padding(20, 20, 20, 10);
@@ -454,7 +454,7 @@ namespace GHelper
panelFooter.AutoSizeMode = AutoSizeMode.GrowAndShrink; panelFooter.AutoSizeMode = AutoSizeMode.GrowAndShrink;
panelFooter.Controls.Add(tableButtons); panelFooter.Controls.Add(tableButtons);
panelFooter.Dock = DockStyle.Top; panelFooter.Dock = DockStyle.Top;
panelFooter.Location = new Point(11, 1878); panelFooter.Location = new Point(11, 1858);
panelFooter.Margin = new Padding(0); panelFooter.Margin = new Padding(0);
panelFooter.Name = "panelFooter"; panelFooter.Name = "panelFooter";
panelFooter.Padding = new Padding(20); panelFooter.Padding = new Padding(20);
@@ -1033,8 +1033,8 @@ namespace GHelper
panelScreen.Location = new Point(11, 651); panelScreen.Location = new Point(11, 651);
panelScreen.Margin = new Padding(0); panelScreen.Margin = new Padding(0);
panelScreen.Name = "panelScreen"; panelScreen.Name = "panelScreen";
panelScreen.Padding = new Padding(20, 20, 20, 0); panelScreen.Padding = new Padding(20, 10, 20, 0);
panelScreen.Size = new Size(827, 176); panelScreen.Size = new Size(827, 166);
panelScreen.TabIndex = 2; panelScreen.TabIndex = 2;
panelScreen.TabStop = true; panelScreen.TabStop = true;
// //
@@ -1042,7 +1042,7 @@ namespace GHelper
// //
labelTipScreen.Dock = DockStyle.Top; labelTipScreen.Dock = DockStyle.Top;
labelTipScreen.ForeColor = SystemColors.GrayText; 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.Margin = new Padding(4, 0, 4, 0);
labelTipScreen.Name = "labelTipScreen"; labelTipScreen.Name = "labelTipScreen";
labelTipScreen.Size = new Size(787, 36); labelTipScreen.Size = new Size(787, 36);
@@ -1062,7 +1062,7 @@ namespace GHelper
tableScreen.Controls.Add(button120Hz, 2, 0); tableScreen.Controls.Add(button120Hz, 2, 0);
tableScreen.Controls.Add(buttonMiniled, 3, 0); tableScreen.Controls.Add(buttonMiniled, 3, 0);
tableScreen.Dock = DockStyle.Top; 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.Margin = new Padding(8, 4, 8, 4);
tableScreen.Name = "tableScreen"; tableScreen.Name = "tableScreen";
tableScreen.RowCount = 1; tableScreen.RowCount = 1;
@@ -1154,7 +1154,7 @@ namespace GHelper
panelScreenTitle.Controls.Add(pictureScreen); panelScreenTitle.Controls.Add(pictureScreen);
panelScreenTitle.Controls.Add(labelSreen); panelScreenTitle.Controls.Add(labelSreen);
panelScreenTitle.Dock = DockStyle.Top; panelScreenTitle.Dock = DockStyle.Top;
panelScreenTitle.Location = new Point(20, 20); panelScreenTitle.Location = new Point(20, 10);
panelScreenTitle.Margin = new Padding(4); panelScreenTitle.Margin = new Padding(4);
panelScreenTitle.Name = "panelScreenTitle"; panelScreenTitle.Name = "panelScreenTitle";
panelScreenTitle.Size = new Size(787, 40); panelScreenTitle.Size = new Size(787, 40);
@@ -1201,7 +1201,7 @@ namespace GHelper
panelKeyboard.Controls.Add(tableLayoutKeyboard); panelKeyboard.Controls.Add(tableLayoutKeyboard);
panelKeyboard.Controls.Add(panelKeyboardTitle); panelKeyboard.Controls.Add(panelKeyboardTitle);
panelKeyboard.Dock = DockStyle.Top; panelKeyboard.Dock = DockStyle.Top;
panelKeyboard.Location = new Point(11, 1361); panelKeyboard.Location = new Point(11, 1341);
panelKeyboard.Margin = new Padding(0); panelKeyboard.Margin = new Padding(0);
panelKeyboard.Name = "panelKeyboard"; panelKeyboard.Name = "panelKeyboard";
panelKeyboard.Padding = new Padding(20); panelKeyboard.Padding = new Padding(20);
@@ -1377,7 +1377,7 @@ namespace GHelper
panelVersion.Controls.Add(labelCharge); panelVersion.Controls.Add(labelCharge);
panelVersion.Controls.Add(checkStartup); panelVersion.Controls.Add(checkStartup);
panelVersion.Dock = DockStyle.Top; panelVersion.Dock = DockStyle.Top;
panelVersion.Location = new Point(11, 1822); panelVersion.Location = new Point(11, 1802);
panelVersion.Margin = new Padding(4); panelVersion.Margin = new Padding(4);
panelVersion.Name = "panelVersion"; panelVersion.Name = "panelVersion";
panelVersion.Size = new Size(827, 56); panelVersion.Size = new Size(827, 56);
@@ -1402,7 +1402,7 @@ namespace GHelper
panelPeripherals.Controls.Add(tableLayoutPeripherals); panelPeripherals.Controls.Add(tableLayoutPeripherals);
panelPeripherals.Controls.Add(panelPeripheralsTile); panelPeripherals.Controls.Add(panelPeripheralsTile);
panelPeripherals.Dock = DockStyle.Top; panelPeripherals.Dock = DockStyle.Top;
panelPeripherals.Location = new Point(11, 1505); panelPeripherals.Location = new Point(11, 1485);
panelPeripherals.Margin = new Padding(0); panelPeripherals.Margin = new Padding(0);
panelPeripherals.Name = "panelPeripherals"; panelPeripherals.Name = "panelPeripherals";
panelPeripherals.Padding = new Padding(20, 20, 20, 10); panelPeripherals.Padding = new Padding(20, 20, 20, 10);
@@ -1544,7 +1544,7 @@ namespace GHelper
panelAlly.Controls.Add(tableLayoutAlly); panelAlly.Controls.Add(tableLayoutAlly);
panelAlly.Controls.Add(panelAllyTitle); panelAlly.Controls.Add(panelAllyTitle);
panelAlly.Dock = DockStyle.Top; panelAlly.Dock = DockStyle.Top;
panelAlly.Location = new Point(11, 1221); panelAlly.Location = new Point(11, 1201);
panelAlly.Margin = new Padding(0); panelAlly.Margin = new Padding(0);
panelAlly.Name = "panelAlly"; panelAlly.Name = "panelAlly";
panelAlly.Padding = new Padding(20, 20, 20, 0); panelAlly.Padding = new Padding(20, 20, 20, 0);
@@ -1680,11 +1680,11 @@ namespace GHelper
panelGamma.Controls.Add(sliderGamma); panelGamma.Controls.Add(sliderGamma);
panelGamma.Controls.Add(panelGammaTitle); panelGamma.Controls.Add(panelGammaTitle);
panelGamma.Dock = DockStyle.Top; panelGamma.Dock = DockStyle.Top;
panelGamma.Location = new Point(11, 827); panelGamma.Location = new Point(11, 817);
panelGamma.Margin = new Padding(0); panelGamma.Margin = new Padding(0);
panelGamma.Name = "panelGamma"; panelGamma.Name = "panelGamma";
panelGamma.Padding = new Padding(20, 20, 20, 10); panelGamma.Padding = new Padding(20, 10, 20, 10);
panelGamma.Size = new Size(827, 200); panelGamma.Size = new Size(827, 190);
panelGamma.TabIndex = 9; panelGamma.TabIndex = 9;
panelGamma.Visible = false; 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.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(buttonInstallColor, 0, 0);
tableVisual.Controls.Add(comboColorTemp, 0, 0);
tableVisual.Controls.Add(comboVisual, 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.Dock = DockStyle.Top;
tableVisual.Location = new Point(20, 104); tableVisual.Location = new Point(20, 94);
tableVisual.Margin = new Padding(8); tableVisual.Margin = new Padding(8);
tableVisual.Name = "tableVisual"; tableVisual.Name = "tableVisual";
tableVisual.RowCount = 1; tableVisual.RowCount = 1;
@@ -1722,33 +1722,17 @@ namespace GHelper
buttonInstallColor.FlatStyle = FlatStyle.Flat; buttonInstallColor.FlatStyle = FlatStyle.Flat;
buttonInstallColor.Image = Properties.Resources.icons8_color_32; buttonInstallColor.Image = Properties.Resources.icons8_color_32;
buttonInstallColor.ImageAlign = ContentAlignment.MiddleRight; 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.Margin = new Padding(4, 8, 4, 8);
buttonInstallColor.Name = "buttonInstallColor"; buttonInstallColor.Name = "buttonInstallColor";
buttonInstallColor.Secondary = true; buttonInstallColor.Secondary = true;
buttonInstallColor.Size = new Size(255, 50); buttonInstallColor.Size = new Size(254, 50);
buttonInstallColor.TabIndex = 38; buttonInstallColor.TabIndex = 38;
buttonInstallColor.Text = "Install Colors"; buttonInstallColor.Text = "Install Colors";
buttonInstallColor.TextImageRelation = TextImageRelation.ImageBeforeText; buttonInstallColor.TextImageRelation = TextImageRelation.ImageBeforeText;
buttonInstallColor.UseVisualStyleBackColor = false; buttonInstallColor.UseVisualStyleBackColor = false;
buttonInstallColor.Visible = 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
// //
comboVisual.BorderColor = Color.White; comboVisual.BorderColor = Color.White;
@@ -1765,6 +1749,22 @@ namespace GHelper
comboVisual.TabIndex = 14; comboVisual.TabIndex = 14;
comboVisual.Visible = false; 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
// //
comboGamut.BorderColor = Color.White; comboGamut.BorderColor = Color.White;
@@ -1774,7 +1774,7 @@ namespace GHelper
comboGamut.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); comboGamut.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point);
comboGamut.FormattingEnabled = true; comboGamut.FormattingEnabled = true;
comboGamut.ItemHeight = 32; comboGamut.ItemHeight = 32;
comboGamut.Location = new Point(266, 11); comboGamut.Location = new Point(4, 77);
comboGamut.Margin = new Padding(4, 11, 4, 8); comboGamut.Margin = new Padding(4, 11, 4, 8);
comboGamut.Name = "comboGamut"; comboGamut.Name = "comboGamut";
comboGamut.Size = new Size(254, 40); comboGamut.Size = new Size(254, 40);
@@ -1784,7 +1784,7 @@ namespace GHelper
// sliderGamma // sliderGamma
// //
sliderGamma.Dock = DockStyle.Top; sliderGamma.Dock = DockStyle.Top;
sliderGamma.Location = new Point(20, 64); sliderGamma.Location = new Point(20, 54);
sliderGamma.Margin = new Padding(4); sliderGamma.Margin = new Padding(4);
sliderGamma.Max = 100; sliderGamma.Max = 100;
sliderGamma.Min = 0; sliderGamma.Min = 0;
@@ -1802,7 +1802,7 @@ namespace GHelper
panelGammaTitle.Controls.Add(pictureGamma); panelGammaTitle.Controls.Add(pictureGamma);
panelGammaTitle.Controls.Add(labelGammaTitle); panelGammaTitle.Controls.Add(labelGammaTitle);
panelGammaTitle.Dock = DockStyle.Top; panelGammaTitle.Dock = DockStyle.Top;
panelGammaTitle.Location = new Point(20, 20); panelGammaTitle.Location = new Point(20, 10);
panelGammaTitle.Margin = new Padding(4); panelGammaTitle.Margin = new Padding(4);
panelGammaTitle.Name = "panelGammaTitle"; panelGammaTitle.Name = "panelGammaTitle";
panelGammaTitle.Padding = new Padding(0, 0, 0, 4); panelGammaTitle.Padding = new Padding(0, 0, 0, 4);

8
app/Settings.cs
View File

@@ -269,15 +269,15 @@ namespace GHelper
if (AppConfig.IsOLED()) if (AppConfig.IsOLED())
{ {
dimming = true; dimming = true;
labelGammaTitle.Text = "Flicker-free Dimming"; labelGammaTitle.Text = Properties.Strings.FlickerFreeDimming;
panelGamma.Visible = true; panelGamma.Visible = true;
sliderGamma.Visible = true; sliderGamma.Visible = true;
VisualiseBrightness(); VisualiseBrightness();
sliderGamma.ValueChanged += SliderGamma_ValueChanged; sliderGamma.ValueChanged += SliderGamma_ValueChanged;
} }
if (!dimming) labelGammaTitle.Text = "Visual Mode"; if (!dimming) labelGammaTitle.Text = Properties.Strings.ViualMode;
else labelGammaTitle.Text += " / Visual"; else labelGammaTitle.Text += " / " + Properties.Strings.ViualMode;
var gamuts = VisualControl.GetGamutModes(); var gamuts = VisualControl.GetGamutModes();
@@ -287,7 +287,7 @@ namespace GHelper
{ {
tableVisual.ColumnCount = 2; tableVisual.ColumnCount = 2;
buttonInstallColor.Text = "Download Color Profile(s)"; buttonInstallColor.Text = Properties.Strings.DownloadColorProfiles;
buttonInstallColor.Visible = true; buttonInstallColor.Visible = true;
buttonInstallColor.Click += ButtonInstallColorProfile_Click; buttonInstallColor.Click += ButtonInstallColorProfile_Click;