banshee r3313 - in trunk/banshee: . src/Core/Banshee.ThickClient/Banshee.Gui src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler

[ahixon svn gnome org]

Author: ahixon
Date: Sat Feb 23 23:09:52 2008
New Revision: 3313
URL: http://svn.gnome.org/viewvc/banshee?rev=3313&view=rev

Log:
2008-02-23  Alexander Hixon  <hixon alexander mediati org>
    * src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:
      Remove a few bits of commented code. Added Stock.Properties icon for the Configure
      menu item.
    
    * src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs: Added Ctrl+E keyboard
      shortcut for equalizer window.
    
    * src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs: Added Stock.Preferences
      icon for Preferences menu item.
    
    * src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs: Added E keyboard shortcut
      for track editor dialog.


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs
   trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs

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	Sat Feb 23 23:09:52 2008
@@ -69,7 +69,7 @@
                 new ActionEntry ("EditMenuAction", null, 
                     Catalog.GetString("_Edit"), null, null, null),
 
-                new ActionEntry ("PreferencesAction", null,
+                new ActionEntry ("PreferencesAction", Stock.Preferences,
                     Catalog.GetString ("_Preferences"), null,
                     Catalog.GetString ("Modify your personal preferences"), OnPreferences),
 

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs	Sat Feb 23 23:09:52 2008
@@ -92,7 +92,7 @@
                     Catalog.GetString("Unselect all tracks"), OnSelectNone),
 
                 new ActionEntry ("TrackPropertiesAction", Stock.Edit,
-                    Catalog.GetString ("_Edit Track Metadata"), null,
+                    Catalog.GetString ("_Edit Track Metadata"), "E",
                     Catalog.GetString ("Edit metadata on selected tracks"), OnTrackProperties),
 
                 new ActionEntry ("AddToPlaylistAction", null,

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs	Sat Feb 23 23:09:52 2008
@@ -48,7 +48,7 @@
                     Catalog.GetString ("_View"), null, null, null),
                     
                 new ActionEntry ("ShowEqualizerAction", null,
-                   Catalog.GetString ("_Equalizer"), null,
+                   Catalog.GetString ("_Equalizer"), "<control>E",
                    Catalog.GetString ("View the graphical equalizer"), OnShowEqualizer)
             });
             

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	Sat Feb 23 23:09:52 2008
@@ -95,10 +95,6 @@
             
             action_service = ServiceManager.Get<InterfaceActionService> ("InterfaceActionService");
             InterfaceInitialize ();
-        
-            /*if (!connection.Started && account.UserName != null && account.CryptedPassword != null) {
-                connection.Connect ();
-            }*/
         }
         
         public void InterfaceInitialize ()
@@ -114,7 +110,7 @@
                     Catalog.GetString ("Visit _user profile page"), null,
                     Catalog.GetString ("Visit your Audioscrobbler profile page"), OnVisitOwnProfile),
                 
-                new ActionEntry ("AudioscrobblerConfigureAction", null,
+                new ActionEntry ("AudioscrobblerConfigureAction", Stock.Properties,
                     Catalog.GetString ("_Configure..."), null,
                     Catalog.GetString ("Configure the Audioscrobbler plugin"), OnConfigurePlugin)
             });
@@ -190,7 +186,6 @@
                 case PlayerEngineEvent.StartOfStream:
                     // Queue the previous track in case of a skip
                     st.Stop ();
-                    //Log.DebugFormat ("Attempting to queue track (from start-o-stream): {0}", last_track);
                     Queue (last_track);
                 
                     st.Reset (); st.Start ();
@@ -210,7 +205,6 @@
                 case PlayerEngineEvent.EndOfStream:
                     st.Stop ();
                     Queue (ServiceManager.PlayerEngine.CurrentTrack);
-                    //Log.DebugFormat ("Attempting to queue track (from end-o-stream): {0}", ServiceManager.PlayerEngine.CurrentTrack);
                     //queued = true;
                     break;
             }