[gnome-music/glade] Updated artist view per design
- From: Vadim Rutkovsky <vrutkovsky src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-music/glade] Updated artist view per design
- Date: Sat, 20 Apr 2013 14:11:13 +0000 (UTC)
commit 4c9cae5e9cb805f8bcbcb295329cd637e84cfadc
Author: Vadim Rutkovsky <vrutkovs redhat com>
Date: Sat Apr 20 16:10:45 2013 +0200
Updated artist view per design
data/ArtistAlbumWidget.ui | 6 ++-
data/TrackWidget.ui | 106 ++++++++++++++++++----------------------------
src/widgets.js | 2 +-
3 files changed, 47 insertions(+), 67 deletions(-)
---
diff --git a/data/ArtistAlbumWidget.ui b/data/ArtistAlbumWidget.ui
index fb8ca5c..a33c7ca 100644
--- a/data/ArtistAlbumWidget.ui
+++ b/data/ArtistAlbumWidget.ui
@@ -36,6 +36,7 @@
<property name="ellipsize">middle</property>
<attributes>
<attribute name="weight" value="bold"/>
+ <attribute name="foreground" value="#bababdbdb6b6"/>
</attributes>
</object>
<packing>
@@ -50,6 +51,9 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
+ <attributes>
+ <attribute name="foreground" value="#bababdbdb6b6"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -66,10 +70,8 @@
</child>
<child>
<object class="GtkGrid" id="grid1">
- <property name="height_request">9</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_homogeneous">True</property>
<property name="column_homogeneous">True</property>
<child>
<placeholder/>
diff --git a/data/TrackWidget.ui b/data/TrackWidget.ui
index 74e8475..0b45a25 100644
--- a/data/TrackWidget.ui
+++ b/data/TrackWidget.ui
@@ -1,78 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <object class="GtkFrame" id="frame1">
+ <object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">etched-out</property>
<child>
- <object class="GtkBox" id="box1">
+ <object class="GtkLabel" id="num">
+ <property name="width_request">32</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">9</property>
- <child>
- <object class="GtkBox" id="box2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="homogeneous">True</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <object class="GtkLabel" id="num">
- <property name="width_request">32</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">
-</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="title">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">
-</property>
- <property name="ellipsize">end</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="duration">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">
+ <property name="valign">start</property>
+ <property name="yalign">0</property>
+ <attributes>
+ <attribute name="foreground" value="#bababdbdb6b6"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="title">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes">
</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">3</property>
- </packing>
- </child>
+ <property name="ellipsize">end</property>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
</child>
- <child type="label_item">
- <placeholder/>
+ <child>
+ <object class="GtkLabel" id="duration">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">3</property>
+ </packing>
</child>
</object>
</interface>
diff --git a/src/widgets.js b/src/widgets.js
index 57e6d90..9005b6c 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -304,7 +304,7 @@ const ArtistAlbumWidget = new Lang.Class({
// [ track.get_title(), track.get_track_number(), "", false, pixbuf, track ]);
var ui = new Gtk.Builder();
ui.add_from_resource('/org/gnome/music/TrackWidget.ui');
- var songWidget = ui.get_object("frame1");
+ var songWidget = ui.get_object("box1");
this.songs.push(songWidget);
ui.get_object("num").set_text(this.songs.length.toString());
if (track.get_title() != null)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]