banshee r5021 - in trunk/banshee: . src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio src/Extensions/Banshee.InternetRadio/Resources src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio src/Extensions/Banshee.Lastfm/Resources src/Extensions/Banshee.Podcasting/Resources

[gburt svn gnome org]

Author: gburt
Date: Mon Feb  9 21:28:02 2009
New Revision: 5021
URL: http://svn.gnome.org/viewvc/banshee?rev=5021&view=rev

Log:
2009-02-09  Gabriel Burt  <gabriel burt gmail com>

	* src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:
	Remove illogical setting of IsImporting.

	* src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:
	* src/Extensions/Banshee.Lastfm/Resources/ActiveSourceUI.xml:
	* src/Extensions/Banshee.InternetRadio/Resources/ActiveSourceUI.xml:
	* src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:
	Set source actions to propagate to child playlists, and show Add Station
	action in the Media menu when selected (BGO #539019)

	* src/Extensions/Banshee.Podcasting/Resources/ActiveSourceUI.xml:
	* src/Extensions/Banshee.Podcasting/Resources/GlobalUI.xml: Only show
	Subscribe to Podcast action when the Podcasts source (or a child) is
	selected.



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs
   trunk/banshee/src/Extensions/Banshee.InternetRadio/Resources/ActiveSourceUI.xml
   trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs
   trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs
   trunk/banshee/src/Extensions/Banshee.Lastfm/Resources/ActiveSourceUI.xml
   trunk/banshee/src/Extensions/Banshee.Podcasting/Resources/ActiveSourceUI.xml
   trunk/banshee/src/Extensions/Banshee.Podcasting/Resources/GlobalUI.xml

Modified: trunk/banshee/src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs	Mon Feb  9 21:28:02 2009
@@ -71,6 +71,9 @@
             ui_id = uia_service.UIManager.AddUiFromResource ("GlobalUI.xml");
             
             Properties.SetString ("ActiveSourceUIResource", "ActiveSourceUI.xml");
+            Properties.Set<bool> ("ActiveSourceUIResourcePropagate", true);
+            Properties.Set<System.Reflection.Assembly> ("ActiveSourceUIResource.Assembly", typeof(InternetRadioSource).Assembly);
+
             Properties.SetString ("GtkActionPath", "/InternetRadioContextMenu");
             
             source_contents = new InternetRadioSourceContents ();

Modified: trunk/banshee/src/Extensions/Banshee.InternetRadio/Resources/ActiveSourceUI.xml
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.InternetRadio/Resources/ActiveSourceUI.xml	(original)
+++ trunk/banshee/src/Extensions/Banshee.InternetRadio/Resources/ActiveSourceUI.xml	Mon Feb  9 21:28:02 2009
@@ -1,7 +1,15 @@
 <ui>
-    <toolbar name="HeaderToolbar">
-        <placeholder name="SourceActions">
-            <toolitem action="AddRadioStationAction" />
-        </placeholder>
-    </toolbar>
+  <menubar name="MainMenu" action="MainMenuAction">
+    <menu name="MediaMenu" action="MediaMenuAction">
+      <placeholder name="BelowOpenLocation">
+        <menuitem action="AddRadioStationAction" />
+      </placeholder>
+    </menu>
+  </menubar>
+
+  <toolbar name="HeaderToolbar">
+      <placeholder name="SourceActions">
+          <toolitem action="AddRadioStationAction" />
+      </placeholder>
+  </toolbar>
 </ui>

Modified: trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs	Mon Feb  9 21:28:02 2009
@@ -414,7 +414,6 @@
             }
 
             bool have_user = (lastfm.Account != null && lastfm.Account.UserName != null);
-            this["LastfmAddAction"].IsImportant = ServiceManager.PlaybackController.Source is LastfmSource;
             this["LastfmAddAction"].Sensitive = have_user;
             this["LastfmSortAction"].Sensitive = have_user;
             this["LastfmConnectAction"].Visible = lastfm.Connection.State == ConnectionState.Disconnected;

Modified: trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs	Mon Feb  9 21:28:02 2009
@@ -98,6 +98,7 @@
             UpdateUI ();
 
             Properties.SetString ("ActiveSourceUIResource", "ActiveSourceUI.xml");
+            Properties.Set<bool> ("ActiveSourceUIResourcePropagate", true);
             Properties.SetString ("GtkActionPath", "/LastfmSourcePopup");
             Properties.SetString ("Icon.Name", "lastfm-audioscrobbler");
             Properties.SetString ("SourcePropertiesActionLabel", Catalog.GetString ("Edit Last.fm Settings"));

Modified: trunk/banshee/src/Extensions/Banshee.Lastfm/Resources/ActiveSourceUI.xml
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Lastfm/Resources/ActiveSourceUI.xml	(original)
+++ trunk/banshee/src/Extensions/Banshee.Lastfm/Resources/ActiveSourceUI.xml	Mon Feb  9 21:28:02 2009
@@ -4,4 +4,12 @@
         <toolitem name="LastfmAdd" action="LastfmAddAction"/>
     </placeholder>
   </toolbar>
+
+  <menubar name="MainMenu" action="MainMenuAction">
+    <menu name="MediaMenu" action="MediaMenuAction">
+      <placeholder name="BelowOpenLocation">
+        <menuitem name="LastfmAdd" action="LastfmAddAction" />
+      </placeholder>
+    </menu>
+  </menubar>
 </ui>

Modified: trunk/banshee/src/Extensions/Banshee.Podcasting/Resources/ActiveSourceUI.xml
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Podcasting/Resources/ActiveSourceUI.xml	(original)
+++ trunk/banshee/src/Extensions/Banshee.Podcasting/Resources/ActiveSourceUI.xml	Mon Feb  9 21:28:02 2009
@@ -7,6 +7,12 @@
   </toolbar>
 
   <menubar name="MainMenu" action="MainMenuAction">
+    <menu name="MediaMenu" action="MediaMenuAction">
+      <placeholder name="BelowOpenLocation">
+        <menuitem name="PodcastAdd" action="PodcastAddAction" />
+      </placeholder>
+    </menu>
+
     <menu name="EditMenu" action="EditMenuAction">
       <placeholder name="BelowAddToPlaylist">
         <separator />

Modified: trunk/banshee/src/Extensions/Banshee.Podcasting/Resources/GlobalUI.xml
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Podcasting/Resources/GlobalUI.xml	(original)
+++ trunk/banshee/src/Extensions/Banshee.Podcasting/Resources/GlobalUI.xml	Mon Feb  9 21:28:02 2009
@@ -1,12 +1,4 @@
 <ui>
-    <menubar name="MainMenu" action="MainMenuAction">
-      <menu name="MediaMenu" action="MediaMenuAction">
-        <placeholder name="BelowOpenLocation">
-          <menuitem name="PodcastAdd" action="PodcastAddAction" />
-        </placeholder>
-      </menu>
-    </menubar>
-
     <popup name="PodcastSourcePopup" action="PodcastSourcePopupAction">
         <menuitem name="PodcastAdd" action="PodcastAddAction" />
         <menuitem name="PodcastUpdateAll" action="PodcastUpdateAllAction"/>