Merge branch 'master' of git://git.assembla.com/fpdboz.git

This commit is contained in:
eblade 2008-12-03 03:25:02 -05:00
commit 703c2a1d12
2 changed files with 721 additions and 562 deletions

File diff suppressed because it is too large Load Diff

View File

@ -22,6 +22,7 @@ import pygtk
pygtk.require('2.0')
import gtk
import os #todo: remove this once import_dir is in fpdb_import
from time import time
class GuiBulkImport (threading.Thread):
def import_dir(self):
@ -29,8 +30,9 @@ class GuiBulkImport (threading.Thread):
self.path=self.inputFile
self.importer.addImportDirectory(self.path)
self.importer.setCallHud(False)
starttime = time()
self.importer.runImport()
print "GuiBulkImport.import_dir done"
print "GuiBulkImport.import_dir done in %s" %(time() - starttime)
def load_clicked(self, widget, data=None):
self.inputFile=self.chooser.get_filename()