[gnome-music/wip/mschraal/core] artistalbumwidget: Update to new style
- From: Marinus Schraal <mschraal src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-music/wip/mschraal/core] artistalbumwidget: Update to new style
- Date: Sat, 13 Jul 2019 22:42:16 +0000 (UTC)
commit 1270e050d0098bedf195ecde278d303205c2125b
Author: Jean Felder <jfelder src gnome org>
Date: Thu Jul 11 01:02:05 2019 +0200
artistalbumwidget: Update to new style
data/org.gnome.Music.css | 2 +-
data/ui/ArtistAlbumWidget.ui | 33 +++++++++------------------------
gnomemusic/widgets/artistalbumwidget.py | 9 ++++-----
3 files changed, 14 insertions(+), 30 deletions(-)
---
diff --git a/data/org.gnome.Music.css b/data/org.gnome.Music.css
index ecdc5d7f..6af80c89 100644
--- a/data/org.gnome.Music.css
+++ b/data/org.gnome.Music.css
@@ -53,7 +53,7 @@ box#ArtistAlbumsWidget .artist-label {
/* ArtistAlbumWidget */
.album-title {
- padding-left:24px;
+ font-size: large;
font-weight: bold;
}
diff --git a/data/ui/ArtistAlbumWidget.ui b/data/ui/ArtistAlbumWidget.ui
index 29aff23e..a5ca2d2e 100644
--- a/data/ui/ArtistAlbumWidget.ui
+++ b/data/ui/ArtistAlbumWidget.ui
@@ -3,14 +3,17 @@
<interface>
<requires lib="gtk+" version="3.12"/>
<template parent="GtkBox" class="ArtistAlbumWidget">
+ <property name="margin_top">30</property>
+ <property name="margin_right">120</property>
<child>
<object class="CoverStack" id="_cover_stack">
<property name="visible">True</property>
+ <property name="margin_top">20</property>
+ <property name="margin_right">30</property>
+ <property name="margin_bottom">20</property>
+ <property name="margin_left">120</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
- <style>
- <class name="album-cover"/>
- </style>
</object>
<packing>
<property name="position">0</property>
@@ -26,36 +29,18 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkLabel" id="_title">
+ <object class="GtkLabel" id="_title_year">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_start">6</property>
- <property name="margin_end">6</property>
+ <property name="margin_top">20</property>
+ <property name="margin_bottom">20</property>
<property name="ellipsize">middle</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<style>
<class name="album-title"/>
- <class name="dim-label"/>
</style>
</object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="_year">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <style>
- <class name="dim-label"/>
- </style>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
</object>
<packing>
diff --git a/gnomemusic/widgets/artistalbumwidget.py b/gnomemusic/widgets/artistalbumwidget.py
index fd0af610..8b81fa78 100644
--- a/gnomemusic/widgets/artistalbumwidget.py
+++ b/gnomemusic/widgets/artistalbumwidget.py
@@ -38,8 +38,7 @@ class ArtistAlbumWidget(Gtk.Box):
_album_box = Gtk.Template.Child()
_cover_stack = Gtk.Template.Child()
_disc_list_box = Gtk.Template.Child()
- _title = Gtk.Template.Child()
- _year = Gtk.Template.Child()
+ _title_year = Gtk.Template.Child()
selection_mode = GObject.Property(type=bool, default=False)
@@ -75,10 +74,10 @@ class ArtistAlbumWidget(Gtk.Box):
GObject.BindingFlags.BIDIRECTIONAL
| GObject.BindingFlags.SYNC_CREATE)
- self._title.props.label = corealbum.props.title
+ self._title_year.props.label = corealbum.props.title
year = corealbum.props.year
- if year:
- self._year.props.label = year
+ if year != "----":
+ self._title_year.props.label += " ({})".format(year)
if self._size_group:
self._size_group.add_widget(self._album_box)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]