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

color background

Browse source
This commit is contained in:
Artem Anufrij 2017-11-26 14:34:18 +01:00
parent af4865214e
commit 3124838c75
2 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Widgets/Browser.vala
View file

@ -67,6 +67,17 @@ namespace Webpin.Widgets {
container = new Gtk.Box (Gtk.Orientation.VERTICAL, 0); container = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
if (desktop_file.color != null) {
var css_provider = Gtk.CssProvider.get_default ();
try {
css_provider.load_from_data (""" .box { background: """ + desktop_file.color.to_string () + """; } """);
} catch (Error err) {
warning (err.message);
}
container.get_style_context ().add_provider (css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
container.get_style_context ().add_class ("box");
}
app_notification = new Granite.Widgets.Toast (""); app_notification = new Granite.Widgets.Toast ("");
var overlay = new Gtk.Overlay (); var overlay = new Gtk.Overlay ();

24
src/Windows/WebApp.vala
View file

@ -54,7 +54,7 @@ namespace Webpin.Windows {
var copy_url = new Gtk.Button.from_icon_name ("insert-link-symbolic", Gtk.IconSize.MENU); var copy_url = new Gtk.Button.from_icon_name ("insert-link-symbolic", Gtk.IconSize.MENU);
copy_url.tooltip_text = _("Copy URL into clipboard"); copy_url.tooltip_text = _("Copy URL into clipboard");
copy_url.clicked.connect (() => { copy_url.clicked.connect (() => {
Gtk.Clipboard.get_default (Gdk.Display.get_default ()).set_text (browser.app_view.uri, -1); Gtk.Clipboard.get_default (Gdk.Display.get_default ()).set_text (browser.web_view.uri, -1);
}); });
headerbar.pack_end (copy_url); headerbar.pack_end (copy_url);
@ -161,7 +161,7 @@ namespace Webpin.Windows {
} }
if (zoom != null) { if (zoom != null) {
browser.app_view.zoom_level = double.parse (zoom); browser.web_view.zoom_level = double.parse (zoom);
} }
} }
@ -186,43 +186,43 @@ namespace Webpin.Windows {
case Gdk.Key.KP_Add: case Gdk.Key.KP_Add:
case Gdk.Key.plus: case Gdk.Key.plus:
if (Gdk.ModifierType.CONTROL_MASK in event.state) { if (Gdk.ModifierType.CONTROL_MASK in event.state) {
browser.app_view.zoom_level += 0.1; browser.web_view.zoom_level += 0.1;
desktop_file.edit_property ("X-Webpin-WindowZoom", browser.app_view.zoom_level.to_string ()); desktop_file.edit_property ("X-Webpin-WindowZoom", browser.web_view.zoom_level.to_string ());
return true; return true;
} }
break; break;
case Gdk.Key.KP_Subtract: case Gdk.Key.KP_Subtract:
case Gdk.Key.minus: case Gdk.Key.minus:
if (Gdk.ModifierType.CONTROL_MASK in event.state) { if (Gdk.ModifierType.CONTROL_MASK in event.state) {
browser.app_view.zoom_level -= 0.1; browser.web_view.zoom_level -= 0.1;
desktop_file.edit_property ("X-Webpin-WindowZoom", browser.app_view.zoom_level.to_string ()); desktop_file.edit_property ("X-Webpin-WindowZoom", browser.web_view.zoom_level.to_string ());
return true; return true;
} }
break; break;
case Gdk.Key.KP_0: case Gdk.Key.KP_0:
case Gdk.Key.@0: case Gdk.Key.@0:
if (Gdk.ModifierType.CONTROL_MASK in event.state) { if (Gdk.ModifierType.CONTROL_MASK in event.state) {
browser.app_view.zoom_level = 1; browser.web_view.zoom_level = 1;
desktop_file.edit_property ("X-Webpin-WindowZoom", browser.app_view.zoom_level.to_string ()); desktop_file.edit_property ("X-Webpin-WindowZoom", browser.web_view.zoom_level.to_string ());
return true; return true;
} }
break; break;
case Gdk.Key.F5: case Gdk.Key.F5:
if (Gdk.ModifierType.CONTROL_MASK in event.state) { if (Gdk.ModifierType.CONTROL_MASK in event.state) {
browser.app_view.reload (); browser.web_view.reload ();
} else { } else {
browser.app_view.reload_bypass_cache (); browser.web_view.reload_bypass_cache ();
} }
return true; return true;
case Gdk.Key.Left: case Gdk.Key.Left:
if (Gdk.ModifierType.MOD1_MASK in event.state) { if (Gdk.ModifierType.MOD1_MASK in event.state) {
browser.app_view.go_back (); browser.web_view.go_back ();
return true; return true;
} }
break; break;
case Gdk.Key.Right: case Gdk.Key.Right:
if (Gdk.ModifierType.MOD1_MASK in event.state) { if (Gdk.ModifierType.MOD1_MASK in event.state) {
browser.app_view.go_forward (); browser.web_view.go_forward ();
return true; return true;
} }
break; break;