diff --git a/GreenshotJiraPlugin/Forms/JiraForm.cs b/GreenshotJiraPlugin/Forms/JiraForm.cs index efee62973..cfd5183e6 100644 --- a/GreenshotJiraPlugin/Forms/JiraForm.cs +++ b/GreenshotJiraPlugin/Forms/JiraForm.cs @@ -27,9 +27,8 @@ using Greenshot.IniFile; using GreenshotPlugin.Controls; using GreenshotPlugin.Core; using System.Collections.Generic; -using System.IO; +using System.Linq; using System.Threading.Tasks; -using Dapplo.Jira; namespace GreenshotJiraPlugin.Forms { public partial class JiraForm : Form { @@ -84,14 +83,11 @@ namespace GreenshotJiraPlugin.Forms { jiraFilterBox.SelectedIndex = 0; } ChangeModus(true); - if (JiraConfig.LastUsedJira != null) + if (_jiraConnector.Monitor.RecentJiras.Any()) { - _selectedIssue = await _jiraConnector.GetIssueAsync(JiraConfig.LastUsedJira); - if (_selectedIssue != null) - { - jiraKey.Text = JiraConfig.LastUsedJira; - uploadButton.Enabled = true; - } + _selectedIssue = _jiraConnector.Monitor.RecentJiras.First().JiraIssue; + jiraKey.Text = _selectedIssue.Key; + uploadButton.Enabled = true; } } } @@ -118,7 +114,6 @@ namespace GreenshotJiraPlugin.Forms { } public async Task UploadAsync(IBinaryContainer attachment) { - JiraConfig.LastUsedJira = _selectedIssue.Key; attachment.Filename = jiraFilenameBox.Text; await _jiraConnector.AttachAsync(_selectedIssue.Key, attachment); diff --git a/GreenshotJiraPlugin/IssueTypeBitmapCache.cs b/GreenshotJiraPlugin/IssueTypeBitmapCache.cs index 162b41b13..b48173e8f 100644 --- a/GreenshotJiraPlugin/IssueTypeBitmapCache.cs +++ b/GreenshotJiraPlugin/IssueTypeBitmapCache.cs @@ -39,7 +39,7 @@ namespace GreenshotJiraPlugin { _jiraApi = jiraApi; // Set the expire timeout to an hour - ExpireTimeSpan = TimeSpan.FromHours(1); + ExpireTimeSpan = TimeSpan.FromHours(4); } protected override string CreateKey(IssueType keyObject) diff --git a/GreenshotJiraPlugin/JiraConfiguration.cs b/GreenshotJiraPlugin/JiraConfiguration.cs index 1f8e0bc31..8674aeaa4 100644 --- a/GreenshotJiraPlugin/JiraConfiguration.cs +++ b/GreenshotJiraPlugin/JiraConfiguration.cs @@ -37,13 +37,12 @@ namespace GreenshotJiraPlugin { [IniProperty("Timeout", Description="Session timeout in minutes", DefaultValue="30")] public int Timeout { get; set; } - [IniProperty("LastUsedJira", Description="Last used Jira")] - public string LastUsedJira { get; set; } - [IniProperty("UploadFormat", Description="What file type to use for uploading", DefaultValue="png")] public OutputFormat UploadFormat { get; set; } + [IniProperty("UploadJpegQuality", Description="JPEG file save quality in %.", DefaultValue="80")] public int UploadJpegQuality { get; set; } + [IniProperty("UploadReduceColors", Description="Reduce color amount of the uploaded image to 256", DefaultValue="False")] public bool UploadReduceColors { get; set; } } diff --git a/GreenshotJiraPlugin/JiraMonitor.cs b/GreenshotJiraPlugin/JiraMonitor.cs index 1d3784fd0..81605bddf 100644 --- a/GreenshotJiraPlugin/JiraMonitor.cs +++ b/GreenshotJiraPlugin/JiraMonitor.cs @@ -196,7 +196,7 @@ namespace GreenshotJiraPlugin return; } // We detected an unknown JIRA, so add it to our list - currentJiraDetails = new JiraDetails() + currentJiraDetails = new JiraDetails { Id = jiraId, ProjectKey = projectKey