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

Merged trunk r18541 through r18545 into geps023.

Browse Source 
svn: r18546
This commit is contained in:
Tim G L Lyons 2011-12-03 15:06:12 +00:00
commit effaf60b24
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/cli/argparser.py
View File

@ -131,15 +131,15 @@ class ArgParser(object):
Possible:
1/ FAMTREE : Just the family tree (name or database dir)
2/ -O, --open=FAMTREE, Open of a family tree
3/ -i, --import=FILE, Import a family tree of any format understood by an
importer, optionally provide- f to indicate format
4/ -e, --export=FILE, export a family tree in required format, optionally
provide -f to indicate format
3/ -i, --import=FILE, Import a family tree of any format understood
by an importer, optionally provide -f to indicate format
4/ -e, --export=FILE, export a family tree in required format,
optionally provide -f to indicate format
5/ -f, --format=FORMAT : format after a -i or -e option
6/ -a, --action: An action (possible: 'report', 'tool')
7/ -p, --options=OPTIONS_STRING : specify options
8/ -u, --force-unlock: A locked database can be unlocked by giving this
argument when opening it
8/ -u, --force-unlock: A locked database can be unlocked by giving
this argument when opening it
If the filename (no flags) is specified, the interactive session is
launched using data from filename.
@ -191,18 +191,18 @@ class ArgParser(object):
Possible:
1/ Just the family tree (name or database dir)
2/ -O, --open: Open of a family tree
3/ -i, --import: Import a family tree of any format understood by an importer,
optionally provide -f to indicate format
4/ -e, --export: export a family tree in required format, optionally provide
-f to indicate format
3/ -i, --import: Import a family tree of any format understood by
an importer, optionally provide -f to indicate format
4/ -e, --export: export a family tree in required format, optionally
provide -f to indicate format
5/ -f, --format=FORMAT : format after a -i or -e option
6/ -a, --action: An action (possible: 'report', 'tool')
7/ -p, --options=OPTIONS_STRING : specify options
8/ -u, --force-unlock: A locked database can be unlocked by giving this
argument when opening it
8/ -u, --force-unlock: A locked database can be unlocked by giving
this argument when opening it
9/ -s --show : Show config settings
10/ -c --config=config.setting:value : Set config.setting and start Gramps
without :value, the actual config.setting is shown
10/ -c --config=config.setting:value : Set config.setting and start
Gramps without :value, the actual config.setting is shown
"""
try:

12
src/gui/grampsgui.py
View File

@ -117,12 +117,12 @@ def register_stock_icons ():
('gramps-font-bgcolor', _('Font Background Color'), gtk.gdk.CONTROL_MASK, 0, ''),
('gramps-gramplet', _('Gramplets'), gtk.gdk.CONTROL_MASK, 0, ''),
('gramps-geo', _('Geography'), gtk.gdk.CONTROL_MASK, 0, ''),
('gramps-geo-mainmap', _('Geography'), gtk.gdk.CONTROL_MASK, 0, ''),
('gramps-geo-altmap', _('Geography'), gtk.gdk.CONTROL_MASK, 0, ''),
('geo-show-person', _('GeoPerson'), gtk.gdk.CONTROL_MASK, 0, ''),
('geo-show-family', _('GeoFamily'), gtk.gdk.CONTROL_MASK, 0, ''),
('geo-show-event', _('GeoEvents'), gtk.gdk.CONTROL_MASK, 0, ''),
('geo-show-place', _('GeoPlaces'), gtk.gdk.CONTROL_MASK, 0, ''),
('gramps-geo-mainmap', _('Geography'), gtk.gdk.CONTROL_MASK, 0, ''),
('gramps-geo-altmap', _('Geography'), gtk.gdk.CONTROL_MASK, 0, ''),
('geo-show-person', _('GeoPerson'), gtk.gdk.CONTROL_MASK, 0, ''),
('geo-show-family', _('GeoFamily'), gtk.gdk.CONTROL_MASK, 0, ''),
('geo-show-event', _('GeoEvents'), gtk.gdk.CONTROL_MASK, 0, ''),
('geo-show-place', _('GeoPlaces'), gtk.gdk.CONTROL_MASK, 0, ''),
('gramps-lock', _('Public'), gtk.gdk.CONTROL_MASK, 0, ''),
('gramps-media', _('Media'), gtk.gdk.CONTROL_MASK, 0, ''),
('gramps-merge', _('Merge'), gtk.gdk.CONTROL_MASK, 0, ''),