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

Fixing hotkey issues

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1926 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-06-20 16:22:32 +00:00
parent 7e27765314
commit 077e12b7cc
1 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
GreenshotPlugin/Controls/GreenshotForm.cs
View file

@ -394,7 +394,15 @@ namespace GreenshotPlugin.Controls {
TextBox textBox = controlObject as TextBox; TextBox textBox = controlObject as TextBox;
if (textBox != null) { if (textBox != null) {
textBox.Text = iniValue.ToString(); HotkeyControl hotkeyControl = controlObject as HotkeyControl;
if (hotkeyControl != null) {
string hotkeyValue = (string)iniValue.Value;
if (!string.IsNullOrEmpty(hotkeyValue)) {
hotkeyControl.SetHotkey(hotkeyValue);
}
continue;
}
textBox.Text = iniValue.ToString();
continue; continue;
} }
@ -405,14 +413,6 @@ namespace GreenshotPlugin.Controls {
continue; continue;
} }
HotkeyControl hotkeyControl = controlObject as HotkeyControl;
if (hotkeyControl != null) {
string hotkeyValue = (string)iniValue.Value;
if (!string.IsNullOrEmpty(hotkeyValue)) {
hotkeyControl.SetHotkey(hotkeyValue);
}
continue;
}
} }
} }
} }
@ -448,13 +448,12 @@ namespace GreenshotPlugin.Controls {
} }
TextBox textBox = controlObject as TextBox; TextBox textBox = controlObject as TextBox;
if (textBox != null) { if (textBox != null) {
HotkeyControl hotkeyControl = textBox as HotkeyControl; HotkeyControl hotkeyControl = controlObject as HotkeyControl;
if (hotkeyControl != null) { if (hotkeyControl != null) {
string hotkeyString = hotkeyControl.ToString(); iniValue.Value = hotkeyControl.ToString();
iniValue.Value = hotkeyString; iniDirty = true;
iniDirty = true; continue;
continue; }
}
iniValue.UseValueOrDefault(textBox.Text); iniValue.UseValueOrDefault(textBox.Text);
iniDirty = true; iniDirty = true;
continue; continue;
@ -465,6 +464,7 @@ namespace GreenshotPlugin.Controls {
iniDirty = true; iniDirty = true;
continue; continue;
} }
} }
} }
} }