Merge lp:~alcinnz/audience/audience into lp:~audience-members/audience/trunk

[Adrian Cochrane]

This code makes the titlebar disappear while a movie is playing.

Involves significant refactoring which moves the headerbar(s) into the widget hierarchy and moves code out of the containing window and into the "pages".

I realized late that there was already a proposal from Lains for fixing this, but I believe I've addressed all your concerns on that proposal.

[Adam Bieńkowski (donadigo)]

Please, resolve merge conflicts.

review: Needs Fixing (code)

[lp:~alcinnz/audience/audience]

713. By Adrian Cochrane on 2017-01-17

Merge changes.

Apologies for undoing some translation refactoring, it didn't fit with my refactoring. Will try to bring it back in.

714. By Adrian Cochrane on 2017-01-17

Restore navigation animations to communicate forward & backward navigation

715. By Adrian Cochrane on 2017-01-17

Fixed translations on the back button.

(Again after a previous fix by Leonardo Lemos made his fix prior to my refactoring)

[Adrian Cochrane (alcinnz)]

> Please, resolve merge conflicts.

They have been resolved, and I verified the translation fix still works.

[Danielle Foré (danrabbit)]

Please make sure to use Gtk.Grid and not Gtk.VBox. Gtk.VBox has been deprecated and as we understand it, Gtk.Box is scheduled to be deprecated in the future.

review: Needs Fixing

[Danielle Foré (danrabbit)]

It seems like this branch completely removes fullscreen

[Cody Garver (codygarver)]

Double click to fullscreen is broken, f key still works.

[lp:~alcinnz/audience/audience]

716. By Adrian Cochrane on 2017-01-20

Switch from deprecated Gtk.VBox to Gtk.Grid.

717. By Adrian Cochrane on 2017-01-20

Remove misleading comments I put in.

718. By Adrian Cochrane on 2017-01-20

Standardize the means of accessing the application window.

I'm sorry to say much of the inconsistancy came from me.

Also I added a bit of dead code that's now been removed.

[Adrian Cochrane (alcinnz)]

> It seems like this branch completely removes fullscreen

I did have trouble preserving "double click to make fullscreen" functionality while retaining standard window controls.

Easiest fix would be restore "maximize to make fullscreen", but there was already a note in the code as to why that's not being done.

On the bright side not going fullscreen is less of a nuisance as now there's a single bar at the top of the screen instead of two, and as noted pressing "f" still works.

[lp:~alcinnz/audience/audience]

719. By Adrian Cochrane on 2017-01-21

Restore double click to make fullscreen

Made a cleaner fix to the new unfullscreen button grabbing focus.

720. By Adrian Cochrane on 2017-01-21

Merging from upstream

[Adrian Cochrane (alcinnz)]

> > It seems like this branch completely removes fullscreen
>
> I did have trouble preserving "double click to make fullscreen" functionality
> while retaining standard window controls.
>
> Easiest fix would be restore "maximize to make fullscreen", but there was
> already a note in the code as to why that's not being done.
>
> On the bright side not going fullscreen is less of a nuisance as now there's a
> single bar at the top of the screen instead of two, and as noted pressing "f"
> still works.

Got it back to the original behaviour of double-clicking titlebar minimizes/maximizes and content fullscreens/unfullscreens.

[Adrian Cochrane (alcinnz)]

> Please make sure to use Gtk.Grid and not Gtk.VBox. Gtk.VBox has been
> deprecated and as we understand it, Gtk.Box is scheduled to be deprecated in
> the future.

This fix has been made a while back, along with a fix to the double click behaviour to make fullscreen behaviour. Haven't heard anything for a while.

[Adrian Cochrane (alcinnz)]

> Please make sure to use Gtk.Grid and not Gtk.VBox. Gtk.VBox has been
> deprecated and as we understand it, Gtk.Box is scheduled to be deprecated in
> the future.

This fix has been made a while back, along with a fix to the double click behaviour to make fullscreen behaviour. Haven't heard anything for a while.

[lp:~alcinnz/audience/audience]

721. By Adrian Cochrane on 2017-01-27

Merging translation fix for "search not found" screen.

[Adam Bieńkowski (donadigo)]

Just my two cents: match_keycode has mutliple definitions in the app while there should be only one declared statically. Also, you seem to be overusing it in methods like key_press_event. You repeadetely call match_keycode which is not very good for overall performance. I strongly recommend to copy the code from match_keycode to those methods and check for each key in one go e.g:

Gdk.Keymap keymap = Gdk.Keymap.get_default ();
if (keymap.get_entries_for_keyval (keyval, out keys)) {
    foreach (var key in keys) {
        case Gdk.Key.p:
            // do something here
            break;
    }
}

Another thing is, in the key_press_event method, you return true in every if statement you have. This is not needed since you did it at the very end of the method, so there is no need for these "return true" lines. I also recommend you to look at the documentation of this method to make sure that returning true always is the right thing to do in this case.

In the multipress_gesture_pressed_cb method I would like to see a switch () statement being used for better code redability rather than using a couple of if's and elseif's.

review: Needs Fixing (code)

[lp:~alcinnz/audience/audience]

722. By Adrian Cochrane on 2017-01-28

Reunifying match_keycode method, minor tidyups from copy-paste.

723. By Adrian Cochrane on 2017-01-28

Use switch statements instead if/else-if in titlebar event handling.

For code readability.

[Adrian Cochrane (alcinnz)]

> Just my two cents: match_keycode has mutliple definitions in the app while
> there should be only one declared statically. Also, you seem to be overusing
> it in methods like key_press_event. You repeadetely call match_keycode which
> is not very good for overall performance. I strongly recommend to copy the
> code from match_keycode to those methods and check for each key in one go e.g:
>
> Gdk.Keymap keymap = Gdk.Keymap.get_default ();
> if (keymap.get_entries_for_keyval (keyval, out keys)) {
> foreach (var key in keys) {
> case Gdk.Key.p:
> // do something here
> break;
> }
> }
>
> Another thing is, in the key_press_event method, you return true in every if
> statement you have. This is not needed since you did it at the very end of the
> method, so there is no need for these "return true" lines. I also recommend
> you to look at the documentation of this method to make sure that returning
> true always is the right thing to do in this case.
>
> In the multipress_gesture_pressed_cb method I would like to see a switch ()
> statement being used for better code redability rather than using a couple of
> if's and elseif's.

I made these fixes you suggested for code cleanliness.

The only exception is that I didn't inline match_keycode into the key_pressed event handlers because that simply doesn't work. The probably with your recommendation there is that the method uses the Keymap to check what hardware keycodes the Gdk.Key constants refer to, and not what constants the event keycode refer to.

Thanks for your feedback.

[Adrian Cochrane (alcinnz)]

> > Just my two cents: match_keycode has mutliple definitions in the app while
> > there should be only one declared statically. Also, you seem to be overusing
> > it in methods like key_press_event. You repeadetely call match_keycode which
> > is not very good for overall performance. I strongly recommend to copy the
> > code from match_keycode to those methods and check for each key in one go
> e.g:
> >
> > Gdk.Keymap keymap = Gdk.Keymap.get_default ();
> > if (keymap.get_entries_for_keyval (keyval, out keys)) {
> > foreach (var key in keys) {
> > case Gdk.Key.p:
> > // do something here
> > break;
> > }
> > }
> >
> > Another thing is, in the key_press_event method, you return true in every if
> > statement you have. This is not needed since you did it at the very end of
> the
> > method, so there is no need for these "return true" lines. I also recommend
> > you to look at the documentation of this method to make sure that returning
> > true always is the right thing to do in this case.
> >
> > In the multipress_gesture_pressed_cb method I would like to see a switch ()
> > statement being used for better code redability rather than using a couple
> of
> > if's and elseif's.
>
> I made these fixes you suggested for code cleanliness.
>
> The only exception is that I didn't inline match_keycode into the key_pressed
> event handlers because that simply doesn't work. The probably with your
> recommendation there is that the method uses the Keymap to check what hardware
> keycodes the Gdk.Key constants refer to, and not what constants the event
> keycode refer to.
>
> Thanks for your feedback.

Typo. "The problem", not "The probably".

[Adrian Cochrane (alcinnz)]

Any more feedback?

[Felipe Escoto (philip.scott)]

I've been testing and there seems to be problems where it sometimes does not detect the keypresses such as space. (Why are you touching that code anyways to add the hiding headerbar? (Small diff is best diff))

Anyways.... We will be moving Audience to GitHub soon if the other branches land before you can fix it :)

review: Needs Fixing

[Danielle Foré (danrabbit)]

Audience has migrated to GitHub. Please resubmit as a PR here: https://github.com/elementary/videos

Unmerged revisions

723. By Adrian Cochrane on 2017-01-28

Use switch statements instead if/else-if in titlebar event handling.

For code readability.

722. By Adrian Cochrane on 2017-01-28

Reunifying match_keycode method, minor tidyups from copy-paste.

721. By Adrian Cochrane on 2017-01-27

Merging translation fix for "search not found" screen.

720. By Adrian Cochrane on 2017-01-21

Merging from upstream

719. By Adrian Cochrane on 2017-01-21

Restore double click to make fullscreen

Made a cleaner fix to the new unfullscreen button grabbing focus.

718. By Adrian Cochrane on 2017-01-20

Standardize the means of accessing the application window.

I'm sorry to say much of the inconsistancy came from me.

Also I added a bit of dead code that's now been removed.

717. By Adrian Cochrane on 2017-01-20

Remove misleading comments I put in.

716. By Adrian Cochrane on 2017-01-20

Switch from deprecated Gtk.VBox to Gtk.Grid.

715. By Adrian Cochrane on 2017-01-17

Fixed translations on the back button.

(Again after a previous fix by Leonardo Lemos made his fix prior to my refactoring)

714. By Adrian Cochrane on 2017-01-17

Restore navigation animations to communicate forward & backward navigation

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-11-02 23:59:41 +0000
+++ src/CMakeLists.txt	2017-01-28 06:32:01 +0000
@@ -53,6 +53,7 @@
     Widgets/WelcomePage.vala
     Widgets/NavigationButton.vala
     Widgets/Toast.vala
+    Widgets/TitleBar.vala
 
     Widgets/Player/BottomBar.vala
     Widgets/Player/SettingsPopover.vala

=== modified file 'src/Consts.vala'
--- src/Consts.vala	2014-06-30 14:54:30 +0000
+++ src/Consts.vala	2017-01-28 06:32:01 +0000
@@ -4,4 +4,4 @@
     // 204/255 = 80% opacity
     public const uint GLOBAL_OPACITY = 204;
 
-}
\ No newline at end of file
+}

=== modified file 'src/Utils.vala'
--- src/Utils.vala	2016-08-01 18:46:23 +0000
+++ src/Utils.vala	2017-01-28 06:32:01 +0000
@@ -104,4 +104,19 @@
         var file = File.new_for_uri (uri);
         return file.query_exists ();
     }
+
+    /** Returns true if the code parameter matches the keycode of the keyval parameter for
+    * any keyboard group or level (in order to allow for non-QWERTY keyboards) **/
+    public bool match_keycode (int keyval, uint code) {
+        Gdk.KeymapKey [] keys;
+        Gdk.Keymap keymap = Gdk.Keymap.get_default ();
+        if (keymap.get_entries_for_keyval (keyval, out keys)) {
+            foreach (var key in keys) {
+                if (code == key.keycode)
+                    return true;
+                }
+            }
+
+        return false;
+    }
 }

=== modified file 'src/Widgets/Library/EpisodesPage.vala'
--- src/Widgets/Library/EpisodesPage.vala	2017-01-25 22:40:27 +0000
+++ src/Widgets/Library/EpisodesPage.vala	2017-01-28 06:32:01 +0000
@@ -31,8 +31,17 @@
         string query;
 
         construct {
+            orientation = Gtk.Orientation.VERTICAL;
             query = "";
 
+            var titlebar = new TitleBar ();
+            titlebar.show_back (Audience.Window.page_label_library);
+            titlebar.add_searchbox (filter);
+            add (titlebar);
+
+            var grid = new Gtk.Grid ();
+            add (grid);
+
             poster = new Gtk.Image ();
             poster.margin = 24;
             poster.margin_right = 0;
@@ -57,10 +66,10 @@
             alert_view.get_style_context ().remove_class (Gtk.STYLE_CLASS_VIEW);
             alert_view.hide ();
 
-            expand = true;
-            attach (poster, 0, 1, 1, 1);
-            attach (scrolled_window, 1, 1, 1, 1);
-            attach (alert_view, 1, 1, 1, 1);
+            grid.expand = true;
+            grid.attach (poster, 0, 1, 1, 1);
+            grid.attach (scrolled_window, 1, 1, 1, 1);
+            grid.attach (alert_view, 1, 1, 1, 1);
 
             manager = Audience.Services.LibraryManager.get_instance ();
             manager.video_file_deleted.connect (remove_item_from_path);
@@ -138,7 +147,7 @@
             }
 
             if (Audience.App.get_instance ().mainwindow.get_visible_child () == this && view_episodes.get_children ().length () == 0) {
-                Audience.App.get_instance ().mainwindow.navigate_back ();
+                Audience.App.get_instance ().mainwindow.show_page ("library");
             }
         }
 

=== modified file 'src/Widgets/Library/LibraryPage.vala'
--- src/Widgets/Library/LibraryPage.vala	2016-11-02 23:59:41 +0000
+++ src/Widgets/Library/LibraryPage.vala	2017-01-28 06:32:01 +0000
@@ -22,12 +22,13 @@
 namespace Audience {
     public class LibraryPage : Gtk.Grid {
 
-        public signal void filter_result_changed (bool has_results);
         public signal void show_episodes (Audience.LibraryItem item);
 
         public Gtk.FlowBox view_movies;
         public Audience.Services.LibraryManager manager;
         public Gtk.ScrolledWindow scrolled_window;
+        private Granite.Widgets.AlertView alert_view;
+        private Gtk.Stack main_stack;
         bool poster_initialized = false;
         string query;
 
@@ -44,10 +45,17 @@
         }
 
         construct {
+            orientation = Gtk.Orientation.VERTICAL;
+
             manager = Audience.Services.LibraryManager.get_instance ();
 
             query = "";
 
+            var title_bar = new TitleBar ();
+            title_bar.add_searchbox (filter);
+            title_bar.show_back (Audience.Window.page_label_welcomescreen);
+            add (title_bar);
+
             scrolled_window = new Gtk.ScrolledWindow (null, null);
             scrolled_window.expand = true;
 
@@ -61,6 +69,11 @@
             view_movies.child_activated.connect (play_video);
 
             scrolled_window.add (view_movies);
+            
+            alert_view = new Granite.Widgets.AlertView ("", "", "");
+            alert_view.get_style_context ().add_class (Gtk.STYLE_CLASS_DIM_LABEL);
+            alert_view.set_vexpand (true);
+            alert_view.no_show_all = true;
 
             manager = Audience.Services.LibraryManager.get_instance ();
             manager.video_file_detected.connect (add_item);
@@ -76,12 +89,18 @@
                     poster_initialized = true;
                     poster_initialisation.begin ();
                 }
+                
+                App.get_instance ().mainwindow.title = _("Videos");
             });
 
             view_movies.set_sort_func (video_sort_func);
             view_movies.set_filter_func (video_filter_func);
 
-            add (scrolled_window);
+            main_stack = new Gtk.Stack ();
+            main_stack.add_named (alert_view, "alert");
+            main_stack.add_named (scrolled_window, "library");
+
+            add (main_stack);
         }
 
         private void play_video (Gtk.FlowBoxChild item) {
@@ -126,7 +145,7 @@
             }
 
             if (view_movies.get_children ().length () == 0) {
-                Audience.App.get_instance ().mainwindow.navigate_back ();
+                Audience.App.get_instance ().mainwindow.show_page (Audience.Window.page_label_welcomescreen);
             }
         }
 
@@ -164,7 +183,30 @@
         public void filter (string text) {
             query = text.strip ();
             view_movies.invalidate_filter ();
-            filter_result_changed (has_child ());
+            filter_result_changed (has_child (), text);
+        }
+        
+        private void filter_result_changed (bool has_results, string search) {
+            if (!has_results) {
+                show_alert (_("No Results for “%s”").printf (search), _("Try changing search terms."), "edit-find-symbolic");
+            } else {
+                hide_alert ();
+            }
+        }
+        
+        public void show_alert (string primary_text, string secondary_text, string icon_name) {
+            alert_view.no_show_all = false;
+            alert_view.show_all ();
+            alert_view.title = primary_text;
+            alert_view.description = secondary_text;
+            alert_view.icon_name = icon_name;
+            main_stack.visible_child = alert_view;
+        }
+        
+        public void hide_alert () {
+            alert_view.no_show_all = true;
+            main_stack.visible_child_name = "library";
+            alert_view.hide ();
         }
 
         public bool has_child () {

=== modified file 'src/Widgets/Player/BottomBar.vala'
--- src/Widgets/Player/BottomBar.vala	2016-11-02 23:59:41 +0000
+++ src/Widgets/Player/BottomBar.vala	2017-01-28 06:32:01 +0000
@@ -24,12 +24,10 @@
     private const string PULSE_TYPE = "attention";
 
     public signal void play_toggled ();
-    public signal void unfullscreen ();
     public signal void seeked (double val);
 
     public bool playing { get; set; default=false; }
     public bool hovered { get; set; default=false; }
-    public bool fullscreen { get; set; default=false; }
     public SettingsPopover preferences_popover;
     public PlaylistPopover playlist_popover;
     public TimeWidget time_widget;
@@ -37,7 +35,7 @@
     private Gtk.Button play_button;
     private Gtk.Button preferences_button;
     private Gtk.Button playlist_button;
-    private Gtk.Revealer unfullscreen_revealer;
+    private Gtk.Revealer titlebar_revealer;
     private uint hiding_timer = 0;
     private bool playlist_glowing = false;
 
@@ -106,14 +104,6 @@
             }
         });
 
-        notify["fullscreen"].connect (() => {
-            if (fullscreen == true && child_revealed == true) {
-                unfullscreen_revealer.set_reveal_child (true);
-            } else if (fullscreen == false && child_revealed == true) {
-                unfullscreen_revealer.set_reveal_child (false);
-            }
-        });
-
         play_button.clicked.connect (() => {
             playing = !playing;
         });
@@ -148,25 +138,21 @@
         }
     }
 
-    public Gtk.Revealer get_unfullscreen_button () {
-        unfullscreen_revealer = new Gtk.Revealer ();
-        unfullscreen_revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_DOWN;
-
-        var unfullscreen_button = new Gtk.Button.from_icon_name ("view-restore-symbolic", Gtk.IconSize.BUTTON);
-        unfullscreen_button.tooltip_text = _("Unfullscreen");
-        unfullscreen_button.clicked.connect (() => {unfullscreen ();});
-        unfullscreen_revealer.add (unfullscreen_button);
-        unfullscreen_revealer.show_all ();
-        return unfullscreen_revealer;
+    public TitleBar titlebar;
+
+    public Gtk.Revealer get_titlebar () {
+        titlebar_revealer = new Gtk.Revealer ();
+        titlebar_revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_DOWN;
+
+        titlebar = new TitleBar ();
+        titlebar_revealer.add (titlebar);
+        titlebar_revealer.show_all ();
+        return titlebar_revealer;
     }
 
     private new void set_reveal_child (bool reveal) {
         base.set_reveal_child (reveal);
-        if (reveal == true && fullscreen == true) {
-            unfullscreen_revealer.set_reveal_child (reveal);
-        } else if (reveal == false) {
-            unfullscreen_revealer.set_reveal_child (reveal);
-        }
+        titlebar_revealer.set_reveal_child (reveal);
     }
 
     public override void get_preferred_width (out int minimum_width, out int natural_width) {
@@ -193,7 +179,7 @@
                 return false;
             }
             set_reveal_child (false);
-            unfullscreen_revealer.set_reveal_child (false);
+            titlebar_revealer.set_reveal_child (false);
             hiding_timer = 0;
             return false;
         });

=== modified file 'src/Widgets/Player/PlayerPage.vala'
--- src/Widgets/Player/PlayerPage.vala	2016-11-02 23:59:41 +0000
+++ src/Widgets/Player/PlayerPage.vala	2017-01-28 06:32:01 +0000
@@ -9,15 +9,17 @@
     };
 
     public class PlayerPage : Gtk.EventBox {
-        public signal void unfullscreen_clicked ();
-        public signal void ended ();
+        private string _back_target;
+        public virtual signal void ended () {
+            App.get_instance ().mainwindow.show_page (_back_target);
+        }
 
         public GtkClutter.Embed clutter;
         private Clutter.Actor video_actor;
         private Audience.Widgets.BottomBar bottom_bar;
         private Clutter.Stage stage;
-        private Gtk.Revealer unfullscreen_bar;
-        private GtkClutter.Actor unfullscreen_actor;
+        private Gtk.Revealer titlebar;
+        private GtkClutter.Actor titlebar_actor;
         private GtkClutter.Actor bottom_actor;
         private GnomeMediaKeys mediakeys;
         private ClutterGst.Playback playback;
@@ -46,16 +48,7 @@
             }
         }
 
-        private bool _fullscreened = false;
-        public bool fullscreened {
-            get {
-                return _fullscreened;
-            }
-            set {
-                _fullscreened = value;
-                bottom_bar.fullscreen = value;
-            }
-        }
+        public bool fullscreened = false;
 
         public PlayerPage () {
         }
@@ -85,7 +78,7 @@
                 var geometry = Gdk.Geometry ();
                 geometry.min_aspect = aspect;
                 geometry.max_aspect = aspect;
-                ((Gtk.Window) get_toplevel ()).set_geometry_hints (get_toplevel (), geometry, Gdk.WindowHints.ASPECT);
+                App.get_instance ().mainwindow.set_geometry_hints (get_toplevel (), geometry, Gdk.WindowHints.ASPECT);
             });
             */
             video_actor.content = aspect_ratio;
@@ -103,9 +96,8 @@
 
             bottom_bar = new Widgets.BottomBar (playback);
             bottom_bar.bind_property ("playing", playback, "playing", BindingFlags.BIDIRECTIONAL);
-            bottom_bar.unfullscreen.connect (() => unfullscreen_clicked ());
 
-            unfullscreen_bar = bottom_bar.get_unfullscreen_button ();
+            titlebar = bottom_bar.get_titlebar ();
 
             bottom_actor = new GtkClutter.Actor.with_contents (bottom_bar);
             bottom_actor.opacity = GLOBAL_OPACITY;
@@ -113,11 +105,11 @@
             bottom_actor.add_constraint (new Clutter.AlignConstraint (stage, Clutter.AlignAxis.Y_AXIS, 1));
             stage.add_child (bottom_actor);
 
-            unfullscreen_actor = new GtkClutter.Actor.with_contents (unfullscreen_bar);
-            unfullscreen_actor.opacity = GLOBAL_OPACITY;
-            unfullscreen_actor.add_constraint (new Clutter.AlignConstraint (stage, Clutter.AlignAxis.X_AXIS, 1));
-            unfullscreen_actor.add_constraint (new Clutter.AlignConstraint (stage, Clutter.AlignAxis.Y_AXIS, 0));
-            stage.add_child (unfullscreen_actor);
+            titlebar_actor = new GtkClutter.Actor.with_contents (titlebar);
+            titlebar_actor.opacity = GLOBAL_OPACITY;
+            titlebar_actor.add_constraint (new Clutter.BindConstraint (stage, Clutter.BindCoordinate.WIDTH, 0));
+            titlebar_actor.add_constraint (new Clutter.AlignConstraint (stage, Clutter.AlignAxis.Y_AXIS, 0));
+            stage.add_child (titlebar_actor);
 
             //media keys
             try {
@@ -219,7 +211,9 @@
             });
 
             bottom_bar.notify["child-revealed"].connect (() => {
-                if (bottom_bar.child_revealed == true) {
+                // FIX: This event is still triggered while player is offscreen
+                //      So check that!
+                if (!get_mapped() || bottom_bar.child_revealed == true) {
                     App.get_instance ().mainwindow.get_window ().set_cursor (null);
                 } else {
                     var window = App.get_instance ().mainwindow.get_window ();
@@ -230,6 +224,7 @@
             });
 
             notify["playing"].connect (() => {
+                var win = App.get_instance ().mainwindow;
                 if (playing) {
                     Audience.Services.Inhibitor.get_instance ().inhibit ();
                 } else {
@@ -239,9 +234,91 @@
 
             add (clutter);
             show_all ();
-        }
-
-        public void play_file (string uri, bool from_beginning = true) {
+            
+            unmap.connect (() => {
+                playing = false;
+            });
+        }
+
+        public override bool key_press_event (Gdk.EventKey e) {
+            uint keycode = e.hardware_keycode;
+
+            if (match_keycode (Gdk.Key.p, keycode) || match_keycode (Gdk.Key.space, keycode)) {
+                playing = !playing;
+            } else if (match_keycode (Gdk.Key.a, keycode)) {
+                next_audio ();
+            } else if (match_keycode (Gdk.Key.s, keycode)) {
+                next_text ();
+            } else if (match_keycode (Gdk.Key.f, keycode)) {
+                var win = App.get_instance ().mainwindow;
+                if (fullscreened) {
+                    win.unfullscreen ();
+                } else {
+                    win.fullscreen ();
+                }
+            }
+
+            switch (e.keyval) {
+                case Gdk.Key.Escape:
+                    var win = App.get_instance ().mainwindow;
+                    if (fullscreened) {
+                        win.unfullscreen ();
+                    } else {
+                        win.destroy ();
+                    }
+
+                    return true;
+                case Gdk.Key.Down:
+                    if (Gdk.ModifierType.SHIFT_MASK in e.state) {
+                        seek_jump_seconds (-5); // 5 secs
+                    } else {
+                        seek_jump_seconds (-60); // 1 min
+                    }
+
+                    reveal_control ();
+                    break;
+                case Gdk.Key.Left:
+                    if (Gdk.ModifierType.SHIFT_MASK in e.state) {
+                        seek_jump_seconds (-1); // 1 sec
+                    } else {
+                        seek_jump_seconds (-10); // 10 secs
+                    }
+
+                    reveal_control ();
+                    break;
+                case Gdk.Key.Right:
+                    if (Gdk.ModifierType.SHIFT_MASK in e.state) {
+                        seek_jump_seconds (1); // 1 sec
+                    } else {
+                        seek_jump_seconds (10); // 10 secs
+                    }
+
+                    reveal_control ();
+                    break;
+                case Gdk.Key.Up:
+                    if (Gdk.ModifierType.SHIFT_MASK in e.state) {
+                        seek_jump_seconds (5); // 5 secs
+                    } else {
+                        seek_jump_seconds (60); // 1 min
+                    }
+
+                    reveal_control ();
+                    break;
+                case Gdk.Key.Page_Down:
+                    seek_jump_seconds (-600); // 10 mins
+                    reveal_control ();
+                    break;
+                case Gdk.Key.Page_Up:
+                    seek_jump_seconds (600); // 10 mins
+                    reveal_control ();
+                    break;
+                default:
+                    break;
+            }
+            return true;
+        }
+
+        public void play_file (string uri, bool from_beginning = true, string back_to = "") {
             debug ("Opening %s", uri);
             get_playlist_widget ().set_current (uri);
             playback.uri = uri;
@@ -258,6 +335,9 @@
                 playback.progress = settings.last_stopped;
             }
 
+            bottom_bar.titlebar.show_back (back_to);
+            _back_target = back_to; // navigate there when we're done
+
             playback.playing = !settings.playback_wait;
             Gtk.RecentManager recent_manager = Gtk.RecentManager.get_default ();
             recent_manager.add_item (uri);

=== added file 'src/Widgets/TitleBar.vala'
--- src/Widgets/TitleBar.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/TitleBar.vala	2017-01-28 06:32:01 +0000
@@ -0,0 +1,309 @@
+namespace Audience {
+    public class TitleBar : Gtk.EventBox {
+        private Gtk.HeaderBar header;
+        private Gtk.Button unfullscreen_button;
+
+        construct {
+            header = new Gtk.HeaderBar ();
+            add (header);
+
+            header.show_close_button = true;
+            var style = header.get_style_context ();
+            style.add_class (Gtk.STYLE_CLASS_TITLEBAR);
+            style.add_class ("compact");
+
+            unfullscreen_button = new Gtk.Button.from_icon_name ("window-restore-symbolic");
+            unfullscreen_button.visible = false;
+            unfullscreen_button.can_focus = false;
+            unfullscreen_button.clicked.connect (() => {
+                toplevel_window.unfullscreen ();
+                
+            });
+            header.pack_end (unfullscreen_button);
+
+            map.connect (init_toplevel_window);
+            unmap.connect (deinit_toplevel_window);
+            
+            show_all ();
+
+            // Set up standard titlebar event handling,
+            //      just like https://git.gnome.org/browse/gtk+/tree/gtk/gtkwindow.c?h=3.22.6#n1741
+            multipress_gesture = new Gtk.GestureMultiPress (this);
+            multipress_gesture.set_button (0);
+            multipress_gesture.set_propagation_phase (Gtk.PropagationPhase.CAPTURE);
+            multipress_gesture.pressed.connect (multipress_gesture_pressed_cb);
+            
+            drag_gesture = new Gtk.GestureDrag (this);
+            drag_gesture.set_propagation_phase (Gtk.PropagationPhase.CAPTURE);
+            drag_gesture.drag_begin.connect (drag_gesture_begin_cb);
+            drag_gesture.drag_update.connect (drag_gesture_update_cb);
+            
+            // Prevent button presses from propagating up.
+            // Not doing so (with elementary OS's defaults) creates ugly states like unmaximized fullscreen.
+            button_press_event.connect ((e) => {return true;});
+        }
+        
+        private Audience.Window toplevel_window {
+            get {
+                // NOTE: The application might not be set up yet,
+                //      so access the window through the widget hierarchy instead.
+                return get_toplevel () as Audience.Window;
+            }
+        }
+
+        private Binding title_binding;
+        private ulong window_state_changed_hook;
+        private void init_toplevel_window () {
+            title_binding = toplevel_window.bind_property ("title", header, "title",
+                                    BindingFlags.SYNC_CREATE);
+
+            window_state_changed_hook = toplevel_window.window_state_event.connect ((e) => {
+                if (Gdk.WindowState.FULLSCREEN in e.new_window_state) {
+                    header.show_close_button = false;
+                    unfullscreen_button.visible = true;
+                } else {
+                    header.show_close_button = true;
+                    unfullscreen_button.visible = false;
+                }
+
+                return false;
+            });
+            unfullscreen_button.visible = toplevel_window.fullscreened;
+            header.show_close_button = !toplevel_window.fullscreened;
+        }
+        
+        private void deinit_toplevel_window () {
+            title_binding.unbind ();
+            toplevel_window.disconnect (window_state_changed_hook);
+        }
+
+        /* The code marked below is transliterated from Gtk+,
+            as the original code can only apply to a custom titlebar
+            registered with a Gtk.Window.
+
+            It would certainly be a preference not to have this code here. */
+        private Gtk.GestureDrag drag_gesture;
+        private Gtk.GestureMultiPress multipress_gesture;
+
+        /* Handles button presses.
+            Transliterated from https://git.gnome.org/browse/gtk+/tree/gtk/gtkwindow.c?h=3.22.6#n1425.
+            Should be kept in sync with master. */
+        private void multipress_gesture_pressed_cb (int n_press,
+                                                    double x, double y) {
+            var win = toplevel_window;
+            var gesture = multipress_gesture;
+            var sequence = gesture.get_current_sequence ();
+            var button = gesture.get_current_button ();
+            var event = gesture.get_last_event (sequence);
+            
+            if (event == null) return;
+            
+            if (n_press > 1) drag_gesture.set_state (Gtk.EventSequenceState.DENIED);
+            
+            /* ... original code had to determine regions */
+            
+            if (win.get_display ().device_is_grabbed (gesture.get_device ())) {
+                drag_gesture.set_state (Gtk.EventSequenceState.DENIED);
+                return;
+            }
+
+            switch (button) {
+                case Gdk.BUTTON_SECONDARY:
+                    if (titlebar_action (win, event, button, n_press))
+                        gesture.set_sequence_state (sequence, Gtk.EventSequenceState.CLAIMED);
+
+                    gesture.reset ();
+                    drag_gesture.reset ();
+                    break;
+                case Gdk.BUTTON_MIDDLE:
+                    if (titlebar_action (win, event, button, n_press))
+                        gesture.set_sequence_state (sequence, Gtk.EventSequenceState.CLAIMED);
+                    break;
+                case Gdk.BUTTON_PRIMARY:
+                    var event_widget = Gtk.get_event_widget (event);
+                    
+                    event_widget.get_window ().raise ();
+                    
+                    if (n_press == 2)
+                        titlebar_action (win, event, button, n_press);
+
+                    if (win.has_grab ())
+                        gesture.set_sequence_state (sequence, Gtk.EventSequenceState.CLAIMED);
+                    break;
+            }
+        }
+
+        /* Triggers the appropriate action for an event.
+            Transliterated from https://git.gnome.org/browse/gtk+/tree/gtk/gtkwindow.c?h=3.22.6#n1367.
+            Should be kept in sync with master. */
+        private bool titlebar_action (Gtk.Window win, Gdk.Event event,
+                                        uint button, int n_press) {
+            var settings = win.get_settings ();
+            string action = "none";
+            switch (button) {
+                case Gdk.BUTTON_PRIMARY:
+                    if (n_press == 2)
+                        action = settings.gtk_titlebar_double_click;
+                    break;
+                case Gdk.BUTTON_MIDDLE:
+                    action = settings.gtk_titlebar_middle_click;
+                    break;
+                case Gdk.BUTTON_SECONDARY:
+                    action = settings.gtk_titlebar_right_click;
+                    break;
+            }
+
+            switch (action) {
+                case "none":
+                    return false;
+                case "lower":
+                    win.get_window ().lower ();
+                    break;
+                case "menu":
+                    do_popup (win, event);
+                    break;
+                default:
+                    /* treat all maximization variants the same */
+                    if (action.has_prefix ("toggle-maximize")) {
+                        if (win.get_resizable () && win.get_type_hint () == Gdk.WindowTypeHint.NORMAL)
+                            toggle_maximized (win);
+                    } else {
+                        warning ("Unsupported titlebar action %s", action);
+                        return false;
+                    }
+                    break;
+            }
+            
+            return true;
+        }
+
+        private double start_x;
+        private double start_y;
+        private void drag_gesture_begin_cb (double start_x, double start_y) {
+            this.start_x = start_x;
+            this.start_y = start_y;
+
+            var sequence = drag_gesture.get_current_sequence ();
+            var event = drag_gesture.get_last_event (sequence);
+            multipress_gesture.handle_event (event);
+        }
+        
+        /* Starts window movement on drag.
+            Transliterated from https://git.gnome.org/browse/gtk+/tree/gtk/gtkwindow.c?h=3.22.6#n1570.
+            Should be kept up to date with master. */
+        private void drag_gesture_update_cb (double offset_x, double offset_y) {
+            var gesture = drag_gesture;
+            var win = toplevel_window;
+            var settings = win.get_settings ();
+            var double_click_distance = settings.gtk_double_click_distance;
+            
+            if (offset_x.abs () > double_click_distance ||
+                    offset_y.abs () > double_click_distance) {
+                var sequence = gesture.get_current_sequence ();
+                var event = gesture.get_last_event (sequence);
+                var event_widget = Gtk.get_event_widget (event);
+                
+                /* Check whether the target widget should be left alone at
+                 * handling the sequence, this is better done late to give
+                 * room for gestures there to go denied.
+                 *
+                 * Besides claiming gestures, we must bail out too if there's
+                 * gestures in the "none" state at this point, as those are
+                 * still handling events and can potentially go claimed, and
+                 * we don't want to stop the target widget from doing anything.
+                 */
+                if (event_widget != this && !event_widget.has_grab ()) {
+                    gesture.set_state (Gtk.EventSequenceState.DENIED);
+                    return;
+                }
+
+                gesture.set_state (Gtk.EventSequenceState.CLAIMED);
+
+                double? x_root;
+                double? y_root;
+                get_window ().get_root_coords ((int) start_x, (int) start_y, out x_root,  out y_root);
+
+                win.get_window ().begin_move_drag_for_device (
+                            gesture.get_device (),
+                            (int) gesture.get_current_button (),
+                            (int) x_root, (int) y_root,
+                            Gtk.get_current_event_time ());
+
+                gesture.reset ();
+                multipress_gesture.reset ();
+            }
+        }
+        
+        private void toggle_maximized (Gtk.Window win) {
+            if (win.is_maximized) win.unmaximize ();
+            else win.maximize ();
+        }
+
+        private void do_popup (Gtk.Window win, Gdk.Event event) {
+            win.get_window ().show_window_menu (event);
+        }
+        
+        private NavigationButton? navigation_button;
+        private string back_target;
+        public void show_back (string label, string target = "") {
+            if (target == "") target = label;
+            back_target = target;
+
+            if (navigation_button == null) {
+                navigation_button = new NavigationButton ();
+                navigation_button.clicked.connect (() => {
+                    toplevel_window.show_page (back_target, Gtk.StackTransitionType.SLIDE_RIGHT);
+                });
+                header.pack_start (navigation_button);
+                navigation_button.show_all ();
+
+                var accel = new Gtk.AccelGroup ();
+                accel.connect (Gdk.Key.Left, Gdk.ModifierType.CONTROL_MASK,
+                                Gtk.AccelFlags.VISIBLE | Gtk.AccelFlags.LOCKED,
+                                (group, acceleratable, key, modifier) => {
+                    navigation_button.clicked ();
+                    return true;
+                });
+                map.connect (() => {
+                    toplevel_window.add_accel_group (accel);
+                });
+                unmap.connect (() => {
+                    toplevel_window.remove_accel_group (accel);
+                });
+            }
+            navigation_button.label = label;
+        }
+
+        public delegate void search_callback (string terms);
+        public void add_searchbox (search_callback cb) {
+            var searchbox = new Gtk.SearchEntry ();
+            searchbox.placeholder_text = _("Search Videos");
+            searchbox.margin_right = 5;
+            searchbox.search_changed.connect (() => {
+                cb (searchbox.text);
+            });
+            header.pack_end (searchbox);
+
+            var accel = new Gtk.AccelGroup ();
+            accel.connect (Gdk.Key.F, Gdk.ModifierType.CONTROL_MASK,
+                            Gtk.AccelFlags.VISIBLE | Gtk.AccelFlags.LOCKED,
+                            (group, acceleratable, key, modifier) => {
+                searchbox.grab_focus ();
+                return true;
+            });
+            accel.connect (Gdk.Key.Escape, 0,
+                            Gtk.AccelFlags.VISIBLE | Gtk.AccelFlags.LOCKED,
+                            (group, acceleratable, key, modifier) => {
+                searchbox.text = "";
+                return true;
+            });
+            map.connect (() => {
+                searchbox.text = "";
+                toplevel_window.add_accel_group (accel);
+            });
+            unmap.connect (() => {
+                toplevel_window.remove_accel_group(accel);
+            });
+        }
+    }
+}

=== modified file 'src/Widgets/WelcomePage.vala'
--- src/Widgets/WelcomePage.vala	2016-09-28 02:32:33 +0000
+++ src/Widgets/WelcomePage.vala	2017-01-28 06:32:01 +0000
@@ -1,13 +1,20 @@
 namespace Audience {
-    public class WelcomePage : Granite.Widgets.Welcome {
+    public class WelcomePage : Gtk.Grid {
         private DiskManager disk_manager;
         private Services.LibraryManager library_manager;
-        public WelcomePage () {
-            base (_("No Videos Open"), _("Select a source to begin playing."));
-        }
+
+        private Granite.Widgets.Welcome welcome;
+
+        public WelcomePage () {}
 
         construct {
-            append ("document-open", _("Open file"), _("Open a saved file."));
+            orientation = Gtk.Orientation.VERTICAL;
+            add (new TitleBar ());
+
+            welcome = new Granite.Widgets.Welcome (_("No Videos Open"),
+                        _("Select a source to begin playing."));
+            welcome.append ("document-open", _("Open file"), _("Open a saved file."));
+            add (welcome);
 
             var filename = settings.current_video;
             var last_file = File.new_for_uri (filename);
@@ -17,40 +24,42 @@
             }
 
             if (settings.last_stopped == 0.0 || !settings.resume_videos) {
-                append ("media-playlist-repeat", _("Replay last video"), get_title (last_file.get_basename ()));
+                welcome.append ("media-playlist-repeat", _("Replay last video"),
+                                get_title (last_file.get_basename ()));
             } else {
-                append ("media-playback-start", _("Resume last video"), get_title (last_file.get_basename ()));
+                welcome.append ("media-playback-start", _("Resume last video"),
+                                get_title (last_file.get_basename ()));
             }
 
-            set_item_visible (1, show_last_file);
+            welcome.set_item_visible (1, show_last_file);
 
             //look for dvd
             disk_manager = DiskManager.get_default ();
             disk_manager.volume_found.connect ((vol) => {
-                set_item_visible (2, disk_manager.has_media_volumes ());
+                welcome.set_item_visible (2, disk_manager.has_media_volumes ());
             });
 
             disk_manager.volume_removed.connect ((vol) => {
-                set_item_visible (2, disk_manager.has_media_volumes ());
+                welcome.set_item_visible (2, disk_manager.has_media_volumes ());
             });
 
             library_manager = Services.LibraryManager.get_instance ();
             library_manager.video_file_detected.connect ((vid) => {
-                set_item_visible (3, true);
+                welcome.set_item_visible (3, true);
                 this.show_all ();
             });
 
             library_manager.video_file_deleted.connect ((vid) => {
-                set_item_visible (3, LibraryPage.get_instance ().has_items);
+                welcome.set_item_visible (3, LibraryPage.get_instance ().has_items);
             });
 
-            append ("media-cdrom", _("Play from Disc"), _("Watch a DVD or open a file from disc"));
-            set_item_visible (2, disk_manager.has_media_volumes ());
-
-            append ("folder-videos", _("Browse Library"), _("Watch a movie from your library"));
-            set_item_visible (3, library_manager.has_items);
-
-            activated.connect ((index) => {
+            welcome.append ("media-cdrom", _("Play from Disc"), _("Watch a DVD or open a file from disc"));
+            welcome.set_item_visible (2, disk_manager.has_media_volumes ());
+
+            welcome.append ("folder-videos", _("Browse Library"), _("Watch a movie from your library"));
+            welcome.set_item_visible (3, library_manager.has_items);
+
+            welcome.activated.connect ((index) => {
                 var window = App.get_instance ().mainwindow;
                 switch (index) {
                     case 0:
@@ -64,13 +73,17 @@
                         window.run_open_dvd ();
                         break;
                     case 3:
-                        window.show_library ();
+                        window.show_page (Audience.Window.page_label_library);
                 }
             });
+
+            map.connect (() => {
+                App.get_instance ().mainwindow.title = _("Videos");
+            });
         }
 
         public void refresh () {
-            var replay_button = get_button_from_index (1);
+            var replay_button = welcome.get_button_from_index (1);
 
             var filename = settings.current_video;
             var last_file = File.new_for_uri (filename);
@@ -89,8 +102,25 @@
                 show_last_file = false;
             }
 
-            set_item_visible (1, show_last_file);
-            set_item_visible (2, disk_manager.has_media_volumes ());
+            welcome.set_item_visible (1, show_last_file);
+            welcome.set_item_visible (2, disk_manager.has_media_volumes ());
+        }
+        
+        public override bool key_press_event (Gdk.EventKey e) {
+            uint keycode = e.hardware_keycode;
+            bool ctrl_pressed = (e.state & Gdk.ModifierType.CONTROL_MASK) != 0;
+            var win = App.get_instance ().mainwindow;
+            
+            if (match_keycode (Gdk.Key.p, keycode) || match_keycode (Gdk.Key.space, keycode)) {
+                win.resume_last_videos ();
+            } else if (ctrl_pressed && match_keycode (Gdk.Key.o, keycode)) {
+                win.run_open_file ();
+            } else if (ctrl_pressed && match_keycode (Gdk.Key.q, keycode)) {
+                win.destroy ();
+            } else if (ctrl_pressed && match_keycode (Gdk.Key.b, keycode)) {
+                win.show_page (Audience.Window.page_label_library);
+            }
+            return true;
         }
     }
 }

=== modified file 'src/Window.vala'
--- src/Window.vala	2017-01-25 22:40:27 +0000
+++ src/Window.vala	2017-01-28 06:32:01 +0000
@@ -23,22 +23,22 @@
 
 public class Audience.Window : Gtk.Window {
     private Gtk.Stack main_stack;
-    private Gtk.HeaderBar header;
     private PlayerPage player_page;
     private WelcomePage welcome_page;
     private LibraryPage library_page;
     private EpisodesPage episodes_page;
-    private Granite.Widgets.AlertView alert_view;
     private Toast app_notification;
-    private NavigationButton navigation_button;
     private ZeitgeistManager zeitgeist_manager;
-    private Gtk.SearchEntry search_entry;
 
 
     // For better translation
-    const string navigation_button_welcomescreen = N_("Back");
-    const string navigation_button_library = N_("Library");
-    const string navigation_button_episodes = N_("Episodes");
+    public static string page_label_welcomescreen;
+    public static string page_label_library;
+    public static string page_label_episodes;
+    // No back button, hence no need for translation
+    public static string page_label_player = "player";
+
+    public bool fullscreened = false;
 
     public signal void media_volumes_changed ();
 
@@ -47,76 +47,42 @@
     }
 
     construct {
+        // Initialize translations
+        page_label_welcomescreen = _("Back");
+        page_label_library = _("Library");
+        page_label_episodes = _("Episodes");
+
+
         zeitgeist_manager = new ZeitgeistManager ();
         window_position = Gtk.WindowPosition.CENTER;
         gravity = Gdk.Gravity.CENTER;
         set_default_geometry (1000, 680);
 
-        header = new Gtk.HeaderBar ();
-        header.set_show_close_button (true);
-        header.get_style_context ().add_class ("compact");
-
-        navigation_button = new NavigationButton ();
-        navigation_button.clicked.connect (() => {
-            navigate_back ();
+        // Put something empty in to hide the title bar,
+        //      leaving a rectangular window for the video to fill.
+        var titlebar = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
+        set_titlebar (titlebar);
+        map.connect (() => {
+            titlebar.visible = false;
         });
 
-        header.pack_start (navigation_button);
-
-        search_entry = new Gtk.SearchEntry ();
-        search_entry.placeholder_text = _("Search Videos");
-        search_entry.margin_right = 5;
-        search_entry.search_changed.connect (() => {
-                if (main_stack.visible_child == episodes_page ) {
-                    episodes_page.filter (search_entry.text);
-                } else {
-                    library_page.filter (search_entry.text);
-                }
-            });
-
-        header.pack_end (search_entry);
-
-        set_titlebar (header);
-
         library_page = LibraryPage.get_instance ();
         library_page.map.connect (() => {
-            search_entry.visible = true;
-            if (search_entry.text != "" && !library_page.has_child ()) {
-                search_entry.text = "";
-            }
             if (library_page.last_filter != "") {
-                search_entry.text = library_page.last_filter;
                 library_page.last_filter = "";
             }
         });
-        library_page.unmap.connect (() => {
-            if (main_stack.visible_child != alert_view && main_stack.visible_child != episodes_page) {
-                search_entry.visible = false;
-            }
-        });
-        library_page.filter_result_changed.connect ((has_result) => {
-            if (!has_result) {
-                show_alert (_("No Results for “%s”").printf (search_entry.text), _("Try changing search terms."), "edit-find-symbolic");
-            } else if (main_stack.visible_child != library_page ) {
-                hide_alert ();
-            }
-        });
         library_page.show_episodes.connect ((item) => {
-            navigation_button.label = _(navigation_button_library);
             episodes_page.set_episodes_items (item.episodes);
             episodes_page.poster.pixbuf = item.poster.pixbuf;
             main_stack.set_visible_child (episodes_page);
             this.title = item.get_title ();
-            search_entry.text = "";
         });
 
         welcome_page = new WelcomePage ();
 
         player_page = new PlayerPage ();
         player_page.ended.connect (on_player_ended);
-        player_page.unfullscreen_clicked.connect (() => {
-            unfullscreen ();
-        });
 
         player_page.notify["playing"].connect (() => {
             set_keep_above (player_page.playing && settings.stay_on_top);
@@ -130,23 +96,14 @@
             app_notification.visible = true;
         });
 
-        alert_view = new Granite.Widgets.AlertView ("", "", "");
-        alert_view.get_style_context ().add_class (Gtk.STYLE_CLASS_DIM_LABEL);
-        alert_view.set_vexpand (true);
-        alert_view.no_show_all = true;
-
         episodes_page = new EpisodesPage ();
-        episodes_page.map.connect (() => {
-            search_entry.visible = true;
-        });
 
         main_stack = new Gtk.Stack ();
         main_stack.expand = true;
-        main_stack.add_named (welcome_page, "welcome");
-        main_stack.add_named (player_page, "player");
-        main_stack.add_named (library_page, "library");
-        main_stack.add_named (episodes_page, "episodes");
-        main_stack.add_named (alert_view, "alert");
+        main_stack.add_named (welcome_page, page_label_welcomescreen);
+        main_stack.add_named (player_page, page_label_player);
+        main_stack.add_named (library_page, page_label_library);
+        main_stack.add_named (episodes_page, page_label_episodes);
         main_stack.transition_type = Gtk.StackTransitionType.SLIDE_LEFT_RIGHT;
 
         app_notification = new Toast ();
@@ -165,9 +122,7 @@
         add (overlay);
         show_all ();
 
-        navigation_button.hide ();
-        search_entry.visible = false;
-        main_stack.set_visible_child_full ("welcome", Gtk.StackTransitionType.NONE);
+        main_stack.set_visible_child_full (page_label_welcomescreen, Gtk.StackTransitionType.NONE);
 
         Gtk.TargetEntry uris = {"text/uri-list", 0, 0};
         Gtk.drag_dest_set (this, Gtk.DestDefaults.ALL, {uris}, Gdk.DragAction.MOVE);
@@ -201,8 +156,7 @@
 
         window_state_event.connect ((e) => {
             if (Gdk.WindowState.FULLSCREEN in e.changed_mask) {
-                player_page.fullscreened = Gdk.WindowState.FULLSCREEN in e.new_window_state;
-                header.visible = !player_page.fullscreened;
+                fullscreened = player_page.fullscreened = Gdk.WindowState.FULLSCREEN in e.new_window_state;
             }
 
             /*/ FIXME: Remove comments once gala bug is fixed: https://bugs.launchpad.net/gala/+bug/1602722
@@ -218,124 +172,22 @@
         });
     }
 
-    /** Returns true if the code parameter matches the keycode of the keyval parameter for
-    * any keyboard group or level (in order to allow for non-QWERTY keyboards) **/
-    public bool match_keycode (int keyval, uint code) {
-        Gdk.KeymapKey [] keys;
-        Gdk.Keymap keymap = Gdk.Keymap.get_default ();
-        if (keymap.get_entries_for_keyval (keyval, out keys)) {
-            foreach (var key in keys) {
-                if (code == key.keycode)
-                    return true;
-                }
-            }
-
-        return false;
+    /** Shows the specified view,
+    * largely used to implement back buttons */
+    public void show_page (string name,
+                    Gtk.StackTransitionType transition = Gtk.StackTransitionType.SLIDE_LEFT) {
+        main_stack.set_visible_child_full (name, transition);
     }
 
     public override bool key_press_event (Gdk.EventKey e) {
         uint keycode = e.hardware_keycode;
         bool ctrl_pressed = (e.state & Gdk.ModifierType.CONTROL_MASK) != 0;
-        if ((e.state & Gdk.ModifierType.MOD1_MASK) != 0 && e.keyval == Gdk.Key.Left) {
-            navigation_button.clicked ();
-            return true;
-        }
-
-        if (main_stack.visible_child == player_page) {
-            if (match_keycode (Gdk.Key.p, keycode) || match_keycode (Gdk.Key.space, keycode)) {
-                player_page.playing = !player_page.playing;
-            } else if (match_keycode (Gdk.Key.a, keycode)) {
-                player_page.next_audio ();
-            } else if (match_keycode (Gdk.Key.s, keycode)) {
-                player_page.next_text ();
-            } else if (match_keycode (Gdk.Key.f, keycode)) {
-                if (player_page.fullscreened) {
-                    unfullscreen ();
-                } else {
-                    fullscreen ();
-                }
-            }
-
-            switch (e.keyval) {
-                case Gdk.Key.Escape:
-                    if (player_page.fullscreened) {
-                        unfullscreen ();
-                    } else {
-                        destroy ();
-                    }
-
-                    return true;
-                case Gdk.Key.Down:
-                    if (Gdk.ModifierType.SHIFT_MASK in e.state) {
-                        player_page.seek_jump_seconds (-5); // 5 secs
-                    } else {
-                        player_page.seek_jump_seconds (-60); // 1 min
-                    }
-
-                    player_page.reveal_control ();
-                    break;
-                case Gdk.Key.Left:
-                    if (Gdk.ModifierType.SHIFT_MASK in e.state) {
-                        player_page.seek_jump_seconds (-1); // 1 sec
-                    } else {
-                        player_page.seek_jump_seconds (-10); // 10 secs
-                    }
-
-                    player_page.reveal_control ();
-                    break;
-                case Gdk.Key.Right:
-                    if (Gdk.ModifierType.SHIFT_MASK in e.state) {
-                        player_page.seek_jump_seconds (1); // 1 sec
-                    } else {
-                        player_page.seek_jump_seconds (10); // 10 secs
-                    }
-
-                    player_page.reveal_control ();
-                    break;
-                case Gdk.Key.Up:
-                    if (Gdk.ModifierType.SHIFT_MASK in e.state) {
-                        player_page.seek_jump_seconds (5); // 5 secs
-                    } else {
-                        player_page.seek_jump_seconds (60); // 1 min
-                    }
-
-                    player_page.reveal_control ();
-                    break;
-                case Gdk.Key.Page_Down:
-                    player_page.seek_jump_seconds (-600); // 10 mins
-                    player_page.reveal_control ();
-                    break;
-                case Gdk.Key.Page_Up:
-                    player_page.seek_jump_seconds (600); // 10 mins
-                    player_page.reveal_control ();
-                    break;
-                default:
-                    break;
-            }
-        } else if (main_stack.visible_child == welcome_page) {
-            if (match_keycode (Gdk.Key.p, keycode) || match_keycode (Gdk.Key.space, keycode)) {
-                resume_last_videos ();
-                return true;
-            } else if (ctrl_pressed && match_keycode (Gdk.Key.o, keycode)) {
-                run_open_file ();
-                return true;
-            } else if (ctrl_pressed && match_keycode (Gdk.Key.q, keycode)) {
-                destroy ();
-                return true;
-            } else if (ctrl_pressed && match_keycode (Gdk.Key.b, keycode)) {
-                show_library ();
-                return true;
-            }
-        } else if (search_entry.visible) {
-            if (ctrl_pressed && match_keycode (Gdk.Key.f, keycode)) {
-                search_entry.grab_focus ();
-            } else if (ctrl_pressed && match_keycode (Gdk.Key.z, keycode)) {
+
+        if (main_stack.visible_child == library_page ||
+                main_stack.visible_child == episodes_page) {
+            if (ctrl_pressed && match_keycode (Gdk.Key.z, keycode)) {
                 library_page.manager.undo_delete_item ();
                 app_notification.reveal_child = false;
-            } else if (match_keycode (Gdk.Key.Escape, keycode)) {
-                search_entry.text = "";
-            } else if (!search_entry.is_focus && e.str.strip ().length > 0) {
-                search_entry.grab_focus ();
             }
         }
 
@@ -381,13 +233,6 @@
         read_first_disk.begin ();
     }
 
-    public void show_library () {
-        navigation_button.label = _(navigation_button_welcomescreen);
-        navigation_button.show ();
-        main_stack.visible_child = library_page;
-        library_page.scrolled_window.grab_focus ();
-    }
-
     public void run_open_file (bool clear_playlist = false, bool force_play = true) {
         var file = new Gtk.FileChooserDialog (_("Open"), this, Gtk.FileChooserAction.OPEN,
             _("_Cancel"), Gtk.ResponseType.CANCEL, _("_Open"), Gtk.ResponseType.ACCEPT);
@@ -449,25 +294,13 @@
     }
 
     private void on_player_ended () {
-        navigate_back ();
         unfullscreen ();
     }
 
     public void play_file (string uri, bool from_beginning = true) {
-        search_entry.visible = false;
-        if (navigation_button.visible) {
-            if (navigation_button.label == _(navigation_button_library)) {
-                navigation_button.label = _(navigation_button_episodes);
-            } else {
-                navigation_button.label = _(navigation_button_library);
-            }
-        } else {
-            navigation_button.show ();
-            navigation_button.label = _(navigation_button_welcomescreen);
-        }
-
-        main_stack.set_visible_child_full ("player", Gtk.StackTransitionType.SLIDE_LEFT);
-        player_page.play_file (uri, from_beginning);
+        var back_target = main_stack.visible_child_name;
+        main_stack.set_visible_child_full (page_label_player, Gtk.StackTransitionType.SLIDE_LEFT);
+        player_page.play_file (uri, from_beginning, back_target);
         if (is_maximized) {
             fullscreen ();
         }
@@ -479,47 +312,6 @@
         welcome_page.refresh ();
     }
 
-    public void navigate_back () {
-        double progress = player_page.get_progress ();
-        if (progress > 0) {
-            settings.last_stopped = progress;
-        }
-        if (player_page.playing) {
-            player_page.playing = false;
-            player_page.reset_played_uri ();
-        }
-        title = App.get_instance ().program_name;
-        get_window ().set_cursor (null);
-
-        if (navigation_button.label == _(navigation_button_library)) {
-            navigation_button.label = _(navigation_button_welcomescreen);
-            main_stack.set_visible_child_full ("library", Gtk.StackTransitionType.SLIDE_RIGHT);
-        } else if (navigation_button.label == _(navigation_button_episodes)) {
-            navigation_button.label = _(navigation_button_library);
-            main_stack.set_visible_child_full ("episodes", Gtk.StackTransitionType.SLIDE_RIGHT);
-        } else {
-            navigation_button.hide ();
-            main_stack.set_visible_child (welcome_page);
-            search_entry.visible = false;
-        }
-        welcome_page.refresh ();
-    }
-
-    public void hide_alert () {
-        alert_view.no_show_all = true;
-        main_stack.set_visible_child_full ("library", Gtk.StackTransitionType.NONE);
-        alert_view.hide ();
-    }
-
-    public void show_alert (string primary_text, string secondary_text, string icon_name) {
-        alert_view.no_show_all = false;
-        alert_view.show_all ();
-        alert_view.title = primary_text;
-        alert_view.description = secondary_text;
-        alert_view.icon_name = icon_name;
-        main_stack.set_visible_child_full ("alert", Gtk.StackTransitionType.NONE);
-    }
-
     public void set_app_notification (string text) {
         app_notification.set_notification (text);
     }