banshee r3430 - in trunk/banshee: . src/Backends/Banshee.Gnome/Banshee.GnomeBackend src/Clients/Nereid/Nereid src/Core/Banshee.ThickClient/Banshee.Gui src/Core/Banshee.ThickClient/Resources src/Core/Banshee.Widgets/Banshee.Widgets src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio src/Libraries/Lastfm.Gui/Lastfm.Gui src/Libraries/Lastfm/Lastfm
- From: abock svn gnome org
- To: svn-commits-list gnome org
- Subject: banshee r3430 - in trunk/banshee: . src/Backends/Banshee.Gnome/Banshee.GnomeBackend src/Clients/Nereid/Nereid src/Core/Banshee.ThickClient/Banshee.Gui src/Core/Banshee.ThickClient/Resources src/Core/Banshee.Widgets/Banshee.Widgets src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio src/Libraries/Lastfm.Gui/Lastfm.Gui src/Libraries/Lastfm/Lastfm
- Date: Wed, 12 Mar 2008 21:42:07 +0000 (GMT)
Author: abock
Date: Wed Mar 12 21:42:07 2008
New Revision: 3430
URL: http://svn.gnome.org/viewvc/banshee?rev=3430&view=rev
Log:
2008-03-12 Aaron Bockover <abock gnome org>
* src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GnomeService.cs:
Fixed the null check, actually works now
* src/Clients/Nereid/Nereid/ViewContainer.cs: Add a 'Help' menu item
to the bottom of the search entry filter menu
* src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:
* src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml:
Add a menu item that takes the user to the documentation on the Wiki
for query/search syntaxt and examples
* src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs: Expose the Menu
* src/Libraries/Lastfm/Lastfm/Account.cs:
* src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:
* src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:
* src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:
Hook up the web browser stuff again so account links work
* src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs: Add the
account signup button back
* src/Libraries/Lastfm/Lastfm/Browser.cs: Fixed up to work again
Modified:
trunk/banshee/ChangeLog
trunk/banshee/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GnomeService.cs
trunk/banshee/src/Clients/Nereid/Nereid/ViewContainer.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs
trunk/banshee/src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml
trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs
trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs
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/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs
trunk/banshee/src/Libraries/Lastfm/Lastfm/Account.cs
trunk/banshee/src/Libraries/Lastfm/Lastfm/Browser.cs
Modified: trunk/banshee/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GnomeService.cs
==============================================================================
--- trunk/banshee/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GnomeService.cs (original)
+++ trunk/banshee/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GnomeService.cs Wed Mar 12 21:42:07 2008
@@ -41,7 +41,7 @@
public void Initialize ()
{
- if (Browser.OpenHandler != null) {
+ if (Browser.OpenHandler == null) {
Browser.OpenHandler = OpenUrl;
}
}
@@ -55,7 +55,8 @@
private bool OpenUrl (string url)
{
- return Gnome.Url.Show (url);;
+ Hyena.Log.Debug ("Opening URL via gnome-open", url);
+ return Gnome.Url.Show (url);
}
string IService.ServiceName {
Modified: trunk/banshee/src/Clients/Nereid/Nereid/ViewContainer.cs
==============================================================================
--- trunk/banshee/src/Clients/Nereid/Nereid/ViewContainer.cs (original)
+++ trunk/banshee/src/Clients/Nereid/Nereid/ViewContainer.cs Wed Mar 12 21:42:07 2008
@@ -35,6 +35,9 @@
using Banshee.Sources.Gui;
using Banshee.Collection;
+using Banshee.Gui;
+using Banshee.ServiceStack;
+
namespace Nereid
{
@@ -72,6 +75,21 @@
header.PackStart (search_label, false, false, 5);
header.PackStart (search_entry, false, false, 0);
+ InterfaceActionService uia = ServiceManager.Get<InterfaceActionService> ();
+ if (uia != null) {
+ Gtk.Action action = uia.GlobalActions["WikiSearchHelpAction"];
+ if (action != null) {
+ MenuItem item = new SeparatorMenuItem ();
+ item.Show ();
+ search_entry.Menu.Append (item);
+
+ item = new ImageMenuItem (Stock.Help, null);
+ item.Activated += delegate { action.Activate (); };
+ item.Show ();
+ search_entry.Menu.Append (item);
+ }
+ }
+
header.ShowAll ();
search_entry.Show ();
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs Wed Mar 12 21:42:07 2008
@@ -94,6 +94,12 @@
Banshee.Web.Browser.Open ("http://banshee-project.org/Guide";);
}),
+ new ActionEntry ("WikiSearchHelpAction", null,
+ Catalog.GetString ("Advanced Collection Searching"), null,
+ Catalog.GetString ("Learn advanced ways to search your media collection"), delegate {
+ Banshee.Web.Browser.Open ("http://banshee-project.org/OnePointEx/Search";);
+ }),
+
new ActionEntry ("WikiAction", null,
Catalog.GetString ("Banshee _Home Page"), null,
Catalog.GetString ("Visit the Banshee Home Page"), delegate {
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml Wed Mar 12 21:42:07 2008
@@ -87,6 +87,7 @@
<menu name="HelpMenu" action="HelpMenuAction">
<menu name="WebMenu" action="WebMenuAction">
<menuitem name="WikiGuide" action="WikiGuideAction"/>
+ <menuitem name="WikiSearchHelp" action="WikiSearchHelpAction"/>
<separator/>
<menuitem name="Wiki" action="WikiAction"/>
<menuitem name="WikiDeveloper" action="WikiDeveloperAction"/>
Modified: trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs (original)
+++ trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs Wed Mar 12 21:42:07 2008
@@ -64,6 +64,10 @@
add { filter_changed += value; }
remove { filter_changed -= value; }
}
+
+ public Menu Menu {
+ get { return menu; }
+ }
public SearchEntry()
{
Modified: trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs (original)
+++ trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs Wed Mar 12 21:42:07 2008
@@ -51,6 +51,8 @@
using Banshee.Collection;
+using Browser = Lastfm.Browser;
+
namespace Banshee.Lastfm.Audioscrobbler
{
public class AudioscrobblerService : IExtensionService, IDisposable
@@ -84,6 +86,8 @@
LastfmCore.UserAgent = Banshee.Web.Browser.UserAgent;
}
+ Browser.Open = Banshee.Web.Browser.Open;
+
queue = new Queue ();
LastfmCore.AudioscrobblerQueue = queue;
connection = LastfmCore.Audioscrobbler;
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 Wed Mar 12 21:42:07 2008
@@ -45,7 +45,8 @@
using Banshee.ServiceStack;
using Banshee.Gui;
using Banshee.Collection;
-using Banshee.Web;
+
+using Browser = Banshee.Web.Browser;
namespace Banshee.Lastfm.Radio
{
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 Wed Mar 12 21:42:07 2008
@@ -46,6 +46,8 @@
using Banshee.Sources.Gui;
+using Browser = Lastfm.Browser;
+
namespace Banshee.Lastfm.Radio
{
public class LastfmSource : Source, IDisposable
@@ -82,6 +84,8 @@
LastfmCore.UserAgent = Banshee.Web.Browser.UserAgent;
}
+ Browser.Open = Banshee.Web.Browser.Open;
+
connection = LastfmCore.Radio;
connection.UpdateNetworkState (NetworkDetect.Instance.Connected);
NetworkDetect.Instance.StateChanged += delegate (object o, NetworkStateChangedArgs args) {
Modified: trunk/banshee/src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs
==============================================================================
--- trunk/banshee/src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs (original)
+++ trunk/banshee/src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs Wed Mar 12 21:42:07 2008
@@ -84,6 +84,7 @@
vbox.PackStart (message, false, false, 0);
login_form = new AccountLoginForm (account);
+ login_form.AddSignUpButton ();
login_form.Show ();
vbox.PackStart (login_form, true, true, 0);
Modified: trunk/banshee/src/Libraries/Lastfm/Lastfm/Account.cs
==============================================================================
--- trunk/banshee/src/Libraries/Lastfm/Lastfm/Account.cs (original)
+++ trunk/banshee/src/Libraries/Lastfm/Lastfm/Account.cs Wed Mar 12 21:42:07 2008
@@ -68,17 +68,17 @@
public void SignUp ()
{
- //Browser.Open ("http://www.last.fm/join";);
+ Browser.Open ("http://www.last.fm/join";);
}
public void VisitUserProfile (string username)
{
- //Browser.Open (String.Format ("http://last.fm/user/{0}";, username));
+ Browser.Open (String.Format ("http://last.fm/user/{0}";, username));
}
public void VisitHomePage ()
{
- //Browser.Open ("http://last.fm/";);
+ Browser.Open ("http://last.fm/";);
}
public virtual void Save ()
Modified: trunk/banshee/src/Libraries/Lastfm/Lastfm/Browser.cs
==============================================================================
--- trunk/banshee/src/Libraries/Lastfm/Lastfm/Browser.cs (original)
+++ trunk/banshee/src/Libraries/Lastfm/Lastfm/Browser.cs Wed Mar 12 21:42:07 2008
@@ -30,23 +30,19 @@
namespace Lastfm
{
- /*public delegate bool UriOpenHandler (string uri);
-
public static class Browser
{
- private static UriOpenHandler open_handler;
+ public delegate bool OpenHandler (string uri);
- public static UriOpenHandler Open {
- get {
- if (open_handler == null) {
- open_handler = new UriOpenHandler (Gnome.Url.Show);
- }
-
- return open_handler;
- }
-
+ private static OpenHandler open_handler = DefaultOpen;
+ public static OpenHandler Open {
+ get { return open_handler; }
set { open_handler = value; }
- }
+ }
+
+ private static bool DefaultOpen (string uri)
+ {
+ return false;
+ }
}
- */
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
