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

Checked ClickActions, added the Settings as possible value. Also made sure we log more information if the INI has wrong values.

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2434 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2013-01-18 11:05:11 +00:00
commit 771fc93d6b
3 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Greenshot/Forms/MainForm.cs
View file

@ -1150,7 +1150,7 @@ namespace Greenshot {
return; return;
} }
// The right button will automatically be handled with the context menu, here we only check the left. // The right button will automatically be handled with the context menu, here we only check the left.
if (conf.DoubleClickAction == ClickActions.NOTHING) { if (conf.DoubleClickAction == ClickActions.DO_NOTHING) {
// As there isn't a double-click we can start the Left click // As there isn't a double-click we can start the Left click
NotifyIconClick(conf.LeftClickAction); NotifyIconClick(conf.LeftClickAction);
// ready with the test // ready with the test
@ -1212,7 +1212,10 @@ namespace Greenshot {
CaptureHelper.CaptureFile(conf.OutputFileAsFullpath, DestinationHelper.GetDestination(EditorDestination.DESIGNATION)); CaptureHelper.CaptureFile(conf.OutputFileAsFullpath, DestinationHelper.GetDestination(EditorDestination.DESIGNATION));
} }
break; break;
case ClickActions.CONTEXT_MENU: case ClickActions.OPEN_SETTINGS:
ShowSetting();
break;
case ClickActions.SHOW_CONTEXT_MENU:
MethodInfo oMethodInfo = typeof(NotifyIcon).GetMethod("ShowContextMenu", BindingFlags.Instance | BindingFlags.NonPublic); MethodInfo oMethodInfo = typeof(NotifyIcon).GetMethod("ShowContextMenu", BindingFlags.Instance | BindingFlags.NonPublic);
oMethodInfo.Invoke(notifyIcon, null); oMethodInfo.Invoke(notifyIcon, null);
break; break;

9
GreenshotPlugin/Core/CoreConfiguration.cs
View file

@ -44,10 +44,11 @@ namespace GreenshotPlugin.Core {
} }
public enum ClickActions { public enum ClickActions {
NOTHING, DO_NOTHING,
OPEN_LAST_IN_EXPLORER, OPEN_LAST_IN_EXPLORER,
OPEN_LAST_IN_EDITOR, OPEN_LAST_IN_EDITOR,
CONTEXT_MENU OPEN_SETTINGS,
SHOW_CONTEXT_MENU
} }
/// <summary> /// <summary>
@ -212,8 +213,8 @@ namespace GreenshotPlugin.Core {
[IniProperty("WindowCornerCutShape", Description = "The cutshape which is used to remove the window corners, is mirrorred for all corners", DefaultValue = "5,3,2,1,1")] [IniProperty("WindowCornerCutShape", Description = "The cutshape which is used to remove the window corners, is mirrorred for all corners", DefaultValue = "5,3,2,1,1")]
public List<int> WindowCornerCutShape; public List<int> WindowCornerCutShape;
[IniProperty("LeftClickAction", Description = "Specify what action is made if the tray icon is left clicked, if a double-click action is specified this action is initiated after a delay (configurable via the windows double-click speed)", DefaultValue = "CONTEXT_MENU")] [IniProperty("LeftClickAction", Description = "Specify what action is made if the tray icon is left clicked, if a double-click action is specified this action is initiated after a delay (configurable via the windows double-click speed)", DefaultValue = "SHOW_CONTEXT_MENU")]
public ClickActions LeftClickAction; public ClickActions LeftClickAction;
[IniProperty("DoubleClickAction", Description = "Specify what action is made if the tray icon is double clicked", DefaultValue = "OPEN_LAST_IN_EXPLORER")] [IniProperty("DoubleClickAction", Description = "Specify what action is made if the tray icon is double clicked", DefaultValue = "OPEN_LAST_IN_EXPLORER")]

5
GreenshotPlugin/IniFile/IniValue.cs
View file

@ -288,9 +288,12 @@ namespace Greenshot.IniFile {
newValue = null; newValue = null;
if (!defaultUsed) { if (!defaultUsed) {
try { try {
LOG.WarnFormat("Problem '{0}' while converting {1} to type {2} trying fallback...", ex1.Message, propertyValue, valueType.FullName);
newValue = ConvertStringToValueType(valueType, defaultValue, attributes.Separator); newValue = ConvertStringToValueType(valueType, defaultValue, attributes.Separator);
this.ContainingIniSection.IsDirty = true;
LOG.InfoFormat("Used default value {0} for property {1}", defaultValue, propertyName);
} catch (Exception ex2) { } catch (Exception ex2) {
LOG.Warn("Problem converting " + propertyValue + " to type " + valueType.FullName, ex2); LOG.Warn("Problem converting fallback value " + defaultValue + " to type " + valueType.FullName, ex2);
} }
} else { } else {
LOG.Warn("Problem converting " + propertyValue + " to type " + valueType.FullName, ex1); LOG.Warn("Problem converting " + propertyValue + " to type " + valueType.FullName, ex1);