rhythmbox r6015 - in trunk: . data/ui plugins/cd-recorder plugins/daap plugins/fmradio plugins/iradio plugins/visualizer

[jmatthew svn gnome org]

Author: jmatthew
Date: Fri Nov  7 10:19:28 2008
New Revision: 6015
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=6015&view=rev

Log:
2008-11-07  Jonathan Matthew  <jonathan d14n org>

	patch partly by:  Steven Brown  <steven w j brown gmail com>

	* data/ui/rhythmbox-ui.xml:
	Rename existing plugin placeholders to just 'PluginPlaceholder' (no
	need to qualify with the name of the popup or whatever), and add some
	more.  Fixes #557152.

	* plugins/cd-recorder/rb-cd-recorder-plugin.c:
	* plugins/daap/daap-ui.xml:
	* plugins/fmradio/fmradio-ui.xml:
	* plugins/iradio/iradio-ui.xml:
	* plugins/visualizer/visualizer-ui.xml:
	Adjust to the above change.


Modified:
   trunk/ChangeLog
   trunk/data/ui/rhythmbox-ui.xml
   trunk/plugins/cd-recorder/rb-cd-recorder-plugin.c
   trunk/plugins/daap/daap-ui.xml
   trunk/plugins/fmradio/fmradio-ui.xml
   trunk/plugins/iradio/iradio-ui.xml
   trunk/plugins/visualizer/visualizer-ui.xml

Modified: trunk/data/ui/rhythmbox-ui.xml
==============================================================================
--- trunk/data/ui/rhythmbox-ui.xml	(original)
+++ trunk/data/ui/rhythmbox-ui.xml	Fri Nov  7 10:19:28 2008
@@ -12,11 +12,11 @@
 	<menuitem name="MusicPlaylistLoadPlaylistMenu" action="MusicPlaylistLoadPlaylist"/>
 	<menuitem name="MusicPlaylistSavePlaylistMenu" action="MusicPlaylistSavePlaylist"/>
 	<menuitem name="MusicPlaylistEditAutoPlaylistMenu" action="EditAutomaticPlaylist"/>
-	<placeholder name="MusicPlaylistPlaylistMenuPluginPlaceholder" />
+	<placeholder name="PluginPlaceholder" />
 	<separator name="MusicPlaylistSeparator1"/>
 	<menuitem name="MusicPlaylistDeletePlaylistMenu" action="MusicPlaylistDeletePlaylist"/>
       </menu>
-      <placeholder name="MusicMenuNewPluginPlaceholder" />
+      <placeholder name="PluginPlaceholder" />
       <menuitem name="MusicNewPodcastMenu" action="MusicNewPodcast"/>
       <separator/>
       <menuitem name="MusicPropertiesMenu" action="MusicProperties"/>
@@ -105,10 +105,11 @@
     <separator/>
     <toolitem name="Browse" action="ViewBrowser"/>
     <separator/>
-    <placeholder name="ToolBarPluginPlaceholder" />
+    <placeholder name="PluginPlaceholder" />
   </toolbar>
 
   <toolbar name="SearchBar">
+    <placeholder name="PluginPlaceholder" />
   </toolbar>
 
   <popup name="RhythmboxTrayPopup">
@@ -120,6 +121,8 @@
       <menuitem name="ShowWindowTray" action="TrayShowWindow"/>
       <menuitem name="ShowNotifications" action="TrayShowNotifications"/>
       <separator/>
+      <placeholder name="PluginPlaceholder"/>
+      <separator/>
       <menuitem name="QuitTray" action="MusicQuit"/>
   </popup>
 
@@ -139,12 +142,16 @@
     <menuitem name="BrowseArtistLibraryPopup" action="BrowserSrcChooseArtist"/>
     <menuitem name="BrowseAlbumLibraryPopup" action="BrowserSrcChooseAlbum"/>
     <separator/>
+    <placeholder name="PluginPlaceholder"/>
+    <separator/>
     <menuitem name="PropertiesLibraryPopup" action="MusicProperties"/>
   </popup>
 
   <popup name="ImportErrorsViewPopup">
     <menuitem name="DeleteLibraryPopup" action="EditDelete"/>
     <menuitem name="MovetoTrashPopup" action="EditMovetoTrash"/>
+    <separator/>
+    <placeholder name="PluginPlaceholder"/>
   </popup>
 
   <popup name="PlaylistViewPopup">
@@ -160,6 +167,8 @@
     <separator/>
     <menuitem name="MovetoTrashPlaylistPopup" action="EditMovetoTrash"/>
     <separator/>
+    <placeholder name="PluginPlaceholder"/>
+    <separator/>
     <menuitem name="PropertiesPlaylistPopup" action="MusicProperties"/>
   </popup>
 
@@ -167,6 +176,8 @@
     <menuitem name="DeletePlaylistPopup" action="EditDelete"/>
     <menuitem name="ShufflePlaylistPopup" action="ShuffleQueue"/>
     <separator/>
+    <placeholder name="PluginPlaceholder"/>
+    <separator/>
     <menuitem name="PropertiesPlaylistPopup" action="MusicProperties"/>
   </popup>
 
@@ -175,30 +186,37 @@
     <menuitem name="ClearPlaylistPopup" action="ClearQueue"/>
     <menuitem name="ShufflePlaylistPopup" action="ShuffleQueue"/>
     <separator/>
+    <placeholder name="PluginPlaceholder"/>
+    <separator/>
     <menuitem name="PropertiesPlaylistPopup" action="QueueMusicProperties"/>
   </popup>
 
   <popup name="QueueSourcePopup">
     <menuitem name="ClearPlaylistPopup" action="ClearQueue"/>
     <menuitem name="ShufflePlaylistPopup" action="ShuffleQueue"/>
-    <placeholder name="QueueSourcePopupPluginPlaceholder" />
     <separator/>
+    <placeholder name="PluginPlaceholder" />
   </popup>
 
   <popup name="SourceListPopup">
     <menuitem name="SourceListPopupNewPlaylist" action="MusicPlaylistNewPlaylist"/>
     <menuitem name="SourceListPopupNewAutomaticPlaylist" action="MusicPlaylistNewAutomaticPlaylist"/>
-    <placeholder name="SourceListPopupPluginPlaceholder" />
+    <separator/>
+    <placeholder name="PluginPlaceholder" />
   </popup>
 
   <popup name="LibrarySourcePopup">
     <menuitem name="LibrarySrcPopupAddFile" action="MusicImportFile"/>
     <menuitem name="LibrarySrcPopupAddFolder" action="MusicImportFolder"/>
+    <separator/>
+    <placeholder name="PluginPlaceholder"/>
   </popup>
 
   <popup name="PodcastSourcePopup">
     <menuitem name="PodcastSrcPopupNew" action="MusicNewPodcast"/>
     <menuitem name="PodcastSrcPopupUpdateAllFeeds" action="PodcastUpdateAllFeeds"/>
+    <separator/>
+    <placeholder name="PluginPlaceholder"/>
   </popup>
 
   <popup name="PodcastViewPopup">
@@ -208,6 +226,8 @@
     <separator/>
     <menuitem name="AddToQueuePodcastPopup" action="AddToQueue"/>
     <separator/>
+    <placeholder name="PluginPlaceholder"/>
+    <separator/>
     <menuitem name="PropertiesPodcastPopup" action="MusicProperties"/>
   </popup>
 
@@ -218,6 +238,8 @@
     <menuitem name="UpdateFeedPodcastPopup" action="PodcastFeedUpdate"/>
     <menuitem name="DeleteFeedPodcastPopup" action="PodcastFeedDelete"/>
     <separator/>
+    <placeholder name="PluginPlaceholder"/>
+    <separator/>
     <menuitem name="PropertiesFeedPodcastPopup" action="PodcastFeedProperties"/>
   </popup>
 
@@ -226,10 +248,12 @@
     <separator/>
     <menuitem name="QueuePlaylistPopup" action="QueuePlaylist"/>
     <menuitem name="ShufflePlaylistPopup" action="ShufflePlaylist"/>
-    <placeholder name="PlaylistSourcePopupPluginPlaceholder" />
+    <placeholder name="PluginPlaceholder" />
     <separator/>
     <menuitem name="DeletePlaylistPopup" action="MusicPlaylistDeletePlaylist"/>
     <separator/>
+    <placeholder name="PluginPlaceholder"/>
+    <separator/>
     <menuitem name="PlaylistSourceSavePlaylistPopup" action="MusicPlaylistSavePlaylist"/>
   </popup>
 
@@ -239,16 +263,20 @@
     <separator/>
     <menuitem name="QueuePlaylistPopup" action="QueuePlaylist"/>
     <menuitem name="ShufflePlaylistPopup" action="ShufflePlaylist"/>
-    <placeholder name="AutoPlaylistSourcePopupPluginPlaceholder" />
+    <placeholder name="PluginPlaceholder" />
     <separator/>
     <menuitem name="DeleteAutoPlaylistPopup" action="MusicPlaylistDeletePlaylist"/>
     <separator/>
+    <placeholder name="PluginPlaceholder"/>
+    <separator/>
     <menuitem name="PlaylistSourceSavePlaylistPopup" action="MusicPlaylistSavePlaylist"/>
   </popup>
 
   <popup name="MissingFilesViewPopup">
     <menuitem name="DeleteMissingFilesPopup" action="EditDelete"/>
     <menuitem name="PropertiesMissingFilesPopup" action="MusicProperties"/>
+    <separator/>
+    <placeholder name="PluginPlaceholder"/>
   </popup>
 
 </ui>

Modified: trunk/plugins/cd-recorder/rb-cd-recorder-plugin.c
==============================================================================
--- trunk/plugins/cd-recorder/rb-cd-recorder-plugin.c	(original)
+++ trunk/plugins/cd-recorder/rb-cd-recorder-plugin.c	Fri Nov  7 10:19:28 2008
@@ -380,12 +380,12 @@
 	gboolean for_burn;
 	gboolean for_copy;
 } ui_paths[] = {
-	{ "/MenuBar/MusicMenu/PlaylistMenu/MusicPlaylistPlaylistMenuPluginPlaceholder", TRUE, FALSE },
-	{ "/MenuBar/MusicMenu/MusicMenuNewPluginPlaceholder", FALSE, TRUE },
-	{ "/ToolBar/ToolBarPluginPlaceholder", TRUE, TRUE },
-	{ "/PlaylistSourcePopup/PlaylistSourcePopupPluginPlaceholder", TRUE, FALSE },
-	{ "/AutoPlaylistSourcePopup/AutoPlaylistSourcePopupPluginPlaceholder", TRUE, FALSE },
-	{ "/QueueSourcePopup/QueueSourcePopupPluginPlaceholder", TRUE, FALSE },
+	{ "/MenuBar/MusicMenu/PlaylistMenu/PluginPlaceholder", TRUE, FALSE },
+	{ "/MenuBar/MusicMenu/PluginPlaceholder", FALSE, TRUE },
+	{ "/ToolBar/PluginPlaceholder", TRUE, TRUE },
+	{ "/PlaylistSourcePopup/PluginPlaceholder", TRUE, FALSE },
+	{ "/AutoPlaylistSourcePopup/PluginPlaceholder", TRUE, FALSE },
+	{ "/QueueSourcePopup/PluginPlaceholder", TRUE, FALSE },
 };
 
 static void

Modified: trunk/plugins/daap/daap-ui.xml
==============================================================================
--- trunk/plugins/daap/daap-ui.xml	(original)
+++ trunk/plugins/daap/daap-ui.xml	Fri Nov  7 10:19:28 2008
@@ -1,7 +1,7 @@
 <ui>
   <menubar name="MenuBar">
     <menu name="MusicMenu" action="Music">
-      <placeholder name="MusicMenuNewPluginPlaceholder">
+      <placeholder name="PluginPlaceholder">
         <menuitem name="MusicNewDAAPShareMenu" action="MusicNewDAAPShare"/>
       </placeholder>
     </menu>
@@ -12,7 +12,7 @@
   </popup>
 
   <popup name="SourceListPopup">
-    <placeholder name="SourceListPopupPluginPlaceholder">
+    <placeholder name="PluginPlaceholder">
       <menuitem name="SourceListPopupNewDAAPShare" action="MusicNewDAAPShare"/>
     </placeholder>
   </popup>

Modified: trunk/plugins/fmradio/fmradio-ui.xml
==============================================================================
--- trunk/plugins/fmradio/fmradio-ui.xml	(original)
+++ trunk/plugins/fmradio/fmradio-ui.xml	Fri Nov  7 10:19:28 2008
@@ -1,7 +1,7 @@
 <ui>
   <menubar name="MenuBar">
     <menu name="MusicMenu" action="Music">
-      <placeholder name="MusicMenuNewPluginPlaceholder">
+      <placeholder name="PluginPlaceholder">
         <menuitem name="MusicNewFMRadioStationMenu" action="MusicNewFMRadioStation"/>
       </placeholder>
     </menu>

Modified: trunk/plugins/iradio/iradio-ui.xml
==============================================================================
--- trunk/plugins/iradio/iradio-ui.xml	(original)
+++ trunk/plugins/iradio/iradio-ui.xml	Fri Nov  7 10:19:28 2008
@@ -1,7 +1,7 @@
 <ui>
   <menubar name="MenuBar">
     <menu name="MusicMenu" action="Music">
-      <placeholder name="MusicMenuNewPluginPlaceholder">
+      <placeholder name="PluginPlaceholder">
         <menuitem name="MusicNewInternetRadioStationMenu" action="MusicNewInternetRadioStation"/>
       </placeholder>
     </menu>

Modified: trunk/plugins/visualizer/visualizer-ui.xml
==============================================================================
--- trunk/plugins/visualizer/visualizer-ui.xml	(original)
+++ trunk/plugins/visualizer/visualizer-ui.xml	Fri Nov  7 10:19:28 2008
@@ -8,7 +8,7 @@
   </menubar>
 
   <toolbar name="ToolBar">
-    <placeholder name="ToolBarPluginPlaceholder">
+    <placeholder name="PluginPlaceholder">
       <toolitem name="Visualization" action="ToggleVisualizer"/>
     </placeholder>
   </toolbar>