Merge lp:~achmyr/docky/large-clock into lp:docky

[Alex Chmyr]

This is minor update to Clock Docklet to make it full-sized. For this change, there was added:
- 1 new option to menu - "Large Digital Clock" - digits occupying whole Docky height
- Added seconds and changed appropriate timer

Unmerged revisions

1810. By Alex Chmyr on 2011-06-04

Added Large clock

=== modified file 'StandardPlugins/Clock/src/ClockDockItem.cs'
--- StandardPlugins/Clock/src/ClockDockItem.cs	2011-03-13 16:47:29 +0000
+++ StandardPlugins/Clock/src/ClockDockItem.cs	2011-06-04 03:03:29 +0000
@@ -69,6 +69,19 @@
 			}
 		}
 		
+		bool large_digital = prefs.Get<bool> ("ShowLargeDigital", false);
+		bool ShowLargeDigital {
+			get { return large_digital; }
+			set {
+				if (large_digital == value)
+					return;
+				large_digital = value;
+				prefs.Set<bool> ("ShowLargeDigital", value);
+				CheckForThemes ();
+				ScalableRendering = !large_digital;
+			}
+		}
+		
 		bool show_date = prefs.Get<bool> ("ShowDate", false);
 		bool ShowDate {
 			get { return show_date; }
@@ -148,11 +161,20 @@
 			painter = new CalendarPainter ();
 			CheckForThemes ();
 			
-			timer = GLib.Timeout.Add (1000, ClockUpdateTimer);
+			timer = GLib.Timeout.Add (100, ClockUpdateTimer);
 		}
 		
 		public override bool Square {
-			get { return !IsSmall || !ShowDigital; }
+			get { return !(IsSmall && ShowDigital) && !ShowLargeDigital; }
+		}
+		
+		int LargeClockSize (int size){
+			int resultSize = (int)(4.5 * size) + 5;
+			if(ShowDate) 
+				resultSize += 6 * size; 
+			if(!ShowMilitary) 
+				resultSize += (int)(1.5 * size);
+			return resultSize;
 		}
 		
 		public override string UniqueID ()
@@ -162,7 +184,7 @@
 		
 		bool ClockUpdateTimer ()
 		{
-			if (minute != DateTime.UtcNow.Minute) {
+			if (ShowLargeDigital || minute != DateTime.UtcNow.Minute) {
 				QueueRedraw ();
 				minute = DateTime.UtcNow.Minute;
 			}
@@ -184,7 +206,9 @@
 		{
 			if (Square)
 				return base.CreateIconBuffer (model, size);
-			else
+			else if(ShowLargeDigital) 
+				return new DockySurface (LargeClockSize(size), size, model);
+			else	
 				return new DockySurface (2 * size, size, model);
 		}
 
@@ -197,9 +221,11 @@
 			
 			if (!ShowDigital)
 				MakeAnalogIcon (surface.Context, Math.Min (surface.Width, surface.Height));
-			else if (Square)
+			else if (ShowLargeDigital)
+				MakeLargeDigitalIcon(surface);
+			else if (Square)	
 				MakeSquareDigitalIcon (surface);
-			else
+			else 
 				MakeRectangularDigitalIcon (surface);
 		}
 		
@@ -305,7 +331,7 @@
 				layout.FontDescription = new Gtk.Style().FontDescription;
 				layout.FontDescription.Weight = Pango.Weight.Bold;
 				layout.Ellipsize = Pango.EllipsizeMode.None;
-				layout.Width = Pango.Units.FromPixels (surface.Width);
+				layout.Width =  (surface.Width);
 				
 				
 				// draw the time, outlined
@@ -370,6 +396,54 @@
 			}
 		}
 		
+		void MakeLargeDigitalIcon (DockySurface surface)
+		{
+			Context cr = surface.Context;
+			
+			// shared by all text
+			using (Pango.Layout layout = DockServices.Drawing.ThemedPangoLayout ()) {
+				layout.FontDescription = new Gtk.Style().FontDescription;
+				layout.FontDescription.Weight = Pango.Weight.Bold;
+				layout.Ellipsize = Pango.EllipsizeMode.None;
+				layout.Width = surface.Width;
+				layout.SingleParagraphMode =  true;
+				
+				// draw the time, outlined
+				layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (surface.Height - 2);
+
+				int xDateOffset = 5;
+				if(ShowDate) {
+					drawText(cr, layout, xDateOffset, 0, DateTime.Now.ToString("ddd,")); 
+					xDateOffset += (int)(2.5 * surface.Height);
+					drawText(cr, layout, xDateOffset, 0, DateTime.Now.ToString("MMM")); 
+					xDateOffset += (int)(1.8 * surface.Height);
+					drawText(cr, layout, xDateOffset, 0, DateTime.Now.ToString("dd")); 
+					xDateOffset += (int)(1.5 * surface.Height);
+				}
+				
+				if(ShowMilitary) { 
+					drawText(cr, layout, xDateOffset, 0, DateTime.Now.ToString("HH:mm:ss"));					
+				} else {
+					drawText(cr, layout, xDateOffset, 0, DateTime.Now.ToString("h:mm:ss"));
+				    drawText(cr, layout, xDateOffset + (int)(4.5 * surface.Height), 0, DateTime.Now.ToString("tt"));
+				} 
+				layout.FontDescription.Dispose ();
+				layout.Context.Dispose ();
+			}
+		}
+		
+		void drawText(Context cr, Pango.Layout layout, int x, int y, string text) {
+			layout.SetMarkup(text);
+			cr.MoveTo (x, y);
+			Pango.CairoHelper.LayoutPath (cr, layout);
+			cr.LineWidth = 2;
+			cr.Color = new Cairo.Color (0, 0, 0, 0.5);
+			cr.StrokePreserve ();
+			cr.Color = new Cairo.Color (1, 1, 1, 0.8);
+			cr.Fill ();
+			
+		}
+		
 		void MakeAnalogIcon (Context cr, int size)
 		{
 			int center = size / 2;
@@ -409,7 +483,7 @@
 		
 		protected override ClickAnimation OnClicked (uint button, Gdk.ModifierType mod, double xPercent, double yPercent)
 		{
-			if (button == 1)
+			if (button == 1 && !ShowLargeDigital)
 				ShowPainter (painter);
 			return ClickAnimation.None;
 		}
@@ -428,12 +502,20 @@
 		protected override MenuList OnGetMenuItems ()
 		{
 			MenuList list = base.OnGetMenuItems ();
+			
 			list[MenuListContainer.Actions].Add (new IconMenuItem (Catalog.GetString ("Di_gital Clock"), ShowDigital ? "gtk-apply" : "gtk-remove", (o, a) =>
 			{
 				ShowDigital = !ShowDigital;
 				QueueRedraw ();
 			}));
-			
+			if(ShowDigital) {
+			list[MenuListContainer.Actions].Add (new IconMenuItem (Catalog.GetString ("L_arge Digital Clock"), ShowLargeDigital ? "gtk-apply" : "gtk-remove", (o, a) =>
+			{
+				ShowLargeDigital = !ShowLargeDigital;
+				QueueRedraw ();
+			}));
+			}
+
 			list[MenuListContainer.Actions].Add (new IconMenuItem (Catalog.GetString ("24-Hour _Clock"), ShowMilitary ? "gtk-apply" : "gtk-remove", (o, a) =>
 			{
 				ShowMilitary = !ShowMilitary;