Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* configure.in: up version number

Browse Source 
* 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
This commit is contained in:
Don Allingham 2006-11-27 03:24:39 +00:00
parent e88d7a9cb5
commit bf974f5ff6
8 changed files with 53 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gramps2/ChangeLog
View File

@ -1,4 +1,10 @@
2006-11-26 Don Allingham <don@gramps-project.org> 2006-11-26 Don Allingham <don@gramps-project.org>
* 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 * src/Merge/_MergePerson.py: fixed check_for_child function to handle childrefs
* po/gramps.pot: updated * po/gramps.pot: updated

4
gramps2/configure.in
View File

@ -11,8 +11,8 @@ AM_INIT_AUTOMAKE(1.6.3)
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
GNOME_DOC_INIT GNOME_DOC_INIT
RELEASE=0.SVN$(svnversion -n .) dnl RELEASE=0.SVN$(svnversion -n .)
dnl RELEASE=1 RELEASE=1
VERSIONSTRING=$VERSION VERSIONSTRING=$VERSION
if test x"$RELEASE" != "x" if test x"$RELEASE" != "x"

64
gramps2/help/C/gramps.xml
View File

@ -650,54 +650,54 @@
a particular category. This will become clearer as we explore the a particular category. This will become clearer as we explore the
different Views, listed below:</para> different Views, listed below:</para>
<itemizedlist> <variablelist>
<listitem> <varlistentry>
<term>People View</term> <term>People View</term>
<para>Displays the list of people in the database</para> <listitem><para>Displays the list of people in the database</para></listitem>
</listitem> </varlistentry>
<listitem> <varlistentry>
<term>Relationships View</term> <term>Relationships View</term>
<para>Shows the relationships between the Active Person and other <listitem><para>Shows the relationships between the Active Person and other
people. This includes parents, spouses, and children</para> people. This includes parents, spouses, and children</para></listitem>
</listitem> </varlistentry>
<listitem> <varlistentry>
<term>Family List View</term> <term>Family List View</term>
<para>Shows the list of families in the database</para> <listitem><para>Shows the list of families in the database</para></listitem>
</listitem> </varlistentry>
<listitem> <varlistentry>
<term>Pedigree View</term> <term>Pedigree View</term>
<para>Displays a graphical ancestor tree for the selected <listitem><para>Displays a graphical ancestor tree for the selected
person</para> person</para></listitem>
</listitem> </varlistentry>
<listitem> <varlistentry>
<term>Events View</term> <term>Events View</term>
<para>Displays the list of events in the database</para> <listitem><para>Displays the list of events in the database</para></listitem>
</listitem> </varlistentry>
<listitem> <varlistentry>
<term>Sources View</term> <term>Sources View</term>
<para>Displays the list of sources in the database</para> <listitem><para>Displays the list of sources in the database</para></listitem>
</listitem> </varlistentry>
<listitem> <varlistentry>
<term>Places View</term> <term>Places View</term>
<para>Displays the list of places in the database</para> <listitem><para>Displays the list of places in the database</para></listitem>
</listitem> </varlistentry>
<listitem> <varlistentry>
<term>Media View</term> <term>Media View</term>
<para>Displays the list of media objects in the database</para> <listitem><para>Displays the list of media objects in the database</para></listitem>
</listitem> </varlistentry>
<listitem> <varlistentry>
<term>Repositories View</term> <term>Repositories View</term>
<para>Displays the list of repositories in the database.</para> <listitem><para>Displays the list of repositories in the database.</para></listitem>
</listitem> </varlistentry>
</itemizedlist> </variablelist>
<para>Before we launch into a description of each View, let's first <para>Before we launch into a description of each View, let's first
explain how to switch between Views.</para> explain how to switch between Views.</para>
@ -925,7 +925,7 @@
<para>You may add a new set of parents by either <para>You may add a new set of parents by either
selecting the <guibutton>Add Parents</guibutton> or the selecting the <guibutton>Add Parents</guibutton> or the
<guibuttion>Share Parents</guibuttion>. The <guibutton>Share Parents</guibutton>. The
<guibutton>Add Parents</guibutton> button will create a <guibutton>Add Parents</guibutton> button will create a
new family with the Active Person listed as a child. The new family with the Active Person listed as a child. The
<guibutton>Share Parents</guibutton> button will allow <guibutton>Share Parents</guibutton> button will allow

4
gramps2/po/POTFILES.in
View File

@ -91,16 +91,12 @@ src/DateHandler/_Date_sv.py
src/DateHandler/__init__.py src/DateHandler/__init__.py
# docgen directory # docgen directory
src/docgen/AbiWord2Doc.py
src/docgen/AsciiDoc.py src/docgen/AsciiDoc.py
src/docgen/HtmlDoc.py src/docgen/HtmlDoc.py
src/docgen/KwordDoc.py
src/docgen/LaTeXDoc.py src/docgen/LaTeXDoc.py
src/docgen/LPRDoc.py src/docgen/LPRDoc.py
src/docgen/ODSDoc.py src/docgen/ODSDoc.py
src/docgen/ODFDoc.py src/docgen/ODFDoc.py
src/docgen/OpenOfficeDoc.py
src/docgen/OpenSpreadSheet.py
src/docgen/PdfDoc.py src/docgen/PdfDoc.py
src/docgen/PSDrawDoc.py src/docgen/PSDrawDoc.py
src/docgen/RTFDoc.py src/docgen/RTFDoc.py

5
gramps2/src/ColumnOrder.py
View File

@ -46,10 +46,7 @@ class ColumnOrder(ManagedWindow.ManagedWindow):
self.glade = gtk.glade.XML(const.gladeFile,"columns","gramps") self.glade = gtk.glade.XML(const.gladeFile,"columns","gramps")
self.set_window(self.glade.get_widget('columns'), self.set_window(self.glade.get_widget('columns'), None, win_name)
self.glade.get_widget('title'),
win_name,
_('Select Columns'))
self.tree = self.glade.get_widget('list') self.tree = self.glade.get_widget('list')
self.arglist = arglist self.arglist = arglist

11
gramps2/src/DisplayState.py
View File

@ -179,6 +179,9 @@ class RecentDocsMenu:
actions = [] actions = []
rfiles = gramps_rf.gramps_recent_files rfiles = gramps_rf.gramps_recent_files
rfiles.sort(by_time) rfiles.sort(by_time)
new_menu = gtk.Menu()
for item in rfiles: for item in rfiles:
try: try:
filename = os.path.basename(item.get_path()).replace('_','__') filename = os.path.basename(item.get_path()).replace('_','__')
@ -186,6 +189,10 @@ class RecentDocsMenu:
f.write('<menuitem action="%s"/>' % action_id) f.write('<menuitem action="%s"/>' % action_id)
actions.append((action_id,None,filename,None,None, actions.append((action_id,None,filename,None,None,
make_callback(item,self.load))) 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: except RuntimeError:
pass # ignore no longer existing files pass # ignore no longer existing files
@ -197,8 +204,8 @@ class RecentDocsMenu:
self.uimanager.ensure_update() self.uimanager.ensure_update()
f.close() f.close()
menu_item = self.uistate.uimanager.get_widget('/MenuBar/FileMenu/OpenRecent') new_menu.show()
self.uistate.set_open_recent_menu(menu_item.get_submenu()) self.uistate.set_open_recent_menu(new_menu)
def make_callback(n,f): def make_callback(n,f):
return lambda x: f(n) return lambda x: f(n)

5
gramps2/src/GrampsCfg.py
View File

@ -577,10 +577,7 @@ class NameFormatEditDlg:
self.top = gtk.glade.XML(const.gladeFile,'namefmt_edit','gramps') self.top = gtk.glade.XML(const.gladeFile,'namefmt_edit','gramps')
self.dlg = self.top.get_widget('namefmt_edit') self.dlg = self.top.get_widget('namefmt_edit')
ManagedWindow.set_titles( ManagedWindow.set_titles(self.dlg, None, _('Name Format Editor'))
self.dlg,
self.top.get_widget('title'),
_('Name Format Editor'))
self.examplelabel = self.top.get_widget('example_label') self.examplelabel = self.top.get_widget('example_label')

57
gramps2/src/glade/gramps.glade
View File

@ -476,7 +476,7 @@
<widget class="GtkTable" id="table46"> <widget class="GtkTable" id="table46">
<property name="border_width">12</property> <property name="border_width">12</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="n_rows">4</property> <property name="n_rows">3</property>
<property name="n_columns">1</property> <property name="n_columns">1</property>
<property name="homogeneous">False</property> <property name="homogeneous">False</property>
<property name="row_spacing">6</property> <property name="row_spacing">6</property>
@ -507,39 +507,11 @@
</widget> </widget>
</child> </child>
</widget> </widget>
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
<property name="top_attach">1</property>
<property name="bottom_attach">4</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="title">
<property name="visible">True</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="right_attach">1</property> <property name="right_attach">1</property>
<property name="top_attach">0</property> <property name="top_attach">0</property>
<property name="bottom_attach">1</property> <property name="bottom_attach">3</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing> </packing>
</child> </child>
</widget> </widget>
@ -14373,31 +14345,6 @@ Very High</property>
<property name="homogeneous">False</property> <property name="homogeneous">False</property>
<property name="spacing">0</property> <property name="spacing">0</property>
<child>
<widget class="GtkLabel" id="title">
<property name="visible">True</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">10</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child> <child>
<widget class="GtkTable" id="table76"> <widget class="GtkTable" id="table76">
<property name="border_width">12</property> <property name="border_width">12</property>