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

Merge from 0.8: Fixed open recent (tray-icon context menu) and added the "save" icon to the SaveAs in the editor menu

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1288 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2011-07-17 14:47:31 +00:00
commit 9e0a754032
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Greenshot/Forms/ImageEditorForm.Designer.cs generated
View file

@ -427,6 +427,7 @@ namespace Greenshot {
// //
// saveAsToolStripMenuItem // saveAsToolStripMenuItem
// //
this.saveAsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image")));
this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem"; this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem";
this.saveAsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) this.saveAsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.S))); | System.Windows.Forms.Keys.S)));

5
Greenshot/Forms/MainForm.cs
View file

@ -780,8 +780,9 @@ namespace Greenshot {
private void Contextmenu_OpenRecent(object sender, EventArgs eventArgs) { private void Contextmenu_OpenRecent(object sender, EventArgs eventArgs) {
string path; string path;
string configPath = FilenameHelper.FillVariables(conf.OutputFilePath); string configPath = FilenameHelper.FillVariables(conf.OutputFilePath);
if (File.Exists(conf.OutputFileAsFullpath)) { string lastFilePath = Path.GetDirectoryName(conf.OutputFileAsFullpath);
path = conf.OutputFileAsFullpath; if (Directory.Exists(lastFilePath)) {
path = lastFilePath;
} else if (Directory.Exists(configPath)) { } else if (Directory.Exists(configPath)) {
path = configPath; path = configPath;
} else { } else {