[gnome-music/glade] Fix AlbumWidget

[Seif Lotfy <seiflotfy src gnome org>]

commit ee5c4ffad93b0e88da9d130af2aed0bc124c541b
Author: Seif Lotfy <seif lotfy com>
Date:   Fri Apr 19 18:50:19 2013 +0200

    Fix AlbumWidget

 data/AlbumWidget.ui       | 36 +++++++++++++++++++++++++-----------
 data/ArtistAlbumWidget.ui |  4 ++--
 src/view.js               | 11 +++++++----
 src/widgets.js            |  4 ++--
 src/window.js             |  2 +-
 5 files changed, 37 insertions(+), 20 deletions(-)
---
diff --git a/data/AlbumWidget.ui b/data/AlbumWidget.ui
index 4ed83d1..9bdd133 100644
--- a/data/AlbumWidget.ui
+++ b/data/AlbumWidget.ui
@@ -4,20 +4,20 @@
   <object class="GtkHBox" id="AlbumWidget">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="valign">center</property>
     <property name="homogeneous">True</property>
     <child>
-      <object class="GtkHBox" id="box1">
+      <object class="GtkHBox" id="box4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">16</property>
-        <property name="margin_top">16</property>
-        <property name="margin_bottom">16</property>
-        <property name="spacing">32</property>
+        <property name="halign">end</property>
+        <property name="margin_right">32</property>
+        <property name="vexpand">True</property>
         <child>
           <object class="GtkVBox" id="vbox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="halign">end</property>
+            <property name="margin_top">64</property>
             <child>
               <placeholder/>
             </child>
@@ -25,6 +25,7 @@
               <object class="GtkImage" id="cover">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="halign">end</property>
                 <property name="xpad">1</property>
                 <property name="stock">gtk-missing-image</property>
               </object>
@@ -68,6 +69,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
+                <property name="padding">24</property>
                 <property name="position">2</property>
               </packing>
             </child>
@@ -165,9 +167,24 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
+            <property name="pack_type">end</property>
             <property name="position">0</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkLabel" id="label2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+            <property name="xalign">0.33000001311302185</property>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
       </object>
       <packing>
         <property name="expand">True</property>
@@ -179,10 +196,6 @@
       <object class="GtkScrolledWindow" id="scrolledWindow">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
-        <property name="margin_right">16</property>
-        <property name="margin_top">16</property>
-        <property name="margin_bottom">16</property>
         <child>
           <object class="GtkViewport" id="view">
             <property name="visible">True</property>
@@ -197,6 +210,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
+                    <property name="margin_top">64</property>
                     <property name="homogeneous">True</property>
                     <child>
                       <placeholder/>
@@ -205,7 +219,7 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">0</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
               </object>
diff --git a/data/ArtistAlbumWidget.ui b/data/ArtistAlbumWidget.ui
index 6250179..228beee 100644
--- a/data/ArtistAlbumWidget.ui
+++ b/data/ArtistAlbumWidget.ui
@@ -23,7 +23,7 @@
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
-          <object class="GtkBox" id="box2">
+          <object class="GtkBox" id="box3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
@@ -77,8 +77,8 @@
             <property name="item_orientation">horizontal</property>
             <property name="model">liststore1</property>
             <property name="columns">2</property>
-            <property name="activate_on_single_click">True</property>
             <property name="row_spacing">1</property>
+            <property name="activate_on_single_click">True</property>
             <style>
               <class name="content-view"/>
               <class name="view"/>
diff --git a/src/view.js b/src/view.js
index 1734a80..0efdc5d 100644
--- a/src/view.js
+++ b/src/view.js
@@ -201,7 +201,6 @@ const ViewContainer = new Lang.Class({
 
     _addItem: function(source, param, item) {
         if (item != null) {
-            print (item.get_title() + "\n");
             this._offset += 1;
             let path = "/usr/share/icons/gnome/scalable/places/folder-music-symbolic.svg";
             let icon = GdkPixbuf.Pixbuf.new_from_file_at_scale(path, this._iconHeight, this._iconWidth, 
true);
@@ -402,15 +401,19 @@ const Artists = new Lang.Class({
         this.parent("Artists", header_bar);
         this.player = player;
         this._artists = {};
-        this._artistAlbumsWidget = new Gtk.VBox();
+        this._artistAlbumsWidget = new Gtk.Frame({
+            shadow_type:    Gtk.ShadowType.NONE
+        });
         this.view.set_view_type(Gd.MainViewType.LIST);
         this.view.set_hexpand(false);
         this._artistAlbumsWidget.set_hexpand(true);
+        this._artistAlbumsWidget.get_style_context().add_class("view");
+        this._artistAlbumsWidget.get_style_context().add_class("content-view");
         var scrolledWindow = new Gtk.ScrolledWindow();
         scrolledWindow.set_policy(
             Gtk.PolicyType.NEVER,
             Gtk.PolicyType.AUTOMATIC);
-        scrolledWindow.add(this._artistAlbumsWidget)
+        scrolledWindow.add(this._artistAlbumsWidget);
         this._grid.attach(scrolledWindow, 1, 0, 1, 1);
         this._addListRenderers();
         this.show_all();
@@ -444,7 +447,7 @@ const Artists = new Lang.Class({
         var artist = this._model.get_value (iter, 0);
         var albums = this._artists[artist.toLowerCase()]["albums"]
         var artistAlbums = new Widgets.ArtistAlbums(artist, albums, this.player);
-        this._artistAlbumsWidget.pack_start(artistAlbums, true, true, 0)
+        this._artistAlbumsWidget.add(artistAlbums);
         //this._artistAlbumsWidget.update(artist, albums);
     },
 
diff --git a/src/widgets.js b/src/widgets.js
index 104d735..19d122d 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -218,7 +218,7 @@ const AlbumWidget = new Lang.Class({
 
     setReleasedLabel: function(year) {
         this.ui.get_object("released_label_info").set_markup(
-            "<b><span color='grey'>" + year + "</span></b>");
+            "<span>" + year + "</span>");
     },
 });
 
@@ -239,7 +239,7 @@ const ArtistAlbums = new Lang.Class({
         var widgets = [];
         for (var i=0; i < albums.length; i++) {
             let widget = new ArtistAlbumWidget(artist, albums[i], this.player, tracks)
-            this.pack_start(widget, false, false, 9);
+            this.pack_start(widget, true, true, 9);
             widgets.push(widget);
         }
         this.show_all();
diff --git a/src/window.js b/src/window.js
index 526e4da..66aef43 100644
--- a/src/window.js
+++ b/src/window.js
@@ -42,7 +42,7 @@ const MainWindow = new Lang.Class({
             hide_titlebar_when_maximized: true
         });
 
-        this.set_default_size(640, 400);
+        this.set_default_size(800, 600);
         this._setupView();
     },