From 96a63cc061778daa3c46f0424507c6db81b241c6 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Thu, 17 Aug 2006 21:39:20 +0000 Subject: [PATCH] 2006-08-17 Alex Roitman * src/StartupDialog.py (__init__): Pass its class to Assistant. * src/Exporter.py (__init__): Pass its class to Assistant. * src/Assistant.py (__init__): Accept parent class (to make assistants unique *only* within their type); (prepare_text_page): Use markup in the text. * NEWS: Update. * src/plugins/Makefile.am (pkgdata_PYTHON): Ship new file. * src/plugins/MediaManager.py: Add new plugin (still in progress). svn: r7192 --- ChangeLog | 10 ++++++++++ NEWS | 7 +++++++ src/Assistant.py | 5 +++-- src/Exporter.py | 2 +- src/StartupDialog.py | 2 +- src/plugins/Makefile.am | 3 ++- 6 files changed, 24 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01e744db1..e886cdb4c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2006-08-17 Alex Roitman + * src/StartupDialog.py (__init__): Pass its class to Assistant. + * src/Exporter.py (__init__): Pass its class to Assistant. + * src/Assistant.py (__init__): Accept parent class (to make + assistants unique *only* within their type); + (prepare_text_page): Use markup in the text. + * NEWS: Update. + * src/plugins/Makefile.am (pkgdata_PYTHON): Ship new file. + * src/plugins/MediaManager.py: Add new plugin (still in progress). + 2006-08-16 Don Allingham * src/DataViews/_PersonView.py: rebuild display after a merge of two people (bug #348) diff --git a/NEWS b/NEWS index 8cb365a8d..0c6d4d4d0 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ +Version 2.1.95 -- the "" release +* Support for attributes in events and event references; + Support for AGE and AGENCY tags in GEDCOM. +* New Media Manager tool: advanced batch operations on media objects/files +* Verification tool displays disconnected people +* Bug fixes + Version 2.1.91 -- the "Strange women lying in ponds distributing swords is no basis for a system of government" release * Transaction-protected metadata (Alex) diff --git a/src/Assistant.py b/src/Assistant.py index 2ee51dd96..36d237341 100644 --- a/src/Assistant.py +++ b/src/Assistant.py @@ -93,13 +93,13 @@ class Assistant(gtk.Object,ManagedWindow.ManagedWindow): ()) } - def __init__(self,uistate,complete,top_title=''): + def __init__(self,uistate,parent_class,complete,top_title=''): gobject.GObject.__init__(self) self.top_title = top_title if uistate: ManagedWindow.ManagedWindow.__init__(self,uistate,[], - self.__class__) + parent_class) else: self.uistate = None @@ -271,6 +271,7 @@ class Assistant(gtk.Object,ManagedWindow.ManagedWindow): hbox.pack_start(image,False) label = gtk.Label(text) label.set_line_wrap(True) + label.set_use_markup(True) hbox.add(label) hbox.show_all() return hbox diff --git a/src/Exporter.py b/src/Exporter.py index 9032cb886..9c349e934 100644 --- a/src/Exporter.py +++ b/src/Exporter.py @@ -93,7 +93,7 @@ class Exporter: self.format_option = None try: - self.w = Assistant.Assistant(uistate,self.complete, + self.w = Assistant.Assistant(uistate,self.__class__,self.complete, _("Export Assistant")) except Errors.WindowActiveError: return diff --git a/src/StartupDialog.py b/src/StartupDialog.py index 6793b5a85..c17a88410 100644 --- a/src/StartupDialog.py +++ b/src/StartupDialog.py @@ -128,7 +128,7 @@ class StartupDialog: Config.set(Config.STARTUP,const.startup) self.close() return - self.w = Assistant.Assistant(None, self.complete) + self.w = Assistant.Assistant(None, self.__class__, self.complete) self.w.add_text_page( _('Getting started'), _('Welcome to GRAMPS, the Genealogical Research ' diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am index 2952248cd..1bf38ee63 100644 --- a/src/plugins/Makefile.am +++ b/src/plugins/Makefile.am @@ -59,7 +59,8 @@ pkgdata_PYTHON = \ ImportGeneWeb.py\ WriteGeneWeb.py\ rel_es.py\ - Checkpoint.py + Checkpoint.py\ + MediaManager.py pkgpyexecdir = @pkgpyexecdir@/plugins pkgpythondir = @pkgpythondir@/plugins