* 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
This commit is contained in:
		@@ -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()
 | 
			
		||||
 | 
			
		||||
#-------------------------------------------------------------------------
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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()
 | 
			
		||||
 
 | 
			
		||||
@@ -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()
 | 
			
		||||
 | 
			
		||||
        #----------------------------------------------------------
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user