From a577020674e49cc4927ac13c32e59c239dc63f01 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Mon, 27 Nov 2006 03:24:39 +0000 Subject: [PATCH] * configure.in: up version number * src/GrampsCfg.py: window title * src/ColumnOrder.py: window title name * src/DisplayState.py: open recent menu copy * help/C/gramps.xml: typo fixes * po/POTFILES.in: remove unused files svn: r7717 --- ChangeLog | 6 ++++ configure.in | 4 +-- help/C/gramps.xml | 64 +++++++++++++++++++++--------------------- po/POTFILES.in | 4 --- src/ColumnOrder.py | 5 +--- src/DisplayState.py | 11 ++++++-- src/GrampsCfg.py | 5 +--- src/glade/gramps.glade | 57 ++----------------------------------- 8 files changed, 53 insertions(+), 103 deletions(-) diff --git a/ChangeLog b/ChangeLog index ab18f51c1..572016920 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,10 @@ 2006-11-26 Don Allingham + * configure.in: up version number + * src/GrampsCfg.py: window title + * src/ColumnOrder.py: window title name + * src/DisplayState.py: open recent menu copy + * help/C/gramps.xml: typo fixes + * po/POTFILES.in: remove unused files * src/Merge/_MergePerson.py: fixed check_for_child function to handle childrefs * po/gramps.pot: updated diff --git a/configure.in b/configure.in index f50882519..85efbb2dc 100644 --- a/configure.in +++ b/configure.in @@ -11,8 +11,8 @@ AM_INIT_AUTOMAKE(1.6.3) AC_CONFIG_MACRO_DIR([m4]) GNOME_DOC_INIT -RELEASE=0.SVN$(svnversion -n .) -dnl RELEASE=1 +dnl RELEASE=0.SVN$(svnversion -n .) +RELEASE=1 VERSIONSTRING=$VERSION if test x"$RELEASE" != "x" diff --git a/help/C/gramps.xml b/help/C/gramps.xml index 39031a976..f6db58b0d 100644 --- a/help/C/gramps.xml +++ b/help/C/gramps.xml @@ -650,54 +650,54 @@ a particular category. This will become clearer as we explore the different Views, listed below: - - + + People View - Displays the list of people in the database - + Displays the list of people in the database + - + Relationships View - Shows the relationships between the Active Person and other - people. This includes parents, spouses, and children - + Shows the relationships between the Active Person and other + people. This includes parents, spouses, and children + - + Family List View - Shows the list of families in the database - + Shows the list of families in the database + - + Pedigree View - Displays a graphical ancestor tree for the selected - person - + Displays a graphical ancestor tree for the selected + person + - + Events View - Displays the list of events in the database - + Displays the list of events in the database + - + Sources View - Displays the list of sources in the database - + Displays the list of sources in the database + - + Places View - Displays the list of places in the database - + Displays the list of places in the database + - + Media View - Displays the list of media objects in the database - + Displays the list of media objects in the database + - + Repositories View - Displays the list of repositories in the database. - - + Displays the list of repositories in the database. + + Before we launch into a description of each View, let's first explain how to switch between Views. @@ -925,7 +925,7 @@ You may add a new set of parents by either selecting the Add Parents or the - Share Parents. The + Share Parents. The Add Parents button will create a new family with the Active Person listed as a child. The Share Parents button will allow diff --git a/po/POTFILES.in b/po/POTFILES.in index 69029561a..b136418af 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -91,16 +91,12 @@ src/DateHandler/_Date_sv.py src/DateHandler/__init__.py # docgen directory -src/docgen/AbiWord2Doc.py src/docgen/AsciiDoc.py src/docgen/HtmlDoc.py -src/docgen/KwordDoc.py src/docgen/LaTeXDoc.py src/docgen/LPRDoc.py src/docgen/ODSDoc.py src/docgen/ODFDoc.py -src/docgen/OpenOfficeDoc.py -src/docgen/OpenSpreadSheet.py src/docgen/PdfDoc.py src/docgen/PSDrawDoc.py src/docgen/RTFDoc.py diff --git a/src/ColumnOrder.py b/src/ColumnOrder.py index 41017838a..4b3a6cfbe 100644 --- a/src/ColumnOrder.py +++ b/src/ColumnOrder.py @@ -46,10 +46,7 @@ class ColumnOrder(ManagedWindow.ManagedWindow): self.glade = gtk.glade.XML(const.gladeFile,"columns","gramps") - self.set_window(self.glade.get_widget('columns'), - self.glade.get_widget('title'), - win_name, - _('Select Columns')) + self.set_window(self.glade.get_widget('columns'), None, win_name) self.tree = self.glade.get_widget('list') self.arglist = arglist diff --git a/src/DisplayState.py b/src/DisplayState.py index 3ff882d6b..bfe342c16 100644 --- a/src/DisplayState.py +++ b/src/DisplayState.py @@ -179,6 +179,9 @@ class RecentDocsMenu: actions = [] rfiles = gramps_rf.gramps_recent_files rfiles.sort(by_time) + + new_menu = gtk.Menu() + for item in rfiles: try: filename = os.path.basename(item.get_path()).replace('_','__') @@ -186,6 +189,10 @@ class RecentDocsMenu: f.write('' % action_id) actions.append((action_id,None,filename,None,None, make_callback(item,self.load))) + mitem = gtk.MenuItem(filename) + mitem.connect('activate', make_callback(item, self.load)) + mitem.show() + new_menu.append(mitem) except RuntimeError: pass # ignore no longer existing files @@ -197,8 +204,8 @@ class RecentDocsMenu: self.uimanager.ensure_update() f.close() - menu_item = self.uistate.uimanager.get_widget('/MenuBar/FileMenu/OpenRecent') - self.uistate.set_open_recent_menu(menu_item.get_submenu()) + new_menu.show() + self.uistate.set_open_recent_menu(new_menu) def make_callback(n,f): return lambda x: f(n) diff --git a/src/GrampsCfg.py b/src/GrampsCfg.py index 8f5a5c2f7..885c0e60c 100644 --- a/src/GrampsCfg.py +++ b/src/GrampsCfg.py @@ -577,10 +577,7 @@ class NameFormatEditDlg: self.top = gtk.glade.XML(const.gladeFile,'namefmt_edit','gramps') self.dlg = self.top.get_widget('namefmt_edit') - ManagedWindow.set_titles( - self.dlg, - self.top.get_widget('title'), - _('Name Format Editor')) + ManagedWindow.set_titles(self.dlg, None, _('Name Format Editor')) self.examplelabel = self.top.get_widget('example_label') diff --git a/src/glade/gramps.glade b/src/glade/gramps.glade index b5dc0cee7..e7464299a 100644 --- a/src/glade/gramps.glade +++ b/src/glade/gramps.glade @@ -476,7 +476,7 @@ 12 True - 4 + 3 1 False 6 @@ -507,39 +507,11 @@ - - 0 - 1 - 1 - 4 - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 1 0 - 1 - fill - + 3 @@ -14373,31 +14345,6 @@ Very High False 0 - - - True - - False - True - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 10 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - 12