From be30e422b90539a907ecee3575553512fb60e50c Mon Sep 17 00:00:00 2001 From: Zsolt Foldvari Date: Sat, 24 Mar 2007 00:30:14 +0000 Subject: [PATCH] * src/Editors/_EditAddress.py: * src/Editors/_EditLdsOrd.py: * src/Editors/_EditSourceRef.py: * src/Editors/_EditEventRef.py: * src/Editors/_EditMedia.py: * src/Editors/_EditName.py: * src/Editors/_EditEvent.py: * src/glade/gramps.glade: move date_entry(ValidatableMaskedEntry) out into glade. 2007-03-24 Zsolt Foldvari svn: r8312 --- ChangeLog | 11 +++ src/Editors/_EditAddress.py | 7 +- src/Editors/_EditEvent.py | 8 +-- src/Editors/_EditEventRef.py | 8 +-- src/Editors/_EditLdsOrd.py | 14 +--- src/Editors/_EditMedia.py | 7 +- src/Editors/_EditName.py | 7 +- src/Editors/_EditSourceRef.py | 7 +- src/glade/gramps.glade | 126 ++++++++++++++++++++++++++++++++++ 9 files changed, 145 insertions(+), 50 deletions(-) diff --git a/ChangeLog b/ChangeLog index cb52a4e6b..82d679975 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2007-03-24 Zsolt Foldvari + * src/Editors/_EditAddress.py: + * src/Editors/_EditLdsOrd.py: + * src/Editors/_EditSourceRef.py: + * src/Editors/_EditEventRef.py: + * src/Editors/_EditMedia.py: + * src/Editors/_EditName.py: + * src/Editors/_EditEvent.py: + * src/glade/gramps.glade: + move date_entry(ValidatableMaskedEntry) out into glade. + 2007-03-24 Zsolt Foldvari * src/MarkupText.py (MarkupBuffer.set_text): better unicode encoding. * src/Editors/_EditPlace.py: source code encoding comment removed; diff --git a/src/Editors/_EditAddress.py b/src/Editors/_EditAddress.py index 65414e7a0..f621c414d 100644 --- a/src/Editors/_EditAddress.py +++ b/src/Editors/_EditAddress.py @@ -80,13 +80,8 @@ class EditAddress(EditSecondary): _('Address Editor')) def _setup_fields(self): - table = self.top.get_widget('table26') - date_entry = ValidatableMaskedEntry(str) - date_entry.show() - table.attach(date_entry, 1, 6, 0, 1, yoptions=gtk.EXPAND) - self.addr_start = MonitoredDate( - date_entry, + self.top.get_widget("date_entry"), self.top.get_widget("date_stat"), self.obj.get_date_object(), self.uistate, diff --git a/src/Editors/_EditEvent.py b/src/Editors/_EditEvent.py index 00b7d2fd5..f9f498acd 100644 --- a/src/Editors/_EditEvent.py +++ b/src/Editors/_EditEvent.py @@ -145,19 +145,13 @@ class EditEvent(EditPrimary): self.obj.get_type, custom_values=self.get_custom_events()) - table = self.top.get_widget('table21') - date_entry = ValidatableMaskedEntry(str) - date_entry.show() - table.attach(date_entry, 3, 4, 0, 1, yoptions=gtk.EXPAND) - self.date_field = MonitoredDate( - date_entry, + self.top.get_widget("date_entry"), self.top.get_widget("date_stat"), self.obj.get_date_object(), self.uistate, self.track, self.db.readonly) - date_entry.grab_focus() def _create_tabbed_pages(self): """ diff --git a/src/Editors/_EditEventRef.py b/src/Editors/_EditEventRef.py index a9b5b6fb1..eda52e76d 100644 --- a/src/Editors/_EditEventRef.py +++ b/src/Editors/_EditEventRef.py @@ -139,20 +139,14 @@ class EditEventRef(EditReference): self.db.readonly, custom_values=self.get_custom_events()) - table = self.top.get_widget('table62') - date_entry = ValidatableMaskedEntry(str) - date_entry.show() - table.attach(date_entry, 1, 2, 1, 2, yoptions=gtk.EXPAND) - self.date_check = MonitoredDate( - date_entry, + self.top.get_widget("eer_date_entry"), self.top.get_widget("eer_date_stat"), self.source.get_date_object(), self.uistate, self.track, self.db.readonly) - def _create_tabbed_pages(self): """ Creates the notebook tabs and inserts them into the main diff --git a/src/Editors/_EditLdsOrd.py b/src/Editors/_EditLdsOrd.py index 1d6be79aa..29f9b606f 100644 --- a/src/Editors/_EditLdsOrd.py +++ b/src/Editors/_EditLdsOrd.py @@ -175,13 +175,8 @@ class EditLdsOrd(EditSecondary): self.top.get_widget("private"), self.obj, self.db.readonly) - table = self.top.get_widget('table') - date_entry = ValidatableMaskedEntry(str) - date_entry.show() - table.attach(date_entry, 1, 2, 3, 4, yoptions=gtk.EXPAND) - self.date_field = MonitoredDate( - date_entry, + self.top.get_widget("date_entry"), self.top.get_widget("date_stat"), self.obj.get_date_object(), self.uistate, @@ -365,13 +360,8 @@ class EditFamilyLdsOrd(EditSecondary): self.top.get_widget("private"), self.obj, self.db.readonly) - table = self.top.get_widget('table') - date_entry = ValidatableMaskedEntry(str) - date_entry.show() - table.attach(date_entry, 1, 2, 3, 4, yoptions=gtk.EXPAND) - self.date_field = MonitoredDate( - date_entry, + self.top.get_widget("date_entry"), self.top.get_widget("date_stat"), self.obj.get_date_object(), self.uistate, diff --git a/src/Editors/_EditMedia.py b/src/Editors/_EditMedia.py index d51ab9c40..8d461cbd5 100644 --- a/src/Editors/_EditMedia.py +++ b/src/Editors/_EditMedia.py @@ -97,13 +97,8 @@ class EditMedia(EditPrimary): self.define_help_button(self.glade.get_widget('button102'),'adv-media') def _setup_fields(self): - table = self.glade.get_widget('table8') - date_entry = ValidatableMaskedEntry(str) - date_entry.show() - table.attach(date_entry, 2, 3, 2, 3, yoptions=gtk.EXPAND) - self.date_field = MonitoredDate( - date_entry, + self.glade.get_widget("date_entry"), self.glade.get_widget("date_edit"), self.obj.get_date_object(), self.uistate, diff --git a/src/Editors/_EditName.py b/src/Editors/_EditName.py index 6fb43fc57..d8a7d301c 100644 --- a/src/Editors/_EditName.py +++ b/src/Editors/_EditName.py @@ -160,13 +160,8 @@ class EditName(EditSecondary): self.obj.get_surname_prefix, self.db.readonly) - table = self.top.get_widget('table23') - date_entry = ValidatableMaskedEntry(str) - date_entry.show() - table.attach(date_entry, 2, 3, 4, 5, yoptions=gtk.EXPAND) - self.date = MonitoredDate( - date_entry, + self.top.get_widget("date_entry"), self.top.get_widget("date_stat"), self.obj.get_date_object(), self.uistate, diff --git a/src/Editors/_EditSourceRef.py b/src/Editors/_EditSourceRef.py index e8bbb01ba..8811f8417 100644 --- a/src/Editors/_EditSourceRef.py +++ b/src/Editors/_EditSourceRef.py @@ -119,13 +119,8 @@ class EditSourceRef(EditReference): (_('Very High'), RelLib.SourceRef.CONF_VERY_HIGH)], self.db.readonly) - table = self.top.get_widget('table67') - date_entry = ValidatableMaskedEntry(str) - date_entry.show() - table.attach(date_entry, 1, 2, 0, 1, yoptions=gtk.EXPAND) - self.date = MonitoredDate( - date_entry, + self.top.get_widget("date_entry"), self.top.get_widget("date_stat"), self.source_ref.get_date_object(), self.uistate, diff --git a/src/glade/gramps.glade b/src/glade/gramps.glade index 2565aa053..e7db971f0 100644 --- a/src/glade/gramps.glade +++ b/src/glade/gramps.glade @@ -5817,6 +5817,24 @@ + + + + 27 + True + ValidatableMaskedEntry + 0 + 0 + Sat, 24 Mar 2007 00:20:48 GMT + + + 2 + 3 + 2 + 3 + + + 0 @@ -7125,6 +7143,24 @@ + + + + 27 + True + ValidatableMaskedEntry + 0 + 0 + Sat, 24 Mar 2007 00:10:06 GMT + + + 3 + 4 + 0 + 1 + + + 0 @@ -9017,6 +9053,24 @@ fill + + + + 27 + True + ValidatableMaskedEntry + 0 + 0 + Sat, 24 Mar 2007 00:23:06 GMT + + + 2 + 3 + 4 + 5 + + + False @@ -10876,6 +10930,24 @@ + + + + 27 + True + ValidatableMaskedEntry + 0 + 0 + Fri, 23 Mar 2007 23:47:44 GMT + + + 1 + 2 + 1 + 2 + + + False @@ -11285,6 +11357,24 @@ Very High + + + + 27 + True + ValidatableMaskedEntry + 0 + 0 + Sat, 24 Mar 2007 00:24:58 GMT + + + 1 + 2 + 0 + 1 + + + False @@ -12928,6 +13018,24 @@ Very High fill + + + + 27 + True + ValidatableMaskedEntry + 0 + 0 + Sat, 24 Mar 2007 00:15:59 GMT + + + 1 + 2 + 3 + 4 + + + 0 @@ -13429,6 +13537,24 @@ Very High fill + + + + 27 + True + ValidatableMaskedEntry + 0 + 0 + Sat, 24 Mar 2007 00:07:03 GMT + + + 1 + 6 + 0 + 1 + + + 0