dcowan/webpin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

renamed app_view -> web_view

Browse source
This commit is contained in:
Artem Anufrij 2017-11-26 14:09:53 +01:00
parent d1068871d7
commit af4865214e
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/Widgets/Browser.vala
View file

@ -28,7 +28,7 @@
namespace Webpin.Widgets { namespace Webpin.Widgets {
public class Browser : Gtk.Stack { public class Browser : Gtk.Stack {
public WebKit.WebView app_view { get; private set; } public WebKit.WebView web_view { get; private set; }
public DesktopFile desktop_file { get; private set; } public DesktopFile desktop_file { get; private set; }
WebKit.CookieManager cookie_manager; WebKit.CookieManager cookie_manager;
@ -62,15 +62,15 @@ namespace Webpin.Widgets {
cookie_manager.set_accept_policy (WebKit.CookieAcceptPolicy.ALWAYS); cookie_manager.set_accept_policy (WebKit.CookieAcceptPolicy.ALWAYS);
cookie_manager.set_persistent_storage (cookie_db + "cookies.db", WebKit.CookiePersistentStorage.SQLITE); cookie_manager.set_persistent_storage (cookie_db + "cookies.db", WebKit.CookiePersistentStorage.SQLITE);
app_view = new WebKit.WebView.with_context (WebKit.WebContext.get_default ()); web_view = new WebKit.WebView.with_context (WebKit.WebContext.get_default ());
app_view.load_uri (desktop_file.url); web_view.load_uri (desktop_file.url);
container = new Gtk.Box (Gtk.Orientation.VERTICAL, 0); container = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
app_notification = new Granite.Widgets.Toast (""); app_notification = new Granite.Widgets.Toast ("");
var overlay = new Gtk.Overlay (); var overlay = new Gtk.Overlay ();
overlay.add (app_view); overlay.add (web_view);
overlay.add_overlay (app_notification); overlay.add_overlay (app_notification);
this.add_named (container, "splash"); this.add_named (container, "splash");
@ -93,7 +93,7 @@ namespace Webpin.Widgets {
} }
container.pack_start (icon, true, true, 0); container.pack_start (icon, true, true, 0);
app_view.create.connect ((action) => { web_view.create.connect ((action) => {
app_notification.title = _("Open request in an external application…"); app_notification.title = _("Open request in an external application…");
app_notification.send_notification (); app_notification.send_notification ();
@ -101,7 +101,7 @@ namespace Webpin.Widgets {
return new WebKit.WebView (); return new WebKit.WebView ();
}); });
app_view.load_changed.connect ((load_event) => { web_view.load_changed.connect ((load_event) => {
request_begin (); request_begin ();
if (load_event == WebKit.LoadEvent.FINISHED) { if (load_event == WebKit.LoadEvent.FINISHED) {
visible_child_name = "app"; visible_child_name = "app";
@ -109,7 +109,7 @@ namespace Webpin.Widgets {
app_notification.reveal_child = false; app_notification.reveal_child = false;
} }
request_finished (); request_finished ();
var source = app_view.get_main_resource (); var source = web_view.get_main_resource ();
source.get_data.begin (null, (obj, res) => { source.get_data.begin (null, (obj, res) => {
try { try {
var body = (string)source.get_data.end (res); var body = (string)source.get_data.end (res);
@ -129,12 +129,12 @@ namespace Webpin.Widgets {
} }
}); });
app_view.show_notification.connect ((notification) => { web_view.show_notification.connect ((notification) => {
desktop_notification (notification.title, notification.body, icon_for_notification); desktop_notification (notification.title, notification.body, icon_for_notification);
return true; return true;
}); });
app_view.permission_request.connect ((permission) => { web_view.permission_request.connect ((permission) => {
var permission_type = permission as WebKit.NotificationPermissionRequest; var permission_type = permission as WebKit.NotificationPermissionRequest;
if (permission_type != null) { if (permission_type != null) {
permission_type.allow (); permission_type.allow ();