From c2da2623b1159536a305cdbcd8934e37d7ee90ec Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Tue, 10 Jun 2003 00:00:05 +0000 Subject: [PATCH] * src/ReadXML.py, src/plugins/Check.py, src/plugins/WriteCD.py, src/plugins/WritePkg.py: Proper use of dialog.run() in file selector for missing media files. svn: r1680 --- ChangeLog | 5 +++++ src/ReadXML.py | 5 ++--- src/plugins/Check.py | 5 ++--- src/plugins/WriteCD.py | 5 ++--- src/plugins/WritePkg.py | 5 ++--- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 592c9d08b..cb6912459 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-06-09 Alex Roitman + * src/ReadXML.py, src/plugins/Check.py, src/plugins/WriteCD.py, + src/plugins/WritePkg.py: Proper use of dialog.run() in file + selector for missing media files. + 2003-06-09 Alex Roitman * src/Plugins.py: Register book items with options and style instead of the functions get_options and get_style. diff --git a/src/ReadXML.py b/src/ReadXML.py index fdf209e24..59c13d0a4 100644 --- a/src/ReadXML.py +++ b/src/ReadXML.py @@ -180,7 +180,7 @@ def importData(database, filename, callback,cl=0): def select_clicked(): # File is lost => select a file to replace the lost one def fs_close_window(obj): - fs_top.destroy() + pass def fs_ok_clicked(obj): name = fs_top.get_filename() @@ -190,14 +190,13 @@ def importData(database, filename, callback,cl=0): shutil.copystat(name,newfile) except: pass - Utils.destroy_passed_object(fs_top) fs_top = gtk.FileSelection("%s - GRAMPS" % _("Select file")) fs_top.hide_fileop_buttons() fs_top.ok_button.connect('clicked',fs_ok_clicked) fs_top.cancel_button.connect('clicked',fs_close_window) - fs_top.show() fs_top.run() + fs_top.destroy() #------------------------------------------------------------------------- diff --git a/src/plugins/Check.py b/src/plugins/Check.py index f7d9d9f8f..5b935308b 100644 --- a/src/plugins/Check.py +++ b/src/plugins/Check.py @@ -137,7 +137,7 @@ class CheckIntegrity: def select_clicked(): # File is lost => select a file to replace the lost one def fs_close_window(obj): - fs_top.destroy() + self.bad_photo.append(ObjectMap[ObjectId]) def fs_ok_clicked(obj): name = fs_top.get_filename() @@ -150,14 +150,13 @@ class CheckIntegrity: self.replaced_photo.append(ObjectMap[ObjectId]) else: self.bad_photo.append(ObjectMap[ObjectId]) - Utils.destroy_passed_object(fs_top) fs_top = gtk.FileSelection("%s - GRAMPS" % _("Select file")) fs_top.hide_fileop_buttons() fs_top.ok_button.connect('clicked',fs_ok_clicked) fs_top.cancel_button.connect('clicked',fs_close_window) - fs_top.show() fs_top.run() + fs_top.destroy() #------------------------------------------------------------------------- ObjectMap = self.db.getObjectMap() diff --git a/src/plugins/WriteCD.py b/src/plugins/WriteCD.py index ca034edc7..3d80888e9 100644 --- a/src/plugins/WriteCD.py +++ b/src/plugins/WriteCD.py @@ -211,11 +211,10 @@ class PackageWriter: def select_clicked(): # File is lost => select a file to replace the lost one def fs_close_window(obj): - fs_top.destroy() + pass def fs_ok_clicked(obj): newfile = fs_top.get_filename() - fs_top.destroy() if os.path.isfile(newfile): self.copy_file(newfile,'burn:///%s/%s' % (base,obase)) ntype = Utils.get_mime_type(newfile) @@ -226,8 +225,8 @@ class PackageWriter: fs_top.hide_fileop_buttons() fs_top.ok_button.connect('clicked',fs_ok_clicked) fs_top.cancel_button.connect('clicked',fs_close_window) - fs_top.show() fs_top.run() + fs_top.destroy() #---------------------------------------------------------- diff --git a/src/plugins/WritePkg.py b/src/plugins/WritePkg.py index 1273559af..02e3b67bd 100644 --- a/src/plugins/WritePkg.py +++ b/src/plugins/WritePkg.py @@ -137,11 +137,10 @@ class PackageWriter: def select_clicked(): # File is lost => select a file to replace the lost one def fs_close_window(obj): - fs_top.destroy() + pass def fs_ok_clicked(obj): name = fs_top.get_filename() - fs_top.destroy() if os.path.isfile(name): g = open(name,"rb") t.add_file(base,mtime,g) @@ -151,8 +150,8 @@ class PackageWriter: fs_top.hide_fileop_buttons() fs_top.ok_button.connect('clicked',fs_ok_clicked) fs_top.cancel_button.connect('clicked',fs_close_window) - fs_top.show() fs_top.run() + fs_top.destroy() #--------------------------------------------------------------- t = TarFile.TarFile(filename)