diff --git a/src/StartupDialog.py b/src/StartupDialog.py index c8386d815..d9b6abd12 100644 --- a/src/StartupDialog.py +++ b/src/StartupDialog.py @@ -23,15 +23,15 @@ import gtk.glade import gconf import Utils -_StartupEntry = "/gramps/config/startup" +_StartupEntry = "/apps/gramps/startup" def need_to_run(): return 0 client = gconf.client_get_default() client.add_dir("/apps/gramps",gconf.CLIENT_PRELOAD_NONE) - if client.get_string(_StartupEntry) == None: + val = client.get_int(_StartupEntry) + if val == None: return 1 - val = client.set_int(_StartupEntry) if val < const.startup: return 1 return 0 @@ -53,11 +53,11 @@ class StartupDialog: self.rlist = ['name','addr','city','state','country', 'postal', 'phone', 'email'] - self.client = gconf.client_get_default + self.client = gconf.client_get_default() for tag in self.rlist: - val = self.client.get_string("/gramps/researcher/%s" % tag) + val = self.client.get_string("/apps/gramps/researcher-%s" % tag) if val != None: - self.druid.get_widget(tag).set_text(val)() + self.druid.get_widget(tag).set_text(val) def destroy(self,obj): @@ -66,7 +66,7 @@ class StartupDialog: def on_finish(self,obj,b): for tag in self.rlist: val = self.druid.get_widget(tag).get_text() - self.client.set_string("/gramps/researcher/%s" % tag,val) + self.client.set_string("/apps/gramps/researcher-%s" % tag,val) if self.druid.get_widget("num_us").get_active(): dateFormat = 0 @@ -74,15 +74,14 @@ class StartupDialog: dateFormat = 1 else: dateFormat = 2 - self.client.set_int("/gramps/config/dateEntry",dateFormat) + self.client.set_int("/apps/gramps/dateEntry",dateFormat) showcal = self.druid.get_widget("altcal").get_active() - self.client.set_int("/gramps/config/ShowCalendar",showcal) + self.client.set_int("/apps/gramps/ShowCalendar",showcal) lds = self.druid.get_widget("enable_lds").get_active() - self.client.set_int("/gramps/config/UseLDS",lds) + self.client.set_int("/apps/gramps/UseLDS",lds) self.client.set_int(_StartupEntry,const.startup) - self.client.sync() Utils.destroy_passed_object(obj) def on_cancel_clicked(self,obj): diff --git a/src/Witness.py b/src/Witness.py index 5996baf0a..9ae2d6d78 100644 --- a/src/Witness.py +++ b/src/Witness.py @@ -119,15 +119,23 @@ class WitnessEditor: "on_id_changed" : self.on_id_changed, "cancel_clicked" : self.cancel_clicked, }) + self.name = self.show_witness.get_widget("name") self.id = self.show_witness.get_widget("id") self.ok = self.show_witness.get_widget("ok") self.in_db = self.show_witness.get_widget("in_db") self.comment = self.show_witness.get_widget("comment") + if self.ref: - self.name.set_text(self.ref.get_value()) + if self.ref.get_type(): + self.id.set_text(self.ref.get_value()) + self.in_db.set_active(1) + else: + self.name.set_text(self.ref.get_value()) + self.in_db.set_active(0) self.comment.get_buffer().set_text(self.ref.get_comment()) + self.on_toggled(None) Utils.set_titles(self.show_witness.get_widget('witness_edit'), self.show_witness.get_widget('title'), _('Witness Editor')) @@ -136,19 +144,28 @@ class WitnessEditor: self.check_valid_id() def check_valid_id(self): - id = self.id.get_text() - if self.db.getPersonMap().has_key(id): - person = self.db.getPerson(id) - self.name.set_text(person.getPrimaryName().getName()) - self.ok.set_sensitive(1) + if self.in_db.get_active(): + id = self.id.get_text() + if self.db.getPersonMap().has_key(id): + person = self.db.getPerson(id) + self.name.set_text(person.getPrimaryName().getName()) + self.ok.set_sensitive(1) + else: + self.ok.set_sensitive(0) else: - self.ok.set_sensitive(0) + self.ok.set_sensitive(1) def on_toggled(self,obj): if self.in_db.get_active(): self.name.set_editable(0) + self.name.set_sensitive(0) + self.id.set_editable(1) + self.id.set_sensitive(1) else: self.name.set_editable(1) + self.name.set_sensitive(1) + self.id.set_editable(0) + self.id.set_sensitive(0) self.check_valid_id() def cancel_clicked(self,obj): diff --git a/src/config.glade b/src/config.glade index 9b8f87a15..1dfa32f4d 100644 --- a/src/config.glade +++ b/src/config.glade @@ -4,7 +4,7 @@ - + True Getting Started - GRAMPS GTK_WINDOW_TOPLEVEL @@ -47,9 +47,9 @@ Preferences dialog under the Settings menu. True Researcher information - #53e00817c71b - #53e00817e118 - #d7a440c2e108 + #53e00817a71b + #53e00817d488 + #b7a440c2d478 gramps.png @@ -487,9 +487,9 @@ files, you may leave it blank. True Numerical date formats - #53e00817c71b - #53e00817e118 - #d7a440c2e108 + #53e00817a71b + #53e00817d488 + #b7a440c2d478 gramps.xpm @@ -635,9 +635,9 @@ numerical dates True Alternate calendar support - #53e00817c71b - #53e00817e118 - #d7a440c2e108 + #53e00817a71b + #53e00817d488 + #b7a440c2d478 gramps.xpm @@ -732,9 +732,9 @@ more of these alternate calendars, enable alternate calendar support. True LDS extensions - #53e00817c71b - #53e00817e118 - #d7a440c2e108 + #53e00817a71b + #53e00817d488 + #b7a440c2d478 gramps.xpm @@ -850,4 +850,821 @@ Please enjoy using GRAMPS. + + True + Getting Started - GRAMPS + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + + + + 4 + True + False + + + + True + GNOME_EDGE_START + Getting Started with GRAMPS + Welcome to GRAMPS, the Genealogical Research +and Analysis Management Programming System. + +Several options and information need to be gathered +before GRAMPS is ready to be used. Any of this +information can be changed in the future in the +Preferences dialog under the Settings menu. + #7d7c68674a4a + #000000000000 + #e2c2dcb6c68a + #e2e1dcdcc6c6 + gramps.png + splash.jpg + + + + + + True + Researcher Information + #53e00817a71b + #53e00817d488 + #e1e0dbdac5c5 + gramps.png + + + + 16 + True + False + 6 + + + + True + False + 6 + + + + True + In order to create valid GEDCOM files, the following information +needs to be entered. If you do not plan to generate GEDCOM +files, you may leave it blank. + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 5 + True + True + + + + + + True + 5 + 4 + False + 6 + 12 + + + + True + Name: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + Address: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + City: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + + True + True + True + True + 0 + + True + * + False + + + + 1 + 2 + 2 + 3 + + + + + + + True + True + True + True + 0 + + True + * + False + + + + 3 + 4 + 2 + 3 + + + + + + + True + State/Province: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 2 + 3 + 2 + 3 + fill + + + + + + + True + True + True + True + 0 + + True + * + False + + + + 3 + 4 + 3 + 4 + + + + + + + True + Country: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 2 + 3 + 3 + 4 + fill + + + + + + + True + ZIP/Postal code: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 3 + 4 + fill + + + + + + + True + True + True + True + 0 + + True + * + False + + + + 1 + 2 + 3 + 4 + + + + + + + True + Phone: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 4 + 5 + fill + + + + + + + True + True + True + True + 0 + + True + * + False + + + + 1 + 2 + 4 + 5 + + + + + + + True + True + True + True + 0 + + True + * + False + + + + 3 + 4 + 4 + 5 + + + + + + + True + Email: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 2 + 3 + 4 + 5 + fill + + + + + + + True + True + True + True + 0 + + True + * + False + + + + 1 + 4 + 0 + 1 + + + + + + + True + True + True + True + 0 + + True + * + False + + + + 1 + 4 + 1 + 2 + + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + + + + + True + Numerical date formats + #53e00817a71b + #53e00817d488 + #e1e0dbdac5c5 + gramps.png + + + + 16 + True + False + 6 + + + + True + False + 0 + + + + True + There are three common formats for entering dates in a numerical format. +Without some type of indication, GRAMPS cannot correctly tell what +format you are using. Please indicate your preferred format for entering +numerical dates + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 5 + 25 + + + 0 + False + False + + + + + + True + True + 0 + + + + 20 + True + False + 0 + + + + True + True + _MM/DD/YYYY (United States) + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + True + _DD/MM/YYYY (European) + True + GTK_RELIEF_NORMAL + False + False + True + num_us + + + 0 + False + False + + + + + + True + True + _YYYY-MM-DD (ISO) + True + GTK_RELIEF_NORMAL + False + False + True + num_us + + + 0 + False + False + + + + + 0 + False + False + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + + + + + True + Alternate calendar support + #53e00817a71b + #53e00817d488 + #e1e0dbdac5c5 + gramps.png + + + + 16 + True + False + 6 + + + + True + False + 0 + + + + True + By default, all dates stored by GRAMPS use the Gregorian calendar. This +is normally sufficient for most users. Support may be enabled for the Julian, +French Republican, and Hebrew calendar. If you believe that you will need one or +more of these alternate calendars, enable alternate calendar support. + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 25 + + + 0 + False + False + + + + + + True + False + 0 + + + + 20 + True + True + _Enable support for alternate calendars + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + True + False + + + + + 0 + False + False + + + + + 0 + True + True + + + + + + + + + + True + LDS extenstions + #53e00817a71b + #53e00817d488 + #e1e0dbdac5c5 + gramps.png + + + + 16 + True + False + 6 + + + + True + False + 0 + + + + True + GRAMPS has support for LDS Ordinances, which are special +event types related to the Church of Jesus Christ of Latter Day Saints. + +You may choose to either enable or disable this support. You may +change this option in the future in the Preferences dialog. + False + False + GTK_JUSTIFY_FILL + False + False + 0.5 + 0.5 + 5 + 25 + + + 0 + False + False + + + + + + True + False + 0 + + + + 20 + True + True + _Enable LDS ordinance support + True + GTK_RELIEF_NORMAL + False + False + True + + + 50 + True + False + + + + + 0 + False + False + + + + + 0 + True + True + + + + + + + + + + True + GNOME_EDGE_FINISH + Complete + GRAMPS is an Open Source project. Its success +depends on the users. User feedback is important. +Please join the mailing lists, submit bug reports, +suggest improvements, and see how you can +contribute. + +Please enjoy using GRAMPS. + #7d7c68674a4a + #e1e0dbdac5c5 + #e1e0dbdac5c5 + gramps.png + + + + + + diff --git a/src/const.py b/src/const.py index 8db4246aa..1c81be2cb 100644 --- a/src/const.py +++ b/src/const.py @@ -107,29 +107,26 @@ comments = _("GRAMPS (Genealogical Research and Analysis " "Management Programming System) is a personal " "genealogy program.") authors = [ - "Donald N. Allingham ", + "Donald N. Allingham", + "Donald A. Peterson" "David Hampton", - "Donald A. Peterson " ] documenters = [ - 'Donald N. Allingham ', - 'Lawrence Allingham' + 'Alex Roitman', ] -translators = u'Radek Malcic - Czech\n' \ - u'Lars Kristian Lundin - Danish (Dansk)\n' \ - u'Bernd Schandl - German (Deutsch)\n' \ - u'Andr\xe9s Sep\xfalveda - Spanish (Espa\xf1ol)\n' \ - u'Laurent Protois - French (Fran\xe7ais)\n' \ - u'Marco Molteni - Italian (Italiano)\n' \ - u'Marcos Bedinelli - Brazilian-Portuguese (Portugu\xeas do Brasil)\n' \ - u'Alex Roitman - Russian\n' \ - u'Jens Arvidsson - Swedish (Svenska)\n' \ - u'Tino Meinen - Dutch' \ - - - +translators = u'Radek Malcic - Czech\n' \ + u'Lars Kristian Lundin - Danish (Dansk)\n' \ + u'Bernd Schandl - German (Deutsch)\n' \ + u'Andr\xe9s Sep\xfalveda - Spanish (Espa\xf1ol)\n' \ + u'Laurent Protois - French (Fran\xe7ais)\n' \ + u'Marco Molteni - Italian (Italiano)\n' \ + u'Marcos Bedinelli - Brazilian-Portuguese\n' \ + u'Alex Roitman - Russian\n' \ + u'Jens Arvidsson - Swedish (Svenska)\n' \ + u'Radu Bogden Mare - Romanian\n' \ + u'Tino Meinen - Dutch' \ #------------------------------------------------------------------------- # diff --git a/src/const.py.in b/src/const.py.in index 16e0c4633..684332e49 100644 --- a/src/const.py.in +++ b/src/const.py.in @@ -107,29 +107,26 @@ comments = _("GRAMPS (Genealogical Research and Analysis " "Management Programming System) is a personal " "genealogy program.") authors = [ - "Donald N. Allingham ", + "Donald N. Allingham", + "Donald A. Peterson" "David Hampton", - "Donald A. Peterson " ] documenters = [ - 'Donald N. Allingham ', - 'Lawrence Allingham' + 'Alex Roitman', ] -translators = u'Radek Malcic - Czech\n' \ - u'Lars Kristian Lundin - Danish (Dansk)\n' \ - u'Bernd Schandl - German (Deutsch)\n' \ - u'Andr\xe9s Sep\xfalveda - Spanish (Espa\xf1ol)\n' \ - u'Laurent Protois - French (Fran\xe7ais)\n' \ - u'Marco Molteni - Italian (Italiano)\n' \ - u'Marcos Bedinelli - Brazilian-Portuguese (Portugu\xeas do Brasil)\n' \ - u'Alex Roitman - Russian\n' \ - u'Jens Arvidsson - Swedish (Svenska)\n' \ - u'Tino Meinen - Dutch' \ - - - +translators = u'Radek Malcic - Czech\n' \ + u'Lars Kristian Lundin - Danish (Dansk)\n' \ + u'Bernd Schandl - German (Deutsch)\n' \ + u'Andr\xe9s Sep\xfalveda - Spanish (Espa\xf1ol)\n' \ + u'Laurent Protois - French (Fran\xe7ais)\n' \ + u'Marco Molteni - Italian (Italiano)\n' \ + u'Marcos Bedinelli - Brazilian-Portuguese\n' \ + u'Alex Roitman - Russian\n' \ + u'Jens Arvidsson - Swedish (Svenska)\n' \ + u'Radu Bogden Mare - Romanian\n' \ + u'Tino Meinen - Dutch' \ #------------------------------------------------------------------------- #