diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py
old mode 100755
new mode 100644
index bff044d5..bded6069
--- a/pyfpdb/fpdb.py
+++ b/pyfpdb/fpdb.py
@@ -18,7 +18,6 @@
import os
import sys
import re
-import Queue
# if path is set to use an old version of python look for a new one:
# (does this work in linux?)
@@ -67,14 +66,12 @@ if not options.errorsToConsole:
errorFile = open('fpdb-error-log.txt', 'w', 0)
sys.stderr = errorFile
-#import logging
-import logging, logging.config
+import logging
try:
import pygtk
pygtk.require('2.0')
import gtk
- import pango
except:
print "Unable to load PYGTK modules required for GUI. Please install PyCairo, PyGObject, and PyGTK from www.pygtk.org."
raw_input("Press ENTER to continue.")
@@ -82,27 +79,8 @@ except:
import interlocks
-# these imports not required in this module, imported here to report version in About dialog
-try:
- import matplotlib
- matplotlib_version = matplotlib.__version__
-except:
- matplotlib_version = 'not found'
-try:
- import numpy
- numpy_version = numpy.__version__
-except:
- numpy_version = 'not found'
-try:
- import sqlite3
- sqlite3_version = sqlite3.version
- sqlite_version = sqlite3.sqlite_version
-except:
- sqlite3_version = 'not found'
- sqlite_version = 'not found'
import GuiPrefs
-import GuiLogView
import GuiBulkImport
import GuiPlayerStats
import GuiPositionalStats
@@ -118,8 +96,6 @@ import Exceptions
VERSION = "0.12"
-log = Configuration.get_logger("logging.conf", "fpdb")
-
class fpdb:
def tab_clicked(self, widget, tab_name):
"""called when a tab button is clicked to activate that tab"""
@@ -132,12 +108,12 @@ class fpdb:
def add_tab(self, new_page, new_tab_name):
"""adds a tab, namely creates the button and displays it and appends all the relevant arrays"""
- for name in self.nb_tab_names: #todo: check this is valid
+ for name in self.nb_tabs: #todo: check this is valid
if name == new_tab_name:
return # if tab already exists, just go to it
used_before = False
- for i, name in enumerate(self.tab_names):
+ for i, name in enumerate(self.tab_names): #todo: check this is valid
if name == new_tab_name:
used_before = True
event_box = self.tabs[i]
@@ -153,13 +129,13 @@ class fpdb:
#self.nb.append_page(new_page, gtk.Label(new_tab_name))
self.nb.append_page(page, event_box)
- self.nb_tab_names.append(new_tab_name)
+ self.nb_tabs.append(new_tab_name)
page.show()
def display_tab(self, new_tab_name):
"""displays the indicated tab"""
tab_no = -1
- for i, name in enumerate(self.nb_tab_names):
+ for i, name in enumerate(self.nb_tabs):
if new_tab_name == name:
tab_no = i
break
@@ -210,13 +186,13 @@ class fpdb:
(nb, text) = data
page = -1
#print "\n remove_tab: start", text
- for i, tab in enumerate(self.nb_tab_names):
+ for i, tab in enumerate(self.nb_tabs):
if text == tab:
page = i
#print " page =", page
if page >= 0 and page < self.nb.get_n_pages():
#print " removing page", page
- del self.nb_tab_names[page]
+ del self.nb_tabs[page]
nb.remove_page(page)
# Need to refresh the widget --
# This forces the widget to redraw itself.
@@ -237,42 +213,10 @@ class fpdb:
dia.set_comments("GTK AboutDialog comments here")
dia.set_license("GPL v3")
dia.set_website("http://fpdb.sourceforge.net/")
- dia.set_authors(['Steffen', 'Eratosthenes', 's0rrow',
- 'EricBlade', '_mt', 'sqlcoder', 'Bostik', 'and others'])
+ dia.set_authors("Steffen, Eratosthenes, s0rrow, EricBlade, _mt, sqlcoder, Bostik, and others")
dia.set_program_name("Free Poker Database (FPDB)")
-
- db_version = ""
- #if self.db is not None:
- # db_version = self.db.get_version()
- nums = [ ('Operating System', os.name)
- , ('Python', sys.version[0:3])
- , ('GTK+', '.'.join([str(x) for x in gtk.gtk_version]))
- , ('PyGTK', '.'.join([str(x) for x in gtk.pygtk_version]))
- , ('matplotlib', matplotlib_version)
- , ('numpy', numpy_version)
- , ('sqlite3', sqlite3_version)
- , ('sqlite', sqlite_version)
- , ('database', self.settings['db-server'] + db_version)
- ]
- versions = gtk.TextBuffer()
- w = 20 # width used for module names and version numbers
- versions.set_text( '\n'.join( [x[0].rjust(w)+' '+ x[1].ljust(w) for x in nums] ) )
- view = gtk.TextView(versions)
- view.set_editable(False)
- view.set_justification(gtk.JUSTIFY_CENTER)
- view.modify_font(pango.FontDescription('monospace 10'))
- view.show()
- dia.vbox.pack_end(view, True, True, 2)
- l = gtk.Label('Version Information:')
- l.set_alignment(0.5, 0.5)
- l.show()
- dia.vbox.pack_end(l, True, True, 2)
-
dia.run()
dia.destroy()
- log.debug("Threads: ")
- for t in self.threads:
- log.debug("........." + str(t.__class__))
def dia_preferences(self, widget, data=None):
dia = gtk.Dialog("Preferences",
@@ -488,53 +432,6 @@ class fpdb:
self.release_global_lock()
- def dia_logs(self, widget, data=None):
- """opens the log viewer window"""
-
- #lock_set = False
- #if self.obtain_global_lock():
- # lock_set = True
-
- # remove members from self.threads if close messages received
- self.process_close_messages()
-
- viewer = None
- for i, t in enumerate(self.threads):
- if str(t.__class__) == 'GuiLogView.GuiLogView':
- viewer = t
- break
-
- if viewer is None:
- #print "creating new log viewer"
- new_thread = GuiLogView.GuiLogView(self.config, self.window, self.closeq)
- self.threads.append(new_thread)
- else:
- #print "showing existing log viewer"
- viewer.get_dialog().present()
-
- #if lock_set:
- # self.release_global_lock()
-
- def addLogText(self, text):
- end_iter = self.logbuffer.get_end_iter()
- self.logbuffer.insert(end_iter, text)
- self.logview.scroll_to_mark(self.logbuffer.get_insert(), 0)
-
-
- def process_close_messages(self):
- # check for close messages
- try:
- while True:
- name = self.closeq.get(False)
- for i, t in enumerate(self.threads):
- if str(t.__class__) == str(name):
- # thread has ended so remove from list:
- del self.threads[i]
- break
- except Queue.Empty:
- # no close messages on queue, do nothing
- pass
-
def __calendar_dialog(self, widget, entry):
self.dia_confirm.set_modal(False)
d = gtk.Window(gtk.WINDOW_TOPLEVEL)
@@ -637,7 +534,6 @@ class fpdb: