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

* src/AddrEdit.py: Make preformatetd note appear without wrapping.

Browse Source 
* src/EditPerson.py: No wrapping for preformatted notes.
* src/EditPlace.py: No wrapping for preformatted notes.
* src/EditSource.py: No wrapping for preformatted notes.
* src/EventEdit.py: No wrapping for preformatted notes.
* src/ImageSelect.py: No wrapping for preformatted notes.
* src/NameEdit.py: No wrapping for preformatted notes.
* src/Marriage.py: No wrapping for preformatted notes.


svn: r5925
This commit is contained in:
Alex Roitman 2006-02-12 20:39:52 +00:00
parent 34e7c8c67d
commit fa8dde68bc
9 changed files with 99 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gramps2/ChangeLog
View File

@ -2,6 +2,15 @@
* src/plugins/ReadPkg.py (impData): Use persistent directory for
unpacking the tarball: we need images to stay there.
* src/AddrEdit.py: Make preformatetd note appear without wrapping.
* src/EditPerson.py: No wrapping for preformatted notes.
* src/EditPlace.py: No wrapping for preformatted notes.
* src/EditSource.py: No wrapping for preformatted notes.
* src/EventEdit.py: No wrapping for preformatted notes.
* src/ImageSelect.py: No wrapping for preformatted notes.
* src/NameEdit.py: No wrapping for preformatted notes.
* src/Marriage.py: No wrapping for preformatted notes.
2006-02-11 Don Allingham <don@gramps-project.org>
* src/GrampsMime.py: detect directory type
* src/ImageSelect.py: don't allow directory types to be added

11
gramps2/src/AddrEdit.py
View File

@ -1,7 +1,7 @@
#
# Gramps - a GTK+/GNOME based genealogy program
#
# Copyright (C) 2000-2005 Donald N. Allingham
# Copyright (C) 2000-2006 Donald N. Allingham
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -139,8 +139,10 @@ class AddressEditor:
Utils.bold_label(self.notes_label)
if addr.get_note_format() == 1:
self.preform.set_active(1)
self.note_field.set_wrap_mode(gtk.WRAP_NONE)
else:
self.flowed.set_active(1)
self.note_field.set_wrap_mode(gtk.WRAP_WORD)
else:
self.addr_date_obj = Date.Date()
self.srcreflist = []
@ -162,6 +164,7 @@ class AddressEditor:
okbtn.set_sensitive(not self.db.readonly)
self.gladeif.connect('button129','clicked',self.on_help_clicked)
self.gladeif.connect('notebook2','switch_page',self.on_switch_page)
self.gladeif.connect('addr_preform','toggled',self.format_toggled)
if parent_window:
self.window.set_transient_for(parent_window)
@ -238,6 +241,12 @@ class AddressEditor:
self.callback(self.addr)
self.close(obj)
def format_toggled(self,junk):
if self.preform.get_active():
self.note_field.set_wrap_mode(gtk.WRAP_NONE)
else:
self.note_field.set_wrap_mode(gtk.WRAP_WORD)
def check(self,get,set,data):
"""Compares a data item, updates if necessary, and sets the
parents lists_changed flag"""

13
gramps2/src/EditPerson.py
View File

@ -1,7 +1,7 @@
#
# Gramps - a GTK+/GNOME based genealogy program
#
# Copyright (C) 2000-2005 Donald N. Allingham
# Copyright (C) 2000-2006 Donald N. Allingham
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -408,8 +408,10 @@ class EditPerson:
self.notes_buffer.set_text(person.get_note())
if person.get_note_object().get_format() == 1:
self.preform.set_active(1)
self.notes_field.set_wrap_mode(gtk.WRAP_NONE)
else:
self.flowed.set_active(1)
self.notes_field.set_wrap_mode(gtk.WRAP_WORD)
Utils.bold_label(self.notes_label)
self.set_list_dnd(self.name_list, self.name_drag_data_get,
@ -478,7 +480,8 @@ class EditPerson:
self.gladeif.connect("button129", "clicked", self.on_ldsendow_note_clicked)
self.gladeif.connect("button133", "clicked", self.on_ldsseal_source_clicked)
self.gladeif.connect("button130", "clicked", self.on_ldsseal_note_clicked)
self.gladeif.connect('preform','toggled',self.format_toggled)
self.sourcetab = Sources.SourceTab(
self.srcreflist, self, self.top, self.window, self.slist,
self.top.get_widget('add_src'), self.top.get_widget('edit_src'),
@ -506,6 +509,12 @@ class EditPerson:
self.window.show()
def format_toggled(self,junk):
if self.preform.get_active():
self.notes_field.set_wrap_mode(gtk.WRAP_NONE)
else:
self.notes_field.set_wrap_mode(gtk.WRAP_WORD)
def set_list_dnd(self,obj, get, begin, receive):
obj.drag_dest_set(gtk.DEST_DEFAULT_ALL, [DdTargets.NAME.target()],
ACTION_COPY)

11
gramps2/src/EditPlace.py
View File

@ -1,7 +1,7 @@
#
# Gramps - a GTK+/GNOME based genealogy program
#
# Copyright (C) 2000-2005 Donald N. Allingham
# Copyright (C) 2000-2006 Donald N. Allingham
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -189,8 +189,10 @@ class EditPlace:
Utils.bold_label(self.notes_label)
if place.get_note_format() == 1:
self.preform.set_active(1)
self.note.set_wrap_mode(gtk.WRAP_NONE)
else:
self.flowed.set_active(1)
self.note.set_wrap_mode(gtk.WRAP_WORD)
self.flowed.set_sensitive(mode)
self.preform.set_sensitive(mode)
@ -214,6 +216,7 @@ class EditPlace:
self.gladeif.connect('web_edit', 'clicked', self.on_update_url_clicked)
self.gladeif.connect('web_go', 'clicked', self.on_web_go_clicked)
self.gladeif.connect('del_url', 'clicked', self.on_delete_url_clicked)
self.gladeif.connect('place_preform','toggled',self.format_toggled)
self.sourcetab = Sources.SourceTab(
self.srcreflist,self,
@ -259,6 +262,12 @@ class EditPlace:
self.idle = gobject.idle_add(self.display_references)
self.ref_not_loaded = 0
def format_toggled(self,junk):
if self.preform.get_active():
self.note.set_wrap_mode(gtk.WRAP_NONE)
else:
self.note.set_wrap_mode(gtk.WRAP_WORD)
def build_pdmap(self):
self.pdmap.clear()
cursor = self.db.get_place_cursor()

11
gramps2/src/EditSource.py
View File

@ -1,7 +1,7 @@
#
# Gramps - a GTK+/GNOME based genealogy program
#
# Copyright (C) 2000-2005 Donald N. Allingham
# Copyright (C) 2000-2006 Donald N. Allingham
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -135,8 +135,10 @@ class EditSource:
Utils.bold_label(self.notes_label)
if source.get_note_format() == 1:
self.preform.set_active(1)
self.note.set_wrap_mode(gtk.WRAP_NONE)
else:
self.flowed.set_active(1)
self.note.set_wrap_mode(gtk.WRAP_WORD)
if self.source.get_media_list():
Utils.bold_label(self.gallery_label)
@ -152,6 +154,7 @@ class EditSource:
self.gladeif.connect('sel_photo','clicked',self.gallery.on_select_media_clicked)
self.gladeif.connect('edit_photo','clicked',self.gallery.on_edit_media_clicked)
self.gladeif.connect('delete_photo','clicked',self.gallery.on_delete_media_clicked)
self.gladeif.connect('source_preform','toggled',self.format_toggled)
if self.source.get_handle() == None or self.db.readonly:
self.top_window.get_widget("edit_photo").set_sensitive(False)
@ -198,6 +201,12 @@ class EditSource:
self.idle = gobject.idle_add(self.display_references)
self.data_sel = self.datalist.get_selection()
def format_toggled(self,junk):
if self.preform.get_active():
self.note.set_wrap_mode(gtk.WRAP_NONE)
else:
self.note.set_wrap_mode(gtk.WRAP_WORD)
def on_add_data_clicked(self,widget):
node = self.data_model.append(row=['',''])
self.data_sel.select_iter(node)

11
gramps2/src/EventEdit.py
View File

@ -1,7 +1,7 @@
#
# Gramps - a GTK+/GNOME based genealogy program
#
# Copyright (C) 2000-2005 Donald N. Allingham
# Copyright (C) 2000-2006 Donald N. Allingham
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -204,8 +204,10 @@ class EventEditor:
Utils.bold_label(self.notes_label)
if event.get_note_format() == 1:
self.preform.set_active(1)
self.note_field.set_wrap_mode(gtk.WRAP_NONE)
else:
self.flowed.set_active(1)
self.note_field.set_wrap_mode(gtk.WRAP_WORD)
if event.get_media_list():
Utils.bold_label(self.gallery_label)
else:
@ -236,6 +238,7 @@ class EventEditor:
self.gladeif.connect('sel_obj','clicked',self.gallery.on_select_media_clicked)
self.gladeif.connect('button172','clicked',self.gallery.on_edit_media_clicked)
self.gladeif.connect('del_obj','clicked',self.gallery.on_delete_media_clicked)
self.gladeif.connect('eventpreform','toggled',self.format_toggled)
self.top.get_widget('del_obj').set_sensitive(not noedit)
self.top.get_widget('sel_obj').set_sensitive(not noedit)
@ -248,6 +251,12 @@ class EventEditor:
self.add_itself_to_menu()
self.window.show()
def format_toggled(self,junk):
if self.preform.get_active():
self.note_field.set_wrap_mode(gtk.WRAP_NONE)
else:
self.note_field.set_wrap_mode(gtk.WRAP_WORD)
def on_delete_event(self,obj,b):
self.gladeif.close()
self.gallery.close()

20
gramps2/src/ImageSelect.py
View File

@ -1,7 +1,7 @@
#
# Gramps - a GTK+/GNOME based genealogy program
#
# Copyright (C) 2000-2005 Donald N. Allingham
# Copyright (C) 2000-2006 Donald N. Allingham
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -783,8 +783,10 @@ class LocalMediaProperties:
Utils.bold_label(self.notes_label)
if self.photo.get_note_format() == 1:
self.preform.set_active(1)
self.notes.set_wrap_mode(gtk.WRAP_NONE)
else:
self.flowed.set_active(1)
self.notes.set_wrap_mode(gtk.WRAP_WORD)
self.gladeif = GladeIf(self.change_dialog)
self.gladeif.connect('change_description','delete_event',self.on_delete_event)
@ -795,6 +797,7 @@ class LocalMediaProperties:
self.gladeif.connect('button86','clicked',self.on_add_attr_clicked)
self.gladeif.connect('button100','clicked',self.on_update_attr_clicked)
self.gladeif.connect('button88','clicked',self.on_delete_attr_clicked)
self.gladeif.connect('preform','toggled',self.format_toggled)
media_obj = self.db.get_object_from_handle(self.photo.get_reference_handle())
gnote = self.change_dialog.get_widget('global_notes')
@ -808,6 +811,12 @@ class LocalMediaProperties:
self.add_itself_to_menu()
self.window.show()
def format_toggled(self,junk):
if self.preform.get_active():
self.notes.set_wrap_mode(gtk.WRAP_NONE)
else:
self.notes.set_wrap_mode(gtk.WRAP_WORD)
def on_delete_event(self,obj,b):
self.gladeif.close()
self.close_child_windows()
@ -1073,8 +1082,10 @@ class GlobalMediaProperties:
Utils.bold_label(self.notes_label)
if self.obj.get_note_format() == 1:
self.preform.set_active(1)
self.notes.set_wrap_mode(gtk.WRAP_NONE)
else:
self.flowed.set_active(1)
self.notes.set_wrap_mode(gtk.WRAP_WORD)
self.gladeif.connect('change_global','delete_event',
self.on_delete_event)
@ -1086,6 +1097,7 @@ class GlobalMediaProperties:
self.gladeif.connect('add_attr','clicked',self.on_add_attr_clicked)
self.gladeif.connect('button101','clicked',self.on_update_attr_clicked)
self.gladeif.connect('del_attr','clicked',self.on_delete_attr_clicked)
self.gladeif.connect('global_preform','toggled',self.format_toggled)
for name in ['gl_del_src','gl_add_src','add_attr','del_attr','ok']:
self.change_dialog.get_widget(name).set_sensitive(mode)
@ -1100,6 +1112,12 @@ class GlobalMediaProperties:
self.cursor_type = None
self.idle = gobject.idle_add(self.display_refs)
def format_toggled(self,junk):
if self.preform.get_active():
self.notes.set_wrap_mode(gtk.WRAP_NONE)
else:
self.notes.set_wrap_mode(gtk.WRAP_WORD)
def on_delete_event(self,obj,b):
self.close_child_windows()
self.remove_itself_from_menu()

11
gramps2/src/Marriage.py
View File

@ -1,7 +1,7 @@
#
# Gramps - a GTK+/GNOME based genealogy program
#
# Copyright (C) 2000-2005 Donald N. Allingham
# Copyright (C) 2000-2006 Donald N. Allingham
#
# This program is free software; you can redistribute it and/or modiy
# it under the terms of the GNU General Public License as published by
@ -138,6 +138,7 @@ class Marriage:
self.gladeif.connect('media_del','clicked',self.gallery.on_delete_media_clicked)
self.gladeif.connect('button114','clicked',self.lds_src_clicked)
self.gladeif.connect('button115','clicked',self.lds_note_clicked)
self.gladeif.connect('mar_preform','toggled',self.format_toggled)
mode = not self.db.readonly
@ -310,8 +311,10 @@ class Marriage:
Utils.bold_label(self.notes_label)
if family.get_note_format() == 1:
self.preform.set_active(1)
self.notes_field.set_wrap_mode(gtk.WRAP_NONE)
else:
self.flowed.set_active(1)
self.notes_field.set_wrap_mode(gtk.WRAP_WORD)
self.sourcetab = Sources.SourceTab(
self.srcreflist, self, self.top, self.window, self.slist,
@ -350,6 +353,12 @@ class Marriage:
index = 0
combo.set_active(index)
def format_toggled(self,junk):
if self.preform.get_active():
self.notes_field.set_wrap_mode(gtk.WRAP_NONE)
else:
self.notes_field.set_wrap_mode(gtk.WRAP_WORD)
def close_child_windows(self):
for child_window in self.child_windows.values():
child_window.close(None)

11
gramps2/src/NameEdit.py
View File

@ -1,7 +1,7 @@
#
# Gramps - a GTK+/GNOME based genealogy program
#
# Copyright (C) 2000-2005 Donald N. Allingham
# Copyright (C) 2000-2006 Donald N. Allingham
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -167,6 +167,7 @@ class NameEditor:
self.gladeif.connect('button131','clicked',self.on_help_clicked)
self.gladeif.connect('notebook3','switch_page',self.on_switch_page)
self.gladeif.connect('group_over','toggled',self.on_group_over_toggled)
self.gladeif.connect('alt_preform','toggled',self.format_toggled)
if name != None:
self.given_field.set_text(name.get_first_name())
@ -182,8 +183,10 @@ class NameEditor:
Utils.bold_label(self.notes_label)
if name.get_note_format() == 1:
self.preform.set_active(1)
self.note_field.set_wrap_mode(gtk.WRAP_NONE)
else:
self.flowed.set_active(1)
self.note_field.set_wrap_mode(gtk.WRAP_WORD)
self.display_as.set_active(name.get_display_as())
self.sort_as.set_active(name.get_display_as())
grp_as = name.get_group_as()
@ -201,6 +204,12 @@ class NameEditor:
self.add_itself_to_menu()
self.window.show()
def format_toggled(self,junk):
if self.preform.get_active():
self.note_field.set_wrap_mode(gtk.WRAP_NONE)
else:
self.note_field.set_wrap_mode(gtk.WRAP_WORD)
def update_group_as(self,obj):
if not self.group_over.get_active():
if self.name and self.name.get_group_as() != self.name.get_surname():