Merge lp:~elementary-apps/noise/popuplistdialog into lp:~elementary-apps/noise/trunk

[Danielle Foré]

Port PopUpListView from Granite decorated window to Gtk.Dialog

Port PopUpListView from Granite decorated window to Gtk.Dialog

[Cody Garver (codygarver)]

There's no close button

[Cody Garver (codygarver)]

My bad, had CSD disabled

review: Approve

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-08-05 22:25:44 +0000
+++ src/CMakeLists.txt	2014-09-27 22:37:33 +0000
@@ -78,7 +78,6 @@
 
 set (CLIENT_VALAC_OPTIONS
   ${GLOBAL_VALAC_OPTIONS}
-  --define=USE_GRANITE_DECORATED_WINDOW
   #--define=HAVE_ADD_PLAYLIST_AS_BUTTON
   #--define=HAVE_SMART_ALBUM_COLUMN
   #--define=ENABLE_EXPERIMENTAL
@@ -106,4 +105,4 @@
 
 target_link_libraries (${EXEC_NAME} ${DEPS_LIBRARIES})
 
-install (TARGETS ${EXEC_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
+install (TARGETS ${EXEC_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
\ No newline at end of file

=== modified file 'src/Views/GridView/PopupListView.vala'
--- src/Views/GridView/PopupListView.vala	2014-04-27 19:34:14 +0000
+++ src/Views/GridView/PopupListView.vala	2014-09-27 22:37:33 +0000
@@ -17,13 +17,9 @@
  *              Scott Ringwelski <[e-mail]>
  */
 
-#if USE_GRANITE_DECORATED_WINDOW
-public class Noise.PopupListView : Granite.Widgets.DecoratedWindow {
-#else
-public class Noise.PopupListView : Window {
-#endif
+public class Noise.PopupListView : Gtk.Dialog {
 
-    public const int MIN_SIZE = 400;
+    public const int MIN_SIZE = 500;
 
     ViewWrapper view_wrapper;
 
@@ -36,38 +32,13 @@
     Gee.Collection<Media> media_list;
 
     public PopupListView (GridView grid_view) {
-#if USE_GRANITE_DECORATED_WINDOW
-        base ("", "album-list-view", "album-list-view");
-
-        // Don't destroy the window
         this.delete_event.connect (hide_on_delete);
-
-        // Hide titlebar (we want to set a title, but not showing it!)
-        this.show_title = false;
-        // We have to fullscreen it otherwise it's not shown on fullscreen mode
-        fullscreen ();
-#else
         window_position = Gtk.WindowPosition.CENTER_ON_PARENT;
 
         // window stuff
-        decorated = false;
         has_resize_grip = false;
         resizable = false;
 
-        // close button
-        var close = new Gtk.Button ();
-        get_style_context ().add_class ("album-list-view");
-        close.get_style_context().add_class("close-button");
-        close.set_image (Icons.render_image ("window-close-symbolic", Gtk.IconSize.MENU));
-        close.hexpand = close.vexpand = false;
-        close.halign = Gtk.Align.START;
-        close.set_relief(Gtk.ReliefStyle.NONE);
-        close.clicked.connect( () =>  { this.hide(); });
-
-        /* Make window draggable */
-        UI.make_window_draggable (this);
-#endif
-
         this.view_wrapper = grid_view.parent_view_wrapper;
         
         set_transient_for (App.main_window);
@@ -79,8 +50,7 @@
         album_label = new Gtk.Label ("");
         artist_label = new Gtk.Label ("");
 
-        // Apply special style: Level-2 header
-        Granite.Widgets.Utils.apply_text_style_to_label (Granite.TextStyle.H2, album_label);
+        album_label.get_style_context ().add_class ("h2"); 
 
         album_label.ellipsize = Pango.EllipsizeMode.END;
         artist_label.ellipsize = Pango.EllipsizeMode.END;
@@ -111,16 +81,11 @@
         rating.margin_top = rating.margin_bottom = 16;
 
         // Add everything
-        var vbox = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
-#if !USE_GRANITE_DECORATED_WINDOW
-        vbox.pack_start (close, false, false, 0);
-#endif
-        vbox.pack_start (album_label, false, true, 0);
-        vbox.pack_start (artist_label, false, true, 0);
-        vbox.pack_start (list_view_scrolled, true, true, 0);
-        vbox.pack_start(rating, false, true, 0);
-
-        add(vbox);
+        Gtk.Box content = get_content_area () as Gtk.Box;
+        content.pack_start (album_label, false, true, 0);
+        content.pack_start (artist_label, false, true, 0);
+        content.pack_start (list_view_scrolled, true, true, 0);
+        content.pack_start(rating, false, true, 0);
 
         rating.rating_changed.connect(rating_changed);
     }
@@ -266,4 +231,4 @@
     {
         minimum_height = natural_height = width;
     }
-}
+}
\ No newline at end of file