From aa9f6a0cd392d5f7c533c840e6dba2e84fa71894 Mon Sep 17 00:00:00 2001 From: RKrom Date: Wed, 30 May 2012 09:57:43 +0000 Subject: [PATCH] Fixing settings form and added a hide expert tab setting. git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1904 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4 --- Greenshot/Forms/SettingsForm.Designer.cs | 6 +++--- Greenshot/Forms/SettingsForm.cs | 1 + GreenshotPlugin/Core/CoreConfiguration.cs | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Greenshot/Forms/SettingsForm.Designer.cs b/Greenshot/Forms/SettingsForm.Designer.cs index fb7b5dad4..a83891c44 100644 --- a/Greenshot/Forms/SettingsForm.Designer.cs +++ b/Greenshot/Forms/SettingsForm.Designer.cs @@ -1180,10 +1180,10 @@ namespace Greenshot { this.columnHeader1}); this.listview_clipboardformats.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; this.listview_clipboardformats.LabelWrap = false; - this.listview_clipboardformats.Location = new System.Drawing.Point(109, 38); + this.listview_clipboardformats.Location = new System.Drawing.Point(170, 38); this.listview_clipboardformats.Name = "listview_clipboardformats"; this.listview_clipboardformats.ShowGroups = false; - this.listview_clipboardformats.Size = new System.Drawing.Size(291, 72); + this.listview_clipboardformats.Size = new System.Drawing.Size(230, 72); this.listview_clipboardformats.Sorting = System.Windows.Forms.SortOrder.Ascending; this.listview_clipboardformats.TabIndex = 0; this.listview_clipboardformats.UseCompatibleStateImageBehavior = false; @@ -1192,7 +1192,7 @@ namespace Greenshot { // columnHeader1 // this.columnHeader1.Text = "Destination"; - this.columnHeader1.Width = 280; + this.columnHeader1.Width = 225; // // checkbox_minimizememoryfootprint // diff --git a/Greenshot/Forms/SettingsForm.cs b/Greenshot/Forms/SettingsForm.cs index bd16a083e..b3e4aa6f4 100644 --- a/Greenshot/Forms/SettingsForm.cs +++ b/Greenshot/Forms/SettingsForm.cs @@ -163,6 +163,7 @@ namespace Greenshot { /// Update the UI to reflect the language and other text settings /// private void UpdateUI() { + tab_expert.Visible = !coreConfiguration.HideExpertSettings; toolTip.SetToolTip(label_language, Language.GetString(LangKey.settings_tooltip_language)); toolTip.SetToolTip(label_storagelocation, Language.GetString(LangKey.settings_tooltip_storagelocation)); toolTip.SetToolTip(label_screenshotname, Language.GetString(LangKey.settings_tooltip_filenamepattern)); diff --git a/GreenshotPlugin/Core/CoreConfiguration.cs b/GreenshotPlugin/Core/CoreConfiguration.cs index 370343923..b52e00be3 100644 --- a/GreenshotPlugin/Core/CoreConfiguration.cs +++ b/GreenshotPlugin/Core/CoreConfiguration.cs @@ -160,6 +160,8 @@ namespace GreenshotPlugin.Core { public bool DisableSettings; [IniProperty("DisableTrayicon", Description = "Disable the trayicon, can only be changed manually in this .ini", DefaultValue = "False")] public bool HideTrayicon; + [IniProperty("HideExpertSettings", Description = "Hide expert tab in the settings, can only be changed manually in this .ini", DefaultValue = "False")] + public bool HideExpertSettings; [IniProperty("ThumnailPreview", Description="Enable/disable thumbnail previews", DefaultValue="True")] public bool ThumnailPreview;