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

Fixed DestinationPicker "issue", the context menu was still shown if the e.g. Jira upload window was shown. Also fixed an issue with the jira upload window that the last used jira was displayed but the upload button was disabled.

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1619 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-02-02 08:57:37 +00:00
commit 8198c69d68
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Greenshot/Destinations/PickerDestination.cs
View file

@ -92,6 +92,8 @@ namespace Greenshot.Destinations {
if (clickedDestination == null) {
return;
}
// Make sure the menu is closed
menu.Close();
bool result = clickedDestination.ExportCapture(surface, captureDetails);
// TODO: Find some better way to detect that we exported to the editor
if (!EditorDestination.DESIGNATION.Equals(clickedDestination.Designation) || result == false) {
@ -99,8 +101,6 @@ namespace Greenshot.Destinations {
// Cleanup surface
surface.Dispose();
}
// Make sure the menu is closed
menu.Close();
}
);
if (item != null) {

11
GreenshotJiraPlugin/Forms/JiraForm.cs
View file

@ -53,9 +53,8 @@ namespace GreenshotJiraPlugin {
} catch (Exception e) {
MessageBox.Show(language.GetFormattedString(LangKey.login_error, e.Message));
}
updateForm();
uploadButton.Enabled = false;
updateForm();
}
private void initializeComponentText() {
@ -74,7 +73,11 @@ namespace GreenshotJiraPlugin {
jiraFilterBox.SelectedIndex = 0;
}
changeModus(true);
jiraKey.Text = config.LastUsedJira;
selectedIssue = jiraConnector.getIssue(config.LastUsedJira);
if (selectedIssue != null) {
jiraKey.Text = config.LastUsedJira;
uploadButton.Enabled = true;
}
}
}
@ -199,7 +202,7 @@ namespace GreenshotJiraPlugin {
// Perform the sort with these new sort options.
this.jiraListView.Sort();
}
void JiraKeyTextChanged(object sender, EventArgs e) {
string jiranumber = jiraKey.Text;
uploadButton.Enabled = false;