Merge branch 'master' of git://github.com/lastpoet/fpdb-lastpoet

pyfpdb/GuiGraphViewer.py

@@ -35,8 +35,10 @@ import Filters
 import Charset
 
 try:
+    calluse = not 'matplotlib' in sys.modules
     import matplotlib
-    matplotlib.use('GTKCairo')
+    if calluse:
+        matplotlib.use('GTKCairo')
     from matplotlib.figure import Figure
     from matplotlib.backends.backend_gtk import FigureCanvasGTK as FigureCanvas
     from matplotlib.backends.backend_gtkagg import NavigationToolbar2GTKAgg as NavigationToolbar

pyfpdb/GuiSessionViewer.py

@@ -30,7 +30,7 @@ try:
     calluse = not 'matplotlib' in sys.modules
     import matplotlib
     if calluse:
-        matplotlib.use('GTK')
+        matplotlib.use('GTKCairo')
     from matplotlib.figure import Figure
     from matplotlib.backends.backend_gtk import FigureCanvasGTK as FigureCanvas
     from matplotlib.backends.backend_gtkagg import NavigationToolbar2GTKAgg as NavigationToolbar

pyfpdb/GuiTourneyGraphViewer.py

@@ -35,8 +35,10 @@ import Filters
 import Charset
 
 try:
+    calluse = not 'matplotlib' in sys.modules
     import matplotlib
-    matplotlib.use('GTKCairo')
+    if calluse:
+        matplotlib.use('GTKCairo')
     from matplotlib.figure import Figure
     from matplotlib.backends.backend_gtk import FigureCanvasGTK as FigureCanvas
     from matplotlib.backends.backend_gtkagg import NavigationToolbar2GTKAgg as NavigationToolbar

pyfpdb/HUD_main.pyw

@@ -111,8 +111,16 @@ class HUD_main(object):
             self.vb.add(self.label)
             self.main_window.add(self.vb)
             self.main_window.set_title(_("HUD Main Window"))
+            cards = os.path.join(os.getcwd(), '..','gfx','fpdb-cards.png')
+            if os.path.exists(cards):
+                self.main_window.set_icon_from_file(cards)
+            elif os.path.exists('/usr/share/pixmaps/fpdb-cards.png'):
+                self.main_window.set_icon_from_file('/usr/share/pixmaps/fpdb-cards.png')
+            else:
+                self.main_window.set_icon_stock(gtk.STOCK_HOME)
             self.main_window.show_all()
             gobject.timeout_add(100, self.check_tables)
+                        
         except:
             log.error("*** Exception in HUD_main.init() *** ")
             for e in traceback.format_tb(sys.exc_info()[2]):