GNOME.org
 

[banshee] Rename the MeeGo extension to MediaPanel and drop MeeGo integration

commit dc783f6683bc629c085ba630e2c9cf26272497fb
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date:   Sat Oct 19 18:47:03 2013 +0200

    Rename the MeeGo extension to MediaPanel and drop MeeGo integration
    
    Rename everything from MeeGo to MediaPanel, with the appropriate
    adjustments. All the MeeGo integration is also removed, so we can build
    this extension by default. But the extension is not active by default.
    
    The general idea for the MediaPanel extension is to provide a simple UI
    to quickly browse and play your media. A bit like the MiniMode, but
    less minimal. It is not specifically targetted  for netbooks, but it
    will probably be more interesting for smaller screens, and maybe touch
    devices ?

 Banshee.sln                                        |    4 +-
 build/build.environment.mk                         |    6 +-
 build/m4/banshee/meego.m4                          |   11 -
 configure.ac                                       |   24 +--
 data/addin-xml-strings.cs                          |    4 +
 src/Clients/Makefile.am                            |    2 +-
 .../Banshee.MediaPanel.Client/MediaPanelClient.cs} |   35 +++-
 src/Clients/MediaPanel/Makefile.am                 |    6 +
 .../MeeGo.csproj => MediaPanel/MediaPanel.csproj}  |   12 +-
 .../MeeGo/Banshee.MeeGo.Client/MeeGoClient.cs      |   84 --------
 src/Clients/MeeGo/Makefile.am                      |   10 -
 .../Banshee.MediaPanel.addin.xml}                  |   12 +-
 .../Banshee.MediaPanel.csproj}                     |   29 ++--
 .../Banshee.MediaPanel/HeaderBox.cs}               |   10 +-
 .../Banshee.MediaPanel/MediaPanel.cs}              |   46 +----
 .../Banshee.MediaPanel}/MediaPanelContents.cs      |   22 +-
 .../Banshee.MediaPanel/MediaPanelService.cs}       |   24 +--
 .../Banshee.MediaPanel/MediaPanelTheme.cs}         |   14 +-
 .../Banshee.MediaPanel}/PlaybackBox.cs             |    2 +-
 .../Banshee.MediaPanel}/SearchEntry.cs             |    2 +-
 .../Banshee.MediaPanel/TrackInfoDisplay.cs}        |   10 +-
 src/Extensions/Banshee.MediaPanel/Makefile.am      |   18 ++
 .../Banshee.MeeGo/Banshee.MeeGo.dll.config         |    3 -
 src/Extensions/Banshee.MeeGo/Makefile.am           |   61 ------
 .../Banshee.MeeGo/MeeGo.Panel/PanelButtonState.cs  |   35 ----
 .../Banshee.MeeGo/MeeGo.Panel/PanelClient.cs       |  209 --------------------
 .../Banshee.MeeGo/MeeGo.Panel/PanelGtk.cs          |   73 -------
 .../MeeGo.Panel/SetPositionHandler.cs              |   43 ----
 .../com.meego.UX.Shell.Panels.banshee.service.in   |    3 -
 src/Extensions/Banshee.MeeGo/meego-panel-banshee   |    3 -
 .../meego-panel-banshee.desktop.in.in              |    9 -
 src/Extensions/Makefile.am                         |    2 +-
 32 files changed, 138 insertions(+), 690 deletions(-)
---
diff --git a/Banshee.sln b/Banshee.sln
index de7508e..0a8923d 100644
--- a/Banshee.sln
+++ b/Banshee.sln
@@ -24,7 +24,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Booter", "src\Clients\Boote
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Beroe", "src\Clients\Beroe\Beroe.csproj", 
"{E0E10333-9B05-4463-8A15-6738C186BF87}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MeeGo", "src\Clients\MeeGo\MeeGo.csproj", 
"{FC44E7C6-D625-4FF1-BA85-F074871423EF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaPanel", 
"src\Clients\MediaPanel\MediaPanel.csproj", "{FC44E7C6-D625-4FF1-BA85-F074871423EF}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{48EA1A64-29EE-4555-9E79-49453EB51976}"
        ProjectSection(SolutionItems) = postProject
@@ -84,7 +84,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Banshee.NotificationArea",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Banshee.MultimediaKeys", 
"src\Extensions\Banshee.MultimediaKeys\Banshee.MultimediaKeys.csproj", 
"{8E8D7EAD-3B7A-4F7D-8146-75AFCB9DEE83}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Banshee.MeeGo", 
"src\Extensions\Banshee.MeeGo\Banshee.MeeGo.csproj", "{4FBB954A-5CA9-44DC-97DA-7D549AC3EADB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Banshee.MediaPanel", 
"src\Extensions\Banshee.MediaPanel\Banshee.MediaPanel.csproj", "{4FBB954A-5CA9-44DC-97DA-7D549AC3EADB}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Banshee.PlayerMigration", 
"src\Extensions\Banshee.PlayerMigration\Banshee.PlayerMigration.csproj", 
"{0AB92BF8-3A25-46AD-9748-1236471E9408}"
 EndProject
diff --git a/build/build.environment.mk b/build/build.environment.mk
index 48cae63..f91f849 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -106,7 +106,7 @@ LINK_BANSHEE_WEBBROWSER_DEPS = $(REF_BANSHEE_WEBBROWSER) $(LINK_BANSHEE_WEBBROWS
 
 REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS)
 LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID)
-REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO)
+REF_MEDIAPANEL = $(LINK_NEREID) $(LINK_EXTENSION_MEDIAPANEL)
 REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS)
 REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS)
 REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS)
@@ -137,8 +137,8 @@ REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
 REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
 REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
 REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
+REF_EXTENSION_MEDIAPANEL = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+LINK_EXTENSION_MEDIAPANEL = -r:$(DIR_BIN)/Banshee.MediaPanel.dll $(REF_EXTENSION_MEDIAPANEL)
 REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
 REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
 REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
diff --git a/configure.ac b/configure.ac
index a467850..6b7624e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,23 +73,9 @@ SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([
        ICSharpCode.SharpZipLib
 ])
 
-dnl In MeeGo we want the full name, but not in GNOME 3 (see bgo#596242)
-PKG_CHECK_MODULES(MEEGO_PANEL, meego-panel, HAVE_MEEGO_PANEL=yes, HAVE_MEEGO_PANEL=no)
-if test "x$HAVE_MEEGO_PANEL" = "xyes"; then
-       BANSHEE_DESKTOP_NAME="_Name=Banshee Media Player"
-else
-       BANSHEE_DESKTOP_NAME="_Name=Banshee"
-fi
+BANSHEE_DESKTOP_NAME="_Name=Banshee"
 AC_SUBST(BANSHEE_DESKTOP_NAME)
 
-if test "x$HAVE_MEEGO_PANEL" = "xyes"; then
-  MEEGO_PANELS_DIR=`$PKG_CONFIG --variable=meego_panel_panels_dir meego-panel`
-else
-  MEEGO_PANELS_DIR='${datadir}/mutter-meego/panels'
-fi
-AC_SUBST(MEEGO_PANELS_DIR)
-
-
 dnl DBus Sharp libraries
 BANSHEE_CHECK_DBUS_SHARP
 
@@ -157,9 +143,6 @@ BANSHEE_CHECK_REMOTE_AUDIO
 dnl MonoTorrent support (optional)
 BANSHEE_CHECK_TORRENT
 
-dnl MeeGo integration (optional)
-BANSHEE_CHECK_MEEGO
-
 dnl Sound menu integration (optional)
 BANSHEE_CHECK_SOUNDMENU
 
@@ -263,7 +246,7 @@ src/Clients/Booter/banshee.darwin
 src/Clients/Halie/Makefile
 src/Clients/Muinshee/Makefile
 src/Clients/Nereid/Makefile
-src/Clients/MeeGo/Makefile
+src/Clients/MediaPanel/Makefile
 
 src/Core/Makefile
 src/Core/Banshee.CollectionIndexer/Makefile
@@ -319,7 +302,7 @@ src/Extensions/Banshee.LastfmStreaming/Makefile
 src/Extensions/Banshee.LibraryWatcher/Makefile
 src/Extensions/Banshee.MiniMode/Makefile
 src/Extensions/Banshee.MiroGuide/Makefile
-src/Extensions/Banshee.MeeGo/Makefile
+src/Extensions/Banshee.MediaPanel/Makefile
 src/Extensions/Banshee.Mpris/Makefile
 src/Extensions/Banshee.MultimediaKeys/Makefile
 src/Extensions/Banshee.NotificationArea/Makefile
@@ -361,7 +344,6 @@ ${PACKAGE}-${VERSION}
   Operating System/Desktop Environment:
     GNOME Support:         ${enable_gnome}
     OSX Support:           ${enable_osx}
-    MeeGo Support:         ${enable_meego}
 
   Digital Audio Player (DAP) Support:
     Apple Device:          ${enable_appledevice} (libgpod-sharp)
diff --git a/data/addin-xml-strings.cs b/data/addin-xml-strings.cs
index a78cff6..e548db9 100644
--- a/data/addin-xml-strings.cs
+++ b/data/addin-xml-strings.cs
@@ -104,6 +104,10 @@ internal static class AddinXmlStringCatalog
         Catalog.GetString (@"Automatically update music and video libraries.");
         Catalog.GetString (@"Utilities");
 
+        // ../src/Extensions/Banshee.MediaPanel/Banshee.MediaPanel.addin.xml
+        Catalog.GetString (@"MediaPanel Support");
+        Catalog.GetString (@"Provides a custom media panel to quickly browse and play your media.");
+
         // ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode.addin.xml
         Catalog.GetString (@"Mini Mode");
         Catalog.GetString (@"Control Banshee through a small window with only playback controls and track 
information.");
diff --git a/src/Clients/Makefile.am b/src/Clients/Makefile.am
index c85adae..29fb516 100644
--- a/src/Clients/Makefile.am
+++ b/src/Clients/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = \
        Halie \
        Muinshee \
        Nereid \
-       MeeGo
+       MediaPanel
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/src/Extensions/Banshee.MeeGo/MeeGo.Panel/SetSizeHandler.cs 
b/src/Clients/MediaPanel/Banshee.MediaPanel.Client/MediaPanelClient.cs
similarity index 52%
rename from src/Extensions/Banshee.MeeGo/MeeGo.Panel/SetSizeHandler.cs
rename to src/Clients/MediaPanel/Banshee.MediaPanel.Client/MediaPanelClient.cs
index a4bb3a5..079c163 100644
--- a/src/Extensions/Banshee.MeeGo/MeeGo.Panel/SetSizeHandler.cs
+++ b/src/Clients/MediaPanel/Banshee.MediaPanel.Client/MediaPanelClient.cs
@@ -1,10 +1,10 @@
 //
-// SetSizeHandler.cs
+// MediaPanelClient.cs
 //
 // Author:
 //   Aaron Bockover <abockover novell com>
 //
-// Copyright 2009-2010 Novell, Inc.
+// Copyright 2010 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
@@ -24,20 +24,35 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+// The MediaPanel client is just a wrapper around the Nereid client.
+// This is done to allow the user to explicitly start the MediaPanel UI, for
+// example through a shortcut or an icon. Otherwise the MediaPanel UI would
+// show itself depending on whether the extension is enabled or not.
+//
+
 using System;
+using System.IO;
+using System.Reflection;
 
-namespace MeeGo.Panel
-{
-    public delegate void SetSizeHandler (object o, SetSizeArgs args);
+using Hyena;
 
-    public class SetSizeArgs : GLib.SignalArgs
+namespace Banshee.MediaPanel.Client
+{
+    public class MediaPanelClient : Nereid.Client
     {
-        public uint Width {
-            get { return (uint)Args[0]; }
+        public new static void Main (string [] args)
+        {
+            // Normally Mono.Addins would load the MediaPanel extension from the
+            // Extensions directory, so we need to load this reference manually
+            Assembly.LoadFile (Paths.Combine (Path.GetDirectoryName (
+                Assembly.GetEntryAssembly ().Location), "Extensions", "Banshee.MediaPanel.dll"));
+            Startup<MediaPanelClient> (args);
         }
 
-        public uint Height {
-            get { return (uint)Args[1]; }
+        protected override void InitializeGtk ()
+        {
+            base.InitializeGtk ();
+            new Banshee.MediaPanel.MediaPanel ();
         }
     }
 }
diff --git a/src/Clients/MediaPanel/Makefile.am b/src/Clients/MediaPanel/Makefile.am
new file mode 100644
index 0000000..2522f1a
--- /dev/null
+++ b/src/Clients/MediaPanel/Makefile.am
@@ -0,0 +1,6 @@
+ASSEMBLY = MediaPanel
+TARGET = exe
+LINK = $(REF_MEDIAPANEL)
+SOURCES = Banshee.MediaPanel.Client/MediaPanelClient.cs
+
+include $(top_srcdir)/build/build.mk
diff --git a/src/Clients/MeeGo/MeeGo.csproj b/src/Clients/MediaPanel/MediaPanel.csproj
similarity index 90%
rename from src/Clients/MeeGo/MeeGo.csproj
rename to src/Clients/MediaPanel/MediaPanel.csproj
index ad76775..c83c53a 100644
--- a/src/Clients/MeeGo/MeeGo.csproj
+++ b/src/Clients/MediaPanel/MediaPanel.csproj
@@ -7,7 +7,7 @@
     <ProjectGuid>{FC44E7C6-D625-4FF1-BA85-F074871423EF}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <UseParentDirectoryAsNamespace>true</UseParentDirectoryAsNamespace>
-    <AssemblyName>MeeGo</AssemblyName>
+    <AssemblyName>MediaPanel</AssemblyName>
     <SchemaVersion>2.0</SchemaVersion>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <SourceAnalysisOverrideSettingsFile>C:\Documents and Settings\Administrator\Application 
Data\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
@@ -15,7 +15,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ReleaseVersion>1.3</ReleaseVersion>
-    <RootNamespace>MeeGo</RootNamespace>
+    <RootNamespace>MediaPanel</RootNamespace>
     <AssemblyOriginatorKeyFile>.</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -46,9 +46,9 @@
       <Project>{4F66A4DE-5204-4150-8D0B-CE21CA52E309}</Project>
       <Name>Nereid</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Extensions\Banshee.MeeGo\Banshee.MeeGo.csproj">
+    <ProjectReference Include="..\..\Extensions\Banshee.MediaPanel\Banshee.MediaPanel.csproj">
       <Project>{4FBB954A-5CA9-44DC-97DA-7D549AC3EADB}</Project>
-      <Name>Banshee.MeeGo</Name>
+      <Name>Banshee.MediaPanel</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\Hyena\Hyena.Data.Sqlite\Hyena.Data.Sqlite.csproj">
       <Project>{95374549-9553-4C1E-9D89-667755F90E13}</Project>
@@ -77,9 +77,9 @@
     </MonoDevelop>
   </ProjectExtensions>
   <ItemGroup>
-    <Folder Include="Banshee.MeeGo.Client\" />
+    <Folder Include="Banshee.MediaPanel.Client\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Banshee.MeeGo.Client\MeeGoClient.cs" />
+    <Compile Include="Banshee.MediaPanel.Client\MediaPanelClient.cs" />
   </ItemGroup>
 </Project>
diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo.addin.xml 
b/src/Extensions/Banshee.MediaPanel/Banshee.MediaPanel.addin.xml
similarity index 63%
rename from src/Extensions/Banshee.MeeGo/Banshee.MeeGo.addin.xml
rename to src/Extensions/Banshee.MediaPanel/Banshee.MediaPanel.addin.xml
index f40456a..4f6d2f9 100644
--- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo.addin.xml
+++ b/src/Extensions/Banshee.MediaPanel/Banshee.MediaPanel.addin.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Addin 
-    id="Banshee.MeeGo"
+    id="Banshee.MediaPanel"
     version="1.0"
     compatVersion="1.0"
     copyright="© 2009-2010 Novell Inc. Licensed under the MIT X11 license."
-    name="MeeGo Support"
-    description="Provides MeeGo integration, including a custom media panel."
+    name="MediaPanel Support"
+    description="Provides a custom media panel to quickly browse and play your media."
     author="Aaron Bockover"
     url="http://banshee.fm/";
-    defaultEnabled="true">
+    defaultEnabled="false">
 
   <Dependencies>
     <Addin id="Banshee.Services" version="1.0"/>
@@ -16,11 +16,11 @@
   </Dependencies>
   
   <Extension path="/Banshee/ServiceManager/Service">
-    <Service class="Banshee.MeeGo.MeeGoService"/>
+    <Service class="Banshee.MediaPanel.MediaPanelService"/>
   </Extension>
 
   <Extension path="/Banshee/ThickClient/GtkBaseClient/PostInitializeGtk">
-    <PostInitializeGtk class="Banshee.MeeGo.MeeGoThemeLoader"/>
+    <PostInitializeGtk class="Banshee.MediaPanel.MediaPanelThemeLoader"/>
   </Extension>
    
 </Addin>
diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo.csproj 
b/src/Extensions/Banshee.MediaPanel/Banshee.MediaPanel.csproj
similarity index 83%
rename from src/Extensions/Banshee.MeeGo/Banshee.MeeGo.csproj
rename to src/Extensions/Banshee.MediaPanel/Banshee.MediaPanel.csproj
index 7c06b36..c2ec025 100644
--- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo.csproj
+++ b/src/Extensions/Banshee.MediaPanel/Banshee.MediaPanel.csproj
@@ -7,14 +7,14 @@
     <ProjectGuid>{4FBB954A-5CA9-44DC-97DA-7D549AC3EADB}</ProjectGuid>
     <OutputType>Library</OutputType>
     <UseParentDirectoryAsNamespace>true</UseParentDirectoryAsNamespace>
-    <AssemblyName>Banshee.MeeGo</AssemblyName>
+    <AssemblyName>Banshee.MediaPanel</AssemblyName>
     <SchemaVersion>2.0</SchemaVersion>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <SourceAnalysisOverrideSettingsFile>C:\Documents and Settings\Administrator\Application 
Data\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
     <Optimize>true</Optimize>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <RootNamespace>Banshee.MeeGo</RootNamespace>
+    <RootNamespace>Banshee.MediaPanel</RootNamespace>
     <AssemblyOriginatorKeyFile>.</AssemblyOriginatorKeyFile>
     <ReleaseVersion>1.3</ReleaseVersion>
   </PropertyGroup>
@@ -83,8 +83,8 @@
   <ItemGroup>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Banshee.MeeGo.addin.xml">
-      <LogicalName>Banshee.MeeGo.addin.xml</LogicalName>
+    <EmbeddedResource Include="Banshee.MediaPanel.addin.xml">
+      <LogicalName>Banshee.MediaPanel.addin.xml</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
@@ -104,18 +104,13 @@
     </MonoDevelop>
   </ProjectExtensions>
   <ItemGroup>
-    <Compile Include="MeeGo.Panel\PanelClient.cs" />
-    <Compile Include="MeeGo.Panel\PanelGtk.cs" />
-    <Compile Include="MeeGo.Panel\SetSizeHandler.cs" />
-    <Compile Include="MeeGo.Panel\SetPositionHandler.cs" />
-    <Compile Include="MeeGo.Panel\PanelButtonState.cs" />
-    <Compile Include="Banshee.MeeGo\MeeGoService.cs" />
-    <Compile Include="Banshee.MeeGo\MediaPanelContents.cs" />
-    <Compile Include="Banshee.MeeGo\SearchEntry.cs" />
-    <Compile Include="Banshee.MeeGo\PlaybackBox.cs" />
-    <Compile Include="Banshee.MeeGo\MeeGoTrackInfoDisplay.cs" />
-    <Compile Include="Banshee.MeeGo\MeeGoPanel.cs" />
-    <Compile Include="Banshee.MeeGo\MeeGoTheme.cs" />
-    <Compile Include="Banshee.MeeGo\MeeGoHeaderBox.cs" />
+    <Compile Include="Banshee.MediaPanel\MediaPanelService.cs" />
+    <Compile Include="Banshee.MediaPanel\MediaPanelContents.cs" />
+    <Compile Include="Banshee.MediaPanel\SearchEntry.cs" />
+    <Compile Include="Banshee.MediaPanel\PlaybackBox.cs" />
+    <Compile Include="Banshee.MediaPanel\TrackInfoDisplay.cs" />
+    <Compile Include="Banshee.MediaPanel\MediaPanel.cs" />
+    <Compile Include="Banshee.MediaPanel\MediaPanelTheme.cs" />
+    <Compile Include="Banshee.MediaPanel\HeaderBox.cs" />
   </ItemGroup>
 </Project>
diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoHeaderBox.cs 
b/src/Extensions/Banshee.MediaPanel/Banshee.MediaPanel/HeaderBox.cs
similarity index 97%
rename from src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoHeaderBox.cs
rename to src/Extensions/Banshee.MediaPanel/Banshee.MediaPanel/HeaderBox.cs
index d92dc66..1f8156b 100644
--- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoHeaderBox.cs
+++ b/src/Extensions/Banshee.MediaPanel/Banshee.MediaPanel/HeaderBox.cs
@@ -1,5 +1,5 @@
 // 
-// MeeGoHeaderBox.cs
+// HeaderBox.cs
 // 
 // Author:
 //   Aaron Bockover <abockover novell com>
@@ -31,9 +31,9 @@ using Gtk;
 
 using Hyena.Gui;
 
-namespace Banshee.MeeGo
+namespace Banshee.MediaPanel
 {
-    public class MeeGoHeaderBox : VBox
+    public class HeaderBox : VBox
     {
         [Flags]
         public enum HighlightFlags
@@ -50,11 +50,11 @@ namespace Banshee.MeeGo
         private Label header_label;
         private string header_label_text;
 
-        protected MeeGoHeaderBox (IntPtr raw) : base (raw)
+        protected HeaderBox (IntPtr raw) : base (raw)
         {
         }
 
-        public MeeGoHeaderBox ()
+        public HeaderBox ()
         {
             BorderWidth = 5;
             Spacing = 5;
diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs 
b/src/Extensions/Banshee.MediaPanel/Banshee.MediaPanel/MediaPanel.cs
similarity index 60%
rename from src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs
rename to src/Extensions/Banshee.MediaPanel/Banshee.MediaPanel/MediaPanel.cs
index eaad0a3..3b12c91 100644
--- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs
+++ b/src/Extensions/Banshee.MediaPanel/Banshee.MediaPanel/MediaPanel.cs
@@ -1,5 +1,5 @@
 //
-// MeeGoPanel.cs
+// MediaPanel.cs
 //
 // Author:
 //   Aaron Bockover <abockover novell com>
@@ -28,54 +28,30 @@ using System;
 using Mono.Unix;
 
 using Gtk;
-using MeeGo.Panel;
 
 using Hyena;
 using Banshee.Base;
 using Banshee.ServiceStack;
 
-namespace Banshee.MeeGo
+namespace Banshee.MediaPanel
 {
-    public class MeeGoPanel : IDisposable
+    public class MediaPanel : IDisposable
     {
-        public static MeeGoPanel Instance { get; private set; }
+        public static MediaPanel Instance { get; private set; }
 
-        private PanelGtk embedded_panel;
         private Window window_panel;
 
         public MediaPanelContents Contents { get; private set; }
 
-        public MeeGoPanel ()
+        public  MediaPanel ()
         {
             if (Instance != null) {
-                throw new InvalidOperationException ("Only one MeeGoPanel instance should exist");
+                throw new InvalidOperationException ("Only one MediaPanel instance should exist");
             }
 
             Instance = this;
 
-            var timer = Log.DebugTimerStart ();
-
-            try {
-                Log.Debug ("Attempting to create MeeGo toolbar panel");
-                embedded_panel = new PanelGtk ("banshee", Catalog.GetString ("media"),
-                    null, "media-button", true);
-                embedded_panel.ShowBeginEvent += (o, e) => {
-                    ServiceManager.SourceManager.SetActiveSource (ServiceManager.SourceManager.MusicLibrary);
-                    if (Contents != null) {
-                        Contents.SyncSearchEntry ();
-                    }
-                };
-                while (Gtk.Application.EventsPending ()) {
-                    Gtk.Application.RunIteration ();
-                }
-            } catch (Exception e) {
-                if (!(e is DllNotFoundException)) {
-                    Log.Exception ("Could not bind to MeeGo panel", e);
-                }
-                window_panel = new Gtk.Window ("MeeGo Media Panel");
-            }
-
-            Log.DebugTimerPrint (timer, "MeeGo panel created: {0}");
+            window_panel = new Gtk.Window ("Banshee Media Panel");
         }
 
         public void Dispose ()
@@ -89,9 +65,7 @@ namespace Banshee.MeeGo
             Contents.ShowAll ();
             Log.DebugTimerPrint (timer, "MeeGo panel contents created: {0}");
 
-            if (embedded_panel != null) {
-                embedded_panel.SetChild (Contents);
-            } else if (window_panel != null) {
+            if (window_panel != null) {
                 window_panel.Add (Contents);
                 window_panel.SetDefaultSize (1000, 500);
                 window_panel.WindowPosition = WindowPosition.Center;
@@ -105,8 +79,8 @@ namespace Banshee.MeeGo
 
         public void Hide ()
         {
-            if (embedded_panel != null) {
-                embedded_panel.Hide ();
+            if (window_panel != null) {
+                window_panel.Hide ();
             }
         }
     }
diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs 
b/src/Extensions/Banshee.MediaPanel/Banshee.MediaPanel/MediaPanelContents.cs
similarity index 94%
rename from src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs
rename to src/Extensions/Banshee.MediaPanel/Banshee.MediaPanel/MediaPanelContents.cs
index c0d8947..7f95324 100644
--- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs
+++ b/src/Extensions/Banshee.MediaPanel/Banshee.MediaPanel/MediaPanelContents.cs
@@ -44,7 +44,7 @@ using Banshee.MediaEngine;
 using Banshee.Gui;
 using Banshee.Gui.Widgets;
 
-namespace Banshee.MeeGo
+namespace Banshee.MediaPanel
 {
     public class MediaPanelContents : Table, ITrackModelSourceContents
     {
@@ -54,7 +54,7 @@ namespace Banshee.MeeGo
 
         private SourceComboBox source_combo_box;
         private SearchEntry search_entry;
-        private MeeGoTrackInfoDisplay track_info_display;
+        private TrackInfoDisplay track_info_display;
 
         private ISource source;
         private Dictionary<object, double> model_positions = new Dictionary<object, double> ();
@@ -117,7 +117,7 @@ namespace Banshee.MeeGo
 
         private void BuildLibrary ()
         {
-            var box = new MeeGoHeaderBox () { Title = Catalog.GetString ("Library") };
+            var box = new HeaderBox () { Title = Catalog.GetString ("Library") };
 
             // Build the Library Header
             var header = new HBox () {
@@ -133,13 +133,13 @@ namespace Banshee.MeeGo
             };
             app_button.Clicked += (o, e) => {
                 ServiceManager.SourceManager.SetActiveSource (ServiceManager.SourceManager.MusicLibrary);
-                ServiceManager.Get<MeeGoService> ().PresentPrimaryInterface ();
+                ServiceManager.Get<MediaPanelService> ().PresentPrimaryInterface ();
             };
 
             header.PackStart (source_combo_box = new SourceComboBox (), false, false, 0);
             header.PackStart (app_button, false, false, 0);
             header.PackStart (search_entry = new SearchEntry (), true, true, 0);
-            box.PackStartHighlighted (header, false, false, 0, MeeGoHeaderBox.HighlightFlags.Background);
+            box.PackStartHighlighted (header, false, false, 0, HeaderBox.HighlightFlags.Background);
 
             // Build the Library Views
             var views = new HBox () { Spacing = 5 };
@@ -162,12 +162,12 @@ namespace Banshee.MeeGo
 
         private void BuildNowPlaying ()
         {
-            var box = new MeeGoHeaderBox () { Title = Catalog.GetString ("Now Playing") };
+            var box = new HeaderBox () { Title = Catalog.GetString ("Now Playing") };
 
             var seek_slider = new ConnectedSeekSlider (SeekSliderLayout.Horizontal);
             seek_slider.StreamPositionLabel.FormatString = "<small>{0}</small>";
 
-            track_info_display = new MeeGoTrackInfoDisplay () {
+            track_info_display = new TrackInfoDisplay () {
                 HeightRequest = 64,
                 NoShowAll = true
             };
@@ -179,10 +179,10 @@ namespace Banshee.MeeGo
             track_view.ColumnController.Insert (new Column (null, "indicator",
                 new ColumnCellStatusIndicator (null), 0.05, true, 20, 20), 0);
 
-            box.PackStartHighlighted (track_info_display, false, false, 0, 
MeeGoHeaderBox.HighlightFlags.Background);
-            box.PackStartHighlighted (seek_slider, false, false, 0, 
MeeGoHeaderBox.HighlightFlags.Background);
+            box.PackStartHighlighted (track_info_display, false, false, 0, 
HeaderBox.HighlightFlags.Background);
+            box.PackStartHighlighted (seek_slider, false, false, 0, HeaderBox.HighlightFlags.Background);
             box.PackStart (SetupView (track_view), true, true, 0);
-            box.PackStartHighlighted (new PlaybackBox (), false, false, 0, 
MeeGoHeaderBox.HighlightFlags.TopLine);
+            box.PackStartHighlighted (new PlaybackBox (), false, false, 0, HeaderBox.HighlightFlags.TopLine);
 
             Attach (box, 1, 2, 1, 2,
                 AttachOptions.Shrink,
@@ -287,7 +287,7 @@ namespace Banshee.MeeGo
 
                 if (source != null && source != ServiceManager.SourceManager.MusicLibrary
                      && source.Parent != ServiceManager.SourceManager.MusicLibrary) {
-                     ServiceManager.Get<MeeGoService> ().PresentPrimaryInterface ();
+                    ServiceManager.Get<MediaPanelService> ().PresentPrimaryInterface ();
                 }
             });
         }
diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs 
b/src/Extensions/Banshee.MediaPanel/Banshee.MediaPanel/MediaPanelService.cs
similarity index 85%
rename from src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs
rename to src/Extensions/Banshee.MediaPanel/Banshee.MediaPanel/MediaPanelService.cs
index ffac0f1..0734b47 100644
--- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs
+++ b/src/Extensions/Banshee.MediaPanel/Banshee.MediaPanel/MediaPanelService.cs
@@ -1,5 +1,5 @@
 //
-// MeeGoService.cs
+// MediaPanelService.cs
 //
 // Authors:
 //   Aaron Bockover <abockover novell com>
@@ -28,7 +28,6 @@
 
 using System;
 using Gtk;
-using MeeGo.Panel;
 
 using Hyena;
 
@@ -39,15 +38,15 @@ using Banshee.ServiceStack;
 using Banshee.MediaEngine;
 using Banshee.Gui;
 
-namespace Banshee.MeeGo
+namespace Banshee.MediaPanel
 {
-    public class MeeGoService : IExtensionService
+    public class MediaPanelService : IExtensionService
     {
         private GtkElementsService elements_service;
         private InterfaceActionService interface_action_service;
         private SourceManager source_manager;
         private PlayerEngineService player;
-        private MeeGoPanel panel;
+        private MediaPanel panel;
 
         void IExtensionService.Initialize ()
         {
@@ -92,15 +91,14 @@ namespace Banshee.MeeGo
 
         private void Initialize ()
         {
-            // If Banshee is running from the MeeGo client entry assembly,
-            // the MeeGoPanel will have already been created. If not, we
-            // assume we're probably not really running in a MeeGo environment,
-            // so we just create the panel here (which is likely to just be
-            // a separate top-level window for testing).
-            panel = MeeGoPanel.Instance ?? new MeeGoPanel ();
+            // If Banshee is running from the MediaPanel client entry assembly,
+            // the MediaPanel will have already been created. If not, we just 
+            // create the panel here (which is likely to just be a separate 
+            // top-level window for testing).
+            panel = MediaPanel.Instance ?? new MediaPanel ();
 
             if (panel == null) {
-                Log.Warning ("MeeGo extension initialized without a panel");
+                Log.Warning ("MediaPanel extension initialized without a panel");
                 return;
             }
 
@@ -139,7 +137,7 @@ namespace Banshee.MeeGo
         }
 
         string IService.ServiceName {
-            get { return "MeeGoService"; }
+            get { return "MediaPanelService"; }
         }
     }
 }
diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoTheme.cs 
b/src/Extensions/Banshee.MediaPanel/Banshee.MediaPanel/MediaPanelTheme.cs
similarity index 94%
rename from src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoTheme.cs
rename to src/Extensions/Banshee.MediaPanel/Banshee.MediaPanel/MediaPanelTheme.cs
index 9646a54..2d5126c 100644
--- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoTheme.cs
+++ b/src/Extensions/Banshee.MediaPanel/Banshee.MediaPanel/MediaPanelTheme.cs
@@ -1,5 +1,5 @@
 // 
-// MeeGoTheme.cs
+// MediaPanelTheme.cs
 // 
 // Author:
 //   Aaron Bockover <abockover novell com>
@@ -32,19 +32,19 @@ using Cairo;
 using Hyena.Gui;
 using Hyena.Gui.Theming;
 
-namespace Banshee.MeeGo
+namespace Banshee.MediaPanel
 {
-    public class MeeGoThemeLoader
+    public class MediaPanelThemeLoader
     {
-        public MeeGoThemeLoader ()
+        public MediaPanelThemeLoader ()
         {
-            Hyena.Gui.Theming.ThemeEngine.SetCurrentTheme<MeeGoTheme> ();
+            Hyena.Gui.Theming.ThemeEngine.SetCurrentTheme<MediaPanelTheme> ();
         }
     }
 
-    public class MeeGoTheme : GtkTheme
+    public class MediaPanelTheme : GtkTheme
     {
-        public MeeGoTheme (Widget widget) : base (widget)
+        public MediaPanelTheme (Widget widget) : base (widget)
         {
         }
 
diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/PlaybackBox.cs 
b/src/Extensions/Banshee.MediaPanel/Banshee.MediaPanel/PlaybackBox.cs
similarity index 98%
rename from src/Extensions/Banshee.MeeGo/Banshee.MeeGo/PlaybackBox.cs
rename to src/Extensions/Banshee.MediaPanel/Banshee.MediaPanel/PlaybackBox.cs
index 2b33336..4cf3341 100644
--- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/PlaybackBox.cs
+++ b/src/Extensions/Banshee.MediaPanel/Banshee.MediaPanel/PlaybackBox.cs
@@ -32,7 +32,7 @@ using Banshee.Gui.Widgets;
 
 using Banshee.ServiceStack;
 
-namespace Banshee.MeeGo
+namespace Banshee.MediaPanel
 {
     public class PlaybackBox : Alignment
     {
diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs 
b/src/Extensions/Banshee.MediaPanel/Banshee.MediaPanel/SearchEntry.cs
similarity index 99%
rename from src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs
rename to src/Extensions/Banshee.MediaPanel/Banshee.MediaPanel/SearchEntry.cs
index b402a61..07e82d0 100644
--- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs
+++ b/src/Extensions/Banshee.MediaPanel/Banshee.MediaPanel/SearchEntry.cs
@@ -33,7 +33,7 @@ using Banshee.ServiceStack;
 using Banshee.Gui;
 using Banshee.Collection;
 
-namespace Banshee.MeeGo
+namespace Banshee.MediaPanel
 {
     public class SearchEntry : Banshee.Widgets.SearchEntry
     {
diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoTrackInfoDisplay.cs 
b/src/Extensions/Banshee.MediaPanel/Banshee.MediaPanel/TrackInfoDisplay.cs
similarity index 89%
rename from src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoTrackInfoDisplay.cs
rename to src/Extensions/Banshee.MediaPanel/Banshee.MediaPanel/TrackInfoDisplay.cs
index 886fcf5..d11b166 100644
--- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoTrackInfoDisplay.cs
+++ b/src/Extensions/Banshee.MediaPanel/Banshee.MediaPanel/TrackInfoDisplay.cs
@@ -1,5 +1,5 @@
 //
-// MeeGoTrackDisplay.cs
+// TrackInfoDisplay.cs
 //
 // Authors:
 //   Aaron Bockover <abockover novell com>
@@ -31,17 +31,17 @@ using System.Text.RegularExpressions;
 
 using Banshee.ServiceStack;
 
-namespace Banshee.MeeGo
+namespace Banshee.MediaPanel
 {
-    public class MeeGoTrackInfoDisplay : Banshee.Gui.Widgets.ClassicTrackInfoDisplay
+    public class TrackInfoDisplay : Banshee.Gui.Widgets.ClassicTrackInfoDisplay
     {
         private Regex line_three_split;
 
-        protected MeeGoTrackInfoDisplay (IntPtr raw) : base (raw)
+        protected TrackInfoDisplay (IntPtr raw) : base (raw)
         {
         }
 
-        public MeeGoTrackInfoDisplay () : base ()
+        public TrackInfoDisplay () : base ()
         {
         }
 
diff --git a/src/Extensions/Banshee.MediaPanel/Makefile.am b/src/Extensions/Banshee.MediaPanel/Makefile.am
new file mode 100644
index 0000000..86a4163
--- /dev/null
+++ b/src/Extensions/Banshee.MediaPanel/Makefile.am
@@ -0,0 +1,18 @@
+ASSEMBLY = Banshee.MediaPanel
+TARGET = library
+LINK = $(REF_EXTENSION_MEDIAPANEL) $(LINK_EXTENSION_PLAYQUEUE_DEPS)
+INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
+
+SOURCES =  \
+       Banshee.MediaPanel/HeaderBox.cs \
+       Banshee.MediaPanel/MediaPanel.cs \
+       Banshee.MediaPanel/MediaPanelContents.cs \
+       Banshee.MediaPanel/MediaPanelService.cs \
+       Banshee.MediaPanel/MediaPanelTheme.cs \
+       Banshee.MediaPanel/PlaybackBox.cs \
+       Banshee.MediaPanel/SearchEntry.cs \
+       Banshee.MediaPanel/TrackInfoDisplay.cs
+
+RESOURCES = Banshee.MediaPanel.addin.xml
+
+include $(top_srcdir)/build/build.mk
diff --git a/src/Extensions/Makefile.am b/src/Extensions/Makefile.am
index f9ebd8a..c120481 100644
--- a/src/Extensions/Makefile.am
+++ b/src/Extensions/Makefile.am
@@ -24,7 +24,7 @@ SUBDIRS = \
        Banshee.OpticalDisc \
        Banshee.PlayerMigration \
        Banshee.PlayQueue \
-       Banshee.MeeGo \
+       Banshee.MediaPanel \
        Banshee.Podcasting \
        Banshee.Sample \
        Banshee.SoundMenu \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]