diff --git a/ChangeLog b/ChangeLog
index fe41c50a1..ad74e568f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,11 @@
 	names without manual encoding
 	* src/DateParser.py: use locale.nl_langinfo to get month
 	names without manual encoding
-
+        * src/AddrEdit.py: Add date editor callback
+        * src/EditPerson.py: Add date editor callback
+        * src/EventEdit.py: Add date editor callback
+	* src/gramps.glade: replace LED indicators with buttons
+	
 2004-09-16  Don Allingham  <dallingham@users.sourceforge.net>
 	* src/Calendar.py: removed
 	* src/Gregorian.py: removed
diff --git a/src/AddrEdit.py b/src/AddrEdit.py
index 7c1d7143f..4af008b37 100644
--- a/src/AddrEdit.py
+++ b/src/AddrEdit.py
@@ -141,6 +141,7 @@ class AddressEditor:
             "on_ok_addr_clicked" : self.ok_clicked,
             "on_cancel_addr_clicked" : self.close,
             "on_addr_edit_delete_event" : self.on_delete_event,
+            "on_date_edit_clicked", self.on_date_edit_clicked,
             })
 
         if parent_window:
@@ -148,6 +149,11 @@ class AddressEditor:
         self.add_itself_to_menu()
         self.window.show()
 
+    def on_date_edit_clicked(self,obj):
+        from QuestionDialog import ErrorDialog
+        ErrorDialog("Not implemented yet",
+                    "The Date Editor has not been implemented yet")
+
     def on_delete_event(self,obj,b):
         self.close_child_windows()
         self.remove_itself_from_menu()
diff --git a/src/EditPerson.py b/src/EditPerson.py
index 7e0272994..345618c71 100644
--- a/src/EditPerson.py
+++ b/src/EditPerson.py
@@ -423,6 +423,8 @@ class EditPerson:
             "on_gender_activate"        : self.on_gender_activate,
             "on_givenName_focus_out_event": self.on_givenName_focus_out_event,
             "on_help_person_clicked"    : self.on_help_clicked,
+            "on_edit_date_birth_clicked": self.on_edit_date_birth_clicked,
+            "on_edit_date_death_clicked": self.on_edit_date_death_clicked,
             })
 
         self.update_birth_death()
@@ -446,6 +448,14 @@ class EditPerson:
         self.add_itself_to_winsmenu()
         self.window.show()
 
+    def on_edit_date_birth_clicked(self,obj):
+        ErrorDialog("Not implemented yet",
+                    "The Date Editor has not been implemented yet")
+
+    def on_edit_date_death_clicked(self,obj):
+        ErrorDialog("Not implemented yet",
+                    "The Date Editor has not been implemented yet")
+
     def close_child_windows(self):
         for child_window in self.child_windows.values():
             child_window.close(None)
diff --git a/src/EventEdit.py b/src/EventEdit.py
index 6da051a6a..e0a7ec76d 100644
--- a/src/EventEdit.py
+++ b/src/EventEdit.py
@@ -216,6 +216,7 @@ class EventEditor:
             "on_deletephoto_clicked"    : self.gallery.on_delete_media_clicked,
             "on_edit_properties_clicked": self.gallery.popup_change_description,
             "on_editphoto_clicked"      : self.gallery.on_edit_media_clicked,
+            "on_date_edit_clicked"      : self.on_date_edit_clicked,
             })
 
         menu = gtk.Menu()
@@ -236,6 +237,11 @@ class EventEditor:
         self.add_itself_to_menu()
         self.window.show()
 
+    def on_date_edit_clicked(self,obj):
+        from QuestionDialog import ErrorDialog
+        ErrorDialog("Not implemented yet",
+                    "The Date Editor has not been implemented yet")
+
     def on_delete_event(self,obj,b):
         self.gallery.close()
         self.close_child_windows()
diff --git a/src/gramps.glade b/src/gramps.glade
index ded93dbe4..0928295d8 100644
--- a/src/gramps.glade
+++ b/src/gramps.glade
@@ -8219,24 +8219,6 @@ Other</property>
 			</packing>
 		      </child>
 
-		      <child>
-			<widget class="GtkImage" id="birth_stat">
-			  <property name="visible">True</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">3</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">13</property>
-			  <property name="bottom_attach">14</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-
 		      <child>
 			<widget class="GtkButton" id="button99">
 			  <property name="border_width">1</property>
@@ -8802,24 +8784,6 @@ Other</property>
 			</packing>
 		      </child>
 
-		      <child>
-			<widget class="GtkImage" id="death_stat">
-			  <property name="visible">True</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">9</property>
-			  <property name="right_attach">10</property>
-			  <property name="top_attach">13</property>
-			  <property name="bottom_attach">14</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-
 		      <child>
 			<widget class="GtkButton" id="button126">
 			  <property name="border_width">1</property>
@@ -9003,6 +8967,64 @@ Other</property>
 			  <property name="y_options">fill</property>
 			</packing>
 		      </child>
+
+		      <child>
+			<widget class="GtkButton" id="button174">
+			  <property name="visible">True</property>
+			  <property name="tooltip" translatable="yes">Invoke date editor</property>
+			  <property name="can_focus">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <signal name="clicked" handler="on_edit_date_birth_clicked" last_modification_time="Sat, 18 Sep 2004 02:29:41 GMT"/>
+
+			  <child>
+			    <widget class="GtkImage" id="birth_stat">
+			      <property name="visible">True</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			    </widget>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="left_attach">3</property>
+			  <property name="right_attach">4</property>
+			  <property name="top_attach">13</property>
+			  <property name="bottom_attach">14</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkButton" id="button175">
+			  <property name="visible">True</property>
+			  <property name="tooltip" translatable="yes">Invoke date editor</property>
+			  <property name="can_focus">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <signal name="clicked" handler="on_edit_date_death_clicked" last_modification_time="Sat, 18 Sep 2004 02:30:11 GMT"/>
+
+			  <child>
+			    <widget class="GtkImage" id="death_stat">
+			      <property name="visible">True</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			    </widget>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="left_attach">9</property>
+			  <property name="right_attach">10</property>
+			  <property name="top_attach">13</property>
+			  <property name="bottom_attach">14</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
 		    </widget>
 		    <packing>
 		      <property name="left_attach">0</property>
@@ -13487,30 +13509,6 @@ Other</property>
 			</packing>
 		      </child>
 
-		      <child>
-			<widget class="GtkLabel" id="marriagePlace">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes"></property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">5</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
 		      <child>
 			<widget class="GtkLabel" id="marriageDate">
 			  <property name="visible">True</property>
@@ -13604,6 +13602,29 @@ Other</property>
 			  <property name="y_options"></property>
 			</packing>
 		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="marriagePlace">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes"></property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+			<packing>
+			  <property name="left_attach">2</property>
+			  <property name="right_attach">5</property>
+			  <property name="top_attach">3</property>
+			  <property name="bottom_attach">4</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
@@ -13667,7 +13688,7 @@ Other</property>
 			    <packing>
 			      <property name="padding">0</property>
 			      <property name="expand">False</property>
-			      <property name="fill">False</property>
+			      <property name="fill">True</property>
 			    </packing>
 			  </child>
 
@@ -13684,7 +13705,7 @@ Other</property>
 			    <packing>
 			      <property name="padding">0</property>
 			      <property name="expand">False</property>
-			      <property name="fill">False</property>
+			      <property name="fill">True</property>
 			    </packing>
 			  </child>
 
@@ -13703,7 +13724,7 @@ Other</property>
 			    <packing>
 			      <property name="padding">0</property>
 			      <property name="expand">False</property>
-			      <property name="fill">False</property>
+			      <property name="fill">True</property>
 			    </packing>
 			  </child>
 
@@ -13713,7 +13734,7 @@ Other</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
-			  <property name="expand">True</property>
+			  <property name="expand">False</property>
 			  <property name="fill">True</property>
 			</packing>
 		      </child>
@@ -26145,7 +26166,7 @@ Other</property>
 		  <property name="border_width">12</property>
 		  <property name="visible">True</property>
 		  <property name="n_rows">6</property>
-		  <property name="n_columns">4</property>
+		  <property name="n_columns">3</property>
 		  <property name="homogeneous">False</property>
 		  <property name="row_spacing">6</property>
 		  <property name="column_spacing">12</property>
@@ -26286,60 +26307,6 @@ Other</property>
 		    </packing>
 		  </child>
 
-		  <child>
-		    <widget class="GtkOptionMenu" id="calendar">
-		      <property name="tooltip" translatable="yes">Selects the calendar format for display</property>
-		      <property name="can_focus">True</property>
-		      <property name="history">0</property>
-
-		      <child internal-child="menu">
-			<widget class="GtkMenu" id="convertwidget4">
-			  <property name="visible">True</property>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget5">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Gregorian</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget6">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Julian</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget7">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Hebrew</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget8">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">French</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">3</property>
-		      <property name="right_attach">4</property>
-		      <property name="top_attach">1</property>
-		      <property name="bottom_attach">2</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options"></property>
-		    </packing>
-		  </child>
-
 		  <child>
 		    <widget class="GtkEntry" id="eventDate">
 		      <property name="visible">True</property>
@@ -26375,7 +26342,7 @@ Other</property>
 		    </widget>
 		    <packing>
 		      <property name="left_attach">1</property>
-		      <property name="right_attach">4</property>
+		      <property name="right_attach">3</property>
 		      <property name="top_attach">4</property>
 		      <property name="bottom_attach">5</property>
 		      <property name="y_options"></property>
@@ -26396,7 +26363,7 @@ Other</property>
 		    </widget>
 		    <packing>
 		      <property name="left_attach">1</property>
-		      <property name="right_attach">4</property>
+		      <property name="right_attach">3</property>
 		      <property name="top_attach">3</property>
 		      <property name="bottom_attach">4</property>
 		      <property name="y_options"></property>
@@ -26417,7 +26384,7 @@ Other</property>
 		    </widget>
 		    <packing>
 		      <property name="left_attach">1</property>
-		      <property name="right_attach">4</property>
+		      <property name="right_attach">3</property>
 		      <property name="top_attach">2</property>
 		      <property name="bottom_attach">3</property>
 		      <property name="y_options"></property>
@@ -26438,7 +26405,7 @@ Other</property>
 		    </widget>
 		    <packing>
 		      <property name="left_attach">1</property>
-		      <property name="right_attach">4</property>
+		      <property name="right_attach">3</property>
 		      <property name="top_attach">5</property>
 		      <property name="bottom_attach">6</property>
 		      <property name="x_options">fill</property>
@@ -26446,37 +26413,47 @@ Other</property>
 		    </packing>
 		  </child>
 
-		  <child>
-		    <widget class="GtkImage" id="date_stat">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">2</property>
-		      <property name="right_attach">3</property>
-		      <property name="top_attach">1</property>
-		      <property name="bottom_attach">2</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options">fill</property>
-		    </packing>
-		  </child>
-
 		  <child>
 		    <widget class="GtkComboBoxEntry" id="personal_events">
 		      <property name="visible">True</property>
 		    </widget>
 		    <packing>
 		      <property name="left_attach">1</property>
-		      <property name="right_attach">4</property>
+		      <property name="right_attach">3</property>
 		      <property name="top_attach">0</property>
 		      <property name="bottom_attach">1</property>
 		      <property name="x_options">fill</property>
 		      <property name="y_options">fill</property>
 		    </packing>
 		  </child>
+
+		  <child>
+		    <widget class="GtkButton" id="button176">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</property>
+		      <signal name="clicked" handler="on_date_edit_clicked" last_modification_time="Sat, 18 Sep 2004 02:42:17 GMT"/>
+
+		      <child>
+			<widget class="GtkImage" id="date_stat">
+			  <property name="visible">True</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="left_attach">2</property>
+		      <property name="right_attach">3</property>
+		      <property name="top_attach">1</property>
+		      <property name="bottom_attach">2</property>
+		      <property name="x_options">fill</property>
+		      <property name="y_options"></property>
+		    </packing>
+		  </child>
 		</widget>
 		<packing>
 		  <property name="tab_expand">False</property>
@@ -28338,7 +28315,7 @@ Other</property>
 		  <property name="border_width">12</property>
 		  <property name="visible">True</property>
 		  <property name="n_rows">8</property>
-		  <property name="n_columns">4</property>
+		  <property name="n_columns">3</property>
 		  <property name="homogeneous">False</property>
 		  <property name="row_spacing">6</property>
 		  <property name="column_spacing">12</property>
@@ -28533,77 +28510,6 @@ Other</property>
 		    </packing>
 		  </child>
 
-		  <child>
-		    <widget class="GtkOptionMenu" id="calendar">
-		      <property name="tooltip" translatable="yes">Selects the calendar format for display</property>
-		      <property name="can_focus">True</property>
-		      <property name="history">0</property>
-
-		      <child internal-child="menu">
-			<widget class="GtkMenu" id="convertwidget20">
-			  <property name="visible">True</property>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget21">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Gregorian</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget22">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Julian</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget23">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Hebrew</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget24">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">French</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">3</property>
-		      <property name="right_attach">4</property>
-		      <property name="top_attach">0</property>
-		      <property name="bottom_attach">1</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options"></property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImage" id="date_stat">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">2</property>
-		      <property name="right_attach">3</property>
-		      <property name="top_attach">0</property>
-		      <property name="bottom_attach">1</property>
-		      <property name="y_options">fill</property>
-		    </packing>
-		  </child>
-
 		  <child>
 		    <widget class="GtkEntry" id="address_start">
 		      <property name="visible">True</property>
@@ -28640,7 +28546,7 @@ Other</property>
 		    </widget>
 		    <packing>
 		      <property name="left_attach">1</property>
-		      <property name="right_attach">4</property>
+		      <property name="right_attach">3</property>
 		      <property name="top_attach">1</property>
 		      <property name="bottom_attach">2</property>
 		      <property name="y_options"></property>
@@ -28661,7 +28567,7 @@ Other</property>
 		    </widget>
 		    <packing>
 		      <property name="left_attach">1</property>
-		      <property name="right_attach">4</property>
+		      <property name="right_attach">3</property>
 		      <property name="top_attach">2</property>
 		      <property name="bottom_attach">3</property>
 		      <property name="y_options"></property>
@@ -28682,7 +28588,7 @@ Other</property>
 		    </widget>
 		    <packing>
 		      <property name="left_attach">1</property>
-		      <property name="right_attach">4</property>
+		      <property name="right_attach">3</property>
 		      <property name="top_attach">3</property>
 		      <property name="bottom_attach">4</property>
 		      <property name="y_options"></property>
@@ -28703,7 +28609,7 @@ Other</property>
 		    </widget>
 		    <packing>
 		      <property name="left_attach">1</property>
-		      <property name="right_attach">4</property>
+		      <property name="right_attach">3</property>
 		      <property name="top_attach">4</property>
 		      <property name="bottom_attach">5</property>
 		      <property name="y_options"></property>
@@ -28724,7 +28630,7 @@ Other</property>
 		    </widget>
 		    <packing>
 		      <property name="left_attach">1</property>
-		      <property name="right_attach">4</property>
+		      <property name="right_attach">3</property>
 		      <property name="top_attach">5</property>
 		      <property name="bottom_attach">6</property>
 		      <property name="y_options"></property>
@@ -28770,12 +28676,40 @@ Other</property>
 		    </widget>
 		    <packing>
 		      <property name="left_attach">1</property>
-		      <property name="right_attach">4</property>
+		      <property name="right_attach">3</property>
 		      <property name="top_attach">6</property>
 		      <property name="bottom_attach">7</property>
 		      <property name="y_options"></property>
 		    </packing>
 		  </child>
+
+		  <child>
+		    <widget class="GtkButton" id="button177">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</property>
+		      <signal name="clicked" handler="on_date_edit_clicked" last_modification_time="Sat, 18 Sep 2004 02:40:33 GMT"/>
+
+		      <child>
+			<widget class="GtkImage" id="date_stat">
+			  <property name="visible">True</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="left_attach">2</property>
+		      <property name="right_attach">3</property>
+		      <property name="top_attach">0</property>
+		      <property name="bottom_attach">1</property>
+		      <property name="x_options">fill</property>
+		      <property name="y_options"></property>
+		    </packing>
+		  </child>
 		</widget>
 		<packing>
 		  <property name="tab_expand">False</property>