[gnome-music] playlists: use popover for menu



commit c6477c7558f018294bd8e822fa8d2979472cd7ea
Author: Vadim Rutkovsky <vrutkovs redhat com>
Date:   Mon Feb 16 15:46:02 2015 +0100

    playlists: use popover for menu
    
    https://bugzilla.gnome.org/show_bug.cgi?id=729377

 data/PlaylistControls.ui |   34 ++++++++++++----------------------
 gnomemusic/view.py       |   11 +++++++----
 2 files changed, 19 insertions(+), 26 deletions(-)
---
diff --git a/data/PlaylistControls.ui b/data/PlaylistControls.ui
index bc6a564..26b5a2a 100644
--- a/data/PlaylistControls.ui
+++ b/data/PlaylistControls.ui
@@ -1,27 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.12 -->
-  <object class="GtkMenu" id="menu1">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="halign">end</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>
+  <menu id="playlistMenu">
+    <item>
+      <attribute name="label" translatable="yes">_Play</attribute>
+      <attribute name="action">win.playlist_play</attribute>
+    </item>
+    <item>
+      <attribute name="label" translatable="yes">_Delete</attribute>
+      <attribute name="action">win.playlist_delete</attribute>
+    </item>
+  </menu>
   <object class="GtkGrid" id="grid">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -73,8 +62,9 @@
         <property name="halign">end</property>
         <property name="valign">center</property>
         <property name="focus_on_click">False</property>
-        <property name="popup">menu1</property>
+        <property name="menu-model">playlistMenu</property>
         <property name="direction">none</property>
+        <property name="use_popover">True</property>
         <style>
           <class name="image-button"/>
         </style>
diff --git a/gnomemusic/view.py b/gnomemusic/view.py
index 8d90609..4bf4a43 100644
--- a/gnomemusic/view.py
+++ b/gnomemusic/view.py
@@ -35,6 +35,7 @@ from gi.repository import Gtk
 from gi.repository import GObject
 from gi.repository import Gd
 from gi.repository import Grl
+from gi.repository import Gio
 from gi.repository import Pango
 from gi.repository import GLib
 from gi.repository import GdkPixbuf
@@ -794,10 +795,12 @@ class Playlist(ViewContainer):
         self.name_label = builder.get_object('playlist_name')
         self.songs_count_label = builder.get_object('songs_count')
         self.menubutton = builder.get_object('playlist_menubutton')
-        self.play_menuitem = builder.get_object('menuitem_play')
-        self.play_menuitem.connect('activate', self._on_play_activate)
-        self.delete_menuitem = builder.get_object('menuitem_delete')
-        self.delete_menuitem.connect('activate', self._on_delete_activate)
+        playlistPlayAction = Gio.SimpleAction.new('playlist_play', None)
+        playlistPlayAction.connect('activate', self._on_play_activate)
+        window.add_action(playlistPlayAction)
+        playlistDeleteAction = Gio.SimpleAction.new('playlist_delete', None)
+        playlistDeleteAction.connect('activate', self._on_delete_activate)
+        window.add_action(playlistDeleteAction)
         self._grid.insert_row(0)
         self._grid.attach(self.headerbar, 1, 0, 1, 1)
 


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