Midori Web Browser

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

  1. granite-tab-pinning
  2. Merge into trunk
Proposed by David Gomes
Status: Work in progress
Proposed branch: lp:~elementary-dev-community/midori/granite-tab-pinning
Merge into: lp:midori
Diff against target: 39 lines (+11/-0)
2 files modified
midori/midori-browser.c (+2/-0)
midori/midori-view.c (+9/-0)
To merge this branch: bzr merge lp:~elementary-dev-community/midori/granite-tab-pinning
Reviewer Review Type Date Requested Status
Midori Devs Pending
Review via email: mp+181682@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
David Gomes (davidgomes) wrote :

WIP because I'm not really sure of how to send the pin call yet.

Reply

Unmerged revisions

6358. By David Gomes

Started implementing Tab Pinning on Midori with Granite.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'midori/midori-browser.c'
2--- midori/midori-browser.c 2013-08-15 21:32:30 +0000
3+++ midori/midori-browser.c 2013-08-22 23:53:01 +0000
4@@ -243,6 +243,8 @@
5 #ifdef HAVE_GRANITE
6 granite_widgets_dynamic_notebook_set_show_tabs (
7 GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), show_tabs);
8+ granite_widgets_dynamic_notebook_set_allow_pinning (
9+ GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), true);
10 #else
11 if (!(has_tabs || katze_object_get_boolean (browser->settings, "always-show-tabbar")))
12 show_tabs = FALSE;
13
14=== modified file 'midori/midori-view.c'
15--- midori/midori-view.c 2013-08-15 11:55:34 +0000
16+++ midori/midori-view.c 2013-08-22 23:53:01 +0000
17@@ -4331,6 +4331,13 @@
18 }
19
20 static void
21+midori_view_tab_label_menu_pin_tab (GtkAction* action,
22+ gpointer user_data)
23+{
24+ // TODO Pin the tab
25+}
26+
27+static void
28 midori_view_tab_label_menu_duplicate_tab_cb (GtkAction* action,
29 gpointer user_data)
30 {
31@@ -4406,6 +4413,8 @@
32 midori_context_action_add_by_name (menu, "TabNew");
33 midori_context_action_add_by_name (menu, "UndoTabClose");
34 midori_context_action_add (menu, NULL);
35+ midori_context_action_add_simple (menu, "TabPin", _("Pin"), NULL, NULL,
36+ midori_view_tab_label_menu_pin_tab, view);
37 midori_context_action_add_simple (menu, "TabWindowNew", _("Open in New _Window"), NULL, STOCK_WINDOW_NEW,
38 midori_view_tab_label_menu_window_new_cb, view);
39 midori_context_action_add_simple (menu, "TabDuplicate", _("_Duplicate Tab"), NULL, NULL,

Subscribers

People subscribed via source and target branches