From 999eac4019c58191ac23a20a3cee23083f6a96db Mon Sep 17 00:00:00 2001 From: steffen123 Date: Mon, 18 Aug 2008 19:42:30 +0100 Subject: [PATCH] p58 - --- docs/known-bugs-and-planned-features.txt | 2 +- pyfpdb/GuiBulkImport.py | 5 +++-- pyfpdb/GuiTableViewer.py | 2 +- pyfpdb/fpdb.py | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/known-bugs-and-planned-features.txt b/docs/known-bugs-and-planned-features.txt index 9851e6e6..fec10458 100644 --- a/docs/known-bugs-and-planned-features.txt +++ b/docs/known-bugs-and-planned-features.txt @@ -3,6 +3,7 @@ Everything is subject to change and especially the order will often change. Patc alpha2 (release by 17Aug) ====== +make windows use correct language version of Appdata, e.g. Anwendungdaten seperate and improve instructions for update update status or make a support matrix table for website add instructions for mailing list to contacts @@ -11,7 +12,6 @@ re-run existing regression tests alpha3 ====== -export imp-callFpdbHud to .conf make it work with postgres expand instructions for profile file ftp: read maxSeats diff --git a/pyfpdb/GuiBulkImport.py b/pyfpdb/GuiBulkImport.py index 7b8aa7ab..f6583cac 100644 --- a/pyfpdb/GuiBulkImport.py +++ b/pyfpdb/GuiBulkImport.py @@ -80,14 +80,15 @@ class GuiBulkImport (threading.Thread): print "todo: implement bulk import thread" #end def run - def __init__(self, db, initial_path="/work/poker-histories/wine-ps/"): + def __init__(self, db, settings): self.db=db + self.settings=settings self.vbox=gtk.VBox(False,1) self.vbox.show() self.chooser = gtk.FileChooserWidget() - self.chooser.set_filename(initial_path) + self.chooser.set_filename(self.settings['bulkImport-defaultPath']) #chooser.set_default_response(gtk.RESPONSE_OK) #self.filesel.ok_button.connect_object("clicked", gtk.Widget.destroy, self.filesel) self.vbox.add(self.chooser) diff --git a/pyfpdb/GuiTableViewer.py b/pyfpdb/GuiTableViewer.py index 0fb29a28..e67355e6 100644 --- a/pyfpdb/GuiTableViewer.py +++ b/pyfpdb/GuiTableViewer.py @@ -243,7 +243,7 @@ class GuiTableViewer (threading.Thread): self.minPrint=0 self.handCount=0 - self.last_read_hand=fpdb_import.import_file_dict(self) + self.last_read_hand=fpdb_import.import_file_dict(self, self.settings) #end def table_viewer.import_clicked def all_clicked(self, widget, data): diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py index 06756328..c7aacd45 100755 --- a/pyfpdb/fpdb.py +++ b/pyfpdb/fpdb.py @@ -343,7 +343,7 @@ class fpdb: def tab_bulk_import(self, widget, data): """opens a tab for bulk importing""" #print "start of tab_bulk_import" - new_import_thread=GuiBulkImport.GuiBulkImport(self.db, self.settings['bulkImport-defaultPath']) + new_import_thread=GuiBulkImport.GuiBulkImport(self.db, self.settings) self.threads.append(new_import_thread) bulk_tab=new_import_thread.get_vbox() self.add_and_display_tab(bulk_tab, "Bulk Import")