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

2007-06-19 Don Allingham <don@gramps-project.org>

Browse Source 
* src/DbManager.py: handle RCS init properly, don't use gziped files
	* src/GrampsDbUtils/_WriteXML.py: pass compress argument properly

2007-06-19  Don Allingham  <don@gramps-project.org>
	* src/DbManager.py: parse comment for display in list
	* src/glade/gramps.glade: fix names of buttons on dbmanager



svn: r8606
This commit is contained in:
Don Allingham 2007-06-20 04:44:32 +00:00
parent 28b00c5bab
commit 5217058733
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,7 +1,15 @@
2007-06-19 Don Allingham <don@gramps-project.org>
* src/DbManager.py: handle RCS init properly, don't use gziped files
* src/GrampsDbUtils/_WriteXML.py: pass compress argument properly
2007-06-19 Alex Roitman <shura@phy.ucsf.edu> 2007-06-19 Alex Roitman <shura@phy.ucsf.edu>
* src/FilterEditor/_FilterEditor.py (_find_dependent_filters): * src/FilterEditor/_FilterEditor.py (_find_dependent_filters):
Add method to first find all filters fo deletion. Add method to first find all filters fo deletion.
2007-06-19 Don Allingham <don@gramps-project.org>
* src/DbManager.py: parse comment for display in list
* src/glade/gramps.glade: fix names of buttons on dbmanager
2007-06-19 Alex Roitman <shura@gramps-project.org> 2007-06-19 Alex Roitman <shura@gramps-project.org>
* src/FilterEditor/_FilterEditor.py (_do_delete_filter): Use a * src/FilterEditor/_FilterEditor.py (_do_delete_filter): Use a
copy for iteration over the filters. copy for iteration over the filters.

21
src/DbManager.py
View File

@ -149,6 +149,8 @@ class DbManager:
""" """
if event.type == gtk.gdk._2BUTTON_PRESS and event.button == 1: if event.type == gtk.gdk._2BUTTON_PRESS and event.button == 1:
data = self.selection.get_selected() data = self.selection.get_selected()
if data[STOCK_COL] == 'gramps-lock':
return
if data[1]: if data[1]:
self.top.response(gtk.RESPONSE_OK) self.top.response(gtk.RESPONSE_OK)
return True return True
@ -548,7 +550,7 @@ def find_revisions(name):
return revlist return revlist
def check_in(db, filename, callback): def check_in(db, filename, callback):
init = [ "rcs", '-i', '-U', '-q', '-t'"GRAMPS database", ] init = [ "rcs", '-i', '-U', '-q', '-t-GRAMPS database', ]
ci = [ "ci", "-q" ] ci = [ "ci", "-q" ]
glade = gtk.glade.XML(const.gladeFile, "comment", "gramps") glade = gtk.glade.XML(const.gladeFile, "comment", "gramps")
@ -559,17 +561,17 @@ def check_in(db, filename, callback):
comment = text.get_text() comment = text.get_text()
top.destroy() top.destroy()
proc = subprocess.Popen(init + [filename + ",v"], stderr = subprocess.PIPE) if not os.path.isfile(filename + ",v") :
status = proc.wait() proc = subprocess.Popen(init + [filename + ",v"], stderr = subprocess.PIPE)
message = "\n".join(proc.stderr.readlines()) status = proc.wait()
proc.stderr.close() message = "\n".join(proc.stderr.readlines())
del proc proc.stderr.close()
del proc
xmlwrite = GrampsDbUtils.XmlWriter(db, callback, xmlwrite = GrampsDbUtils.XmlWriter(db, callback, False, 0)
False, False)
xmlwrite.write(filename) xmlwrite.write(filename)
cmd = ci + ['-m%s' % comment, filename] cmd = ci + ['-m%s' % comment, filename, filename + ",v" ]
proc = subprocess.Popen( proc = subprocess.Popen(
cmd, cmd,
@ -577,6 +579,7 @@ def check_in(db, filename, callback):
stderr = subprocess.PIPE ) stderr = subprocess.PIPE )
proc.stdin.close() proc.stdin.close()
message = "\n".join(proc.stderr.readlines()) message = "\n".join(proc.stderr.readlines())
print message
proc.stderr.close() proc.stderr.close()
status = proc.wait() status = proc.wait()
del proc del proc

2
src/GrampsDbUtils/_WriteXML.py
View File

@ -81,7 +81,7 @@ class XmlWriter(GrampsDbXmlWriter):
def __init__(self, db, callback, strip_photos, compress=1): def __init__(self, db, callback, strip_photos, compress=1):
""" """
""" """
GrampsDbXmlWriter.__init__(self, db, version=const.version) GrampsDbXmlWriter.__init__(self, db, strip_photos, compress, const.version)
def write(self,filename): def write(self,filename):
""" """