[gnome-music/freeze-break: 84/107] Follow changes to mockup for Playlists view



commit 9080804759060d064a3c0a9186231e9ad913a38b
Author: Arnel A. Borja <arnelborja src gnome org>
Date:   Sun Sep 8 14:47:05 2013 +0800

    Follow changes to mockup for Playlists view

 data/PlaylistControls.ui |  207 ++++++++++++++--------------------------------
 data/application.css     |    8 +--
 2 files changed, 63 insertions(+), 152 deletions(-)
---
diff --git a/data/PlaylistControls.ui b/data/PlaylistControls.ui
index b3697a6..a1882f4 100644
--- a/data/PlaylistControls.ui
+++ b/data/PlaylistControls.ui
@@ -1,179 +1,94 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.10 -->
-  <object class="GtkBox" id="container">
+  <object class="GtkMenu" id="menu1">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="margin_left">24</property>
+    <child>
+      <object class="GtkMenuItem" id="menuitem_play">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">_Play</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="menuitem_delete">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">_Delete</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
+  </object>
+  <object class="GtkGrid" id="grid">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="margin_left">18</property>
+    <property name="margin_right">24</property>
     <property name="margin_top">18</property>
-    <property name="orientation">vertical</property>
+    <property name="margin_bottom">18</property>
     <child>
-      <object class="GtkBox" id="box2">
+      <object class="GtkLabel" id="playlist_name">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <child>
-          <object class="GtkLabel" id="playlist">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label">label</property>
-            <property name="ellipsize">middle</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </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="spacer">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="playlistEditButton">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="focus_on_click">False</property>
-            <style>
-              <class name="circle-button"/>
-            </style>
-            <child>
-              <object class="GtkImage" id="image1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="icon_name">applications-system-symbolic</property>
-                <property name="use_fallback">True</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label1">
-            <property name="width_request">24</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
+        <property name="hexpand">True</property>
+        <property name="xalign">0</property>
+        <property name="label">Playlist Name</property>
+        <property name="ellipsize">middle</property>
+        <attributes>
+          <attribute name="weight" value="bold"/>
+        </attributes>
       </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="GtkBox" id="box1">
+      <object class="GtkLabel" id="songs_count">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="spacing">6</property>
-        <child>
-          <object class="GtkLabel" id="songsCount">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">00</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="songs">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Songs,</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="songsSize">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">size</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="songsDuration">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">duration</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
+        <property name="xalign">0</property>
+        <property name="label">3 Songs</property>
+        <style>
+          <class name="dim-label"/>
+        </style>
       </object>
       <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
+        <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="GtkScrolledWindow" id="scrolledwindow">
+      <object class="GtkMenuButton" id="playlist_menubutton">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
-        <property name="hscrollbar_policy">never</property>
+        <property name="receives_default">True</property>
+        <property name="halign">end</property>
+        <property name="valign">center</property>
+        <property name="focus_on_click">False</property>
+        <property name="popup">menu1</property>
+        <style>
+          <class name="circle-button"/>
+        </style>
         <child>
-          <object class="GtkViewport" id="viewport">
+          <object class="GtkImage" id="image1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="shadow_type">none</property>
-            <child>
-              <placeholder/>
-            </child>
+            <property name="icon_name">emblem-system-symbolic</property>
           </object>
         </child>
       </object>
       <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">3</property>
+        <property name="left_attach">1</property>
+        <property name="top_attach">0</property>
+        <property name="width">1</property>
+        <property name="height">2</property>
       </packing>
     </child>
   </object>
diff --git a/data/application.css b/data/application.css
index 5fb9a55..9d43284 100644
--- a/data/application.css
+++ b/data/application.css
@@ -46,6 +46,7 @@
 
 .songs-list {
     box-shadow: inset 0 -1px shade(@borders, 1.30);
+    box-shadow: inset 0 1px shade(@borders, 1.30);
     background-color: @theme_bg_color;
 }
 
@@ -142,10 +143,5 @@
 }
 
 .circle-button {
-    border-radius: 15px;
-    border-width: 2px;
-}
-
-.circle-button image {
-    border-radius: 15px;
+    border-radius: 50%;
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]