diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-04-03 13:15:00 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-04-03 13:15:00 +0200 |
| commit | bc53b714952ceb0afd02b591403cb2bc0cb1aab9 (patch) | |
| tree | 8ff57ed1a1265b2c87f37e3c8fa19876faf80990 /src/Page.vala | |
| parent | d4c476947425c12b1984fedea16f8a8c42a07ba3 (diff) | |
| parent | c43dfb815a4951b8248f4f0e98babe4f80204f03 (diff) | |
Merge tag 'upstream/0.22.0'
Upstream version 0.22.0
Diffstat (limited to 'src/Page.vala')
| -rw-r--r-- | src/Page.vala | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/Page.vala b/src/Page.vala index 807a926..72613e0 100644 --- a/src/Page.vala +++ b/src/Page.vala @@ -1,4 +1,4 @@ -/* Copyright 2009-2014 Yorba Foundation +/* Copyright 2009-2015 Yorba Foundation * * This software is licensed under the GNU LGPL (version 2.1 or later). * See the COPYING file in this distribution. @@ -95,8 +95,6 @@ public abstract class Page : Gtk.ScrolledWindow { init_ui(); realize.connect(attach_view_signals); - - Resources.style_widget(this, Resources.SCROLL_FRAME_STYLESHEET); } ~Page() { @@ -218,6 +216,7 @@ public abstract class Page : Gtk.ScrolledWindow { toolbar = toolbar_path == null ? new Gtk.Toolbar() : ui.get_widget(toolbar_path) as Gtk.Toolbar; toolbar.get_style_context().add_class("bottom-toolbar"); // for elementary theme + toolbar.set_icon_size(Gtk.IconSize.SMALL_TOOLBAR); } return toolbar; } @@ -1210,8 +1209,6 @@ public abstract class CheckerboardPage : Page { viewport.set_border_width(0); viewport.set_shadow_type(Gtk.ShadowType.NONE); - Resources.style_widget(viewport, Resources.VIEWPORT_STYLESHEET); - viewport.add(layout); // want to set_adjustments before adding to ScrolledWindow to let our signal handlers @@ -1228,8 +1225,6 @@ public abstract class CheckerboardPage : Page { // scrollbar policy set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC); - - Resources.style_widget(this, Resources.PAGE_STYLESHEET); } public void init_item_context_menu(string path) { @@ -1952,9 +1947,6 @@ public abstract class SinglePhotoPage : Page { canvas.draw.connect(on_canvas_exposed); set_event_source(canvas); - - // style the viewport - Resources.style_widget(viewport, Resources.VIEWPORT_STYLESHEET); } public bool is_transition_in_progress() { |