banshee r4433 - in trunk/banshee: . src/Clients/Muinshee src/Clients/Muinshee/Muinshee

[gburt svn gnome org]

Author: gburt
Date: Tue Aug 26 19:49:21 2008
New Revision: 4433
URL: http://svn.gnome.org/viewvc/banshee?rev=4433&view=rev

Log:
2008-08-26  Gabriel Burt  <gabriel burt gmail com>

	* src/Clients/Muinshee/Makefile.am:
	* src/Clients/Muinshee/Muinshee.mdp:
	* src/Clients/Muinshee/Muinshee/MuinsheeActions.cs: New file adding
	Muinshee's Gtk.Actions and UIManager XML.

	* src/Clients/Muinshee/Muinshee/PlayerInterface.cs: Instantiate and
	dispose the MuinsheeActions.

	* src/Clients/Muinshee/Muinshee/Client.cs: Change client's name.



Added:
   trunk/banshee/src/Clients/Muinshee/Muinshee/MuinsheeActions.cs
Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Clients/Muinshee/Makefile.am
   trunk/banshee/src/Clients/Muinshee/Muinshee.mdp
   trunk/banshee/src/Clients/Muinshee/Muinshee/Client.cs
   trunk/banshee/src/Clients/Muinshee/Muinshee/PlayerInterface.cs

Modified: trunk/banshee/src/Clients/Muinshee/Makefile.am
==============================================================================
--- trunk/banshee/src/Clients/Muinshee/Makefile.am	(original)
+++ trunk/banshee/src/Clients/Muinshee/Makefile.am	Tue Aug 26 19:49:21 2008
@@ -3,6 +3,7 @@
 LINK = $(REF_NEREID)
 SOURCES =  \
 	Muinshee/Client.cs \
+	Muinshee/MuinsheeActions.cs \
 	Muinshee/PlayerInterface.cs \
 	Muinshee/ViewContainer.cs
 

Modified: trunk/banshee/src/Clients/Muinshee/Muinshee.mdp
==============================================================================
--- trunk/banshee/src/Clients/Muinshee/Muinshee.mdp	(original)
+++ trunk/banshee/src/Clients/Muinshee/Muinshee.mdp	Tue Aug 26 19:49:21 2008
@@ -11,6 +11,7 @@
     <File name="Muinshee/PlayerInterface.cs" subtype="Code" buildaction="Compile" />
     <File name="Muinshee/ViewContainer.cs" subtype="Code" buildaction="Compile" />
     <File name="Muinshee/Client.cs" subtype="Code" buildaction="Compile" />
+    <File name="Muinshee/MuinsheeActions.cs" subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
@@ -23,6 +24,7 @@
     <ProjectReference type="Project" localcopy="False" refto="Hyena.Gui" />
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
   </References>
+  <GtkDesignInfo gtkVersion="2.12.1" />
   <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am" ExecuteTargetName="run">
     <BuildFilesVar Sync="True" Name="SOURCES" />
     <DeployFilesVar />
@@ -32,4 +34,4 @@
     <AsmRefVar />
     <ProjectRefVar />
   </MonoDevelop.Autotools.MakefileInfo>
-</Project>
+</Project>
\ No newline at end of file

Modified: trunk/banshee/src/Clients/Muinshee/Muinshee/Client.cs
==============================================================================
--- trunk/banshee/src/Clients/Muinshee/Muinshee/Client.cs	(original)
+++ trunk/banshee/src/Clients/Muinshee/Muinshee/Client.cs	Tue Aug 26 19:49:21 2008
@@ -205,7 +205,7 @@
         }
         
         public override string ClientId {
-            get { return "nereid"; }
+            get { return "muinshee"; }
         }
     }
 }

Added: trunk/banshee/src/Clients/Muinshee/Muinshee/MuinsheeActions.cs
==============================================================================
--- (empty file)
+++ trunk/banshee/src/Clients/Muinshee/Muinshee/MuinsheeActions.cs	Tue Aug 26 19:49:21 2008
@@ -0,0 +1,65 @@
+//
+// MuinsheeActions.cs
+//
+// Authors:
+//   Gabriel Burt <gburt novell com>
+//
+// Copyright (C) 2008 Novell, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using Mono.Unix;
+using Gtk;
+using Hyena;
+using Banshee.Gui;
+
+namespace Muinshee
+{
+    public class MuinsheeActions : BansheeActionGroup
+    {       
+        public MuinsheeActions () : base ("muinshee")
+        {
+            AddImportant (
+                new ActionEntry (
+                    "PlaySongAction", Stock.Add,
+                     Catalog.GetString ("_Play Song"),
+                     null, Catalog.GetString ("Add a song to the playlist"), OnPlaySong
+                ),
+                new ActionEntry (
+                    "PlayAlbumAction", Stock.Add,
+                     Catalog.GetString ("_Play Album"),
+                     null, Catalog.GetString ("Add an album to the playlist"), OnPlayAlbum
+                )
+            );
+            
+            AddUiFromFile ("GlobalUI.xml");
+        }
+
+        private void OnPlaySong (object sender, EventArgs args)
+        {
+        }
+
+        private void OnPlayAlbum (object sender, EventArgs args)
+        {
+        }
+    }
+}

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	Tue Aug 26 19:49:21 2008
@@ -62,6 +62,8 @@
         private Toolbar footer_toolbar;
         private HPaned views_pane;
         private ViewContainer view_container;
+
+        private MuinsheeActions actions;
         
         // Major Interaction Components
         private SourceView source_view;
@@ -75,6 +77,8 @@
         
         protected override void Initialize ()
         {
+            actions = new MuinsheeActions ();
+
             BuildPrimaryLayout ();
             ConnectEvents ();
 
@@ -106,6 +110,7 @@
         {
             lock (this) {
                 Hide ();
+                actions.Dispose ();
                 base.Dispose ();
                 Gtk.Application.Quit ();
             }