[Feature] Option to set icon size (#297), version 1.2.2.4

This commit is contained in:
Markus Hofknecht 2022-01-22 15:43:44 +01:00
parent 2ec51aa3e2
commit ea1d6a0d19
26 changed files with 237 additions and 97 deletions

View file

@ -272,7 +272,7 @@ namespace SystemTrayMenu.DataClasses
if (string.IsNullOrEmpty(resolvedLnkPath))
{
//Log.Info($"Could not resolve *.LNK '{TargetFilePath}'");
// Log.Info($"Could not resolve *.LNK '{TargetFilePath}'");
}
else if (isFolder)
{

View file

@ -39,5 +39,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.2.3")]
[assembly: AssemblyFileVersion("1.2.2.3")]
[assembly: AssemblyVersion("1.2.2.4")]
[assembly: AssemblyFileVersion("1.2.2.4")]

View file

@ -367,15 +367,15 @@ namespace SystemTrayMenu.Properties
[global::System.Configuration.SettingsProviderAttribute(typeof(CustomSettingsProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("125")]
public int SizeInPercentage
public int SizeInPercent
{
get
{
return ((int)(this["SizeInPercentage"]));
return ((int)(this["SizeInPercent"]));
}
set
{
this["SizeInPercentage"] = value;
this["SizeInPercent"] = value;
}
}
@ -411,6 +411,22 @@ namespace SystemTrayMenu.Properties
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Configuration.SettingsProviderAttribute(typeof(CustomSettingsProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("100")]
public int IconSizeInPercent
{
get
{
return ((int)(this["IconSizeInPercent"]));
}
set
{
this["IconSizeInPercent"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Configuration.SettingsProviderAttribute(typeof(CustomSettingsProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

View file

@ -168,6 +168,8 @@ Thanks for ideas, reporting issues and contributing!
#283 #284 #289 [RuSieg](https://github.com/RuSieg),
#285 #286 [dao-net](https://github.com/dao-net),
#288 William P.,
#294 #295 #296 Stefan Mahrer,
#297 [chip33](https://github.com/chip33),
Donations
@ -186,6 +188,8 @@ Don't hesitate to donate if you appreciate SystemTrayMenu and would like to supp
Sponsors - Thank you!
------------------
* Stefan Mahrer
* Ralf K.
* Maximilian H.
* [donaldaken](https://github.com/donaldaken)
* [Traditional_Tap3954](https://www.reddit.com/user/Traditional_Tap3954/)
* Maximilian H.

View file

@ -809,11 +809,11 @@ namespace SystemTrayMenu.Resources {
}
/// <summary>
/// Looks up a localized string similar to Row height in percentage.
/// Looks up a localized string similar to Row height in percent.
/// </summary>
internal static string Row_height_in_percentage {
internal static string Row_height_in_percent {
get {
return ResourceManager.GetString("Row height in percentage", resourceCulture);
return ResourceManager.GetString("Row height in percent", resourceCulture);
}
}
@ -934,6 +934,15 @@ namespace SystemTrayMenu.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Size of the icons in percent.
/// </summary>
internal static string Size_of_the_icons_in_percent {
get {
return ResourceManager.GetString("Size of the icons in percent", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Slider.
/// </summary>

View file

@ -390,7 +390,7 @@
<data name="Round corners" xml:space="preserve">
<value>Kulaté rohy</value>
</data>
<data name="Row height in percentage" xml:space="preserve">
<data name="Row height in percent" xml:space="preserve">
<value>Výška řádku v procentech</value>
</data>
<data name="Appearance" xml:space="preserve">
@ -456,4 +456,7 @@
<data name="Sub menu appears at" xml:space="preserve">
<value>Podnabídka se zobrazí na</value>
</data>
<data name="Size of the icons in percent" xml:space="preserve">
<value>Velikost ikon v procentech</value>
</data>
</root>

View file

@ -390,7 +390,7 @@
<data name="Round corners" xml:space="preserve">
<value>Runde Ecken</value>
</data>
<data name="Row height in percentage" xml:space="preserve">
<data name="Row height in percent" xml:space="preserve">
<value>Zeilenhöhe in Prozent</value>
</data>
<data name="Appearance" xml:space="preserve">
@ -456,4 +456,7 @@
<data name="Sub menu appears at" xml:space="preserve">
<value>Untermenü erscheint bei</value>
</data>
<data name="Size of the icons in percent" xml:space="preserve">
<value>Größe der Icons in Prozent</value>
</data>
</root>

View file

@ -390,7 +390,7 @@
<data name="Round corners" xml:space="preserve">
<value>Esquinas redondas</value>
</data>
<data name="Row height in percentage" xml:space="preserve">
<data name="Row height in percent" xml:space="preserve">
<value>Altura de fila en porcentaje</value>
</data>
<data name="Appearance" xml:space="preserve">
@ -456,4 +456,7 @@
<data name="Sub menu appears at" xml:space="preserve">
<value>El submenú aparece en</value>
</data>
<data name="Size of the icons in percent" xml:space="preserve">
<value>Tamaño de los iconos en porcentaje</value>
</data>
</root>

View file

@ -390,7 +390,7 @@
<data name="Round corners" xml:space="preserve">
<value>گوشه های گرد</value>
</data>
<data name="Row height in percentage" xml:space="preserve">
<data name="Row height in percent" xml:space="preserve">
<value>ارتفاع ردیف بر حسب درصد</value>
</data>
<data name="Appearance" xml:space="preserve">
@ -456,4 +456,7 @@
<data name="Sub menu appears at" xml:space="preserve">
<value>منوی فرعی در نشان داده می شود</value>
</data>
<data name="Size of the icons in percent" xml:space="preserve">
<value>اندازه آیکون ها بر حسب درصد</value>
</data>
</root>

View file

@ -390,7 +390,7 @@
<data name="Round corners" xml:space="preserve">
<value>Coins arrondis</value>
</data>
<data name="Row height in percentage" xml:space="preserve">
<data name="Row height in percent" xml:space="preserve">
<value>Hauteur de ligne en pourcentage</value>
</data>
<data name="Appearance" xml:space="preserve">
@ -456,4 +456,7 @@
<data name="Sub menu appears at" xml:space="preserve">
<value>Le sous-menu apparaît à</value>
</data>
<data name="Size of the icons in percent" xml:space="preserve">
<value>Taille des icônes en pourcentage</value>
</data>
</root>

View file

@ -390,7 +390,7 @@
<data name="Round corners" xml:space="preserve">
<value>Angoli arrotondati</value>
</data>
<data name="Row height in percentage" xml:space="preserve">
<data name="Row height in percent" xml:space="preserve">
<value>Altezza riga in percentuale</value>
</data>
<data name="Appearance" xml:space="preserve">
@ -456,4 +456,7 @@
<data name="Sub menu appears at" xml:space="preserve">
<value>Il sottomenu appare a</value>
</data>
<data name="Size of the icons in percent" xml:space="preserve">
<value>Dimensione delle icone in percentuale</value>
</data>
</root>

View file

@ -390,7 +390,7 @@
<data name="Round corners" xml:space="preserve">
<value>丸い角</value>
</data>
<data name="Row height in percentage" xml:space="preserve">
<data name="Row height in percent" xml:space="preserve">
<value>行の高さ(パーセンテージ)</value>
</data>
<data name="Appearance" xml:space="preserve">
@ -456,4 +456,7 @@
<data name="Sub menu appears at" xml:space="preserve">
<value>サブメニューはに表示されます</value>
</data>
<data name="Size of the icons in percent" xml:space="preserve">
<value>アイコンのサイズ(パーセント)</value>
</data>
</root>

View file

@ -390,7 +390,7 @@
<data name="Round corners" xml:space="preserve">
<value>둥근 모서리</value>
</data>
<data name="Row height in percentage" xml:space="preserve">
<data name="Row height in percent" xml:space="preserve">
<value>행 높이(%)</value>
</data>
<data name="Appearance" xml:space="preserve">
@ -456,4 +456,7 @@
<data name="Sub menu appears at" xml:space="preserve">
<value>하위 메뉴가 나타납니다.</value>
</data>
<data name="Size of the icons in percent" xml:space="preserve">
<value>아이콘 크기(%)</value>
</data>
</root>

View file

@ -390,7 +390,7 @@
<data name="Round corners" xml:space="preserve">
<value>Ronde hoeken</value>
</data>
<data name="Row height in percentage" xml:space="preserve">
<data name="Row height in percent" xml:space="preserve">
<value>Rijhoogte in procenten</value>
</data>
<data name="Appearance" xml:space="preserve">
@ -456,4 +456,7 @@
<data name="Sub menu appears at" xml:space="preserve">
<value>Submenu verschijnt bij</value>
</data>
<data name="Size of the icons in percent" xml:space="preserve">
<value>Grootte van de pictogrammen in procent</value>
</data>
</root>

View file

@ -390,7 +390,7 @@
<data name="Round corners" xml:space="preserve">
<value>Cantos arredondados</value>
</data>
<data name="Row height in percentage" xml:space="preserve">
<data name="Row height in percent" xml:space="preserve">
<value>Altura da linha em porcentagem</value>
</data>
<data name="Appearance" xml:space="preserve">
@ -456,4 +456,7 @@
<data name="Sub menu appears at" xml:space="preserve">
<value>O submenu aparece em</value>
</data>
<data name="Size of the icons in percent" xml:space="preserve">
<value>Tamanho dos ícones em porcentagem</value>
</data>
</root>

View file

@ -387,8 +387,8 @@
<data name="Add sample 'Start Menu' folder" xml:space="preserve">
<value>Add sample 'Start Menu' folder</value>
</data>
<data name="Row height in percentage" xml:space="preserve">
<value>Row height in percentage</value>
<data name="Row height in percent" xml:space="preserve">
<value>Row height in percent</value>
</data>
<data name="Round corners" xml:space="preserve">
<value>Round corners</value>
@ -456,4 +456,7 @@
<data name="Sub menu appears at" xml:space="preserve">
<value>Sub menu appears at</value>
</data>
<data name="Size of the icons in percent" xml:space="preserve">
<value>Size of the icons in percent</value>
</data>
</root>

View file

@ -390,7 +390,7 @@
<data name="Round corners" xml:space="preserve">
<value>Закругленные углы</value>
</data>
<data name="Row height in percentage" xml:space="preserve">
<data name="Row height in percent" xml:space="preserve">
<value>Высота строки</value>
</data>
<data name="Appearance" xml:space="preserve">
@ -456,4 +456,7 @@
<data name="Sub menu appears at" xml:space="preserve">
<value>Подменю появляется в</value>
</data>
<data name="Size of the icons in percent" xml:space="preserve">
<value>Размер иконок в процентах</value>
</data>
</root>

View file

@ -390,7 +390,7 @@
<data name="Round corners" xml:space="preserve">
<value>Yuvarlak köşeler</value>
</data>
<data name="Row height in percentage" xml:space="preserve">
<data name="Row height in percent" xml:space="preserve">
<value>Yüzde olarak satır yüksekliği</value>
</data>
<data name="Appearance" xml:space="preserve">
@ -456,4 +456,7 @@
<data name="Sub menu appears at" xml:space="preserve">
<value>Alt menü şurada görünür</value>
</data>
<data name="Size of the icons in percent" xml:space="preserve">
<value>Simgelerin yüzde olarak boyutu</value>
</data>
</root>

View file

@ -390,7 +390,7 @@
<data name="Round corners" xml:space="preserve">
<value>Góc tròn</value>
</data>
<data name="Row height in percentage" xml:space="preserve">
<data name="Row height in percent" xml:space="preserve">
<value>Chiều cao hàng tính bằng phần trăm</value>
</data>
<data name="Appearance" xml:space="preserve">
@ -456,4 +456,7 @@
<data name="Sub menu appears at" xml:space="preserve">
<value>Menu phụ xuất hiện tại</value>
</data>
<data name="Size of the icons in percent" xml:space="preserve">
<value>Kích thước của các biểu tượng tính bằng phần trăm</value>
</data>
</root>

View file

@ -390,7 +390,7 @@
<data name="Round corners" xml:space="preserve">
<value>圆角</value>
</data>
<data name="Row height in percentage" xml:space="preserve">
<data name="Row height in percent" xml:space="preserve">
<value>行高百分比</value>
</data>
<data name="Appearance" xml:space="preserve">
@ -456,4 +456,7 @@
<data name="Sub menu appears at" xml:space="preserve">
<value>子菜单出现在</value>
</data>
<data name="Size of the icons in percent" xml:space="preserve">
<value>图标的大小百分比</value>
</data>
</root>

View file

@ -101,7 +101,9 @@ namespace SystemTrayMenu.Helper
ab.AppMoreInfo += "#205 kristofzerbe, #209 jonaskohl, #211 blacksparrow15, #220 Yavuz E., #229 #230 #239 Peter O., #231 Ryonez, ";
ab.AppMoreInfo += "#235 #242 243 #247, #271 Tom, #237 Torsten S., #240 video Patrick, #244 Gunter D., #246 MACE4GITHUB, #259 vanjac, ";
ab.AppMoreInfo += "#262 terencemcdonnell, #269 petersnows25, #272 Peter M., #273 #274 ParasiteDelta, #275 #276 #278 donaldaken, ";
ab.AppMoreInfo += "#277 Jan S., #282 akuznets, #283 #284 #289 RuSieg, #285 #286 dao-net, #288 William P.," + Environment.NewLine;
ab.AppMoreInfo += "#277 Jan S., #282 akuznets, #283 #284 #289 RuSieg, #285 #286 dao-net, #288 William P., #294 #295 #296 Stefan Mahrer, ";
ab.AppMoreInfo += "#297 chip33, " + Environment.NewLine;
ab.AppDetailsButton = true;
ab.ShowDialog();
}

View file

@ -620,6 +620,13 @@ namespace SystemTrayMenu.UserInterface
factor = Properties.Settings.Default.RowHeighteInPercentageTouch / 100f;
}
double factorIconSizeInPercent = Properties.Settings.Default.IconSizeInPercent / 100f;
if (factor < factorIconSizeInPercent)
{
factor = factorIconSizeInPercent;
}
if (menuPredecessor == null)
{
if (dgv.Tag == null && dgv.Rows.Count > 0)

View file

@ -81,9 +81,9 @@ namespace SystemTrayMenu.UserInterface
this.tableLayoutPanelRowHeighteInPercentage = new System.Windows.Forms.TableLayoutPanel();
this.numericUpDownRowHeighteInPercentage = new System.Windows.Forms.NumericUpDown();
this.labelRowHeightInPercentage = new System.Windows.Forms.Label();
this.tableLayoutPanelSizeInPercentage = new System.Windows.Forms.TableLayoutPanel();
this.numericUpDownSizeInPercentage = new System.Windows.Forms.NumericUpDown();
this.labelSizeInPercentage = new System.Windows.Forms.Label();
this.tableLayoutPanelSizeInPercent = new System.Windows.Forms.TableLayoutPanel();
this.numericUpDownSizeInPercent = new System.Windows.Forms.NumericUpDown();
this.labelSizeInPercent = new System.Windows.Forms.Label();
this.tableLayoutPanelMenuHeight = new System.Windows.Forms.TableLayoutPanel();
this.numericUpDownMenuHeight = new System.Windows.Forms.NumericUpDown();
this.labelMaxMenuHeight = new System.Windows.Forms.Label();
@ -307,6 +307,9 @@ namespace SystemTrayMenu.UserInterface
this.buttonOk = new System.Windows.Forms.Button();
this.buttonCancel = new System.Windows.Forms.Button();
this.colorDialog = new System.Windows.Forms.ColorDialog();
this.tableLayoutPanelIconSizeInPercent = new System.Windows.Forms.TableLayoutPanel();
this.numericUpDownIconSizeInPercent = new System.Windows.Forms.NumericUpDown();
this.labelIconSizeInPercent = new System.Windows.Forms.Label();
this.tableLayoutPanelMain.SuspendLayout();
this.tabControl.SuspendLayout();
this.tabPageGeneral.SuspendLayout();
@ -335,8 +338,8 @@ namespace SystemTrayMenu.UserInterface
this.tableLayoutPanelSize.SuspendLayout();
this.tableLayoutPanelRowHeighteInPercentage.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownRowHeighteInPercentage)).BeginInit();
this.tableLayoutPanelSizeInPercentage.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownSizeInPercentage)).BeginInit();
this.tableLayoutPanelSizeInPercent.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownSizeInPercent)).BeginInit();
this.tableLayoutPanelMenuHeight.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownMenuHeight)).BeginInit();
this.tableLayoutPanelMaxMenuWidth.SuspendLayout();
@ -450,6 +453,8 @@ namespace SystemTrayMenu.UserInterface
this.groupBoxAppearance.SuspendLayout();
this.tableLayoutPanelAppearance.SuspendLayout();
this.tableLayoutPanelBottom.SuspendLayout();
this.tableLayoutPanelIconSizeInPercent.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownIconSizeInPercent)).BeginInit();
this.SuspendLayout();
//
// tableLayoutPanelMain
@ -922,7 +927,7 @@ namespace SystemTrayMenu.UserInterface
this.groupBoxSubMenuAppearAt.AutoSize = true;
this.groupBoxSubMenuAppearAt.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.groupBoxSubMenuAppearAt.Controls.Add(this.tableLayoutPanel3);
this.groupBoxSubMenuAppearAt.Location = new System.Drawing.Point(3, 278);
this.groupBoxSubMenuAppearAt.Location = new System.Drawing.Point(3, 307);
this.groupBoxSubMenuAppearAt.MaximumSize = new System.Drawing.Size(400, 0);
this.groupBoxSubMenuAppearAt.MinimumSize = new System.Drawing.Size(400, 0);
this.groupBoxSubMenuAppearAt.Name = "groupBoxSubMenuAppearAt";
@ -1026,7 +1031,7 @@ namespace SystemTrayMenu.UserInterface
//
this.buttonSizeAndLocationDefault.AutoSize = true;
this.buttonSizeAndLocationDefault.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.buttonSizeAndLocationDefault.Location = new System.Drawing.Point(9, 366);
this.buttonSizeAndLocationDefault.Location = new System.Drawing.Point(9, 395);
this.buttonSizeAndLocationDefault.Margin = new System.Windows.Forms.Padding(9, 9, 3, 9);
this.buttonSizeAndLocationDefault.MinimumSize = new System.Drawing.Size(75, 25);
this.buttonSizeAndLocationDefault.Name = "buttonSizeAndLocationDefault";
@ -1041,7 +1046,7 @@ namespace SystemTrayMenu.UserInterface
this.groupBoxMenuAppearAt.AutoSize = true;
this.groupBoxMenuAppearAt.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.groupBoxMenuAppearAt.Controls.Add(this.tableLayoutPanelMenuAppearAt);
this.groupBoxMenuAppearAt.Location = new System.Drawing.Point(3, 150);
this.groupBoxMenuAppearAt.Location = new System.Drawing.Point(3, 179);
this.groupBoxMenuAppearAt.MaximumSize = new System.Drawing.Size(400, 0);
this.groupBoxMenuAppearAt.MinimumSize = new System.Drawing.Size(400, 0);
this.groupBoxMenuAppearAt.Name = "groupBoxMenuAppearAt";
@ -1129,7 +1134,7 @@ namespace SystemTrayMenu.UserInterface
this.groupBoxSize.MinimumSize = new System.Drawing.Size(400, 0);
this.groupBoxSize.Name = "groupBoxSize";
this.groupBoxSize.Padding = new System.Windows.Forms.Padding(3, 3, 3, 6);
this.groupBoxSize.Size = new System.Drawing.Size(400, 141);
this.groupBoxSize.Size = new System.Drawing.Size(400, 170);
this.groupBoxSize.TabIndex = 0;
this.groupBoxSize.TabStop = false;
this.groupBoxSize.Text = "groupBoxSize";
@ -1140,22 +1145,21 @@ namespace SystemTrayMenu.UserInterface
this.tableLayoutPanelSize.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.tableLayoutPanelSize.ColumnCount = 1;
this.tableLayoutPanelSize.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanelSize.Controls.Add(this.tableLayoutPanelRowHeighteInPercentage, 0, 1);
this.tableLayoutPanelSize.Controls.Add(this.tableLayoutPanelSizeInPercentage, 0, 0);
this.tableLayoutPanelSize.Controls.Add(this.tableLayoutPanelMenuHeight, 0, 3);
this.tableLayoutPanelSize.Controls.Add(this.tableLayoutPanelMaxMenuWidth, 0, 2);
this.tableLayoutPanelSize.Controls.Add(this.tableLayoutPanelIconSizeInPercent, 0, 1);
this.tableLayoutPanelSize.Controls.Add(this.tableLayoutPanelRowHeighteInPercentage, 0, 2);
this.tableLayoutPanelSize.Controls.Add(this.tableLayoutPanelSizeInPercent, 0, 0);
this.tableLayoutPanelSize.Controls.Add(this.tableLayoutPanelMenuHeight, 0, 4);
this.tableLayoutPanelSize.Controls.Add(this.tableLayoutPanelMaxMenuWidth, 0, 3);
this.tableLayoutPanelSize.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanelSize.Location = new System.Drawing.Point(3, 19);
this.tableLayoutPanelSize.Name = "tableLayoutPanelSize";
this.tableLayoutPanelSize.RowCount = 4;
this.tableLayoutPanelSize.RowCount = 5;
this.tableLayoutPanelSize.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanelSize.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanelSize.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanelSize.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanelSize.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanelSize.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanelSize.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanelSize.Size = new System.Drawing.Size(394, 116);
this.tableLayoutPanelSize.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanelSize.Size = new System.Drawing.Size(394, 145);
this.tableLayoutPanelSize.TabIndex = 0;
//
// tableLayoutPanelRowHeighteInPercentage
@ -1168,7 +1172,7 @@ namespace SystemTrayMenu.UserInterface
this.tableLayoutPanelRowHeighteInPercentage.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanelRowHeighteInPercentage.Controls.Add(this.numericUpDownRowHeighteInPercentage, 0, 0);
this.tableLayoutPanelRowHeighteInPercentage.Controls.Add(this.labelRowHeightInPercentage, 1, 0);
this.tableLayoutPanelRowHeighteInPercentage.Location = new System.Drawing.Point(0, 29);
this.tableLayoutPanelRowHeighteInPercentage.Location = new System.Drawing.Point(0, 58);
this.tableLayoutPanelRowHeighteInPercentage.Margin = new System.Windows.Forms.Padding(0);
this.tableLayoutPanelRowHeighteInPercentage.Name = "tableLayoutPanelRowHeighteInPercentage";
this.tableLayoutPanelRowHeighteInPercentage.RowCount = 1;
@ -1194,43 +1198,43 @@ namespace SystemTrayMenu.UserInterface
this.labelRowHeightInPercentage.TabIndex = 0;
this.labelRowHeightInPercentage.Text = "labelRowHeighteInPercentage";
//
// tableLayoutPanelSizeInPercentage
// tableLayoutPanelSizeInPercent
//
this.tableLayoutPanelSizeInPercentage.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanelSizeInPercentage.AutoSize = true;
this.tableLayoutPanelSizeInPercentage.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.tableLayoutPanelSizeInPercentage.ColumnCount = 2;
this.tableLayoutPanelSizeInPercentage.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanelSizeInPercentage.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanelSizeInPercentage.Controls.Add(this.numericUpDownSizeInPercentage, 0, 0);
this.tableLayoutPanelSizeInPercentage.Controls.Add(this.labelSizeInPercentage, 1, 0);
this.tableLayoutPanelSizeInPercentage.Location = new System.Drawing.Point(0, 0);
this.tableLayoutPanelSizeInPercentage.Margin = new System.Windows.Forms.Padding(0);
this.tableLayoutPanelSizeInPercentage.Name = "tableLayoutPanelSizeInPercentage";
this.tableLayoutPanelSizeInPercentage.RowCount = 1;
this.tableLayoutPanelSizeInPercentage.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanelSizeInPercentage.Size = new System.Drawing.Size(394, 29);
this.tableLayoutPanelSizeInPercentage.TabIndex = 0;
this.tableLayoutPanelSizeInPercent.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanelSizeInPercent.AutoSize = true;
this.tableLayoutPanelSizeInPercent.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.tableLayoutPanelSizeInPercent.ColumnCount = 2;
this.tableLayoutPanelSizeInPercent.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanelSizeInPercent.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanelSizeInPercent.Controls.Add(this.numericUpDownSizeInPercent, 0, 0);
this.tableLayoutPanelSizeInPercent.Controls.Add(this.labelSizeInPercent, 1, 0);
this.tableLayoutPanelSizeInPercent.Location = new System.Drawing.Point(0, 0);
this.tableLayoutPanelSizeInPercent.Margin = new System.Windows.Forms.Padding(0);
this.tableLayoutPanelSizeInPercent.Name = "tableLayoutPanelSizeInPercent";
this.tableLayoutPanelSizeInPercent.RowCount = 1;
this.tableLayoutPanelSizeInPercent.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanelSizeInPercent.Size = new System.Drawing.Size(394, 29);
this.tableLayoutPanelSizeInPercent.TabIndex = 0;
//
// numericUpDownSizeInPercentage
// numericUpDownSizeInPercent
//
this.numericUpDownSizeInPercentage.Location = new System.Drawing.Point(3, 3);
this.numericUpDownSizeInPercentage.Name = "numericUpDownSizeInPercentage";
this.numericUpDownSizeInPercentage.Size = new System.Drawing.Size(55, 23);
this.numericUpDownSizeInPercentage.TabIndex = 1;
this.numericUpDownSizeInPercentage.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown);
this.numericUpDownSizeInPercentage.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp);
this.numericUpDownSizeInPercent.Location = new System.Drawing.Point(3, 3);
this.numericUpDownSizeInPercent.Name = "numericUpDownSizeInPercent";
this.numericUpDownSizeInPercent.Size = new System.Drawing.Size(55, 23);
this.numericUpDownSizeInPercent.TabIndex = 1;
this.numericUpDownSizeInPercent.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown);
this.numericUpDownSizeInPercent.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp);
//
// labelSizeInPercentage
// labelSizeInPercent
//
this.labelSizeInPercentage.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.labelSizeInPercentage.AutoSize = true;
this.labelSizeInPercentage.Location = new System.Drawing.Point(64, 7);
this.labelSizeInPercentage.MaximumSize = new System.Drawing.Size(330, 0);
this.labelSizeInPercentage.Name = "labelSizeInPercentage";
this.labelSizeInPercentage.Size = new System.Drawing.Size(121, 15);
this.labelSizeInPercentage.TabIndex = 0;
this.labelSizeInPercentage.Text = "labelSizeInPercentage";
this.labelSizeInPercent.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.labelSizeInPercent.AutoSize = true;
this.labelSizeInPercent.Location = new System.Drawing.Point(64, 7);
this.labelSizeInPercent.MaximumSize = new System.Drawing.Size(330, 0);
this.labelSizeInPercent.Name = "labelSizeInPercent";
this.labelSizeInPercent.Size = new System.Drawing.Size(121, 15);
this.labelSizeInPercent.TabIndex = 0;
this.labelSizeInPercent.Text = "labelSizeInPercent";
//
// tableLayoutPanelMenuHeight
//
@ -1242,7 +1246,7 @@ namespace SystemTrayMenu.UserInterface
this.tableLayoutPanelMenuHeight.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanelMenuHeight.Controls.Add(this.numericUpDownMenuHeight, 0, 0);
this.tableLayoutPanelMenuHeight.Controls.Add(this.labelMaxMenuHeight, 1, 0);
this.tableLayoutPanelMenuHeight.Location = new System.Drawing.Point(0, 87);
this.tableLayoutPanelMenuHeight.Location = new System.Drawing.Point(0, 116);
this.tableLayoutPanelMenuHeight.Margin = new System.Windows.Forms.Padding(0);
this.tableLayoutPanelMenuHeight.Name = "tableLayoutPanelMenuHeight";
this.tableLayoutPanelMenuHeight.RowCount = 1;
@ -1280,7 +1284,7 @@ namespace SystemTrayMenu.UserInterface
this.tableLayoutPanelMaxMenuWidth.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanelMaxMenuWidth.Controls.Add(this.numericUpDownMenuWidth, 0, 0);
this.tableLayoutPanelMaxMenuWidth.Controls.Add(this.labelMaxMenuWidth, 1, 0);
this.tableLayoutPanelMaxMenuWidth.Location = new System.Drawing.Point(0, 58);
this.tableLayoutPanelMaxMenuWidth.Location = new System.Drawing.Point(0, 87);
this.tableLayoutPanelMaxMenuWidth.Margin = new System.Windows.Forms.Padding(0);
this.tableLayoutPanelMaxMenuWidth.Name = "tableLayoutPanelMaxMenuWidth";
this.tableLayoutPanelMaxMenuWidth.RowCount = 1;
@ -4340,6 +4344,42 @@ namespace SystemTrayMenu.UserInterface
this.buttonCancel.UseVisualStyleBackColor = true;
this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
//
// tableLayoutPanel6
//
this.tableLayoutPanelIconSizeInPercent.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanelIconSizeInPercent.AutoSize = true;
this.tableLayoutPanelIconSizeInPercent.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.tableLayoutPanelIconSizeInPercent.ColumnCount = 2;
this.tableLayoutPanelIconSizeInPercent.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanelIconSizeInPercent.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanelIconSizeInPercent.Controls.Add(this.numericUpDownIconSizeInPercent, 0, 0);
this.tableLayoutPanelIconSizeInPercent.Controls.Add(this.labelIconSizeInPercent, 1, 0);
this.tableLayoutPanelIconSizeInPercent.Location = new System.Drawing.Point(0, 29);
this.tableLayoutPanelIconSizeInPercent.Margin = new System.Windows.Forms.Padding(0);
this.tableLayoutPanelIconSizeInPercent.Name = "tableLayoutPanel6";
this.tableLayoutPanelIconSizeInPercent.RowCount = 1;
this.tableLayoutPanelIconSizeInPercent.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanelIconSizeInPercent.Size = new System.Drawing.Size(394, 29);
this.tableLayoutPanelIconSizeInPercent.TabIndex = 1;
//
// numericUpDownIconSizeInPercent
//
this.numericUpDownIconSizeInPercent.Location = new System.Drawing.Point(3, 3);
this.numericUpDownIconSizeInPercent.Name = "numericUpDownIconSizeInPercent";
this.numericUpDownIconSizeInPercent.Size = new System.Drawing.Size(55, 23);
this.numericUpDownIconSizeInPercent.TabIndex = 1;
//
// labelIconSizeInPercent
//
this.labelIconSizeInPercent.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.labelIconSizeInPercent.AutoSize = true;
this.labelIconSizeInPercent.Location = new System.Drawing.Point(64, 7);
this.labelIconSizeInPercent.MaximumSize = new System.Drawing.Size(330, 0);
this.labelIconSizeInPercent.Name = "labelIconSizeInPercent";
this.labelIconSizeInPercent.Size = new System.Drawing.Size(144, 15);
this.labelIconSizeInPercent.TabIndex = 0;
this.labelIconSizeInPercent.Text = "labelIconSizeInPercent";
//
// SettingsForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@ -4408,9 +4448,9 @@ namespace SystemTrayMenu.UserInterface
this.tableLayoutPanelRowHeighteInPercentage.ResumeLayout(false);
this.tableLayoutPanelRowHeighteInPercentage.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownRowHeighteInPercentage)).EndInit();
this.tableLayoutPanelSizeInPercentage.ResumeLayout(false);
this.tableLayoutPanelSizeInPercentage.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownSizeInPercentage)).EndInit();
this.tableLayoutPanelSizeInPercent.ResumeLayout(false);
this.tableLayoutPanelSizeInPercent.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownSizeInPercent)).EndInit();
this.tableLayoutPanelMenuHeight.ResumeLayout(false);
this.tableLayoutPanelMenuHeight.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownMenuHeight)).EndInit();
@ -4594,6 +4634,9 @@ namespace SystemTrayMenu.UserInterface
this.tableLayoutPanelAppearance.PerformLayout();
this.tableLayoutPanelBottom.ResumeLayout(false);
this.tableLayoutPanelBottom.PerformLayout();
this.tableLayoutPanelIconSizeInPercent.ResumeLayout(false);
this.tableLayoutPanelIconSizeInPercent.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownIconSizeInPercent)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@ -4799,9 +4842,9 @@ namespace SystemTrayMenu.UserInterface
private System.Windows.Forms.Label labelColorDarkModeSlider;
private System.Windows.Forms.Button buttonColorsDefaultDarkMode;
private System.Windows.Forms.CheckBox checkBoxUseIconFromRootFolder;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanelSizeInPercentage;
private System.Windows.Forms.NumericUpDown numericUpDownSizeInPercentage;
private System.Windows.Forms.Label labelSizeInPercentage;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanelSizeInPercent;
private System.Windows.Forms.NumericUpDown numericUpDownSizeInPercent;
private System.Windows.Forms.Label labelSizeInPercent;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanelBackgroundBorder;
private System.Windows.Forms.PictureBox pictureBoxBackgroundBorder;
private System.Windows.Forms.TextBox textBoxColorBackgroundBorder;
@ -4880,5 +4923,8 @@ namespace SystemTrayMenu.UserInterface
private System.Windows.Forms.RadioButton radioButtonOverlapping;
private System.Windows.Forms.RadioButton radioButtonNextToPreviousMenu;
private System.Windows.Forms.NumericUpDown numericUpDownOverlappingOffsetPixels;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanelIconSizeInPercent;
private System.Windows.Forms.NumericUpDown numericUpDownIconSizeInPercent;
private System.Windows.Forms.Label labelIconSizeInPercent;
}
}

View file

@ -127,8 +127,9 @@ namespace SystemTrayMenu.UserInterface
tabPageSizeAndLocation.Text = Translator.GetText("Size and location");
groupBoxSize.Text = Translator.GetText("Size");
labelSizeInPercentage.Text = $"% {Translator.GetText("Size")}";
labelRowHeightInPercentage.Text = $"% {Translator.GetText("Row height in percentage")}";
labelSizeInPercent.Text = $"% {Translator.GetText("Size")}";
labelIconSizeInPercent.Text = Translator.GetText("Size of the icons in percent");
labelRowHeightInPercentage.Text = Translator.GetText("Row height in percent");
labelMaxMenuWidth.Text = Translator.GetText("Pixels maximum menu width");
labelMaxMenuHeight.Text = Translator.GetText("Pixels maximum menu height");
groupBoxMenuAppearAt.Text = Translator.GetText("Main menu appears at");
@ -298,10 +299,10 @@ namespace SystemTrayMenu.UserInterface
checkBoxStoreConfigAtAssemblyLocation.Checked = CustomSettingsProvider.IsActivatedConfigPathAssembly();
numericUpDownSizeInPercentage.Minimum = 100;
numericUpDownSizeInPercentage.Maximum = 200;
numericUpDownSizeInPercentage.Increment = 25;
numericUpDownSizeInPercentage.MouseWheel += NumericUpDown_MouseWheel;
numericUpDownSizeInPercent.Minimum = 100;
numericUpDownSizeInPercent.Maximum = 200;
numericUpDownSizeInPercent.Increment = 25;
numericUpDownSizeInPercent.MouseWheel += NumericUpDown_MouseWheel;
void NumericUpDown_MouseWheel(object sender, MouseEventArgs e)
{
NumericUpDown numericUpDown = (NumericUpDown)sender;
@ -327,7 +328,13 @@ namespace SystemTrayMenu.UserInterface
((HandledMouseEventArgs)e).Handled = true;
}
numericUpDownSizeInPercentage.Value = Settings.Default.SizeInPercentage;
numericUpDownSizeInPercent.Value = Settings.Default.SizeInPercent;
numericUpDownIconSizeInPercent.Minimum = 50;
numericUpDownIconSizeInPercent.Maximum = 200;
numericUpDownIconSizeInPercent.Increment = 5;
numericUpDownIconSizeInPercent.MouseWheel += NumericUpDown_MouseWheel;
numericUpDownIconSizeInPercent.Value = Settings.Default.IconSizeInPercent;
numericUpDownRowHeighteInPercentage.Minimum = 50;
numericUpDownRowHeighteInPercentage.Maximum = 200;
@ -765,7 +772,8 @@ namespace SystemTrayMenu.UserInterface
}
}
Settings.Default.SizeInPercentage = (int)numericUpDownSizeInPercentage.Value;
Settings.Default.SizeInPercent = (int)numericUpDownSizeInPercent.Value;
Settings.Default.IconSizeInPercent = (int)numericUpDownIconSizeInPercent.Value;
if (DllImports.NativeMethods.IsTouchEnabled())
{
Settings.Default.RowHeighteInPercentageTouch = (int)numericUpDownRowHeighteInPercentage.Value;
@ -1079,7 +1087,8 @@ namespace SystemTrayMenu.UserInterface
private void ButtonSizeAndLocationDefault_Click(object sender, EventArgs e)
{
numericUpDownSizeInPercentage.Value = 125;
numericUpDownSizeInPercent.Value = 125;
numericUpDownIconSizeInPercent.Value = 100;
numericUpDownRowHeighteInPercentage.Value = 100;
numericUpDownMenuWidth.Value = 400;
numericUpDownMenuHeight.Value = 600;

View file

@ -48,7 +48,9 @@ namespace SystemTrayMenu.Utilities
stringWithWidthLikeIcon,
#pragma warning restore CA1303 // Do not pass literals as localized parameters
dgv.RowTemplate.DefaultCellStyle.Font).Width;
dgv.Columns[0].Width = (int)width0;
double factorIconSizeInPercent = Properties.Settings.Default.IconSizeInPercent / 100f;
dgv.Columns[0].Width = (int)(width0 * factorIconSizeInPercent);
}
}
}

View file

@ -18,7 +18,7 @@ namespace SystemTrayMenu.Utilities
internal static void Initialize()
{
Factor = Properties.Settings.Default.SizeInPercentage / 100f;
Factor = Properties.Settings.Default.SizeInPercent / 100f;
}
internal static int Scale(int width)