Merge lp:~mboevink/midori/midori into lp:midori

[Matthew Boevink]

Add close tabs to right feature

Adds close rightmost tab, a useful feature supplied by most browsers

[Cody Garver (codygarver)]

I prefer "Close Tabs to the Right". That's also what Firefox and Chrome use.

[Matthew Boevink (mboevink)]

It's a bit long for a drop down menu don't you agree?

[Cris Dywan (kalikiana)]

Indeed Chromium appears to have this… could you give an example on how you use it?. It seems a little "arbitrary" without a use case and it smells like the kind of feature that will raise eyebrows when being re-evaluated out of context after a while.

review: Needs Information

[Matthew Boevink (mboevink)]

> Indeed Chromium appears to have this… could you give an example on how you use
> it?. It seems a little "arbitrary" without a use case and it smells like the
> kind of feature that will raise eyebrows when being re-evaluated out of
> context after a while.

I'm not going to lie: porn. So often you're looking for something particular from a web search and open up a large amount of tabs trying to find what you want, so you go through, one by one closing each tab until you find what you want. Now you have your search on the left and the content you don't need to look at on the right. "Close tabs to right". It's also handy when a website defaults to opening new tabs.

[Cris Dywan (kalikiana)]

I'm convinced.

review: Approve

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2013-09-17 15:41:00 +0000
+++ midori/midori-view.c	2013-10-10 13:29:13 +0000
@@ -3891,7 +3891,7 @@
 
         if (handled)
             return;
-        
+
         if (!strcmp (uri, "about:new"))
             uri = midori_settings_get_tabhome (MIDORI_SETTINGS (view->settings));
         if (!strcmp (uri, "about:home"))
@@ -4406,6 +4406,27 @@
 }
 
 static void
+midori_view_tab_label_menu_close_tabs_right_cb (GtkAction* action,
+                                                gpointer   user_data)
+{
+    GtkWidget* view = user_data;
+    MidoriBrowser* browser = midori_browser_get_for_widget (view);
+    GList* tabs = midori_browser_get_tabs (browser);
+    gboolean found_tab = FALSE;
+    for (; tabs; tabs = g_list_next (tabs))
+    {
+        if (tabs->data == view)
+        {
+            found_tab = TRUE;
+            continue;
+        }
+        if (found_tab)
+            midori_browser_close_tab (browser, tabs->data);
+    }
+    g_list_free (tabs);
+}
+
+static void
 midori_view_tab_label_menu_close_other_tabs_cb (GtkAction* action,
                                                 gpointer   user_data)
 {
@@ -4454,7 +4475,7 @@
 
     MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (view));
     g_return_val_if_fail (browser != NULL, NULL);
-    
+
     GtkActionGroup* actions = midori_browser_get_action_group (browser);
     MidoriContextAction* menu = midori_context_action_new ("TabContextMenu", NULL, NULL, NULL);
     midori_context_action_add_action_group (menu, actions);
@@ -4471,6 +4492,8 @@
         view->minimized ? _("Show Tab _Label") : _("Show Tab _Icon Only"), NULL, NULL,
         midori_view_tab_label_menu_minimize_tab_cb, view);
     midori_context_action_add (menu, NULL);
+    midori_context_action_add_simple (menu, "TabCloseRight", _("Close Tabs to the R_ight"), NULL, NULL,
+        midori_view_tab_label_menu_close_tabs_right_cb, view);
     GtkAction* action = gtk_action_new ("TabCloseOther", g_dngettext (NULL, "Close Ot_her Tab", "Close Ot_her Tabs", pages - 1), NULL, NULL);
     g_signal_connect (action, "activate", G_CALLBACK (midori_view_tab_label_menu_close_other_tabs_cb), view);
     gtk_action_set_sensitive (action, pages > 1);