evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'gimick'

Browse Source
This commit is contained in:
Steffen Schaumburg 2011-04-10 08:35:29 +02:00
commit e3e4299171
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pyfpdb/fpdb_import.py
View File

@ -314,7 +314,7 @@ class Importer:
for file in self.filelist: for file in self.filelist:
ProgressDialog.progress_update() ProgressDialog.progress_update(file)
(stored, duplicates, partial, errors, ttime) = self.import_file_dict(file, self.filelist[file][0] (stored, duplicates, partial, errors, ttime) = self.import_file_dict(file, self.filelist[file][0]
,self.filelist[file][1], self.filelist[file][2], q) ,self.filelist[file][1], self.filelist[file][2], q)
@ -570,7 +570,7 @@ class ProgressBar:
self.progress.destroy() self.progress.destroy()
def progress_update(self): def progress_update(self, file):
if not self.parent: if not self.parent:
#nothing to do #nothing to do
@ -591,6 +591,10 @@ class ProgressBar:
self.pbar.set_fraction(progress_percent) self.pbar.set_fraction(progress_percent)
self.pbar.set_text(progress_text) self.pbar.set_text(progress_text)
now = datetime.datetime.now()
now_formatted = now.strftime("%H:%M:%S")
self.progresstext.set_text(now_formatted + " - "+self.title+ " " +file+"\n")
def __init__(self, sum, parent): def __init__(self, sum, parent):
@ -605,6 +609,7 @@ class ProgressBar:
self.title = _("Importing") self.title = _("Importing")
self.progress = gtk.Window(gtk.WINDOW_TOPLEVEL) self.progress = gtk.Window(gtk.WINDOW_TOPLEVEL)
self.progress.set_size_request(500,150)
self.progress.set_resizable(False) self.progress.set_resizable(False)
self.progress.set_modal(True) self.progress.set_modal(True)
@ -618,14 +623,23 @@ class ProgressBar:
self.progress.add(vbox) self.progress.add(vbox)
vbox.show() vbox.show()
align = gtk.Alignment(0.5, 0.5, 0, 0) align = gtk.Alignment(0, 0, 0, 0)
vbox.pack_start(align, True, True, 2) vbox.pack_start(align, False, True, 2)
align.show() align.show()
self.pbar = gtk.ProgressBar() self.pbar = gtk.ProgressBar()
align.add(self.pbar) align.add(self.pbar)
self.pbar.show() self.pbar.show()
align = gtk.Alignment(0, 0, 0, 0)
vbox.pack_start(align, False, True, 0)
align.show()
self.progresstext = gtk.Label()
self.progresstext.set_line_wrap(True)
align.add(self.progresstext)
self.progresstext.show()
self.progress.show() self.progress.show()