diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 45f71f0..6ea5fca 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -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.9.28")] -[assembly: AssemblyFileVersion("1.2.9.28")] +[assembly: AssemblyVersion("1.2.9.29")] +[assembly: AssemblyFileVersion("1.2.9.29")] diff --git a/README.md b/README.md index e84b205..b345a48 100644 --- a/README.md +++ b/README.md @@ -275,7 +275,7 @@ Thanks for ideas, reporting issues and contributing! #285 #286 [dao-net](https://github.com/dao-net), #288 William P., #294 #295 #296 Stefan Mahrer, -#225 #297 #299 #317 #321 #324 #330 #386 #390 [chip33](https://github.com/chip33), +#225 #297 #299 #317 #321 #324 #330 #386 #390 #407 [chip33](https://github.com/chip33), #298 [phanirithvij](https://github.com/phanirithvij), #306 [wini2](https://github.com/wini2), #370 [dna5589](https://github.com/dna5589), diff --git a/UserInterface/AppContextMenu.cs b/UserInterface/AppContextMenu.cs index a3d45ca..32f0494 100644 --- a/UserInterface/AppContextMenu.cs +++ b/UserInterface/AppContextMenu.cs @@ -89,7 +89,7 @@ namespace SystemTrayMenu.Helper aboutBox.AppMoreInfo += "#235 #242 243 #247, #271 Tom, #237 Torsten S., #240 video Patrick, #244 Gunter D., #246 #329 MACE4GITHUB, #259 #310 vanjac, "; aboutBox.AppMoreInfo += "#262 terencemcdonnell, #269 petersnows25, #272 Peter M., #273 #274 ParasiteDelta, #275 #276 #278 donaldaken, "; aboutBox.AppMoreInfo += "#277 Jan S., #282 akuznets, #283 #284 #289 RuSieg, #285 #286 dao-net, #288 William P., #294 #295 #296 Stefan Mahrer, "; - aboutBox.AppMoreInfo += "#225 #297 #299 #317 #321 #324 #330 #386 #390 chip33, #298 phanirithvij, #306 wini2, #370 dna5589, #372 not-nef, #376 Michelle H. "; + aboutBox.AppMoreInfo += "#225 #297 #299 #317 #321 #324 #330 #386 #390 #407 chip33, #298 phanirithvij, #306 wini2, #370 dna5589, #372 not-nef, #376 Michelle H. "; aboutBox.AppMoreInfo += "#377 SoenkeHob, #380 #394 TransLucida, #384 boydfields, #386 visusys, #387 yrctw" + Environment.NewLine; aboutBox.AppMoreInfo += @" Sponsors - Thank you! diff --git a/UserInterface/SettingsForm.Designer.cs b/UserInterface/SettingsForm.Designer.cs index 21acab6..944e063 100644 --- a/UserInterface/SettingsForm.Designer.cs +++ b/UserInterface/SettingsForm.Designer.cs @@ -510,7 +510,7 @@ namespace SystemTrayMenu.UserInterface this.tableLayoutPanelMain.RowCount = 2; this.tableLayoutPanelMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanelMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanelMain.Size = new System.Drawing.Size(432, 558); + this.tableLayoutPanelMain.Size = new System.Drawing.Size(432, 563); this.tableLayoutPanelMain.TabIndex = 0; // // tabControl @@ -525,7 +525,7 @@ namespace SystemTrayMenu.UserInterface this.tabControl.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); this.tabControl.Name = "tabControl"; this.tabControl.SelectedIndex = 2; - this.tabControl.Size = new System.Drawing.Size(420, 518); + this.tabControl.Size = new System.Drawing.Size(420, 523); this.tabControl.TabIndex = 0; // // tabPageGeneral @@ -536,7 +536,7 @@ namespace SystemTrayMenu.UserInterface this.tabPageGeneral.Margin = new System.Windows.Forms.Padding(3, 3, 6, 3); this.tabPageGeneral.Name = "tabPageGeneral"; this.tabPageGeneral.Padding = new System.Windows.Forms.Padding(3); - this.tabPageGeneral.Size = new System.Drawing.Size(412, 490); + this.tabPageGeneral.Size = new System.Drawing.Size(412, 495); this.tabPageGeneral.TabIndex = 0; this.tabPageGeneral.Text = "tabPageGeneral"; this.tabPageGeneral.UseVisualStyleBackColor = true; @@ -565,7 +565,7 @@ namespace SystemTrayMenu.UserInterface this.tableLayoutPanelGeneral.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanelGeneral.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanelGeneral.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanelGeneral.Size = new System.Drawing.Size(406, 484); + this.tableLayoutPanelGeneral.Size = new System.Drawing.Size(406, 489); this.tableLayoutPanelGeneral.TabIndex = 0; // // buttonGeneralDefault @@ -983,7 +983,7 @@ namespace SystemTrayMenu.UserInterface this.tabPageSizeAndLocation.Location = new System.Drawing.Point(4, 24); this.tabPageSizeAndLocation.Name = "tabPageSizeAndLocation"; this.tabPageSizeAndLocation.Padding = new System.Windows.Forms.Padding(3); - this.tabPageSizeAndLocation.Size = new System.Drawing.Size(412, 490); + this.tabPageSizeAndLocation.Size = new System.Drawing.Size(412, 495); this.tabPageSizeAndLocation.TabIndex = 3; this.tabPageSizeAndLocation.Text = "tabPageSizeAndLocation"; this.tabPageSizeAndLocation.UseVisualStyleBackColor = true; @@ -1006,7 +1006,7 @@ namespace SystemTrayMenu.UserInterface this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(406, 484); + this.tableLayoutPanel2.Size = new System.Drawing.Size(406, 489); this.tableLayoutPanel2.TabIndex = 1; // // groupBoxSubMenuAppearAt @@ -1442,7 +1442,7 @@ namespace SystemTrayMenu.UserInterface this.tabPageAdvanced.Location = new System.Drawing.Point(4, 24); this.tabPageAdvanced.Name = "tabPageAdvanced"; this.tabPageAdvanced.Padding = new System.Windows.Forms.Padding(3); - this.tabPageAdvanced.Size = new System.Drawing.Size(412, 490); + this.tabPageAdvanced.Size = new System.Drawing.Size(412, 495); this.tabPageAdvanced.TabIndex = 0; this.tabPageAdvanced.Text = "tabPageAdvanced"; this.tabPageAdvanced.UseVisualStyleBackColor = true; @@ -1851,7 +1851,7 @@ namespace SystemTrayMenu.UserInterface this.tabPageFolders.Location = new System.Drawing.Point(4, 24); this.tabPageFolders.Name = "tabPageFolders"; this.tabPageFolders.Padding = new System.Windows.Forms.Padding(3); - this.tabPageFolders.Size = new System.Drawing.Size(412, 490); + this.tabPageFolders.Size = new System.Drawing.Size(412, 495); this.tabPageFolders.TabIndex = 2; this.tabPageFolders.Text = "tabPageFolders"; this.tabPageFolders.UseVisualStyleBackColor = true; @@ -1871,7 +1871,7 @@ namespace SystemTrayMenu.UserInterface this.tableLayoutPanelFoldersInRootFolder.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanelFoldersInRootFolder.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanelFoldersInRootFolder.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanelFoldersInRootFolder.Size = new System.Drawing.Size(406, 484); + this.tableLayoutPanelFoldersInRootFolder.Size = new System.Drawing.Size(406, 489); this.tableLayoutPanelFoldersInRootFolder.TabIndex = 1; // // groupBoxFoldersInRootFolder @@ -2082,7 +2082,7 @@ namespace SystemTrayMenu.UserInterface this.tabPageExpert.Location = new System.Drawing.Point(4, 24); this.tabPageExpert.Name = "tabPageExpert"; this.tabPageExpert.Padding = new System.Windows.Forms.Padding(3); - this.tabPageExpert.Size = new System.Drawing.Size(412, 490); + this.tabPageExpert.Size = new System.Drawing.Size(412, 495); this.tabPageExpert.TabIndex = 1; this.tabPageExpert.Text = "tabPageExpert"; this.tabPageExpert.UseVisualStyleBackColor = true; @@ -2107,7 +2107,7 @@ namespace SystemTrayMenu.UserInterface this.tableLayoutPanelExpert.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanelExpert.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanelExpert.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanelExpert.Size = new System.Drawing.Size(406, 484); + this.tableLayoutPanelExpert.Size = new System.Drawing.Size(406, 489); this.tableLayoutPanelExpert.TabIndex = 1; // // groupBoxSearchPattern @@ -2464,7 +2464,7 @@ namespace SystemTrayMenu.UserInterface this.tabPageCustomize.Location = new System.Drawing.Point(4, 24); this.tabPageCustomize.Name = "tabPageCustomize"; this.tabPageCustomize.Padding = new System.Windows.Forms.Padding(3); - this.tabPageCustomize.Size = new System.Drawing.Size(412, 490); + this.tabPageCustomize.Size = new System.Drawing.Size(412, 495); this.tabPageCustomize.TabIndex = 0; this.tabPageCustomize.Text = "tabPageCustomize"; this.tabPageCustomize.UseVisualStyleBackColor = true; @@ -4805,7 +4805,7 @@ namespace SystemTrayMenu.UserInterface this.tableLayoutPanelBottom.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanelBottom.Controls.Add(this.buttonOk, 1, 0); this.tableLayoutPanelBottom.Controls.Add(this.buttonCancel, 2, 0); - this.tableLayoutPanelBottom.Location = new System.Drawing.Point(3, 527); + this.tableLayoutPanelBottom.Location = new System.Drawing.Point(3, 532); this.tableLayoutPanelBottom.Margin = new System.Windows.Forms.Padding(3, 3, 3, 6); this.tableLayoutPanelBottom.Name = "tableLayoutPanelBottom"; this.tableLayoutPanelBottom.RowCount = 1; @@ -4847,6 +4847,8 @@ namespace SystemTrayMenu.UserInterface // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.AutoSize = true; + this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.ClientSize = new System.Drawing.Size(995, 554); this.Controls.Add(this.tableLayoutPanelMain); this.MaximizeBox = false; @@ -4856,6 +4858,7 @@ namespace SystemTrayMenu.UserInterface this.Text = "Settings"; this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.SettingsForm_FormClosed); this.Load += new System.EventHandler(this.SettingsForm_Load); + this.Shown += new System.EventHandler(this.SettingsForm_Shown); this.tableLayoutPanelMain.ResumeLayout(false); this.tableLayoutPanelMain.PerformLayout(); this.tabControl.ResumeLayout(false); diff --git a/UserInterface/SettingsForm.cs b/UserInterface/SettingsForm.cs index 9ecfc27..83a0975 100644 --- a/UserInterface/SettingsForm.cs +++ b/UserInterface/SettingsForm.cs @@ -815,20 +815,17 @@ namespace SystemTrayMenu.UserInterface { AdjustControlMultilineIfNecessary(checkBoxStayOpenWhenFocusLost); dataGridViewFolders.ClearSelection(); - int heightFirstTabpage = tableLayoutPanelGeneral.Size.Height + (int)(50 * Scaling.Factor); - tabControl.Size = new Size( - tabControl.Size.Width, - heightFirstTabpage); tabPageGeneral.AutoScrollMinSize = tabPageGeneral.Size; - int widthMin = tableLayoutPanelMain.Width + - tableLayoutPanelMain.Margin.Horizontal + - tableLayoutPanelMain.Padding.Horizontal + 16; - int heightMin = heightFirstTabpage + tableLayoutPanelBottom.Height + 54; - Size = new Size(widthMin, heightMin); tableLayoutPanelMain.Dock = DockStyle.Fill; tabControl.Dock = DockStyle.Fill; } + private void SettingsForm_Shown(object sender, EventArgs e) + { + AutoSize = false; + AutoSizeMode = AutoSizeMode.GrowOnly; + } + private void ButtonOk_Click(object sender, EventArgs e) { if (checkBoxSetFolderByWindowsContextMenu.Checked)