github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-20 05:23:24 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

FEATURE-731: reducing some of the logic, the upload form automatically takes the most recent.

Browse source
This commit is contained in:
Robin 2016-09-03 23:42:04 +02:00
commit 099813b5b6
4 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

15
GreenshotJiraPlugin/Forms/JiraForm.cs
View file

@ -27,9 +27,8 @@ using Greenshot.IniFile;
using GreenshotPlugin.Controls; using GreenshotPlugin.Controls;
using GreenshotPlugin.Core; using GreenshotPlugin.Core;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Dapplo.Jira;
namespace GreenshotJiraPlugin.Forms { namespace GreenshotJiraPlugin.Forms {
public partial class JiraForm : Form { public partial class JiraForm : Form {
@ -84,14 +83,11 @@ namespace GreenshotJiraPlugin.Forms {
jiraFilterBox.SelectedIndex = 0; jiraFilterBox.SelectedIndex = 0;
} }
ChangeModus(true); ChangeModus(true);
if (JiraConfig.LastUsedJira != null) if (_jiraConnector.Monitor.RecentJiras.Any())
{ {
_selectedIssue = await _jiraConnector.GetIssueAsync(JiraConfig.LastUsedJira); _selectedIssue = _jiraConnector.Monitor.RecentJiras.First().JiraIssue;
if (_selectedIssue != null) jiraKey.Text = _selectedIssue.Key;
{ uploadButton.Enabled = true;
jiraKey.Text = JiraConfig.LastUsedJira;
uploadButton.Enabled = true;
}
} }
} }
} }
@ -118,7 +114,6 @@ namespace GreenshotJiraPlugin.Forms {
} }
public async Task UploadAsync(IBinaryContainer attachment) { public async Task UploadAsync(IBinaryContainer attachment) {
JiraConfig.LastUsedJira = _selectedIssue.Key;
attachment.Filename = jiraFilenameBox.Text; attachment.Filename = jiraFilenameBox.Text;
await _jiraConnector.AttachAsync(_selectedIssue.Key, attachment); await _jiraConnector.AttachAsync(_selectedIssue.Key, attachment);

2
GreenshotJiraPlugin/IssueTypeBitmapCache.cs
View file

@ -39,7 +39,7 @@ namespace GreenshotJiraPlugin
{ {
_jiraApi = jiraApi; _jiraApi = jiraApi;
// Set the expire timeout to an hour // Set the expire timeout to an hour
ExpireTimeSpan = TimeSpan.FromHours(1); ExpireTimeSpan = TimeSpan.FromHours(4);
} }
protected override string CreateKey(IssueType keyObject) protected override string CreateKey(IssueType keyObject)

5
GreenshotJiraPlugin/JiraConfiguration.cs
View file

@ -37,13 +37,12 @@ namespace GreenshotJiraPlugin {
[IniProperty("Timeout", Description="Session timeout in minutes", DefaultValue="30")] [IniProperty("Timeout", Description="Session timeout in minutes", DefaultValue="30")]
public int Timeout { get; set; } 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")] [IniProperty("UploadFormat", Description="What file type to use for uploading", DefaultValue="png")]
public OutputFormat UploadFormat { get; set; } public OutputFormat UploadFormat { get; set; }
[IniProperty("UploadJpegQuality", Description="JPEG file save quality in %.", DefaultValue="80")] [IniProperty("UploadJpegQuality", Description="JPEG file save quality in %.", DefaultValue="80")]
public int UploadJpegQuality { get; set; } public int UploadJpegQuality { get; set; }
[IniProperty("UploadReduceColors", Description="Reduce color amount of the uploaded image to 256", DefaultValue="False")] [IniProperty("UploadReduceColors", Description="Reduce color amount of the uploaded image to 256", DefaultValue="False")]
public bool UploadReduceColors { get; set; } public bool UploadReduceColors { get; set; }
} }

2
GreenshotJiraPlugin/JiraMonitor.cs
View file

@ -196,7 +196,7 @@ namespace GreenshotJiraPlugin
return; return;
} }
// We detected an unknown JIRA, so add it to our list // We detected an unknown JIRA, so add it to our list
currentJiraDetails = new JiraDetails() currentJiraDetails = new JiraDetails
{ {
Id = jiraId, Id = jiraId,
ProjectKey = projectKey ProjectKey = projectKey