diff --git a/ChangeLog b/ChangeLog index fd5265b64..4053da20b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-01-26 Don Allingham + * src/GrampsDb/_WriteGedcom.py: make unicode the default for export + * src/GrampsDb/gedcompexport.glade: remove unused dialog + * src/plugins/WritePkg.py: don't attempt to delete missing media objects. + 2007-01-26 Douglas Blank * src/ReportBase/ReportUtils.py: 0000875: _ReportUtils.py has incorrect conversion cm2pt diff --git a/src/GrampsDb/_WriteGedcom.py b/src/GrampsDb/_WriteGedcom.py index 5cef1fd65..943aa9bcc 100644 --- a/src/GrampsDb/_WriteGedcom.py +++ b/src/GrampsDb/_WriteGedcom.py @@ -268,7 +268,7 @@ class GedcomWriterOptionBox: def get_option_box(self): self.restrict = True self.private = True - self.cnvtxt = ansel_utf8.utf8_to_ansel + self.cnvtxt = keep_utf8 self.adopt = GedcomInfo.ADOPT_EVENT glade_file = "%s/gedcomexport.glade" % os.path.dirname(__file__) @@ -286,6 +286,8 @@ class GedcomWriterOptionBox: "on_restrict_toggled": self.on_restrict_toggled, }) + self.topDialog.get_widget("encoding").set_history(1) + filter_obj = self.topDialog.get_widget("filter") self.copy = 0 diff --git a/src/GrampsDb/gedcomexport.glade b/src/GrampsDb/gedcomexport.glade index 377fdfaf1..b2f9cb01a 100644 --- a/src/GrampsDb/gedcomexport.glade +++ b/src/GrampsDb/gedcomexport.glade @@ -18,6 +18,8 @@ False GDK_WINDOW_TYPE_HINT_DIALOG GDK_GRAVITY_NORTH_WEST + True + False False @@ -110,6 +112,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -134,6 +140,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -159,6 +169,10 @@ 0 0 filter + PANGO_ELLIPSIZE_NONE + -1 + False + 0 1 @@ -206,6 +220,10 @@ 0 0 target + PANGO_ELLIPSIZE_NONE + -1 + False + 0 1 @@ -256,11 +274,15 @@ GTK_JUSTIFY_LEFT False False - 0.001 + 0.0010000000475 0.5 0 0 copyright + PANGO_ELLIPSIZE_NONE + -1 + False + 0 1 @@ -547,7 +569,7 @@ 0 media True - * + * False @@ -584,233 +606,4 @@ - - True - - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - False - - - - True - False - 8 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - 0 - - - - - - 0 - False - True - GTK_PACK_END - - - - - - 6 - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 6 - - - 0 - False - False - - - - - - 12 - True - 3 - 2 - False - 6 - 12 - - - - True - Sources: - False - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 2 - 3 - 5 - 5 - fill - - - - - - - True - Families: - False - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 1 - 2 - 5 - 5 - fill - - - - - - - True - People: - False - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 0 - 1 - 5 - 5 - fill - - - - - - - True - GTK_PROGRESS_LEFT_TO_RIGHT - 0 - 0.1 - - - 1 - 2 - 0 - 1 - - - - - - - True - GTK_PROGRESS_LEFT_TO_RIGHT - 0 - 0.1 - - - 1 - 2 - 1 - 2 - - - - - - - True - GTK_PROGRESS_LEFT_TO_RIGHT - 0 - 0.1 - - - 1 - 2 - 2 - 3 - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - diff --git a/src/plugins/WritePkg.py b/src/plugins/WritePkg.py index 6970b646b..6d0766bc3 100644 --- a/src/plugins/WritePkg.py +++ b/src/plugins/WritePkg.py @@ -162,26 +162,26 @@ class PackageWriter: filename = mobject.get_path() if os.path.isfile(filename): archive.add(filename) - else: - # File is lost => ask what to do - if missmedia_action == 0: - mmd = MissingMediaDialog( - _("Media object could not be found"), - _("%(file_name)s is referenced in the database, " - "but no longer exists. The file may have been " - "deleted or moved to a different location. " - "You may choose to either remove the reference " - "from the database, keep the reference to the " - "missing file, or select a new file." - ) % { 'file_name' : filename }, - remove_clicked, leave_clicked, select_clicked) - missmedia_action = mmd.default_action - elif missmedia_action == 1: - remove_clicked() - elif missmedia_action == 2: - leave_clicked() - elif missmedia_action == 3: - select_clicked() +# else: +# # File is lost => ask what to do +# if missmedia_action == 0: +# mmd = MissingMediaDialog( +# _("Media object could not be found"), +# _("%(file_name)s is referenced in the database, " +# "but no longer exists. The file may have been " +# "deleted or moved to a different location. " +# "You may choose to either remove the reference " +# "from the database, keep the reference to the " +# "missing file, or select a new file." +# ) % { 'file_name' : filename }, +# remove_clicked, leave_clicked, select_clicked) +# missmedia_action = mmd.default_action +# elif missmedia_action == 1: +# remove_clicked() +# elif missmedia_action == 2: +# leave_clicked() +# elif missmedia_action == 3: +# select_clicked() # Write XML now g = StringIO()