github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-16 10:03:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes for bug #1484, disabling the edit button after redrawing the items.

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2551 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2013-04-03 07:18:26 +00:00
parent b1a7fd77eb
commit 28346d2eab
3 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
GreenshotExternalCommandPlugin/ExternalCommandDestination.cs
View file

@ -58,7 +58,7 @@ namespace ExternalCommand {
public override Image DisplayIcon { public override Image DisplayIcon {
get { get {
return IconCache.IconForExe(presetCommand); return IconCache.IconForCommand(presetCommand);
} }
} }

16
GreenshotExternalCommandPlugin/IconCache.cs
View file

@ -11,20 +11,20 @@ namespace ExternalCommand {
private static ExternalCommandConfiguration config = IniConfig.GetIniSection<ExternalCommandConfiguration>(); private static ExternalCommandConfiguration config = IniConfig.GetIniSection<ExternalCommandConfiguration>();
private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(IconCache)); private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(IconCache));
public static Image IconForExe(string exepath) { public static Image IconForCommand(string commandName) {
if (exepath != null) { if (commandName != null) {
if (!iconCache.ContainsKey(exepath)) { if (!iconCache.ContainsKey(commandName)) {
Image icon = null; Image icon = null;
if (File.Exists(config.commandlines[exepath])) { if (File.Exists(config.commandlines[commandName])) {
try { try {
icon = PluginUtils.GetExeIcon(config.commandlines[exepath], 0); icon = PluginUtils.GetExeIcon(config.commandlines[commandName], 0);
} catch (Exception ex) { } catch (Exception ex) {
LOG.Warn("Problem loading icon for " + config.commandlines[exepath], ex); LOG.Warn("Problem loading icon for " + config.commandlines[commandName], ex);
} }
} }
iconCache.Add(exepath, icon); iconCache.Add(commandName, icon);
} }
return iconCache[exepath]; return iconCache[commandName];
} else { } else {
return null; return null;
} }

10
GreenshotExternalCommandPlugin/SettingsForm.cs
View file

@ -76,7 +76,7 @@ namespace ExternalCommand {
int imageNr = 0; int imageNr = 0;
foreach (string commando in config.commands) { foreach (string commando in config.commands) {
ListViewItem item = null; ListViewItem item = null;
Image iconForExe = IconCache.IconForExe(commando); Image iconForExe = IconCache.IconForCommand(commando);
if (iconForExe != null) { if (iconForExe != null) {
imageList.Images.Add(iconForExe); imageList.Images.Add(iconForExe);
item = new ListViewItem(commando, imageNr++); item = new ListViewItem(commando, imageNr++);
@ -87,6 +87,8 @@ namespace ExternalCommand {
listView1.Items.Add(item); listView1.Items.Add(item);
} }
} }
// Fix for bug #1484, getting an ArgumentOutOfRangeException as there is nothing selected but the edit button was still active.
button_edit.Enabled = listView1.SelectedItems.Count > 0;
} }
void ListView1ItemSelectionChanged(object sender, EventArgs e) { void ListView1ItemSelectionChanged(object sender, EventArgs e) {
@ -98,6 +100,12 @@ namespace ExternalCommand {
} }
void ListView1DoubleClick(object sender, EventArgs e) { void ListView1DoubleClick(object sender, EventArgs e) {
// Safety check for bug #1484
bool selectionActive = listView1.SelectedItems.Count > 0;
if (!selectionActive) {
button_edit.Enabled = false;
return;
}
string commando = listView1.SelectedItems[0].Tag as string; string commando = listView1.SelectedItems[0].Tag as string;
SettingsFormDetail form = new SettingsFormDetail(commando); SettingsFormDetail form = new SettingsFormDetail(commando);