New option to delay the page reload

This commit is contained in:
André Stösel 2012-07-19 23:07:08 +02:00 committed by Christian Dywan
parent 2cf8d9323e
commit 7461925615

View file

@ -9,21 +9,137 @@
See the file COPYING for the full license text. See the file COPYING for the full license text.
*/ */
using Gtk;
using Katze; using Katze;
using Midori; using Midori;
namespace DelayedLoad { namespace DelayedLoad {
private class PreferencesDialog : Dialog {
protected Manager dl_manager;
protected Scale slider;
public PreferencesDialog (Manager manager) {
this.dl_manager = manager;
this.title = _("Preferences for %s").printf ( _("Delayed load"));
if (this.get_class ().find_property ("has-separator") != null)
this.set ("has-separator", false);
this.border_width = 5;
this.set_modal (true);
this.set_default_size (350, 100);
this.create_widgets ();
this.response.connect (response_cb);
}
private void response_cb (Dialog source, int response_id) {
switch (response_id) {
case ResponseType.APPLY:
this.dl_manager.set_integer ("delay", (int) (this.slider.get_value () * 1000));
this.dl_manager.preferences_changed ();
this.destroy ();
break;
case ResponseType.CANCEL:
this.destroy ();
break;
}
}
private void create_widgets () {
Label text = new Label ("%s:".printf (_("Delay in seconds until loading the page")));
this.slider = new Scale.with_range (Orientation.HORIZONTAL, 0, 15, 0.1);
int delay = this.dl_manager.get_integer ("delay");
if (delay > 0)
this.slider.set_value ((float)delay / 1000);
#if HAVE_GTK3
Gtk.Box vbox = get_content_area () as Gtk.Box;
vbox.pack_start (text, false, false, 0);
vbox.pack_start (this.slider, false, true, 0);
#else
this.vbox.pack_start (text, false, false, 0);
this.vbox.pack_start (this.slider, false, true, 0);
#endif
this.add_button (Gtk.STOCK_CANCEL, ResponseType.CANCEL);
this.add_button (Gtk.STOCK_APPLY, ResponseType.APPLY);
this.show_all ();
}
}
private class TabShaker : GLib.Object {
public unowned Midori.Browser browser;
public GLib.PtrArray tasks;
public bool reload_tab () {
if (tasks.len == 1) {
Midori.View? view = browser.tab as Midori.View;
Midori.View scheduled_view = tasks.index (0) as Midori.View;
if (scheduled_view == view) {
Katze.Item item = view.get_proxy_item ();
item.ref();
int64 delay = item.get_meta_integer ("delay");
if (delay == -2) {
view.reload (true);
}
}
}
tasks.remove_index (0);
return false;
}
public TabShaker (Midori.Browser browser) {
this.browser = browser;
}
construct {
this.tasks = new GLib.PtrArray ();
}
}
private class Manager : Midori.Extension { private class Manager : Midori.Extension {
private int timeout = 0;
private bool timeout_handler = false;
private HashTable<Midori.Browser, TabShaker> tasks;
public signal void preferences_changed ();
private void preferences_changed_cb () {
this.timeout = get_integer ("delay");
}
private void show_preferences () {
PreferencesDialog dialog = new PreferencesDialog (this);
dialog.show ();
}
private void schedule_reload (Midori.Browser browser, Midori.View view) {
if (this.timeout == 0)
view.reload (true);
else {
unowned TabShaker shaker = tasks.get (browser);
if (shaker != null) {
shaker.tasks.add (view);
Timeout.add (this.timeout, shaker.reload_tab);
}
}
}
private void tab_changed (GLib.Object window, GLib.ParamSpec pspec) { private void tab_changed (GLib.Object window, GLib.ParamSpec pspec) {
Midori.Browser browser = window as Midori.Browser; Midori.Browser browser = window as Midori.Browser;
Midori.View? view = browser.tab as Midori.View; Midori.View? view = browser.tab as Midori.View;
Katze.Item item = view.get_proxy_item (); if (view != null) {
item.ref(); Katze.Item item = view.get_proxy_item ();
item.ref();
int64 delay = item.get_meta_integer ("delay"); int64 delay = item.get_meta_integer ("delay");
if (delay == -2 && view.can_reload ()) { if (delay == -2 && view.can_reload ()) {
view.reload (true); this.schedule_reload (browser, view);
}
} }
} }
@ -32,17 +148,23 @@ namespace DelayedLoad {
Midori.Browser? browser = app.browser; Midori.Browser? browser = app.browser;
Midori.View? view = browser.tab as Midori.View; Midori.View? view = browser.tab as Midori.View;
Katze.Item item = view.get_proxy_item (); if (view != null) {
item.ref(); Katze.Item item = view.get_proxy_item ();
item.ref();
int64 delay = item.get_meta_integer ("delay"); int64 delay = item.get_meta_integer ("delay");
if (delay != 1) { if (delay != 1) {
unowned WebKit.WebView web_view = view.get_web_view (); unowned WebKit.WebView web_view = view.get_web_view ();
WebKit.LoadStatus load_status = web_view.load_status; WebKit.LoadStatus load_status = web_view.load_status;
if (load_status == WebKit.LoadStatus.FINISHED) { if (load_status == WebKit.LoadStatus.FINISHED) {
if (view.can_reload ()) if (this.timeout != 0)
view.reload (false); this.tasks.set (browser, new TabShaker (browser));
return false;
if (view.can_reload ())
this.schedule_reload (browser, view);
return false;
}
} }
} }
@ -61,6 +183,8 @@ namespace DelayedLoad {
/* FIXME: override behavior without changing the preference */ /* FIXME: override behavior without changing the preference */
app.settings.load_on_startup = MidoriStartup.DELAYED_PAGES; app.settings.load_on_startup = MidoriStartup.DELAYED_PAGES;
this.preferences_changed ();
Midori.Browser? focused_browser = app.browser; Midori.Browser? focused_browser = app.browser;
if (focused_browser == null) if (focused_browser == null)
Timeout.add (50, this.reload_first_tab); Timeout.add (50, this.reload_first_tab);
@ -85,8 +209,14 @@ namespace DelayedLoad {
version: "0.1", version: "0.1",
authors: "André Stösel <andre@stoesel.de>"); authors: "André Stösel <andre@stoesel.de>");
install_integer ("delay", 0);
activate.connect (this.activated); activate.connect (this.activated);
deactivate.connect (this.deactivated); deactivate.connect (this.deactivated);
open_preferences.connect (show_preferences);
preferences_changed.connect (preferences_changed_cb);
this.tasks = new HashTable<Midori.Browser, TabShaker> (GLib.direct_hash, GLib.direct_equal);
} }
} }
} }