From 80c3922bc09e7b3b2a44237418f54e4fef286f18 Mon Sep 17 00:00:00 2001 From: eblade Date: Mon, 16 Mar 2009 18:35:56 -0400 Subject: [PATCH] remove pyc, merge with everyone else remove some useless junk in fpdb.display_tab() --- pyfpdb/HandHistoryConverter.pyc | Bin 10310 -> 0 bytes pyfpdb/fpdb.py | 29 ++++++++++------------------- 2 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 pyfpdb/HandHistoryConverter.pyc diff --git a/pyfpdb/HandHistoryConverter.pyc b/pyfpdb/HandHistoryConverter.pyc deleted file mode 100644 index cecce850bd34cf39a3de334ca43c043c978ef648..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10310 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 diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py index f1ff7e1a..5cdd3d3b 100755 --- a/pyfpdb/fpdb.py +++ b/pyfpdb/fpdb.py @@ -81,23 +81,13 @@ class fpdb: def display_tab(self, new_tab_name): """displays the indicated tab""" #print "start of display_tab, len(self.tab_names):",len(self.tab_names) - tab_no=-1 - #if len(self.tab_names)>1: - for i in range(len(self.tab_names)): - #print "display_tab, new_tab_name:",new_tab_name," self.tab_names[i]:", self.tab_names[i] - if (new_tab_name==self.tab_names[i]): - tab_no=i - #self.tab_buttons[i].set_active(False) - #else: - # tab_no=0 + tab_no = -1 + for i, name in enumerate(self.tab_names): + if name == new_tab_name: + tab_no = i + break - #current_tab_no=-1 - for i in range(len(self.tab_names)): - if self.current_tab==self.tabs[i]: - #self.tab_buttons[i].set_active(False) - pass - - if tab_no==-1: + if tab_no == -1: raise fpdb_simple.FpdbError("invalid tab_no") else: self.main_vbox.remove(self.current_tab) @@ -199,12 +189,13 @@ class fpdb: def dia_recreate_tables(self, widget, data): """Dialogue that asks user to confirm that he wants to delete and recreate the tables""" self.obtain_global_lock() - dia_confirm=gtk.MessageDialog(parent=None, flags=0, type=gtk.MESSAGE_WARNING, + + dia_confirm = gtk.MessageDialog(parent=None, flags=0, type=gtk.MESSAGE_WARNING, buttons=(gtk.BUTTONS_YES_NO), message_format="Confirm deleting and recreating tables") - diastring=("Please confirm that you want to (re-)create the tables. If there already are tables in the database "+self.db.database+" on "+self.db.host+" they will be deleted.") + diastring = "Please confirm that you want to (re-)create the tables. If there already are tables in the database "+self.db.database+" on "+self.db.host+" they will be deleted." dia_confirm.format_secondary_text(diastring)#todo: make above string with bold for db, host and deleted - response=dia_confirm.run() + response = dia_confirm.run() dia_confirm.destroy() if response == gtk.RESPONSE_YES: self.db.recreate_tables()