[f-spot] move from Gnome.DateEdit to FSpot.Widgets.DateEdit

[Stephane Delcroix <sdelcroix src gnome org>]

commit f521b76a11949e597f75c63185b0ffbf8f75be8d
Author: Stephane Delcroix <stephane delcroix org>
Date:   Mon May 18 17:01:28 2009 +0200

    move from Gnome.DateEdit to FSpot.Widgets.DateEdit
---
 src/UI.Dialog/DateRangeDialog.cs    |   27 ++++++++++++++++++---------
 src/UI.Dialog/ui/DateRangeDialog.ui |   23 ++++++++++-------------
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/src/UI.Dialog/DateRangeDialog.cs b/src/UI.Dialog/DateRangeDialog.cs
index 3a69e17..60b2c83 100644
--- a/src/UI.Dialog/DateRangeDialog.cs
+++ b/src/UI.Dialog/DateRangeDialog.cs
@@ -13,8 +13,8 @@
 using Gtk;
 using System;
 using Mono.Unix;
-using FSpot;
 using FSpot.Query;
+using FSpot.Widgets;
 
 namespace FSpot.UI.Dialog
 {
@@ -23,10 +23,13 @@ namespace FSpot.UI.Dialog
 		Gtk.Window parent_window;
 
 		[Builder.Object] Button ok_button;
-		[Builder.Object] Gnome.DateEdit start_dateedit;
-		[Builder.Object] Gnome.DateEdit end_dateedit;
+		[Builder.Object] Frame startframe;
+		[Builder.Object] Frame endframe;
 		[Builder.Object] ComboBox period_combobox;
 
+		DateEdit start_dateedit;
+		DateEdit end_dateedit;
+
 		TreeStore rangestore;
 
 		static string [] ranges = {
@@ -52,6 +55,12 @@ namespace FSpot.UI.Dialog
 			this.parent_window = parent_window;
 			TransientFor = parent_window;
 			DefaultResponse = ResponseType.Ok;
+
+			(startframe.Child as Bin).Child = start_dateedit = new DateEdit ();
+			start_dateedit.Show ();
+			(endframe.Child as Bin).Child = end_dateedit = new DateEdit ();
+			end_dateedit.Show ();
+
 			var cell_renderer = new CellRendererText ();
 
 			// Build the combo box with years and month names
@@ -67,8 +76,8 @@ namespace FSpot.UI.Dialog
            	 	period_combobox.Active = System.Array.IndexOf(ranges, "last7days"); // Default to Last 7 days
 
 			if (query_range != null) {
-				start_dateedit.Time = query_range.Start;
-				end_dateedit.Time = query_range.End;
+				start_dateedit.DateTimeOffset = query_range.Start;
+				end_dateedit.DateTimeOffset = query_range.End;
 			}
 
 		}
@@ -202,8 +211,8 @@ namespace FSpot.UI.Dialog
 				clear = true;
 				break;
 			case "customizedrange":
-				startdate = start_dateedit.Time;
-				enddate = end_dateedit.Time;
+				startdate = start_dateedit.DateTimeOffset.Date;
+				enddate = end_dateedit.DateTimeOffset.Date;
 				break;
 			default:
 				clear = true;
@@ -238,8 +247,8 @@ namespace FSpot.UI.Dialog
 
 			DateRange range = QueryRange (period_combobox.Active);
 			if (range != null) {
-				start_dateedit.Time = range.Start;
-				end_dateedit.Time = range.End;
+				start_dateedit.DateTimeOffset = range.Start;
+				end_dateedit.DateTimeOffset = range.End;
 			}
 			
 			start_dateedit.DateChanged += HandleDateEditChanged;
diff --git a/src/UI.Dialog/ui/DateRangeDialog.ui b/src/UI.Dialog/ui/DateRangeDialog.ui
index 440f6fd..0656ae1 100644
--- a/src/UI.Dialog/ui/DateRangeDialog.ui
+++ b/src/UI.Dialog/ui/DateRangeDialog.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <interface>
   <requires lib="gtk+" version="2.14"/>
-  <!-- interface-requires gnome 0.0 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkDialog" id="date_range_dialog">
     <property name="visible">True</property>
@@ -63,19 +62,16 @@
               </packing>
             </child>
             <child>
-              <object class="GtkFrame" id="frame3">
+              <object class="GtkFrame" id="startframe">
                 <property name="visible">True</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment5">
+                  <object class="GtkAlignment" id="alignment4">
                     <property name="visible">True</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <object class="GnomeDateEdit" id="start_dateedit">
-                        <property name="visible">True</property>
-                        <property name="dateedit_flags">GNOME_DATE_EDIT_24_HR</property>
-                      </object>
+                      <placeholder/>
                     </child>
                   </object>
                 </child>
@@ -95,19 +91,16 @@
               </packing>
             </child>
             <child>
-              <object class="GtkFrame" id="frame2">
+              <object class="GtkFrame" id="endframe">
                 <property name="visible">True</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment4">
+                  <object class="GtkAlignment" id="alignment5">
                     <property name="visible">True</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <object class="GnomeDateEdit" id="end_dateedit">
-                        <property name="visible">True</property>
-                        <property name="dateedit_flags">GNOME_DATE_EDIT_24_HR</property>
-                      </object>
+                      <placeholder/>
                     </child>
                   </object>
                 </child>
@@ -146,6 +139,8 @@
                 <property name="use_stock">True</property>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">0</property>
               </packing>
             </child>
@@ -160,6 +155,8 @@
                 <property name="use_stock">True</property>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>