Convert everything to GMenu and add an app menu

Most significantly, this removes the menu bar, scattering its contents
into an application menu, additional menus added to source toolbars,
and a toolbar in the source list.

The playlist related parts of the music menu are now in the source list
toolbar.  The rest formed the basis of the app menu.

Most sources now have an edit menu that corresponds roughly to the
edit menu from the menu bar.

The view and tools menus are now part of the app menu.

The control menu is gone, since it didn't do anything that wasn't already
represented in the controls in the main toolbar.

The help menu is now part of the app menu.

bindings/gi/Makefile.am

@@ -79,6 +79,8 @@ rb_introspection_sources = \
 		rhythmdb/rhythmdb-song-entry-types.c \
 		rhythmdb/rb-refstring.h \
 		rhythmdb/rb-refstring.c \
+		shell/rb-application.h \
+		shell/rb-application.c \
 		shell/rb-shell.h \
 		shell/rb-shell.c \
 		shell/rb-shell-player.h \
@@ -128,6 +130,8 @@ rb_introspection_sources = \
 		sources/rb-device-source.c \
 		sources/rb-transfer-target.h \
 		sources/rb-transfer-target.c \
+		widgets/rb-button-bar.h \
+		widgets/rb-button-bar.c \
 		widgets/rb-entry-view.h \
 		widgets/rb-entry-view.c \
 		widgets/rb-property-view.h \

configure.ac

@@ -44,7 +44,7 @@ m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
 AC_C_BIGENDIAN
 AC_CHECK_SIZEOF(long)
 
-GTK_REQS=3.4.0
+GTK_REQS=3.6.0
 
 GST_REQS=0.11.92
 GDK_PIXBUF_REQS=2.18.0

data/org.gnome.rhythmbox.gschema.xml

@@ -16,6 +16,11 @@
       <summary>Position of browser pane (if it exists)</summary>
       <description>Position of browser pane.</description>
     </key>
+    <key name="search-type" type="s">
+      <default>'search-match'</default>
+      <summary>Selected search type</summary>
+      <description>The currently selected search type for the source.</description>
+    </key>
   </schema>
 
   <schema id="org.gnome.rhythmbox.encoding-settings">
@@ -70,10 +75,10 @@
       <summary>Position of the right pane</summary>
       <description>Position of the right pane</description>
     </key>
-    <key name="statusbar-hidden" type="b">
-      <default>false</default>
+    <key name="statusbar-visible" type="b">
+      <default>true</default>
       <summary>Statusbar visibility</summary>
-      <description>If true, the statusbar is hidden.</description>
+      <description>If true, the statusbar is visible.</description>
     </key>
     <key name="queue-as-sidebar" type="b">
       <default>false</default>
@@ -174,6 +179,7 @@
     <override name="sorting">('Feed',true)</override>
     <override name="paned-position">180</override>
     <override name="show-browser">true</override>
+    <override name="search-type">'search-match'</override>
   </schema>
   <schema id="org.gnome.rhythmbox.podcast" path="/org/gnome/rhythmbox/podcast/">
 
@@ -409,7 +415,7 @@
       <summary>GStreamer element to use for visual effects</summary>
       <description>The name of the GStreamer element to use for visual effects.</description>
     </key>
-    <key name="quality" enum="org.gnome.rhythmbox.plugins.visualizer.quality">
+    <key name="vis-quality" enum="org.gnome.rhythmbox.plugins.visualizer.quality">
       <default>'medium'</default>
       <summary>The frame rate and size to use for visual effects</summary>
       <description>The frame rate and size to use for visual effects</description>

data/ui/Makefile.am

@@ -1,27 +1,39 @@
 
-
-UI_XML_FILES = rhythmbox-ui.xml
-
 GTK_BUILDER_FILES =					\
+	app-menu.ui					\
+	browser-popup.ui				\
 	create-playlist.ui				\
+	display-page-add-menu.ui			\
+	edit-menu.ui					\
 	general-prefs.ui				\
 	import-dialog.ui				\
+	import-errors-popup.ui				\
 	library-prefs.ui				\
+	library-toolbar.ui				\
+	main-toolbar.ui					\
 	media-player-properties.ui			\
+	missing-files-popup.ui				\
 	playback-prefs.ui				\
+	playlist-menu.ui				\
+	playlist-popup.ui				\
 	playlist-save.ui				\
+	playlist-toolbar.ui				\
 	podcast-add-dialog.ui				\
 	podcast-feed-properties.ui			\
+	podcast-popups.ui				\
 	podcast-prefs.ui				\
 	podcast-properties.ui				\
+	podcast-toolbar.ui				\
+	queue-popups.ui					\
+	queue-toolbar.ui				\
 	song-info.ui					\
 	song-info-multiple.ui				\
 	sync-dialog.ui					\
 	sync-state.ui					\
 	uri-new.ui
 
 uidir = $(pkgdatadir)
-ui_DATA = $(UI_XML_FILES) $(GTK_BUILDER_FILES)
+ui_DATA = $(GTK_BUILDER_FILES)
 
-EXTRA_DIST = $(UI_XML_FILES) $(GTK_BUILDER_FILES)
+EXTRA_DIST = $(GTK_BUILDER_FILES)
 

data/ui/app-menu.ui

@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<interface>
+  <menu id="app-menu">
+    <section>
+      <item>
+	<attribute name="label" translatable="yes">_Add Music</attribute>
+	<attribute name="action">app.library-import</attribute>
+      </item>
+    </section>
+    <section>
+      <submenu>
+	<attribute name="label" translatable="yes">_View</attribute>
+	<section>
+	  <item>
+	    <attribute name="label" translatable="yes">P_arty Mode</attribute>
+	    <attribute name="action">win.party-mode</attribute>
+	    <attribute name="accel">F11</attribute>
+	  </item>
+	  <item>
+	    <attribute name="label" translatable="yes">Side Pane</attribute>
+	    <attribute name="action">win.display-page-tree-visible</attribute>
+	    <attribute name="accel">F9</attribute>
+	  </item>
+	  <item>
+	    <attribute name="label" translatable="yes">Play Queue in Side Pane</attribute>
+	    <attribute name="action">win.queue-as-sidebar</attribute>
+	    <attribute name="accel">&lt;Primary&gt;k</attribute>
+	  </item>
+	  <item>
+	    <attribute name="label" translatable="yes">Status Bar</attribute>
+	    <attribute name="action">win.statusbar-visible</attribute>
+	  </item>
+	  <item>
+	    <attribute name="label" translatable="yes">Song Position Slider</attribute>
+	    <attribute name="action">win.show-song-position-slider</attribute>
+	  </item>
+	  <item>
+	    <attribute name="label" translatable="yes">Album Art</attribute>
+	    <attribute name="action">win.show-album-art</attribute>
+	  </item>
+	</section>
+	<section>
+	  <attribute name="rb-plugin-menu-link">view</attribute>
+	</section>
+      </submenu>
+      <submenu>
+	<attribute name="label" translatable="yes">_Tools</attribute>
+	<attribute name="rb-plugin-menu-link">tools</attribute>
+      </submenu>
+    </section>
+    <section>
+      <item>
+	<attribute name="label" translatable="yes">P_lugins</attribute>
+	<attribute name="action">app.plugins</attribute>
+      </item>
+      <item>
+	<attribute name="label" translatable="yes">_Preferences</attribute>
+	<attribute name="action">app.preferences</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+	<attribute name="label" translatable="yes">_Help</attribute>
+	<attribute name="action">app.help</attribute>
+      </item>
+      <item>
+	<attribute name="label" translatable="yes">_About</attribute>
+	<attribute name="action">app.about</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+	<attribute name="label" translatable="yes">_Quit</attribute>
+	<attribute name="action">app.quit</attribute>
+	<attribute name="accel">&lt;Primary&gt;q</attribute>
+      </item>
+    </section>
+  </menu>
+
+</interface>

data/ui/browser-popup.ui

@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<interface>
+  <menu id="browser-popup">
+    <section>
+      <item>
+	<attribute name="label" translatable="yes">Add to Queue</attribute>
+	<attribute name="action">app.clipboard-add-to-queue</attribute>
+      </item>
+      <submenu>
+	<attribute name="label" translatable="yes">Add to Playlist</attribute>
+	<attribute name="rb-playlist-menu-link"></attribute>
+      </submenu>
+    </section>
+    <section>
+      <item>
+	<attribute name="label" translatable="yes">Copy</attribute>
+	<attribute name="action">app.clipboard-copy</attribute>
+      </item>
+      <item>
+	<attribute name="label" translatable="yes">Cut</attribute>
+	<attribute name="action">app.clipboard-cut</attribute>
+      </item>
+    </section>
+    <section>
+      <section>
+	<attribute name="rb-menu-link">delete-menu</attribute>
+      </section>
+      <item>
+	<attribute name="label" translatable="yes">_Move to Trash</attribute>
+	<attribute name="action">app.clipboard-trash</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+	<attribute name="label" translatable="yes">Browse this Genre</attribute>
+	<attribute name="action">app.browser-select-genre</attribute>
+      </item>
+      <item>
+	<attribute name="label" translatable="yes">Browse this Artist</attribute>
+	<attribute name="action">app.browser-select-artist</attribute>
+      </item>
+      <item>
+	<attribute name="label" translatable="yes">Browse this Album</attribute>
+	<attribute name="action">app.browser-select-album</attribute>
+      </item>
+    </section>
+    <section>
+      <attribute name="rb-plugin-menu-link">browser-popup</attribute>
+    </section>
+    <section>
+      <item>
+	<attribute name="label" translatable="yes">Pr_operties</attribute>
+	<attribute name="action">app.clipboard-properties</attribute>
+      </item>
+    </section>
+  </menu>
+</interface>

data/ui/display-page-add-menu.ui

@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<interface>
+  <menu id="display-page-add-menu">
+    <section>
+      <item>
+	<attribute name="label" translatable="yes">_New Playlist</attribute>
+	<attribute name="action">app.playlist-new</attribute>
+      </item>
+      <item>
+	<attribute name="label" translatable="yes">New _Automatic Playlist</attribute>
+	<attribute name="action">app.playlist-new-auto</attribute>
+      </item>
+      <item>
+	<attribute name="label" translatable="yes">_Load from File</attribute>
+	<attribute name="action">app.playlist-load</attribute>
+      </item>
+    </section>
+    <section>
+      <attribute name="rb-plugin-menu-link">display-page-add-playlist</attribute>
+    </section>
+    <section>
+      <item>
+	<attribute name="label" translatable="yes">_Check for New Devices</attribute>
+	<attribute name="action">app.check-devices</attribute>
+      </item>
+    </section>
+    <section>
+      <attribute name="rb-plugin-menu-link">display-page-add</attribute>
+    </section>
+  </menu>
+</interface>

data/ui/edit-menu.ui

@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<interface>
+  <menu id="edit-menu">
+    <section>
+      <item>
+	<attribute name="label" translatable="yes">Cu_t</attribute>
+	<attribute name="action">app.clipboard-cut</attribute>
+      </item>
+      <item>
+	<attribute name="label" translatable="yes">_Copy</attribute>
+	<attribute name="action">app.clipboard-copy</attribute>
+      </item>
+      <item>
+	<attribute name="label" translatable="yes">_Paste</attribute>
+	<attribute name="action">app.clipboard-paste</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+	<attribute name="label" translatable="yes">Select _All</attribute>
+	<attribute name="action">app.clipboard-select-all</attribute>
+      </item>
+      <item>
+	<attribute name="label" translatable="yes">D_eselect All</attribute>
+	<attribute name="action">app.clipboard-select-none</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+	<attribute name="label" translatable="yes">Add to Play Queue</attribute>
+	<attribute name="action">app.clipboard-add-to-queue</attribute>
+      </item>
+      <submenu>
+	<attribute name="label" translatable="yes">Add to Playlist</attribute>
+	<attribute name="rb-playlist-menu-link"></attribute>
+      </submenu>
+    </section>
+    <section>
+      <item>
+	<attribute name="label" translatable="yes">Pr_operties</attribute>
+	<attribute name="action">app.clipboard-properties</attribute>
+      </item>
+    </section>
+    <section>
+      <section>
+	<attribute name="rb-menu-link">delete-menu</attribute>
+      </section>	
+      <item>
+	<attribute name="label" translatable="yes">_Move to Trash</attribute>
+	<attribute name="action">app.clipboard-move-to-trash</attribute>
+      </item>
+    </section>
+    <section>
+      <attribute name="rb-plugin-menu-link">edit</attribute>
+    </section>
+  </menu>
+</interface>

data/ui/import-errors-popup.ui

@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<interface>
+  <menu id="import-errors-popup">
+    <section>
+      <item>
+	<attribute name="label" translatable="yes">_Remove</attribute>
+	<attribute name="action">app.clipboard-delete</attribute>
+      </item>
+      <item>
+	<attribute name="label" translatable="yes">_Move to Trash</attribute>
+	<attribute name="action">app.clipboard-move-to-trash</attribute>
+      </item>
+    </section>
+  </menu>
+</interface>

data/ui/library-toolbar.ui

@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<interface>
+  <menu id="library-toolbar">
+    <section>
+      <submenu>
+	<attribute name="label" translatable="yes">Edit</attribute>
+	<attribute name="rb-menu-link">edit-menu</attribute>
+      </submenu>
+      <item>
+	<attribute name="label" translatable="yes">Browse</attribute>
+	<attribute name="rb-property-bind">show-browser</attribute>
+	<attribute name="accel">&lt;Primary&gt;b</attribute>
+      </item>
+      <item>
+	<attribute name="label" translatable="yes">View All</attribute>
+	<attribute name="action">app.source-view-all</attribute>
+      </item>
+      <item>
+	<attribute name="label" translatable="yes">Import</attribute>
+	<attribute name="action">app.library-import</attribute>
+      </item>
+    </section>
+    <section>
+      <attribute name="rb-plugin-menu-link">library-toolbar</attribute>
+    </section>
+  </menu>
+</interface>
+