From 7c5169da6973a377a28c728ff2d2a424f538ad66 Mon Sep 17 00:00:00 2001 From: RKrom Date: Wed, 2 May 2012 11:08:36 +0000 Subject: [PATCH] Added "suppress save dialog" option for the editor in the expert setting. git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1824 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4 --- Greenshot/Forms/SettingsForm.Designer.cs | 43 ++++++++++++++++-------- Greenshot/Forms/SettingsForm.cs | 1 + Greenshot/Languages/language-en-US.xml | 3 ++ 3 files changed, 33 insertions(+), 14 deletions(-) diff --git a/Greenshot/Forms/SettingsForm.Designer.cs b/Greenshot/Forms/SettingsForm.Designer.cs index a4e0f2610..aeb64a291 100644 --- a/Greenshot/Forms/SettingsForm.Designer.cs +++ b/Greenshot/Forms/SettingsForm.Designer.cs @@ -65,6 +65,7 @@ namespace Greenshot { this.groupbox_applicationsettings = new GreenshotPlugin.Controls.GreenshotGroupBox(); this.checkbox_autostartshortcut = new GreenshotPlugin.Controls.GreenshotCheckBox(); this.groupbox_qualitysettings = new GreenshotPlugin.Controls.GreenshotGroupBox(); + this.checkbox_reducecolors = new GreenshotPlugin.Controls.GreenshotCheckBox(); this.checkbox_alwaysshowqualitydialog = new GreenshotPlugin.Controls.GreenshotCheckBox(); this.label_jpegquality = new GreenshotPlugin.Controls.GreenshotLabel(); this.textBoxJpegQuality = new System.Windows.Forms.TextBox(); @@ -134,7 +135,7 @@ namespace Greenshot { this.checkbox_enableexpert = new GreenshotPlugin.Controls.GreenshotCheckBox(); this.listview_clipboardformats = new System.Windows.Forms.ListView(); this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.checkbox_reducecolors = new GreenshotPlugin.Controls.GreenshotCheckBox(); + this.checkbox_suppresssavedialogatclose = new GreenshotPlugin.Controls.GreenshotCheckBox(); this.groupbox_preferredfilesettings.SuspendLayout(); this.groupbox_applicationsettings.SuspendLayout(); this.groupbox_qualitysettings.SuspendLayout(); @@ -341,7 +342,18 @@ namespace Greenshot { this.groupbox_qualitysettings.Size = new System.Drawing.Size(412, 106); this.groupbox_qualitysettings.TabIndex = 14; this.groupbox_qualitysettings.TabStop = false; - this.groupbox_qualitysettings.Text = "JPEG settings"; + this.groupbox_qualitysettings.Text = "Quality settings"; + // + // checkbox_reducecolors + // + this.checkbox_reducecolors.LanguageKey = "settings_reducecolors"; + this.checkbox_reducecolors.Location = new System.Drawing.Point(12, 72); + this.checkbox_reducecolors.Name = "checkbox_reducecolors"; + this.checkbox_reducecolors.PropertyName = "OutputFileReduceColors"; + this.checkbox_reducecolors.Size = new System.Drawing.Size(394, 25); + this.checkbox_reducecolors.TabIndex = 17; + this.checkbox_reducecolors.Text = "Reduce the amount of colors to a maximum of 256"; + this.checkbox_reducecolors.UseVisualStyleBackColor = true; // // checkbox_alwaysshowqualitydialog // @@ -351,7 +363,7 @@ namespace Greenshot { this.checkbox_alwaysshowqualitydialog.PropertyName = "OutputFilePromptQuality"; this.checkbox_alwaysshowqualitydialog.Size = new System.Drawing.Size(394, 25); this.checkbox_alwaysshowqualitydialog.TabIndex = 16; - this.checkbox_alwaysshowqualitydialog.Text = "Show quality dialog every time a JPEG image is saved"; + this.checkbox_alwaysshowqualitydialog.Text = "Show quality dialog every time an image is saved"; this.checkbox_alwaysshowqualitydialog.UseVisualStyleBackColor = true; // // label_jpegquality @@ -1026,6 +1038,7 @@ namespace Greenshot { // // groupbox_expert // + this.groupbox_expert.Controls.Add(this.checkbox_suppresssavedialogatclose); this.groupbox_expert.Controls.Add(this.label_counter); this.groupbox_expert.Controls.Add(this.textbox_counter); this.groupbox_expert.Controls.Add(this.label_footerpattern); @@ -1083,7 +1096,7 @@ namespace Greenshot { // checkbox_thumbnailpreview // this.checkbox_thumbnailpreview.LanguageKey = "expertsettings_thumbnailpreview"; - this.checkbox_thumbnailpreview.Location = new System.Drawing.Point(10, 207); + this.checkbox_thumbnailpreview.Location = new System.Drawing.Point(10, 185); this.checkbox_thumbnailpreview.Name = "checkbox_thumbnailpreview"; this.checkbox_thumbnailpreview.PropertyName = "ThumnailPreview"; this.checkbox_thumbnailpreview.Size = new System.Drawing.Size(394, 24); @@ -1094,7 +1107,7 @@ namespace Greenshot { // checkbox_optimizeforrdp // this.checkbox_optimizeforrdp.LanguageKey = "expertsettings_optimizeforrdp"; - this.checkbox_optimizeforrdp.Location = new System.Drawing.Point(10, 177); + this.checkbox_optimizeforrdp.Location = new System.Drawing.Point(10, 166); this.checkbox_optimizeforrdp.Name = "checkbox_optimizeforrdp"; this.checkbox_optimizeforrdp.PropertyName = "OptimizeForRDP"; this.checkbox_optimizeforrdp.Size = new System.Drawing.Size(394, 24); @@ -1157,16 +1170,17 @@ namespace Greenshot { this.columnHeader1.Text = "Destination"; this.columnHeader1.Width = 280; // - // checkbox_reducecolors + // checkbox_suppresssavedialogatclose // - this.checkbox_reducecolors.LanguageKey = "settings_reducecolors"; - this.checkbox_reducecolors.Location = new System.Drawing.Point(12, 72); - this.checkbox_reducecolors.Name = "checkbox_reducecolors"; - this.checkbox_reducecolors.PropertyName = "OutputFileReduceColors"; - this.checkbox_reducecolors.Size = new System.Drawing.Size(394, 25); - this.checkbox_reducecolors.TabIndex = 17; - this.checkbox_reducecolors.Text = "Show quality dialog every time a JPEG image is saved"; - this.checkbox_reducecolors.UseVisualStyleBackColor = true; + this.checkbox_suppresssavedialogatclose.LanguageKey = "expertsettings_suppresssavedialogatclose"; + this.checkbox_suppresssavedialogatclose.Location = new System.Drawing.Point(10, 204); + this.checkbox_suppresssavedialogatclose.Name = "checkbox_suppresssavedialogatclose"; + this.checkbox_suppresssavedialogatclose.PropertyName = "SuppressSaveDialogAtClose"; + this.checkbox_suppresssavedialogatclose.SectionName = "Editor"; + this.checkbox_suppresssavedialogatclose.Size = new System.Drawing.Size(394, 24); + this.checkbox_suppresssavedialogatclose.TabIndex = 28; + this.checkbox_suppresssavedialogatclose.Text = "Suppress save dialog when closing the editor"; + this.checkbox_suppresssavedialogatclose.UseVisualStyleBackColor = true; // // SettingsForm // @@ -1305,5 +1319,6 @@ namespace Greenshot { private GreenshotPlugin.Controls.GreenshotLabel label_counter; private GreenshotPlugin.Controls.GreenshotTextBox textbox_counter; private GreenshotPlugin.Controls.GreenshotCheckBox checkbox_reducecolors; + private GreenshotPlugin.Controls.GreenshotCheckBox checkbox_suppresssavedialogatclose; } } diff --git a/Greenshot/Forms/SettingsForm.cs b/Greenshot/Forms/SettingsForm.cs index c449f8fbf..025e1bbe5 100644 --- a/Greenshot/Forms/SettingsForm.cs +++ b/Greenshot/Forms/SettingsForm.cs @@ -486,6 +486,7 @@ namespace Greenshot { checkbox_thumbnailpreview.Enabled = state; textbox_footerpattern.Enabled = state; textbox_counter.Enabled = state; + checkbox_suppresssavedialogatclose.Enabled = state; } /// diff --git a/Greenshot/Languages/language-en-US.xml b/Greenshot/Languages/language-en-US.xml index f97982d85..6658b5ea2 100644 --- a/Greenshot/Languages/language-en-US.xml +++ b/Greenshot/Languages/language-en-US.xml @@ -655,6 +655,9 @@ time, e.g. 11_58_32 (plus extension defined in the settings) The number for the ${NUM} in the filename pattern + + Suppress the save dialog when closing the editor + As displayed