github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-14 02:37:03 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed file handling, fixed wrong order in the title of the editor, changed left-click handling of the context menu. Added a boolean in the ProcessCmdKey of the surface.

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2327 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-11-28 18:59:01 +00:00
commit 2a26be0a37
4 changed files with 56 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

39
Greenshot/Forms/MainForm.cs
View file

@ -592,7 +592,7 @@ namespace Greenshot {
openFileDialog.Filter = "Image files (*.png, *.jpg, *.gif, *.bmp, *.ico, *.tiff, *.wmf)|*.png; *.jpg; *.jpeg; *.gif; *.bmp; *.ico; *.tiff; *.tif; *.wmf";
if (openFileDialog.ShowDialog() == DialogResult.OK) {
if (File.Exists(openFileDialog.FileName)) {
CaptureHelper.CaptureFile(openFileDialog.FileName);
CaptureHelper.CaptureFile(openFileDialog.FileName);
}
}
}
@ -1087,10 +1087,43 @@ namespace Greenshot {
new BugReportForm(exceptionText).ShowDialog();
}
/// <summary>
/// Handle the notify icon click
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void NotifyIconClick(object sender, MouseEventArgs e) {
// The right button will automatically be handled with the context menu, here we only check the left.
if (e.Button == MouseButtons.Left) {
MethodInfo oMethodInfo = typeof(NotifyIcon).GetMethod("ShowContextMenu", BindingFlags.Instance | BindingFlags.NonPublic);
oMethodInfo.Invoke(notifyIcon, null);
switch (conf.LeftClickAction) {
case LeftClickActions.OPEN_LAST_IN_EXPLORER:
string path = null;
string configPath = FilenameHelper.FillVariables(conf.OutputFilePath, false);
string lastFilePath = Path.GetDirectoryName(conf.OutputFileAsFullpath);
if (Directory.Exists(lastFilePath)) {
path = lastFilePath;
} else if (Directory.Exists(configPath)) {
path = configPath;
}
try {
System.Diagnostics.Process.Start(path);
} catch (Exception ex) {
// Make sure we show what we tried to open in the exception
ex.Data.Add("path", path);
throw ex;
}
break;
case LeftClickActions.OPEN_LAST_IN_EDITOR:
if (File.Exists(conf.OutputFileAsFullpath)) {
CaptureHelper.CaptureFile(conf.OutputFileAsFullpath, DestinationHelper.GetDestination(EditorDestination.DESIGNATION));
}
break;
default:
MethodInfo oMethodInfo = typeof(NotifyIcon).GetMethod("ShowContextMenu", BindingFlags.Instance | BindingFlags.NonPublic);
oMethodInfo.Invoke(notifyIcon, null);
break;
}
}
}