github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-30 19:50:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Creating a branch 1.1 where I will try to make the 1.1.7 build available, this means I need to merge some changes from 2.0 to here.

Browse source
This commit is contained in:
RKrom 2013-12-04 17:46:02 +01:00
parent 2a8e2475d8
commit a03bc31aef
247 changed files with 6986 additions and 8233 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Greenshot/Forms/MainForm.cs
View file

@ -153,6 +153,10 @@ namespace Greenshot {
helpOutput.AppendLine("\t\tSet the language of Greenshot, e.g. greenshot /language en-US.");
helpOutput.AppendLine();
helpOutput.AppendLine();
helpOutput.AppendLine("\t/inidirectory [directory]");
helpOutput.AppendLine("\t\tSet the directory where the greenshot.ini should be stored & read.");
helpOutput.AppendLine();
helpOutput.AppendLine();
helpOutput.AppendLine("\t[filename]");
helpOutput.AppendLine("\t\tOpen the bitmap files in the running Greenshot instance or start a new instance");
Console.WriteLine(helpOutput.ToString());
@ -201,7 +205,13 @@ namespace Greenshot {
IniConfig.Save();
continue;
}
// Setting the INI-directory
if (argument.ToLower().Equals("/inidirectory")) {
IniConfig.IniDirectory = args[++argumentNr];
continue;
}
// Files to open
filesToOpen.Add(argument);
}
@ -338,8 +348,6 @@ namespace Greenshot {
// Disable access to the settings, for feature #3521446
contextmenu_settings.Visible = !conf.DisableSettings;
IniConfig.IniChanged += new FileSystemEventHandler(ReloadConfiguration);
// Make sure all hotkeys pass this window!
HotkeyControl.RegisterHotkeyHWND(this.Handle);
RegisterHotkeys();
@ -441,7 +449,14 @@ namespace Greenshot {
LOG.Info("Reload requested");
try {
IniConfig.Reload();
ReloadConfiguration(null, null);
this.Invoke((MethodInvoker)delegate {
// Even update language when needed
UpdateUI();
// Update the hotkey
// Make sure the current hotkeys are disabled
HotkeyControl.UnregisterHotkeys();
RegisterHotkeys();
});
} catch {}
break;
case CommandEnum.OpenFile:
@ -462,23 +477,6 @@ namespace Greenshot {
}
}
/// <summary>
/// This is called when the ini-file changes
/// </summary>
/// <param name="source"></param>
/// <param name="e"></param>
private void ReloadConfiguration(object source, FileSystemEventArgs e) {
Language.CurrentLanguage = null; // Reload
this.Invoke((MethodInvoker) delegate {
// Even update language when needed
UpdateUI();
// Update the hotkey
// Make sure the current hotkeys are disabled
HotkeyControl.UnregisterHotkeys();
RegisterHotkeys();
});
}
public ContextMenuStrip MainMenu {
get {return contextMenu;}
}