Merge lp:~artem-anufrij/audience/Bugfix-1045937 into lp:~audience-members/audience/trunk

[Artem Anufrij]

Added a "Repeat Playlist" toggle button into playlist popover (lp:1045937)

Added a "Repeat Playlist" toggle button into playlist popup.

We need a new settings item, if the state should be saved permanently.

[lp:~artem-anufrij/audience/Bugfix-1045937]

446. By artem-anufrij on 2014-10-30

Grid.attach adjust

447. By artem-anufrij on 2014-10-30

Tooltip fixed

[Danielle Foré (danrabbit)]

Check the behavior of the repeat button in Noise. We should change the icon and tooltip to help indicate the state and what will happen when you toggle the button.

I think I liked the version better where the repeat button was not homogenously sized. It helps create a separation since it's behavior is a little different than the others.

Is it possible to make the UI not show when the video repeats? I imagine a use case for this feature is a looping video on a projector or television and it would be odd to see the UI pop up in this setting.

review: Needs Fixing (ux)

[Artem Anufrij (artem-anufrij)]

@Dan:

Button location:

playlist popup
or
bottom bar like noise?

review: Needs Information

[lp:~artem-anufrij/audience/Bugfix-1045937]

448. By artem-anufrij on 2014-10-31

Repeate button tooltip and symbolic like noise

[Artem Anufrij (artem-anufrij)]

Please test the UX

[Artem Anufrij (artem-anufrij)]

I'm working on:

> Is it possible to make the UI not show when the video repeats? I imagine a use case for this feature is a looping video on a projector or television and it would be odd to see the UI pop up in this setting.

[lp:~artem-anufrij/audience/Bugfix-1045937]

449. By artem-anufrij on 2014-10-31

Bottom bar stays hidden between each videos of the playlist, or if repeat function is enabled.

[Artem Anufrij (artem-anufrij)]

I think, now it works fine.

[Danielle Foré (danrabbit)]

Yep, everything seems to work as expected now :)

review: Approve (ux)

[Cody Garver (codygarver)]

diff comment

[lp:~artem-anufrij/audience/Bugfix-1045937]

450. By artem-anufrij on 2014-11-01

 } else {

[Artem Anufrij (artem-anufrij)]

code fixed
" } else {"

[lp:~artem-anufrij/audience/Bugfix-1045937]

451. By artem-anufrij on 2014-11-02

code style fixed

452. By artem-anufrij on 2014-11-02

code style fixed

=== modified file 'src/Audience.vala'
--- src/Audience.vala	2014-10-29 12:24:42 +0000
+++ src/Audience.vala	2014-11-02 19:13:44 +0000
@@ -47,6 +47,8 @@
         /// TRANSLATORS: This is the shortcut used to view information about the application itself when its displayed name is the localized equivalent of "Videos".
         public const string ABOUT_GENERIC = N_("About Videos");
 
+        public bool repeat { get; set; }
+
         construct {
             program_name = PROGRAM_NAME;
             exec_name = "audience";
@@ -110,6 +112,8 @@
 
             Gtk.Settings.get_default ().gtk_application_prefer_dark_theme = true;
             this.flags |= GLib.ApplicationFlags.HANDLES_OPEN;
+
+            repeat = false;
         }
 
         public static App get_instance () {
@@ -141,9 +145,9 @@
 
             bottom_bar = new Widgets.BottomBar ();
             bottom_bar.set_valign (Gtk.Align.END);
-            bottom_bar.play_toggled.connect (() => {video_player.playing = !video_player.playing;});
-            bottom_bar.seeked.connect ((val) => {video_player.progress = val;});
-            bottom_bar.unfullscreen.connect (() => {toggle_fullscreen ();});
+            bottom_bar.play_toggled.connect (() => { video_player.playing = !video_player.playing; });
+            bottom_bar.seeked.connect ((val) => { video_player.progress = val; });
+            bottom_bar.unfullscreen.connect (() => { toggle_fullscreen (); });
 
             //tagview.select_external_subtitle.connect (video_player.set_subtitle_uri);
 
@@ -223,17 +227,24 @@
                 Idle.add (() => {
                     int last_played_index = playlist.get_current ();
                     if (!playlist.next ()) {
-                        welcome.set_item_visible (1, false);
-                        if (last_played_index > 0) {
-                            welcome.set_item_visible (2, false);
-                            welcome.set_item_visible (3, true);
+
+                        if (repeat) {
+                            open_file (playlist.get_first_item ().get_path ());
+                            Idle.add (() => { video_player.progress = 0; return false; });
+                            video_player.playing = true;
                         } else {
-                            welcome.set_item_visible (2, true);
-                            welcome.set_item_visible (3, false);
+                            welcome.set_item_visible (1, false);
+                            if (last_played_index > 0) {
+                                welcome.set_item_visible (2, false);
+                                welcome.set_item_visible (3, true);
+                            } else {
+                                welcome.set_item_visible (2, true);
+                                welcome.set_item_visible (3, false);
+                            }
+
+                            welcome.show_all ();
+                            clutter.hide ();
                         }
-                        
-                        welcome.show_all ();
-                        clutter.hide ();
                     }
                     return false;
                 });
@@ -364,13 +375,13 @@
             }
 
             welcome.set_item_visible (1, show_last_file);
-            
+
             welcome.append ("media-playlist-repeat", _("Replay"), _("Replay last video"));
             welcome.set_item_visible (2, false);
-            
+
             welcome.append ("media-playlist-repeat", _("Replay"), _("Replay last playlist"));
             welcome.set_item_visible (3, false);
-            
+
             welcome.append ("media-cdrom", _("Play from Disc"), _("Watch a DVD or open a file from disc"));
             welcome.set_item_visible (4, false);
 
@@ -386,8 +397,8 @@
                 welcome.set_item_visible (4, disk_manager.has_media_volumes ());
             });
 
-            
-            
+
+
             //handle welcome
             welcome.activated.connect ((index) => {
                 switch (index) {
@@ -402,7 +413,7 @@
                         video_player.playing = false;
                         Idle.add (() => {video_player.progress = settings.last_stopped; return false;});
                         video_player.playing = true;
-                        break;                   
+                        break;
                     case 2:
                     case 3:
                         welcome.hide ();
@@ -565,7 +576,7 @@
                 foreach (var uri in sel.get_uris ()) {
                     open_file (uri);
                 }
-                
+
                 welcome.hide ();
                 clutter.show_all ();
             });
@@ -578,8 +589,8 @@
             }
 
             if (video_player.uri == null || video_player.uri == "")
-                return;                
-                
+                return;
+
             save_last_played_videos ();
         }
 
@@ -626,13 +637,13 @@
                 settings.last_stopped = 0;
             }
         }
-        
+
         private inline void clear_video_settings () {
             settings.last_stopped = 0;
             settings.last_played_videos = null;
             settings.current_video = "";
         }
-        
+
 
         private void restore_playlist () {
             foreach (var filename in settings.last_played_videos) {
@@ -661,17 +672,17 @@
                 if (welcome.is_visible ()) {
                     playlist.clear_items ();
                 }
-                
+
                 foreach (File item in file.get_files ()) {
                     playlist.add_item (item);
                 }
-                
+
                 if (video_player.uri == null || welcome.is_visible ())
                     open_file (file.get_uri ());
-                    
+
                 welcome.hide ();
                 clutter.show_all ();
-                
+
                 settings.last_folder = file.get_current_folder ();
             }
 
@@ -741,12 +752,12 @@
             string without_ext;
             int last_dot = uri.last_index_of (".", 0);
             int last_slash = uri.last_index_of ("/", 0);
-            
+
             if (last_dot < last_slash) //we dont have extension
                 without_ext = uri;
             else
                 without_ext = uri.slice (0, last_dot);
-            
+
             foreach (string ext in SUBTITLE_EXTENSIONS){
                 string sub_uri = without_ext + "." + ext;
                 if (File.new_for_uri (sub_uri).query_exists ())
@@ -791,12 +802,12 @@
         //the application started
         public override void activate () {
             build ();
-            if (settings.resume_videos == true 
-                && settings.last_played_videos.length > 0 
+            if (settings.resume_videos == true
+                && settings.last_played_videos.length > 0
                 && settings.current_video != ""
                 && file_exists (settings.current_video)) {
                 restore_playlist ();
-                
+
                 if (settings.last_stopped > 0) {
                     welcome.hide ();
                     clutter.show_all ();
@@ -812,7 +823,7 @@
         public override void open (File[] files, string hint) {
             if (mainwindow == null)
                 build ();
-                
+
             welcome.hide ();
             clutter.show_all ();
             foreach (var file in files) {
@@ -822,7 +833,7 @@
             if (video_player.uri != null) { // we already play some file
                 if (files.length == 1)
                     show_notification (_("Video added to playlist"), files[0].get_basename ());
-                else 
+                else
                     show_notification (_("%i videos added to playlist").printf (files.length), "");
             } else
                 open_file(files[0].get_uri ());
@@ -843,4 +854,4 @@
     var app = Audience.App.get_instance ();
 
     app.run (args);
-}
+}
\ No newline at end of file

=== modified file 'src/Widgets/BottomBar.vala'
--- src/Widgets/BottomBar.vala	2014-10-14 03:51:08 +0000
+++ src/Widgets/BottomBar.vala	2014-11-02 19:13:44 +0000
@@ -113,7 +113,7 @@
         } else {
             play_button.image = new Gtk.Image.from_icon_name ("media-playback-start-symbolic", Gtk.IconSize.BUTTON);
             play_button.tooltip_text = _("Play");
-            set_reveal_child (true);
+            set_reveal_child (!VideoPlayer.get_default ().at_end);
         }
     }
 
@@ -156,4 +156,4 @@
             return false;
         });
     }
-}
+}
\ No newline at end of file

=== modified file 'src/Widgets/PlaylistPopover.vala'
--- src/Widgets/PlaylistPopover.vala	2014-10-05 02:03:16 +0000
+++ src/Widgets/PlaylistPopover.vala	2014-11-02 19:13:44 +0000
@@ -32,6 +32,9 @@
         var dvd = new Gtk.Button.from_icon_name ("media-optical-symbolic", Gtk.IconSize.BUTTON);
         dvd.set_tooltip_text (_("Play from Disc"));
         dvd.no_show_all = true;
+        var rep = new Gtk.ToggleButton ();
+        rep.set_image (new Gtk.Image.from_icon_name ("media-playlist-no-repeat-symbolic", Gtk.IconSize.BUTTON));
+        rep.set_tooltip_text (_("Enable Repeat"));
 
         playlist_scrolled = new Gtk.ScrolledWindow (null, null);
         playlist_scrolled.set_min_content_height (100);
@@ -49,9 +52,21 @@
             app.run_open_dvd ();
         });
 
-        grid.attach (playlist_scrolled, 0, 0, 2, 1);
-        grid.attach (fil, 0, 1, 1, 1);
-        grid.attach (dvd, 1, 1, 1, 1);
+        rep.toggled.connect ( () => {
+            app.repeat = rep.active;
+            if (rep.active) {
+                rep.set_image (new Gtk.Image.from_icon_name ("media-playlist-repeat-symbolic", Gtk.IconSize.BUTTON));
+                rep.set_tooltip_text (_("Disable Repeat"));
+            } else {
+                rep.set_image (new Gtk.Image.from_icon_name ("media-playlist-no-repeat-symbolic", Gtk.IconSize.BUTTON));
+                rep.set_tooltip_text (_("Enable Repeat"));
+            }
+        });
+
+        grid.attach (playlist_scrolled, 0, 0, 7, 1);
+        grid.attach (fil, 0, 1, 3, 1);
+        grid.attach (dvd, 3, 1, 3, 1);
+        grid.attach (rep, 6, 1, 1, 1);
 
         //look for dvd
         var disk_manager = DiskManager.get_default ();
@@ -99,4 +114,4 @@
             natural_height = minimum_height;
         }
     }
-}
+}
\ No newline at end of file