Merge lp:~artem-anufrij/audience/dynamic-repeat-button into lp:~audience-members/audience/trunk

[Artem Anufrij]

Show filename with the Replay button (lp:1403247)

Repeat button shows name of last video (see screenshot), or "Replay last playlist" if playlist has more than one item.

[Artem Anufrij (artem-anufrij)]

Screenshot:
https://launchpadlibrarian.net/201470076/Bildschirmfoto%20vom%202015-03-28%2016%3A01%3A34.png

[Cody Garver (codygarver)]

src/CMakeLists.txt line 14 needs to specific the version of granite required

review: Needs Fixing

[lp:~artem-anufrij/audience/dynamic-repeat-button]

507. By Artem Anufrij on 2015-03-28

CMakeList: 'granite' changed to 'granite>=0.3.0'

[Artem Anufrij (artem-anufrij)]

CMakeList: 'granite' changed to 'granite>=0.3.0'

[Cody Garver (codygarver)]

review: Approve

=== modified file 'src/Audience.vala'
--- src/Audience.vala	2015-03-22 10:49:25 +0000
+++ src/Audience.vala	2015-03-28 15:27:29 +0000
@@ -234,13 +234,13 @@
                             Idle.add (() => { video_player.progress = 0; return false; });
                             video_player.playing = true;
                         } else {
+                            var button = welcome.get_button_from_index (2);
                             welcome.set_item_visible (1, false);
+                            welcome.set_item_visible (2, true);
                             if (last_played_index > 0) {
-                                welcome.set_item_visible (2, false);
-                                welcome.set_item_visible (3, true);
+                                button.description = _("Replay last playlist");
                             } else {
-                                welcome.set_item_visible (2, true);
-                                welcome.set_item_visible (3, false);
+                                button.description = _("Replay '%s'").printf (get_title (playlist.get_first_item ().get_basename ()));
                             }
 
                             welcome.show_all ();
@@ -380,22 +380,19 @@
             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.append ("media-cdrom", _("Play from Disc"), _("Watch a DVD or open a file from disc"));
             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);
-
             //look for dvd
             var disk_manager = DiskManager.get_default ();
-            welcome.set_item_visible (4, disk_manager.has_media_volumes ());
+            welcome.set_item_visible (3, disk_manager.has_media_volumes ());
 
             disk_manager.volume_found.connect ((vol) => {
-                welcome.set_item_visible (4, disk_manager.has_media_volumes ());
+                welcome.set_item_visible (3, disk_manager.has_media_volumes ());
             });
 
             disk_manager.volume_removed.connect ((vol) => {
-                welcome.set_item_visible (4, disk_manager.has_media_volumes ());
+                welcome.set_item_visible (3, disk_manager.has_media_volumes ());
             });
 
 
@@ -416,7 +413,6 @@
                         video_player.playing = true;
                         break;
                     case 2:
-                    case 3:
                         welcome.hide ();
                         clutter.show_all ();
                         open_file (playlist.get_first_item ().get_path ());
@@ -424,7 +420,7 @@
                         Idle.add (() => {video_player.progress = 0; return false;});
                         video_player.playing = true;
                         break;
-                    case 4:
+                    case 3:
                         run_open_dvd ();
                         break;
                     default:

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-10-14 09:03:22 +0000
+++ src/CMakeLists.txt	2015-03-28 15:27:29 +0000
@@ -11,9 +11,9 @@
 # pkgconfig, real C code
 find_package (PkgConfig)
 
-set (PKG_DEPS granite clutter-gtk-1.0 gstreamer-1.0 gstreamer-pbutils-1.0 gstreamer-tag-1.0)
-set (VALA_DEPS 
-    granite
+set (PKG_DEPS granite>=0.3.0 clutter-gtk-1.0 gstreamer-1.0 gstreamer-pbutils-1.0 gstreamer-tag-1.0)
+set (VALA_DEPS
+    granite>=0.3.0
     clutter-gtk-1.0
     gdk-x11-3.0
     gstreamer-1.0