From c0316303792fbcb8ae97855b9cc008d929bec995 Mon Sep 17 00:00:00 2001
From: coderkun <olli@coderkun.de>
Date: Sat, 11 Jun 2016 13:15:20 +0200
Subject: [PATCH] move labels on cover panel to the right and use CSS for
 styling

---
 data/gtk.glade | 168 ++++++++++++++++++++++++-------------------------
 data/mcg.css   |   7 +++
 mcg/mcgGtk.py  |  20 +++---
 3 files changed, 98 insertions(+), 97 deletions(-)

diff --git a/data/gtk.glade b/data/gtk.glade
index 562f483..fcbd62d 100644
--- a/data/gtk.glade
+++ b/data/gtk.glade
@@ -408,60 +408,112 @@
               <object class="GtkBox" id="cover-panel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
+                <property name="homogeneous">True</property>
                 <child>
-                  <object class="GtkBox">
+                  <object class="GtkStack" id="cover-stack">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="homogeneous">True</property>
                     <child>
-                      <object class="GtkStack" id="cover-stack">
+                      <object class="GtkSpinner" id="cover-spinner">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                      </object>
+                      <packing>
+                        <property name="name">cover-spinner</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkScrolledWindow" id="cover-scroll">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="kinetic_scrolling">False</property>
+                        <property name="overlay_scrolling">False</property>
+                        <signal name="size-allocate" handler="on_cover-scroll_size_allocate" swapped="no"/>
                         <child>
-                          <object class="GtkSpinner" id="cover-spinner">
+                          <object class="GtkViewport">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                          </object>
-                          <packing>
-                            <property name="name">cover-spinner</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkScrolledWindow" id="cover-scroll">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="kinetic_scrolling">False</property>
-                            <property name="overlay_scrolling">False</property>
-                            <signal name="size-allocate" handler="on_cover-scroll_size_allocate" swapped="no"/>
                             <child>
-                              <object class="GtkViewport">
+                              <object class="GtkEventBox">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="GtkEventBox">
+                                  <object class="GtkImage" id="cover-image">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <child>
-                                      <object class="GtkImage" id="cover-image">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="stock">gtk-missing-image</property>
-                                      </object>
-                                    </child>
+                                    <property name="stock">gtk-missing-image</property>
                                   </object>
                                 </child>
                               </object>
                             </child>
                           </object>
-                          <packing>
-                            <property name="name">cover-scroll</property>
-                            <property name="position">1</property>
-                          </packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">True</property>
+                        <property name="name">cover-scroll</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkGrid">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_top">5</property>
+                        <property name="margin_bottom">5</property>
+                        <property name="row_spacing">5</property>
+                        <property name="row_homogeneous">True</property>
+                        <property name="column_homogeneous">True</property>
+                        <child>
+                          <object class="GtkLabel" id="cover-album">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label">Album</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="cover-date">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label">Date</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="cover-artist">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label">Artist</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">2</property>
+                          </packing>
+                        </child>
+                        <style>
+                          <class name="cover-labels"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
                         <property name="fill">True</property>
                         <property name="padding">10</property>
                         <property name="position">0</property>
@@ -473,7 +525,6 @@
                         <property name="can_focus">True</property>
                         <property name="halign">start</property>
                         <property name="orientation">vertical</property>
-                        <property name="round_digits">1</property>
                         <property name="draw_value">False</property>
                         <signal name="button-press-event" handler="on_cover-songs_button_press_event" swapped="no"/>
                         <signal name="button-release-event" handler="on_cover-songs_button_release_event" swapped="no"/>
@@ -481,66 +532,15 @@
                       <packing>
                         <property name="expand">True</property>
                         <property name="fill">True</property>
-                        <property name="padding">10</property>
-                        <property name="pack_type">end</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="padding">10</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkGrid">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="row_spacing">5</property>
-                    <property name="row_homogeneous">True</property>
-                    <property name="column_homogeneous">True</property>
-                    <child>
-                      <object class="GtkLabel" id="cover-album">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Album</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="cover-date">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Date</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="cover-artist">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Artist</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">2</property>
-                      </packing>
-                    </child>
-                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
                     <property name="padding">10</property>
+                    <property name="pack_type">end</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
diff --git a/data/mcg.css b/data/mcg.css
index df42fb1..13d4fa8 100644
--- a/data/mcg.css
+++ b/data/mcg.css
@@ -11,6 +11,13 @@
     border:none;
 }
 
+.cover-labels label {
+    font-size:larger;
+}
+.cover-labels label:first-child {
+    font-weight:bold;
+}
+
 iconview.view:selected,
 iconview.view:selected:focus,
 GtkIconView.cell:selected,
diff --git a/mcg/mcgGtk.py b/mcg/mcgGtk.py
index 7f74b20..acc9155 100755
--- a/mcg/mcgGtk.py
+++ b/mcg/mcgGtk.py
@@ -816,25 +816,19 @@ class CoverPanel(mcg.Base):
 
     def set_album(self, album):
         # Set labels
-        self._album_title_label.set_markup(
-            "<b><big>{}</big></b>".format(
-                GObject.markup_escape_text(
-                    album.get_title()
-                )
+        self._album_title_label.set_label(
+            GObject.markup_escape_text(
+                album.get_title()
             )
         )
         self._album_date_label.set_markup(
-            "<big>{}</big>".format(
-                GObject.markup_escape_text(
-                    ', '.join(album.get_dates())
-                )
+            GObject.markup_escape_text(
+                ', '.join(album.get_dates())
             )
         )
         self._album_artist_label.set_markup(
-            "<big>{}</big>".format(
-                GObject.markup_escape_text(
-                    ', '.join(album.get_artists())
-                )
+            GObject.markup_escape_text(
+                ', '.join(album.get_artists())
             )
         )