Merge lp:~roignac/nautilus/bug_32542_save_search_as_button into lp:~ubuntu-desktop/nautilus/ubuntu

[Vadim Rutkovsky]

Add 'Save search as' to search toolbar

[Sebastien Bacher (seb128)]

Thank you for your work there, I'm unsure that saving searches is something users do enough to justify to be added to the toolbar though, also we are ui frozen for precise so that will have to wait the next cycle. I will watch the upstream comments though and review the patch again next cycle if they don't do it

[Sebastien Bacher (seb128)]

the save search has been removed upstream, closing that request

Unmerged revisions

273. By Vadim Rutkovsky on 2012-03-07

* debian/patches/21_save_search_on_toolbar.patch:
  - Add 'Save search as' button on search toolbar (lp: #32542)

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-06 21:21:03 +0000
+++ debian/changelog	2012-03-07 11:59:19 +0000
@@ -1,3 +1,10 @@
+nautilus (1:3.3.91-0ubuntu3) UNRELEASED; urgency=low
+
+  * debian/patches/21_save_search_on_toolbar.patch:
+    - Add 'Save search as' button on search toolbar (lp: #32542)
+
+ -- Vadim Rutkovsky <[e-mail]>  Wed, 07 Mar 2012 14:07:27 +0300
+
 nautilus (1:3.3.91-0ubuntu2) UNRELEASED; urgency=low
 
   * debian/patches/20_static_unity_quicklist.patch:
 
=== added file 'debian/patches/21_save_search_on_toolbar.patch'
--- debian/patches/21_save_search_on_toolbar.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/21_save_search_on_toolbar.patch	2012-03-07 11:59:19 +0000
@@ -0,0 +1,87 @@
+## Description: Add 'Save search as' button on search toolbar
+## Origin/Author: Vadim Rutkovsky <[e-mail]>
+## Bug: https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/32542, https://bugzilla.gnome.org/show_bug.cgi?id=332299
+Index: trunk/src/nautilus-query-editor.c
+===================================================================
+--- trunk.orig/src/nautilus-query-editor.c	2012-03-07 09:45:57.319085722 +0300
++++ trunk/src/nautilus-query-editor.c	2012-03-07 11:59:08.746123993 +0300
+@@ -24,6 +24,8 @@
+ #include <config.h>
+ #include "nautilus-query-editor.h"
+ #include "nautilus-window-slot.h"
++#include "nautilus-actions.h"
++#include "nautilus-view.h"
+ 
+ #include <string.h>
+ #include <glib/gi18n.h>
+@@ -1017,9 +1019,19 @@
+ }
+ 
+ static void
++save_search_cb (GtkButton *clicked_button, NautilusQueryEditor *editor)
++{
++	
++	NautilusView *view;
++
++	view = nautilus_window_slot_get_current_view (editor->details->slot);
++	nautilus_activate_search_save_as (view);
++}
++
++static void
+ finish_first_line (NautilusQueryEditor *editor, GtkWidget *hbox, gboolean use_go)
+ {
+-	GtkWidget *button, *image;
++	GtkWidget *button, *save_search_as, *image;
+ 
+ 	button = gtk_button_new ();
+ 	image = gtk_image_new_from_stock (GTK_STOCK_ADD,
+@@ -1051,6 +1063,14 @@
+ 			  G_CALLBACK (go_search_cb), editor);
+ 		
+ 	gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
++
++	if (!use_go) {
++		save_search_as = gtk_button_new_with_label (_("Save Search as"));
++		g_signal_connect (save_search_as, "clicked",
++		                  G_CALLBACK (save_search_cb), editor);
++		gtk_widget_show (save_search_as);
++		gtk_box_pack_end (GTK_BOX (hbox), save_search_as, FALSE, FALSE, 0);
++	}
+ }
+ 
+ static void
+Index: trunk/src/nautilus-view.c
+===================================================================
+--- trunk.orig/src/nautilus-view.c	2012-03-07 08:08:01.221113000 +0300
++++ trunk/src/nautilus-view.c	2012-03-07 12:00:50.982630965 +0300
+@@ -1774,6 +1774,18 @@
+ 	}
+ }
+ 
++void
++nautilus_activate_search_save_as (NautilusView *view)
++{
++	GtkAction *action;
++
++	g_assert (NAUTILUS_IS_VIEW (view));
++
++	action = gtk_action_group_get_action (view->details->dir_action_group,
++					      NAUTILUS_ACTION_SAVE_SEARCH_AS);
++	gtk_action_activate (action);
++}
++
+ 
+ static void
+ action_empty_trash_callback (GtkAction *action,
+Index: trunk/src/nautilus-view.h
+===================================================================
+--- trunk.orig/src/nautilus-view.h	2012-03-07 08:08:01.221113000 +0300
++++ trunk/src/nautilus-view.h	2012-03-07 11:58:58.938075362 +0300
+@@ -365,6 +365,7 @@
+ 
+ /* NautilusView methods */
+ const char *      nautilus_view_get_view_id                (NautilusView      *view);
++void		  nautilus_activate_search_save_as         (NautilusView      *view);
+ 
+ /* file operations */
+ char *            nautilus_view_get_backing_uri            (NautilusView      *view);
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2012-03-05 18:48:13 +0000
+++ debian/patches/series	2012-03-07 11:59:19 +0000
@@ -12,5 +12,6 @@
 14_bring_del_instead_ctrl_del.patch
 15_use-ubuntu-help.patch
 20_static_unity_quicklist.patch
+21_save_search_on_toolbar.patch
 git-0001-Workaround-focus-issues-on-typeahead.patch
 zg_activity_logging.patch