diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py index 0cb4062b..1d50022e 100644 --- a/pyfpdb/Hud.py +++ b/pyfpdb/Hud.py @@ -60,12 +60,11 @@ class Hud: self.stat_windows = {} self.popup_windows = {} self.font = pango.FontDescription("Sans 8") - -# Set up a main window for this this instance of the HUD - self.main_window = gtk.Window() + +# Set up a main window for this this instance of the HUD + self.main_window = gtk.Window() # self.window.set_decorated(0) self.main_window.set_gravity(gtk.gdk.GRAVITY_STATIC) -# self.main_window.set_keep_above(True) self.main_window.set_title(table.name + " FPDBHUD") self.main_window.connect("destroy", self.kill_hud) self.main_window.set_decorated(False) @@ -295,7 +294,6 @@ class Stat_Window: self.window.set_opacity(parent.colors['hudopacity']) self.window.set_gravity(gtk.gdk.GRAVITY_STATIC) -# self.window.set_keep_above(1) self.window.set_title("%s" % seat) self.window.set_property("skip-taskbar-hint", True) self.window.set_transient_for(parent.main_window) diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py index fb170240..4a855d1d 100755 --- a/pyfpdb/fpdb_import.py +++ b/pyfpdb/fpdb_import.py @@ -138,7 +138,7 @@ class Importer: # ^^ May not work on windows for dir in self.dirlist: for file in os.listdir(dir): - self.filelist = self.filelist + [dir+os.sep+file] + self.filelist = self.filelist + [os.path.join(dir, file)] self.filelist = list(set(self.filelist))