[gnome-music] small cosmetic changes
- From: Seif Lotfy <seiflotfy src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-music] small cosmetic changes
- Date: Thu, 9 May 2013 01:22:31 +0000 (UTC)
commit f8eeafe7a70f12b4886e74302b788525c0b7b092
Author: Seif Lotfy <seif lotfy com>
Date: Thu May 9 03:21:33 2013 +0200
small cosmetic changes
data/AlbumWidget.ui | 138 ++++++++++++++++++++++-----------------------------
src/widgets.js | 38 +++++++-------
2 files changed, 78 insertions(+), 98 deletions(-)
---
diff --git a/data/AlbumWidget.ui b/data/AlbumWidget.ui
index 38d2717..93eba40 100644
--- a/data/AlbumWidget.ui
+++ b/data/AlbumWidget.ui
@@ -34,7 +34,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -43,13 +43,14 @@
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="valign">start</property>
+ <property name="spacing">3</property>
<child>
<object class="GtkLabel" id="title_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="justify">center</property>
- <property name="wrap">True</property>
+ <property name="ellipsize">middle</property>
<attributes>
<attribute name="weight" value="bold"/>
<attribute name="scale" value="1.2"/>
@@ -67,11 +68,10 @@
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="justify">center</property>
- <property name="wrap">True</property>
<attributes>
<attribute name="weight" value="bold"/>
<attribute name="foreground" value="#808080808080"/>
- <attribute name="size" value="1"/>
+ <attribute name="scale" value="1.2"/>
</attributes>
</object>
<packing>
@@ -84,104 +84,84 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="infobox">
+ <object class="GtkGrid" id="grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="spacing">12</property>
- <property name="homogeneous">True</property>
+ <property name="column_spacing">12</property>
+ <property name="row_homogeneous">True</property>
+ <property name="column_homogeneous">True</property>
<child>
- <object class="GtkVBox" id="infobox_titles">
+ <object class="GtkLabel" id="released_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <child>
- <object class="GtkLabel" id="released_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="xalign">1</property>
- <property name="ypad">2</property>
- <property name="label" translatable="yes"><span
color='grey'>Released</span></property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="running_length_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes"><span color='grey'>Running
Length</span></property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="xalign">1</property>
+ <property name="ypad">2</property>
+ <property name="label" translatable="yes"><span
color='grey'>Released</span></property>
+ <property name="use_markup">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="running_length_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes"><span color='grey'>Running
Length</span></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkVBox" id="infobox_values">
+ <object class="GtkLabel" id="released_label_info">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <child>
- <object class="GtkLabel" id="released_label_info">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="xalign">0</property>
- <property name="ypad">2</property>
- <property name="label" translatable="yes">----</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="running_length_label_info">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">--:--</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="xalign">0</property>
+ <property name="ypad">2</property>
+ <property name="label" translatable="yes">----</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="running_length_label_info">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">--:--</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
diff --git a/src/widgets.js b/src/widgets.js
index 30475b7..c745564 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -157,25 +157,25 @@ const AlbumWidget = new Lang.Class({
GObject.TYPE_OBJECT, /*song object*/
GObject.TYPE_BOOLEAN
]);
- var tracks = [];
- grilo.getAlbumSongs(item.get_id(), Lang.bind(this, function (source, prefs, track) {
- if (track != null) {
- tracks.push(track);
- duration = duration + track.get_duration();
- let iter = this.model.append();
- let path = "/usr/share/icons/gnome/scalable/actions/media-playback-start-symbolic.svg";
- let pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale(path, -1, 16, true);
- let escapedTitle = GLib.markup_escape_text(track.get_title(), track.get_title().length);
- this.model.set(iter,
- [0, 1, 2, 3, 4, 5],
- [ escapedTitle, "", "", false, nowPlayingPixbuf, track ]);
- this.ui.get_object("running_length_label_info").set_text(
- (parseInt(duration/60) + 1) + " min");
- this.emit("track-added")
- }
- }));
- }
- this.view.set_model(this.model);
+ var tracks = [];
+ grilo.getAlbumSongs(item.get_id(), Lang.bind(this, function (source, prefs, track) {
+ if (track != null) {
+ tracks.push(track);
+ duration = duration + track.get_duration();
+ let iter = this.model.append();
+ let path = "/usr/share/icons/gnome/scalable/actions/media-playback-start-symbolic.svg";
+ let pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale(path, -1, 16, true);
+ let escapedTitle = GLib.markup_escape_text(track.get_title(), track.get_title().length);
+ this.model.set(iter,
+ [0, 1, 2, 3, 4, 5],
+ [ escapedTitle, "", "", false, nowPlayingPixbuf, track ]);
+ this.ui.get_object("running_length_label_info").set_text(
+ (parseInt(duration/60) + 1) + " min");
+ this.emit("track-added")
+ }
+ }));
+ }
+ this.view.set_model(this.model);
let pixbuf = albumArtCache.lookup (256, artist, item.get_string(Grl.METADATA_KEY_ALBUM));
if (pixbuf == null)
pixbuf = albumArtCache.makeDefaultIcon(256, 256);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
