banshee r5063 - in trunk/banshee: . src/Clients/Halie/Halie src/Clients/Muinshee/Muinshee src/Clients/Nereid/Nereid src/Core/Banshee.ThickClient/Banshee.Gui

[gburt svn gnome org]

Author: gburt
Date: Wed Feb 25 18:31:27 2009
New Revision: 5063
URL: http://svn.gnome.org/viewvc/banshee?rev=5063&view=rev

Log:
2009-02-25  Gabriel Burt  <gabriel burt gmail com>

	* src/Clients/Halie/Halie/Client.cs: Fix bug where the --hide command
	would call .Hide () on the window, but then it would get Presented which
	Shows it (BGO #540172)

	* src/Clients/Muinshee/Muinshee/PlayerInterface.cs:
	* src/Clients/Nereid/Nereid/PlayerInterface.cs:
	* src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs: Add
	protected InitialShowPresent method that subclasses can use when they are
	ready to be shown/presented, but that respects the command line options.

Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Clients/Halie/Halie/Client.cs
   trunk/banshee/src/Clients/Muinshee/Muinshee/PlayerInterface.cs
   trunk/banshee/src/Clients/Nereid/Nereid/PlayerInterface.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs

Modified: trunk/banshee/src/Clients/Halie/Halie/Client.cs
==============================================================================
--- trunk/banshee/src/Clients/Halie/Halie/Client.cs	(original)
+++ trunk/banshee/src/Clients/Halie/Halie/Client.cs	Wed Feb 25 18:31:27 2009
@@ -89,7 +89,10 @@
                 switch (arg.Key) {
                     case "show":
                     case "present": present = true; break;
-                    case "hide": window.Hide (); break;
+                    case "hide":
+                        present = false;
+                        window.Hide ();
+                        break;
                 }
             }
             

Modified: trunk/banshee/src/Clients/Muinshee/Muinshee/PlayerInterface.cs
==============================================================================
--- trunk/banshee/src/Clients/Muinshee/Muinshee/PlayerInterface.cs	(original)
+++ trunk/banshee/src/Clients/Muinshee/Muinshee/PlayerInterface.cs	Wed Feb 25 18:31:27 2009
@@ -108,7 +108,7 @@
 
                 track_view.SetModel (play_queue.TrackModel);
 
-                Show ();
+                InitialShowPresent ();
             }
         }
 

Modified: trunk/banshee/src/Clients/Nereid/Nereid/PlayerInterface.cs
==============================================================================
--- trunk/banshee/src/Clients/Nereid/Nereid/PlayerInterface.cs	(original)
+++ trunk/banshee/src/Clients/Nereid/Nereid/PlayerInterface.cs	Wed Feb 25 18:31:27 2009
@@ -86,7 +86,7 @@
             
             composite_view.TrackView.HasFocus = true;
             
-            Show ();
+            InitialShowPresent ();
         }
         
 #region System Overrides 

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs	Wed Feb 25 18:31:27 2009
@@ -30,6 +30,7 @@
 using Gtk;
 using Mono.Unix;
 
+using Banshee.Base;
 using Banshee.ServiceStack;
 using Banshee.MediaEngine;
 using Banshee.Collection;
@@ -74,6 +75,20 @@
             InitializeWindow ();
         }
 
+		protected void InitialShowPresent ()
+		{
+			bool hide = ApplicationContext.CommandLine.Contains ("hide");
+			bool present = !hide && !ApplicationContext.CommandLine.Contains ("no-present");
+
+			if (!hide) {
+				Show ();
+			}
+
+			if (present) {
+				Present ();
+			}
+		}
+
         public virtual Box ViewContainer { get { return null; } }
         
         public void ToggleVisibility ()