banshee r4484 - in trunk/banshee: . src/Clients/Muinshee/Muinshee src/Clients/Muinshee/Resources

[gburt svn gnome org]

Author: gburt
Date: Mon Sep  8 01:50:45 2008
New Revision: 4484
URL: http://svn.gnome.org/viewvc/banshee?rev=4484&view=rev

Log:
2008-09-07  Gabriel Burt  <gabriel burt gmail com>

	* src/Clients/Muinshee/Resources/GlobalUI.xml:
	* src/Clients/Muinshee/Muinshee/PlayerInterface.cs: Add the Play
	Song/Album items to the Media menu, and add the AccelGroup to the main
	window so that s and a (and other accels) work.



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Clients/Muinshee/Muinshee/PlayerInterface.cs
   trunk/banshee/src/Clients/Muinshee/Resources/GlobalUI.xml

Modified: trunk/banshee/src/Clients/Muinshee/Muinshee/PlayerInterface.cs
==============================================================================
--- trunk/banshee/src/Clients/Muinshee/Muinshee/PlayerInterface.cs	(original)
+++ trunk/banshee/src/Clients/Muinshee/Muinshee/PlayerInterface.cs	Mon Sep  8 01:50:45 2008
@@ -95,20 +95,21 @@
 
         private void InitPlayQueue (PlayQueueSource play_queue)
         {
-            actions = new MuinsheeActions (play_queue);
-            actions.Actions.AddActionGroup (actions);
-            ServiceManager.SourceManager.SetActiveSource (play_queue);
-            play_queue.TrackModel.Reloaded += HandleTrackModelReloaded;
+            if (actions == null) {
+                actions = new MuinsheeActions (play_queue);
+                actions.Actions.AddActionGroup (actions);
+                ServiceManager.SourceManager.SetActiveSource (play_queue);
+                play_queue.TrackModel.Reloaded += HandleTrackModelReloaded;
 
-            BuildPrimaryLayout ();
-            ConnectEvents ();
+                BuildPrimaryLayout ();
+                ConnectEvents ();
 
-            // FIXME
-            //AddAccelGroup (ActionService.UIManager.AccelGroup);
+                AddAccelGroup (ActionService.UIManager.AccelGroup);
 
-            track_view.SetModel (play_queue.TrackModel);
+                track_view.SetModel (play_queue.TrackModel);
 
-            Show ();
+                Show ();
+            }
         }
 
 #region System Overrides 
@@ -236,22 +237,6 @@
         
 #endregion
         
-#region Gtk.Window Overrides
-
-        private bool accel_group_active = true;
-
-        private void OnEntryFocusOutEvent (object o, FocusOutEventArgs args)
-        {
-            if (!accel_group_active) {
-                AddAccelGroup (ActionService.UIManager.AccelGroup);
-                accel_group_active = true;
-            }
-
-            (o as Widget).FocusOutEvent -= OnEntryFocusOutEvent;
-        }
-
-#endregion
-
 #region Helper Functions
 
         private void HandleTrackModelReloaded (object sender, EventArgs args)

Modified: trunk/banshee/src/Clients/Muinshee/Resources/GlobalUI.xml
==============================================================================
--- trunk/banshee/src/Clients/Muinshee/Resources/GlobalUI.xml	(original)
+++ trunk/banshee/src/Clients/Muinshee/Resources/GlobalUI.xml	Mon Sep  8 01:50:45 2008
@@ -1,4 +1,13 @@
 <ui>
+  <menubar name="MainMenu" action="MainMenuAction">
+    <menu name="MediaMenu" action="MediaMenuAction">
+      <placeholder name="BelowOpenLocation">
+        <menuitem action="PlaySongAction"/>
+        <menuitem action="PlayAlbumAction"/>
+      </placeholder>
+    </menu>
+  </menubar>
+
   <toolbar name="MuinsheeHeaderToolbar">
     <toolitem action="PlayPauseAction"/>
     <toolitem action="PreviousAction"/>