github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-15 09:33:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Changes for feature request #3547158, although the feature was already there it wasn't clear.

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1977 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-08-07 16:12:28 +00:00
parent 7fa34e04e9
commit d51f4fbcc1
2 changed files with 52 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -171,6 +171,7 @@ namespace Greenshot {
this.textbox_storagelocation.Name = "textbox_storagelocation"; this.textbox_storagelocation.Name = "textbox_storagelocation";
this.textbox_storagelocation.Size = new System.Drawing.Size(233, 20); this.textbox_storagelocation.Size = new System.Drawing.Size(233, 20);
this.textbox_storagelocation.TabIndex = 12; this.textbox_storagelocation.TabIndex = 12;
this.textbox_storagelocation.TextChanged += new System.EventHandler(StorageLocationChanged);
// //
// label_storagelocation // label_storagelocation
// //

14
Greenshot/Forms/SettingsForm.cs
View file

@ -55,7 +55,6 @@ namespace Greenshot {
protected override void OnLoad(EventArgs e) { protected override void OnLoad(EventArgs e) {
base.OnLoad(e); base.OnLoad(e);
this.Icon = GreenshotPlugin.Core.GreenshotResources.getGreenshotIcon(); this.Icon = GreenshotPlugin.Core.GreenshotResources.getGreenshotIcon();
// Fix for Vista/XP differences // Fix for Vista/XP differences
@ -88,6 +87,7 @@ namespace Greenshot {
GreenshotPlugin.Controls.HotkeyControl.UnregisterHotkeys(); GreenshotPlugin.Controls.HotkeyControl.UnregisterHotkeys();
inHotkey = true; inHotkey = true;
} }
private void LeaveHotkeyControl() { private void LeaveHotkeyControl() {
MainForm.RegisterHotkeys(); MainForm.RegisterHotkeys();
inHotkey = false; inHotkey = false;
@ -236,11 +236,20 @@ namespace Greenshot {
textbox_storagelocation.BackColor = Color.Red; textbox_storagelocation.BackColor = Color.Red;
settingsOk = false; settingsOk = false;
} else { } else {
textbox_storagelocation.BackColor = Control.DefaultBackColor; // "Added" feature #3547158
if (Environment.OSVersion.Version.Major >= 6) {
this.textbox_storagelocation.BackColor = System.Drawing.SystemColors.Window;
} else {
this.textbox_storagelocation.BackColor = System.Drawing.SystemColors.Control;
}
} }
return settingsOk; return settingsOk;
} }
private void StorageLocationChanged(object sender, System.EventArgs e) {
CheckSettings();
}
/// <summary> /// <summary>
/// Show all destination descriptions in the current language /// Show all destination descriptions in the current language
/// </summary> /// </summary>
@ -429,7 +438,6 @@ namespace Greenshot {
this.textbox_storagelocation.Text = this.folderBrowserDialog1.SelectedPath; this.textbox_storagelocation.Text = this.folderBrowserDialog1.SelectedPath;
} }
} }
CheckSettings();
} }
void TrackBarJpegQualityScroll(object sender, System.EventArgs e) { void TrackBarJpegQualityScroll(object sender, System.EventArgs e) {