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

* src/Report.py: Minor tweaks for file selection.

Browse Source 
* src/docgen//OpenOfficeDoc.py: Correct output for spacing.


svn: r5385
This commit is contained in:
Alex Roitman 2005-11-09 22:23:55 +00:00
parent 3a107558ee
commit ebe0d065e6
3 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gramps2/ChangeLog
View File

@ -7,6 +7,8 @@
* src/BaseDoc.py: Support space above/below paragraph. * src/BaseDoc.py: Support space above/below paragraph.
* src/StyleEditor.py: Support space above/below paragraph. * src/StyleEditor.py: Support space above/below paragraph.
* src/gramps.glade: Support space above/below paragraph. * src/gramps.glade: Support space above/below paragraph.
* src/Report.py: Minor tweaks for file selection.
* src/docgen//OpenOfficeDoc.py: Correct output for spacing.
2005-11-09 Martin Hawlisch <Martin.Hawlisch@gmx.de> 2005-11-09 Martin Hawlisch <Martin.Hawlisch@gmx.de>
* src/DbPrompter.py (DbPrompter): Use Combo to list multiple rcecent files * src/DbPrompter.py (DbPrompter): Use Combo to list multiple rcecent files

4
gramps2/src/Report.py
View File

@ -69,7 +69,7 @@ class FileEntry(gtk.HBox):
gtk.STOCK_OPEN, gtk.STOCK_OPEN,
gtk.RESPONSE_OK)) gtk.RESPONSE_OK))
f.set_current_name(self.entry.get_text()) f.set_current_name(os.path.basename(self.entry.get_text()))
f.set_current_folder(self.spath) f.set_current_folder(self.spath)
status = f.run() status = f.run()
if status == gtk.RESPONSE_OK: if status == gtk.RESPONSE_OK:
@ -84,7 +84,7 @@ class FileEntry(gtk.HBox):
else: else:
self.spath = os.getcwd() self.spath = os.getcwd()
self.defname = path self.defname = path
self.entry.set_text(self.defname) self.entry.set_text(os.path.join(self.spath,self.defname))
def gtk_entry(self): def gtk_entry(self):
return self.entry return self.entry

33
gramps2/src/docgen/OpenOfficeDoc.py
View File

@ -219,7 +219,8 @@ class OpenOfficeDoc(BaseDoc.BaseDoc):
else: else:
self.cntnt.write('style:font-name="Times New Roman" ') self.cntnt.write('style:font-name="Times New Roman" ')
self.cntnt.write('fo:font-size="%.3fpt" ' % font.get_size()) self.cntnt.write('fo:font-size="%.3fpt" ' % font.get_size())
self.cntnt.write('style:font-size-asian="%.3fpt" ' % font.get_size()) self.cntnt.write('style:font-size-asian="%.3fpt" '
% font.get_size())
color = font.get_color() color = font.get_color()
self.cntnt.write('fo:color="#%02x%02x%02x" ' % color) self.cntnt.write('fo:color="#%02x%02x%02x" ' % color)
if font.get_bold(): if font.get_bold():
@ -229,11 +230,16 @@ class OpenOfficeDoc(BaseDoc.BaseDoc):
if font.get_underline(): if font.get_underline():
self.cntnt.write('style:text-underline="single" ') self.cntnt.write('style:text-underline="single" ')
self.cntnt.write('style:text-underline-color="font-color" ') self.cntnt.write('style:text-underline-color="font-color" ')
self.cntnt.write('fo:text-indent="%.2fcm" ' % style.get_first_indent()) self.cntnt.write('fo:text-indent="%.2fcm" '
self.cntnt.write('fo:margin-right="%.2fcm" ' % style.get_right_margin()) % style.get_first_indent())
self.cntnt.write('fo:margin-left="%.2fcm" ' % style.get_left_margin()) self.cntnt.write('fo:margin-right="%.2fcm" '
self.cntnt.write('fo:margin-top="0cm" ') % style.get_right_margin())
self.cntnt.write('fo:margin-bottom="0.212cm"') self.cntnt.write('fo:margin-left="%.2fcm" '
% style.get_left_margin())
self.cntnt.write('fo:margin-top="%.2fcm" '
% style.get_top_margin())
self.cntnt.write('fo:margin-bottom="%.2fcm"'
% style.get_bottom_margin())
self.cntnt.write('/>\n') self.cntnt.write('/>\n')
self.cntnt.write('</style:style>\n') self.cntnt.write('</style:style>\n')
@ -596,11 +602,16 @@ class OpenOfficeDoc(BaseDoc.BaseDoc):
if font.get_underline(): if font.get_underline():
self.sfile.write('style:text-underline="single" ') self.sfile.write('style:text-underline="single" ')
self.sfile.write('style:text-underline-color="font-color" ') self.sfile.write('style:text-underline-color="font-color" ')
self.sfile.write('fo:text-indent="%.2fcm" ' % style.get_first_indent()) self.sfile.write('fo:text-indent="%.2fcm" '
self.sfile.write('fo:margin-right="%.2fcm" ' % style.get_right_margin()) % style.get_first_indent())
self.sfile.write('fo:margin-left="%.2fcm" ' % style.get_left_margin()) self.sfile.write('fo:margin-right="%.2fcm" '
self.sfile.write('fo:margin-top="0cm" ') % style.get_right_margin())
self.sfile.write('fo:margin-bottom="0.212cm"') self.sfile.write('fo:margin-left="%.2fcm" '
% style.get_left_margin())
self.sfile.write('fo:margin-top="%.2fcm" '
% style.get_top_margin())
self.sfile.write('fo:margin-bottom="%.2fcm"'
% style.get_bottom_margin())
self.sfile.write('/>\n') self.sfile.write('/>\n')
self.sfile.write('</style:style>\n') self.sfile.write('</style:style>\n')