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

Merge remote-tracking branch 'remotes/origin/master' into release/1.2.9

Browse source
This commit is contained in:
Robin 2016-05-24 13:13:48 +02:00
commit 0323705513
276 changed files with 5382 additions and 3666 deletions
Download patch file Download diff file Expand all files Collapse all files

20
GreenshotJiraPlugin/Forms/JiraForm.cs
View file

@ -29,21 +29,21 @@ using Jira;
namespace GreenshotJiraPlugin {
public partial class JiraForm : Form {
private JiraConnector jiraConnector;
private readonly JiraConnector jiraConnector;
private JiraIssue selectedIssue;
private GreenshotColumnSorter columnSorter;
private JiraConfiguration config = IniConfig.GetIniSection<JiraConfiguration>();
private readonly GreenshotColumnSorter columnSorter;
private readonly JiraConfiguration config = IniConfig.GetIniSection<JiraConfiguration>();
public JiraForm(JiraConnector jiraConnector) {
InitializeComponent();
this.Icon = GreenshotPlugin.Core.GreenshotResources.getGreenshotIcon();
Icon = GreenshotResources.getGreenshotIcon();
AcceptButton = uploadButton;
CancelButton = cancelButton;
initializeComponentText();
this.columnSorter = new GreenshotColumnSorter();
this.jiraListView.ListViewItemSorter = columnSorter;
columnSorter = new GreenshotColumnSorter();
jiraListView.ListViewItemSorter = columnSorter;
this.jiraConnector = jiraConnector;
@ -60,9 +60,9 @@ namespace GreenshotJiraPlugin {
}
private void initializeComponentText() {
this.label_jirafilter.Text = Language.GetString("jira", LangKey.label_jirafilter);
this.label_comment.Text = Language.GetString("jira", LangKey.label_comment);
this.label_filename.Text = Language.GetString("jira", LangKey.label_filename);
label_jirafilter.Text = Language.GetString("jira", LangKey.label_jirafilter);
label_comment.Text = Language.GetString("jira", LangKey.label_comment);
label_filename.Text = Language.GetString("jira", LangKey.label_filename);
}
private void updateForm() {
@ -188,7 +188,7 @@ namespace GreenshotJiraPlugin {
}
// Perform the sort with these new sort options.
this.jiraListView.Sort();
jiraListView.Sort();
}
void JiraKeyTextChanged(object sender, EventArgs e) {