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

* src/GrampsCfg.py: signal_autoconnect changes

Browse Source 
* src/ImageSelect.py: signal_autoconnect changes
* src/ReadGedcom.py: signal_autoconnect changes
* src/WriteGedcom.py: signal_autoconnect changes
* src/gedcomimport.glade: signal_autoconnect changes
* src/gramps.glade: signal_autoconnect changes


svn: r5348
This commit is contained in:
Don Allingham 2005-10-25 02:29:12 +00:00
parent df27ab97d1
commit 8d466a146c
7 changed files with 36 additions and 55 deletions

8
gramps2/ChangeLog

@ -1,3 +1,11 @@
2005-10-24 Don Allingham <don@gramps-project.org>
* src/GrampsCfg.py: signal_autoconnect changes
* src/ImageSelect.py: signal_autoconnect changes
* src/ReadGedcom.py: signal_autoconnect changes
* src/WriteGedcom.py: signal_autoconnect changes
* src/gedcomimport.glade: signal_autoconnect changes
* src/gramps.glade: signal_autoconnect changes
2005-10-24 Julio Sanchez <jsanchez@users.sourceforge.net>
* src/WriteGedcom.py: export more objects, better conformance with
the spec, preserve timestamps on objects

13
gramps2/src/GrampsCfg.py

@ -48,6 +48,7 @@ import const
import Utils
import DateHandler
import GrampsDisplay
from WindowUtils import GladeIf
#-------------------------------------------------------------------------
#
@ -143,12 +144,11 @@ class GrampsPreferences:
self.built = 0
self.db = db
self.top = gtk.glade.XML(const.prefsFile,"preferences","gramps")
self.top.signal_autoconnect({
"on_close_clicked" : self.on_close_clicked,
"on_help_clicked" : self.on_propertybox_help,
"on_tree_select_row" : self.select
})
self.gladeif = GladeIf(self.top)
self.gladeif.connect('button6','clicked',self.on_close_clicked)
self.gladeif.connect('button7','clicked',self.on_propertybox_help)
self.window = self.top.get_widget("preferences")
self.tree = self.top.get_widget("tree")
self.store = gtk.TreeStore(gobject.TYPE_STRING)
@ -336,7 +336,8 @@ class GrampsPreferences:
GrampsDisplay.help('gramps-prefs')
def on_close_clicked(self,obj):
Utils.destroy_passed_object(self.window)
self.gladeif.close()
self.window.destroy()
#-------------------------------------------------------------------------
#

9
gramps2/src/ImageSelect.py

@ -119,7 +119,7 @@ class ImageSelect:
if self.path == '':
return
self.glade = gtk.glade.XML(const.imageselFile,"imageSelect","gramps")
self.window = self.glade.get_widget("imageSelect")
@ -133,10 +133,9 @@ class ImageSelect:
Utils.set_titles(self.window,self.glade.get_widget('title'),
_('Select a media object'))
self.glade.signal_autoconnect({
"on_fname_update_preview" : self.on_name_changed,
"on_help_imagesel_clicked" : self.on_help_imagesel_clicked,
})
self.gladeif = GladeIf(self.glade)
self.gladeif.connect('fname', 'update_preview', self.on_name_changed)
if os.path.isdir(_last_path):
self.fname.set_current_folder(_last_path)

34
gramps2/src/ReadGedcom.py

@ -186,26 +186,25 @@ def import2(database, filename, cb, codeset, use_trans):
glade_file = "plugins/gedcomimport.glade"
statusTop = gtk.glade.XML(glade_file,"status","gramps")
statusWindow = statusTop.get_widget("status")
status_window = statusTop.get_widget("status")
Utils.set_titles(statusWindow,statusTop.get_widget('title'),
Utils.set_titles(status_window,statusTop.get_widget('title'),
_('GEDCOM import status'))
statusTop.get_widget("close").set_sensitive(0)
statusTop.signal_autoconnect({
"destroy_passed_object" : Utils.destroy_passed_object
})
closebtn = statusTop.get_widget("close")
closebtn.set_sensitive(0)
closebtn.connect('clicked',lambda x: Utils.destroy_passed_object(status_window))
try:
np = NoteParser(filename, False)
g = GedcomParser(database,filename,statusTop, codeset, np.get_map(),
np.get_lines())
except IOError,msg:
Utils.destroy_passed_object(statusWindow)
status_window.destroy()
ErrorDialog(_("%s could not be opened\n") % filename,str(msg))
return
except:
Utils.destroy_passed_object(statusWindow)
status_window.destroy()
DisplayTrace.DisplayTrace()
return
@ -215,17 +214,17 @@ def import2(database, filename, cb, codeset, use_trans):
try:
close = g.parse_gedcom_file(use_trans)
except IOError,msg:
Utils.destroy_passed_object(statusWindow)
status_window.destroy()
errmsg = _("%s could not be opened\n") % filename
ErrorDialog(errmsg,str(msg))
return
except Errors.GedcomError, val:
(m1,m2) = val.messages()
Utils.destroy_passed_object(statusWindow)
status_window.destroy()
ErrorDialog(m1,m2)
return
except db.DBSecondaryBadError, msg:
Utils.destroy_passed_object(statusWindow)
status_window.destroy()
WarningDialog(_('Database corruption detected'),
_('A problem was detected with the database. Please '
'run the Check and Repair Database tool to fix the '
@ -237,16 +236,17 @@ def import2(database, filename, cb, codeset, use_trans):
return
statusTop.get_widget("close").set_sensitive(True)
statusWindow.set_modal(False)
status_window.set_modal(False)
if close:
statusWindow.destroy()
if cb:
statusWindow.destroy()
status_window.destroy()
elif cb:
status_window.destroy()
cb(1)
elif callback:
callback()
#-------------------------------------------------------------------------
#
#

24
gramps2/src/WriteGedcom.py

@ -438,28 +438,6 @@ class GedcomWriterOptionBox:
self.nl = self.cnvtxt(self.target_ged.get_endl())
# glade_file = "%s/gedcomexport.glade" % os.path.dirname(__file__)
#
# self.exprogress = gtk.glade.XML(glade_file,"exportprogress","gramps")
# self.exprogress.signal_autoconnect({
# "on_close_clicked" : Utils.destroy_passed_object
# })
#
# Utils.set_titles(self.exprogress.get_widget('exportprogress'),
# self.exprogress.get_widget('title'),
# _('GEDCOM export'))
#
# self.fbar = self.exprogress.get_widget("fbar")
# self.pbar = self.exprogress.get_widget("pbar")
# self.sbar = self.exprogress.get_widget("sbar")
# self.progress = self.exprogress.get_widget('exportprogress')
#
# closebtn = self.exprogress.get_widget("close")
# closebtn.connect("clicked",Utils.destroy_passed_object)
# closebtn.set_sensitive(0)
#
# self.export_data(name)
# closebtn.set_sensitive(1)
class GedcomWriter:
def __init__(self,database,person,cl=0,filename="",option_box=None):
@ -570,11 +548,9 @@ class GedcomWriter:
except IOError,msg:
msg2 = _("Could not create %s") % filename
ErrorDialog(msg2,str(msg))
# self.progress.destroy()
return 0
except:
ErrorDialog(_("Could not create %s") % filename)
# self.progress.destroy()
return 0
date = time.ctime(time.time()).split()

1
gramps2/src/gedcomimport.glade

@ -542,7 +542,6 @@
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="destroy_passed_object" object="status"/>
</widget>
</child>
</widget>

2
gramps2/src/gramps.glade

@ -16095,7 +16095,6 @@ Other</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">0</property>
<signal name="clicked" handler="on_close_clicked"/>
</widget>
</child>
@ -16109,7 +16108,6 @@ Other</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-11</property>
<signal name="clicked" handler="on_help_clicked" last_modification_time="Tue, 02 Dec 2003 03:23:46 GMT"/>
</widget>
</child>
</widget>