From 3250eee5334cad28976f842a9d7e871031ae9554 Mon Sep 17 00:00:00 2001 From: RKrom Date: Tue, 20 Mar 2012 05:55:49 +0000 Subject: [PATCH] Added missing changes git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1711 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4 --- GreenshotJiraPlugin/JiraConfiguration.cs | 30 +++++++++++++----------- GreenshotPlugin/GreenshotPlugin.csproj | 1 - 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/GreenshotJiraPlugin/JiraConfiguration.cs b/GreenshotJiraPlugin/JiraConfiguration.cs index d9428e095..e9ec0b973 100644 --- a/GreenshotJiraPlugin/JiraConfiguration.cs +++ b/GreenshotJiraPlugin/JiraConfiguration.cs @@ -45,25 +45,27 @@ namespace GreenshotJiraPlugin { public OutputFormat UploadFormat; [IniProperty("UploadJpegQuality", Description="JPEG file save quality in %.", DefaultValue="80")] public int UploadJpegQuality; + [IniProperty("UploadReduceColors", Description="Reduce color amount of the uploaded image to 256", DefaultValue="False")] + public bool UploadReduceColors; /// /// A form for username/password /// /// bool true if OK was pressed, false if cancel - public bool ShowConfigDialog() { + public bool ShowConfigDialog() { SettingsForm settingsForm = new SettingsForm(this); - settingsForm.Url = Url; - settingsForm.UploadFormat = UploadFormat.ToString(); - DialogResult result = settingsForm.ShowDialog(); - if (result == DialogResult.OK) { - if (!settingsForm.Url.Equals(Url) || !settingsForm.UploadFormat.Equals(UploadFormat.ToString())) { - Url = settingsForm.Url; - UploadFormat = (OutputFormat)Enum.Parse(typeof(OutputFormat), settingsForm.UploadFormat.ToLower()); - } - IniConfig.Save(); - return true; - } - return false; - } + settingsForm.Url = Url; + settingsForm.UploadFormat = UploadFormat.ToString(); + DialogResult result = settingsForm.ShowDialog(); + if (result == DialogResult.OK) { + if (!settingsForm.Url.Equals(Url) || !settingsForm.UploadFormat.Equals(UploadFormat.ToString())) { + Url = settingsForm.Url; + UploadFormat = (OutputFormat)Enum.Parse(typeof(OutputFormat), settingsForm.UploadFormat.ToLower()); + } + IniConfig.Save(); + return true; + } + return false; + } } } diff --git a/GreenshotPlugin/GreenshotPlugin.csproj b/GreenshotPlugin/GreenshotPlugin.csproj index be05ffdbd..3b64e31a1 100644 --- a/GreenshotPlugin/GreenshotPlugin.csproj +++ b/GreenshotPlugin/GreenshotPlugin.csproj @@ -240,7 +240,6 @@ -