← Back to team overview

elementary-dev-community team mailing list archive

[Merge] lp:~elementary-dev-community/midori/granite-tab-pinning into lp:midori

 

David Gomes has proposed merging lp:~elementary-dev-community/midori/granite-tab-pinning into lp:midori.

Requested reviews:
  Midori Devs (midori)

For more details, see:
https://code.launchpad.net/~elementary-dev-community/midori/granite-tab-pinning/+merge/181682

There's a branch that will implement tab pinning in Granite's DynamicNotebook: lp:~gangsterveggies/granite/fix-bug-959553

This branch assumes that branch has been merged to trunk (which should happen soon) to implement tab pinning on Midori with --enable-granite.
-- 
https://code.launchpad.net/~elementary-dev-community/midori/granite-tab-pinning/+merge/181682
Your team elementary Developer Community is subscribed to branch lp:~elementary-dev-community/midori/granite-tab-pinning.
=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2013-08-15 21:32:30 +0000
+++ midori/midori-browser.c	2013-08-22 23:53:01 +0000
@@ -243,6 +243,8 @@
 #ifdef HAVE_GRANITE
     granite_widgets_dynamic_notebook_set_show_tabs (
         GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), show_tabs);
+    granite_widgets_dynamic_notebook_set_allow_pinning (
+        GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), true);
 #else
     if (!(has_tabs || katze_object_get_boolean (browser->settings, "always-show-tabbar")))
         show_tabs = FALSE;

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2013-08-15 11:55:34 +0000
+++ midori/midori-view.c	2013-08-22 23:53:01 +0000
@@ -4331,6 +4331,13 @@
 }
 
 static void
+midori_view_tab_label_menu_pin_tab (GtkAction* action,
+                                    gpointer user_data)
+{
+    // TODO Pin the tab
+}
+                             
+static void
 midori_view_tab_label_menu_duplicate_tab_cb (GtkAction* action,
                                              gpointer   user_data)
 {
@@ -4406,6 +4413,8 @@
     midori_context_action_add_by_name (menu, "TabNew");
     midori_context_action_add_by_name (menu, "UndoTabClose");
     midori_context_action_add (menu, NULL);
+    midori_context_action_add_simple (menu, "TabPin", _("Pin"), NULL, NULL,
+        midori_view_tab_label_menu_pin_tab, view);
     midori_context_action_add_simple (menu, "TabWindowNew", _("Open in New _Window"), NULL, STOCK_WINDOW_NEW,
         midori_view_tab_label_menu_window_new_cb, view);
     midori_context_action_add_simple (menu, "TabDuplicate", _("_Duplicate Tab"), NULL, NULL,


References