nemo r40 - in trunk: . gtk gtk-gui

[arj svn gnome org]

Author: arj
Date: Mon Jan  7 11:01:27 2008
New Revision: 40
URL: http://svn.gnome.org/viewvc/nemo?rev=40&view=rev

Log:
Add shortcut for search
  
And make sure that pressing return in the search field always searches



Modified:
   trunk/NEWS
   trunk/gtk-gui/MainWindow.cs
   trunk/gtk/MainWindow.cs

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Mon Jan  7 11:01:27 2008
@@ -10,6 +10,7 @@
   search text
 - Make add label menu look better when the item has no labels already
 - Add indexing dialog
+- Add shortcut for search
 
 0.1.2 alpha
 -----------

Modified: trunk/gtk-gui/MainWindow.cs
==============================================================================
--- trunk/gtk-gui/MainWindow.cs	(original)
+++ trunk/gtk-gui/MainWindow.cs	Mon Jan  7 11:01:27 2008
@@ -237,14 +237,14 @@
         this.prev_button.UseUnderline = true;
         // Container child prev_button.Gtk.Container+ContainerChild
         Gtk.Alignment w22 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
-        // Container child GtkAlignment.Gtk.Container+ContainerChild
+        // Container child GtkAlignment1.Gtk.Container+ContainerChild
         Gtk.HBox w23 = new Gtk.HBox();
         w23.Spacing = 2;
-        // Container child GtkHBox.Gtk.Container+ContainerChild
+        // Container child GtkHBox1.Gtk.Container+ContainerChild
         Gtk.Image w24 = new Gtk.Image();
         w24.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-go-back", Gtk.IconSize.Menu, 16);
         w23.Add(w24);
-        // Container child GtkHBox.Gtk.Container+ContainerChild
+        // Container child GtkHBox1.Gtk.Container+ContainerChild
         Gtk.Label w26 = new Gtk.Label();
         w26.LabelProp = "";
         w23.Add(w26);
@@ -262,14 +262,14 @@
         this.next_button.UseUnderline = true;
         // Container child next_button.Gtk.Container+ContainerChild
         Gtk.Alignment w31 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
-        // Container child GtkAlignment.Gtk.Container+ContainerChild
+        // Container child GtkAlignment2.Gtk.Container+ContainerChild
         Gtk.HBox w32 = new Gtk.HBox();
         w32.Spacing = 2;
-        // Container child GtkHBox.Gtk.Container+ContainerChild
+        // Container child GtkHBox2.Gtk.Container+ContainerChild
         Gtk.Image w33 = new Gtk.Image();
         w33.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-go-forward", Gtk.IconSize.Menu, 16);
         w32.Add(w33);
-        // Container child GtkHBox.Gtk.Container+ContainerChild
+        // Container child GtkHBox2.Gtk.Container+ContainerChild
         Gtk.Label w35 = new Gtk.Label();
         w35.LabelProp = "";
         w32.Add(w35);

Modified: trunk/gtk/MainWindow.cs
==============================================================================
--- trunk/gtk/MainWindow.cs	(original)
+++ trunk/gtk/MainWindow.cs	Mon Jan  7 11:01:27 2008
@@ -47,6 +47,8 @@
 
 		this.Title = version;
 
+		this.AddMnemonic('s', this.search_input);
+
 		// hide while moving
 		this.FocusOutEvent += delegate(object sender, Gtk.FocusOutEventArgs args) {
 			Nemo.Singleton<Nemo.OverlayTracker>.Instance.hide_all(); 
@@ -201,7 +203,7 @@
     		return;
     	}
     	
-    	if (last_search_text == search_input.Text)
+    	if (last_search_text == search_input.Text && !quick_search)
     		return;
     
     	last_search_text = search_input.Text;