debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Let History List properly override tab switching

Browse source
This commit is contained in:
André Stösel 2011-04-30 12:19:30 +02:00 committed by Christian Dywan
parent 34da7c8090
commit ed0024390b
1 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
extensions/history-list.vala
View file

@ -221,31 +221,24 @@ private class HistoryList : Midori.Extension {
hw.walk (step); hw.walk (step);
} }
void browser_added (Midori.Browser browser) { void browser_added (Midori.Browser browser) {
ulong sidTabNext, sidTabPrevious;
var acg = new Gtk.AccelGroup (); var acg = new Gtk.AccelGroup ();
browser.add_accel_group (acg); browser.add_accel_group (acg);
var action_group = browser.get_action_group (); var action_group = browser.get_action_group ();
Gtk.Action action; Gtk.Action action;
action = new Gtk.Action ("HistoryListNextTab", action = action_group.get_action ("TabNext");
_("Next Tab (History List)"), browser.block_action (action);
_("Next tab from history"), null); sidTabNext = action.activate.connect ((a) => {
action.activate.connect ((a) => {
this.walk (a, browser, typeof (TabWindow), 1); this.walk (a, browser, typeof (TabWindow), 1);
}); });
action_group.add_action_with_accel (action, "<Ctrl>Tab");
action.set_accel_group (acg);
action.connect_accelerator ();
action = new Gtk.Action ("HistoryListPreviousTab", action = action_group.get_action ("TabPrevious");
_("Previous Tab (History List)"), browser.block_action (action);
_("Previous tab from history"), null); sidTabPrevious = action.activate.connect ((a) => {
action.activate.connect ((a) => {
this.walk (a, browser, typeof (TabWindow), -1); this.walk (a, browser, typeof (TabWindow), -1);
}); });
action_group.add_action_with_accel (action, "<Ctrl><Shift>Tab");
action.set_accel_group (acg);
action.connect_accelerator ();
action = new Gtk.Action ("HistoryListNextNewTab", action = new Gtk.Action ("HistoryListNextNewTab",
_("Next new Tab (History List)"), _("Next new Tab (History List)"),
@ -267,6 +260,9 @@ private class HistoryList : Midori.Extension {
action.set_accel_group (acg); action.set_accel_group (acg);
action.connect_accelerator (); action.connect_accelerator ();
browser.set_data<ulong> ("history-list-sid-tab-next", sidTabNext);
browser.set_data<ulong> ("history-list-sid-tab-previous", sidTabPrevious);
browser.set_data<GLib.PtrArray*> ("history-list-tab-history", browser.set_data<GLib.PtrArray*> ("history-list-tab-history",
new GLib.PtrArray ()); new GLib.PtrArray ());
browser.set_data<GLib.PtrArray*> ("history-list-tab-history-new", browser.set_data<GLib.PtrArray*> ("history-list-tab-history-new",
@ -280,13 +276,24 @@ private class HistoryList : Midori.Extension {
browser.notify["tab"].connect (this.tab_changed); browser.notify["tab"].connect (this.tab_changed);
} }
void browser_removed (Midori.Browser browser) { void browser_removed (Midori.Browser browser) {
string[] callbacks = { "HistoryListNextTab", "HistoryListPreviousTab", string[] callbacks = { "HistoryListNextNewTab", "HistoryListPreviousNewTab" };
"HistoryListNextNewTab", "HistoryListPreviousNewTab" }; ulong sidTabNext, sidTabPrevious;
sidTabNext = browser.get_data<ulong> ("history-list-sid-tab-next");
sidTabPrevious = browser.get_data<ulong> ("history-list-sid-tab-previous");
Gtk.Action action;
Gtk.ActionGroup action_group; Gtk.ActionGroup action_group;
action_group = browser.get_action_group (); action_group = browser.get_action_group ();
action = action_group.get_action ("TabNext");
action.disconnect (sidTabNext);
browser.unblock_action (action);
action = action_group.get_action ("TabPrevious");
action.disconnect (sidTabPrevious);
browser.unblock_action (action);
for (int i = 0; i < callbacks.length; i++) { for (int i = 0; i < callbacks.length; i++) {
Gtk.Action action = action_group.get_action (callbacks[i]); action = action_group.get_action (callbacks[i]);
if (action != null) if (action != null)
action_group.remove_action (action); action_group.remove_action (action);
} }