Merge lp:~nmurphy/do-plugins/batteryFullInvisible into lp:do-plugins/docklets

[Niall Murphy]

[Niall Murphy (nmurphy)]

The battery docklet checks now if it is full enough and hides its self if over 98%.
Its a bit hacky, if the person looks in the "active docklets" bit of the options they see the docklet as inactive.
When the battery is below 98% the docklet reactivates itself.

[Robert Dyer (psybers)]

I tried out a variation of this. It's a no-go. We will need to implement a way for docklets to be 'active' but hidden for this.

Part of the problem is that if you manually toggle the battery docklet 'off', it can turn itself back on! That just can't happen!

review: Disapprove

Unmerged revisions

53. By Niall Murphy on 2009-07-04

modified to hide the battery notifyier when it is full

=== modified file 'BatteryMonitor/src/BatteryMonitor.cs'
--- BatteryMonitor/src/BatteryMonitor.cs	2009-06-03 15:40:26 +0000
+++ BatteryMonitor/src/BatteryMonitor.cs	2009-07-04 09:02:56 +0000
@@ -30,6 +30,7 @@
 using Do.Interface;
 
 using Docky.Interface;
+using Docky.Core;
 
 namespace BatteryMonitor
 {
@@ -162,20 +163,42 @@
 			CairoHelper.SetSourcePixbuf (cr, pbuf, x + ((pbuf.Width - size) / 2), y + ((pbuf.Height - size) / 2));
 			cr.Paint ();
 		}
-		
+
+		bool IsVisible ()
+		{
+			bool visible = false;
+			foreach (AbstractDockletItem visibleDocklet in DockServices.DockletService.ActiveDocklets)
+			{
+				if (visibleDocklet.Name == "Battery Monitor"){
+					visible = true;
+					break;
+				}
+			}
+			return visible;
+		}
+
 		protected override Surface MakeIconSurface (Cairo.Surface similar, int size)
 		{
 			Surface sr = similar.CreateSimilar (similar.Content, size, size);
-			using (Context cr = new Context (sr)) {
-				RenderSvgOnContext (cr, BottomSvg + "@" + GetType ().Assembly.FullName, size, 0, 0);
-				if (RoundedCapacity > 0)
-					RenderSvgOnContext (cr, string.Format (InsideSvg, RoundedCapacity) + "@" + GetType ().Assembly.FullName, size, 0, 0);
-				RenderSvgOnContext (cr, TopSvg + "@" + GetType ().Assembly.FullName, size, 0, 0);
-				if (!Services.System.GetOnBatteryPower ()) {
-					RenderSvgOnContext (cr, PluggedSvg + "@" + GetType ().Assembly.FullName, size, 0, 0);
+			if (RoundedCapacity >= 97){
+				if (IsVisible())
+					DockServices.DockletService.ToggleDocklet (this); //toggle invisible
+			}
+			else
+			{
+				if (!IsVisible())
+					DockServices.DockletService.ToggleDocklet (this); //toggle visible
+				
+				using (Context cr = new Context (sr)) {
+					RenderSvgOnContext (cr, BottomSvg + "@" + GetType ().Assembly.FullName, size, 0, 0);
+					if (RoundedCapacity > 0)
+						RenderSvgOnContext (cr, string.Format (InsideSvg, RoundedCapacity) + "@" + GetType ().Assembly.FullName, size, 0, 0);
+					RenderSvgOnContext (cr, TopSvg + "@" + GetType ().Assembly.FullName, size, 0, 0);
+					if (!Services.System.GetOnBatteryPower ()) 
+						RenderSvgOnContext (cr, PluggedSvg + "@" + GetType ().Assembly.FullName, size, 0, 0);
+					
 				}
 			}
-			
 			return sr;
 		}