[tomboy] Close findbar on escape, even if it has not the focus.
- From: Benjamin Podszun <bpodszun src gnome org>
- To: svn-commits-list gnome org
- Subject: [tomboy] Close findbar on escape, even if it has not the focus.
- Date: Fri, 22 May 2009 14:25:06 -0400 (EDT)
commit e3dbcac334046b89dcf6c24392083068fd0eccd1
Author: Benjamin Podszun <benjamin podszun gmail com>
Date: Fri May 22 18:15:17 2009 +0200
Close findbar on escape, even if it has not the focus.
Fixes bug #540822
---
Tomboy/NoteWindow.cs | 25 ++++++-------------------
1 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/Tomboy/NoteWindow.cs b/Tomboy/NoteWindow.cs
index 35e0422..87e2fed 100644
--- a/Tomboy/NoteWindow.cs
+++ b/Tomboy/NoteWindow.cs
@@ -1,4 +1,3 @@
-
using System;
using System.Collections.Generic;
using System.Runtime.InteropServices;
@@ -160,13 +159,8 @@ namespace Tomboy
Gdk.ModifierType.ControlMask,
Gtk.AccelFlags.Visible);
- // Have Esc key close the note window
- if ((bool) Preferences.Get (Preferences.ENABLE_CLOSE_NOTE_ON_ESCAPE))
- KeyPressEvent += KeyPressed;
-
- // Watch the escape setting in GConf
- Preferences.Client.AddNotify (Preferences.ENABLE_CLOSE_NOTE_ON_ESCAPE,
- OnEscapeSettingChanged);
+ // Have Esc key close the find bar or note window
+ KeyPressEvent += KeyPressed;
// Increase Indent
global_keys.AddAccelerator (new EventHandler (ChangeDepthRightHandler),
@@ -203,16 +197,6 @@ namespace Tomboy
Move (x, y);
}
- void OnEscapeSettingChanged (object sender, NotifyEventArgs args)
- {
- // enable escape key
- if ((bool) args.Value)
- KeyPressEvent += KeyPressed;
- // disable escape key
- else
- KeyPressEvent -= KeyPressed;
- }
-
void KeyPressed (object sender, Gtk.KeyPressEventArgs args)
{
args.RetVal = true;
@@ -220,7 +204,10 @@ namespace Tomboy
switch (args.Event.Key)
{
case Gdk.Key.Escape:
- CloseWindowHandler (null, null);
+ if (find_bar != null && find_bar.Visible)
+ find_bar.Hide ();
+ else if ((bool) Preferences.Get(Preferences.ENABLE_CLOSE_NOTE_ON_ESCAPE))
+ CloseWindowHandler (null, null);
break;
default:
args.RetVal = false;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]