Merge lp:~vikoadi/pantheon-photos/slideshow-toolbutton into lp:~pantheon-photos/pantheon-photos/trunk

[Viko Adi Rahmawan]

Move Slideshow menuitem into Toolbar in PhotoPage and CollectionPage

Move Slideshow menuitem into Toolbar in PhotoPage and CollectionPage

[Robert Roth (evfool)]

Code looks fine, not tested though. I'm pretty sure there will be merge conflicts though, as the codebase has been reformatted according to the elementary code style guidelines, so I suggest merging from trunk again.

review: Needs Fixing (code style)

[lp:~vikoadi/pantheon-photos/slideshow-toolbutton]

2570. By Viko Adi Rahmawan on 2014-08-10

merge trunk, fix codestyle

[Viko Adi Rahmawan (vikoadi)]

Done

[lp:~vikoadi/pantheon-photos/slideshow-toolbutton]

2571. By Viko Adi Rahmawan on 2014-08-10

use large icon

[Cody Garver (codygarver)]

The play icon should be the first (far left) icon in the toolbar

review: Needs Fixing

[lp:~vikoadi/pantheon-photos/slideshow-toolbutton]

2572. By Viko Adi Rahmawan on 2014-08-14

move slideshow button to be first in the toolbar

2573. By Viko Adi Rahmawan on 2014-08-14

merge trunk

[Viko Adi Rahmawan (vikoadi)]

Moved to far left.
I guess i should never ever improvise :)

=== modified file 'src/CollectionPage.vala'
--- src/CollectionPage.vala	2014-08-10 22:31:33 +0000
+++ src/CollectionPage.vala	2014-08-14 11:43:06 +0000
@@ -60,6 +60,12 @@
             MediaPage.ZoomSliderAssembly zoom_slider_assembly = create_zoom_slider_assembly ();
             connect_slider (zoom_slider_assembly);
             get_toolbar ().insert (zoom_slider_assembly, -1);
+            
+            Gtk.Image start_image = new Gtk.Image.from_icon_name ("media-playback-start", Gtk.IconSize.LARGE_TOOLBAR);
+            Gtk.ToolButton slideshow_button = new Gtk.ToolButton (start_image, _("S_lideshow"));
+            slideshow_button.set_tooltip_text (_("Play a slideshow"));
+            slideshow_button.clicked.connect (on_slideshow);
+            get_toolbar ().insert (slideshow_button, 0);
         }
 
         return toolbar;
@@ -88,8 +94,6 @@
         InjectionGroup group = new InjectionGroup ("/MediaViewMenu/ViewExtrasFullscreenSlideshowPlaceholder");
 
         group.add_menu_item ("Fullscreen", "CommonFullscreen");
-        group.add_separator ();
-        group.add_menu_item ("Slideshow");
 
         return group;
     }

=== modified file 'src/PhotoPage.vala'
--- src/PhotoPage.vala	2014-08-10 22:06:21 +0000
+++ src/PhotoPage.vala	2014-08-14 11:43:06 +0000
@@ -2346,6 +2346,19 @@
         LibraryPhoto.global.items_altered.disconnect (on_metadata_altered);
     }
 
+    public override Gtk.Toolbar get_toolbar () {
+        if (toolbar == null) {
+            base.get_toolbar ();
+
+            Gtk.Image start_image = new Gtk.Image.from_icon_name ("media-playback-start", Gtk.IconSize.LARGE_TOOLBAR);
+            Gtk.ToolButton slideshow_button = new Gtk.ToolButton (start_image, _("S_lideshow"));
+            slideshow_button.set_tooltip_text (_("Play a slideshow"));
+            slideshow_button.clicked.connect (on_slideshow);
+            get_toolbar ().insert (slideshow_button, 0);
+        }
+        return toolbar;
+    }
+
     public bool not_trashed_view_filter (DataView view) {
         return ! ((MediaSource) view.get_source ()).is_trashed ();
     }
@@ -3432,4 +3445,4 @@
         get_command_manager ().execute (new ModifyTagsCommand (photo, new_tags));
     }
 
-}
+}
\ No newline at end of file

=== modified file 'src/direct/DirectPhotoPage.vala'
--- src/direct/DirectPhotoPage.vala	2014-08-08 21:13:09 +0000
+++ src/direct/DirectPhotoPage.vala	2014-08-14 11:43:06 +0000
@@ -599,4 +599,4 @@
         // direct.ui.
         ui_filenames.add ("direct_context.ui");
     }
-}
+}
\ No newline at end of file