Merge lp:~mathijshenquet/docky/date-enhance into lp:docky

[Mathijs Henquet]

DateTime Docklet now has better 24 hour and internationalized functionality:
 * Removed the 24 hour analog clock
 * Resized the date and time in 24 digital
 * Added a Day First gconf option to show the day of the month before the month, the users date format is probed on the first run to determain what format should b eused

Fixes Bug #593592

[lp:~mathijshenquet/docky/date-enhance]

1646. By Mathijs Henquet on 2010-09-29

Removed ui option for day first, the ShortDateFormat is now checked instead

[Rico Tzschichholz (ricotz)]

Please update the proposal and remove all 24-hour-analog clock related stuff (like the obsolete theme files)

review: Needs Fixing

[Mathijs Henquet (mathijshenquet)]

I'm on holliday right now but i'll take a look at it next monday. Thanks for taking a look at it.

Mathijs Henquet

Op 29 dec. 2010 om 21:06 heeft Rico Tzschichholz <email address hidden> het volgende geschreven:

> Review: Needs Fixing
> Please update the proposal and remove all 24-hour-analog clock related stuff (like the obsolete theme files)
> --
> https://code.launchpad.net/~mathijshenquet/docky/date-enhance/+merge/36607
> You are the owner of lp:~mathijshenquet/docky/date-enhance.

Unmerged revisions

1646. By Mathijs Henquet on 2010-09-29

Removed ui option for day first, the ShortDateFormat is now checked instead

1645. By Mathijs Henquet on 2010-09-24

DateTime Docklet now has better 24 hour and internationalized functionality:
 * Removed the 24 hour analog clock
 * Resized the date and time in 24 digital
 * Added a Day First option to show the day of the month before the month

=== modified file 'StandardPlugins/Clock/src/ClockDockItem.cs'
--- StandardPlugins/Clock/src/ClockDockItem.cs	2010-08-03 02:44:47 +0000
+++ StandardPlugins/Clock/src/ClockDockItem.cs	2010-09-29 07:48:40 +0000
@@ -79,6 +79,17 @@
 				prefs.Set<bool> ("ShowDate", value);
 			}
 		}
+
+        bool day_first = prefs.Get<bool> ("DayFirst", CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern.StartsWith("d"));
+		public bool DayFirst {
+			get { return day_first; }
+			set {
+				if (day_first == value)
+					return;
+				day_first = value;
+				prefs.Set<bool> ("DayFirst", value);
+			}
+		}
 		
 		string current_theme = prefs.Get<string> ("ClockTheme", "default");
 		public string CurrentTheme {
@@ -88,7 +99,6 @@
 					return;
 				current_theme = value;
 				prefs.Set<string> ("ClockTheme", value);
-				ShowMilitary = value.EndsWith ("-24");
 				CheckForThemes ();
 			}
 		}
@@ -115,30 +125,16 @@
 			if (ShowDigital)
 				return;
 			
-			// check if we have a 24hr theme available
-			bool has24hourtheme = false;
-			
-			if (CurrentTheme.EndsWith ("-24") || Directory.Exists (ThemePath + "-24"))
-				has24hourtheme = true;
-			
-			// check if we have a 12hr theme available
-			bool has12hourtheme = false;
+			// check if we have the theme available
+			bool hasTheme = false;
 			
 			if (!CurrentTheme.EndsWith ("-24") || Directory.Exists (ThemePath.Substring (0, ThemePath.Length - 3)))
-				has12hourtheme = true;
+				hasTheme = true;
 			
-			// make sure military and the theme match
-			if (ShowMilitary) {
-				if (!has24hourtheme)
-					ShowMilitary = false;
-				else if (!CurrentTheme.EndsWith ("-24"))
-					CurrentTheme = CurrentTheme + "-24";
-			} else {
-				if (!has12hourtheme)
-					ShowMilitary = true;
-				else if (CurrentTheme.EndsWith ("-24"))
-					CurrentTheme = CurrentTheme.Substring (0, CurrentTheme.Length - 3);
-			}
+			if (!hasTheme)
+				ShowMilitary = true;
+			else if (CurrentTheme.EndsWith ("-24"))
+				CurrentTheme = CurrentTheme.Substring (0, CurrentTheme.Length - 3);
 		}
 		
 		public ClockDockItem ()
@@ -190,11 +186,20 @@
 
 		protected override void PaintIconSurface (DockySurface surface)
 		{
-			if (ShowMilitary)
-				HoverText = DateTime.Now.ToString ("ddd, MMM dd HH:mm");
+            string timeFormat = "";
+
+            if (DayFirst)
+                timeFormat += "ddd dd MMM, ";
+            else
+                timeFormat += "ddd, MMM dd ";
+
+            if (ShowMilitary)
+                timeFormat += "HH:mm";
 			else
-				HoverText = DateTime.Now.ToString ("ddd, MMM dd h:mm tt");
-			
+                timeFormat += "h:mm tt";			
+	
+            HoverText = DateTime.Now.ToString (timeFormat);
+                
 			if (!ShowDigital)
 				MakeAnalogIcon (surface.Context, Math.Min (surface.Width, surface.Height));
 			else if (Square)
@@ -208,10 +213,10 @@
 			Context cr = surface.Context;
 			
 			// useful sizes
-			int timeSize = surface.Height / 4;
-			int dateSize = surface.Height / 5;
+			int timeSize = ShowMilitary ? surface.Height / 3 : surface.Height / 4;
+			int dateSize = ShowMilitary ? surface.Height / 4 : surface.Height / 5;
 			int ampmSize = surface.Height / 5;
-			int spacing = timeSize / 2;
+			int spacing = surface.Height / 8;
 			int center = surface.Height / 2;
 			
 			// shared by all text
@@ -221,7 +226,6 @@
 				layout.Ellipsize = Pango.EllipsizeMode.None;
 				layout.Width = Pango.Units.FromPixels (surface.Width);
 				
-				
 				// draw the time, outlined
 				layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (timeSize);
 				
@@ -233,7 +237,7 @@
 				Pango.Rectangle inkRect, logicalRect;
 				layout.GetPixelExtents (out inkRect, out logicalRect);
 				
-				int timeYOffset = ShowMilitary ? timeSize : timeSize / 2;
+				int timeYOffset = ShowMilitary ? timeSize / 4 * 3 : timeSize / 2;
 				int timeXOffset = (surface.Width - inkRect.Width) / 2;
 				if (ShowDate)
 					cr.MoveTo (timeXOffset, timeYOffset);
@@ -251,7 +255,7 @@
 				if (ShowDate) {
 					layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (dateSize);
 					
-					layout.SetText (DateTime.Now.ToString ("MMM dd"));
+					layout.SetText (DateTime.Now.ToString (DayFirst ? "dd MMM" : "MMM dd"));
 					layout.GetPixelExtents (out inkRect, out logicalRect);
 					cr.MoveTo ((surface.Width - inkRect.Width) / 2, surface.Height - spacing - dateSize);
 					
@@ -335,7 +339,7 @@
 				if (ShowDate) {
 					layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (dateSize);
 					
-					layout.SetText (DateTime.Now.ToString ("MMM dd"));
+					layout.SetText (DateTime.Now.ToString (DayFirst ? "dd MMM" : "MMM dd"));
 					layout.GetPixelExtents (out inkRect, out logicalRect);
 					cr.MoveTo ((surface.Width - inkRect.Width) / 2, surface.Height - spacing - dateSize);