Merge branch 'master' of git://git.assembla.com/fpdb

This commit is contained in:
gimick 2011-02-23 22:36:22 +00:00
commit 0254381ab3
12 changed files with 1016 additions and 847 deletions

View File

@ -77,7 +77,7 @@ class Filters(threading.Thread):
self.mainVBox = gtk.VBox(False, 0) self.mainVBox = gtk.VBox(False, 0)
self.sw.add_with_viewport(self.mainVBox) self.sw.add_with_viewport(self.mainVBox)
self.sw.show() self.sw.show()
print "DEBUG: New packing box created!" print _("DEBUG: New packing box created!")
self.found = {'nl':False, 'fl':False, 'pl':False, 'ring':False, 'tour':False} self.found = {'nl':False, 'fl':False, 'pl':False, 'ring':False, 'tour':False}
self.label = {} self.label = {}

View File

@ -116,7 +116,7 @@ class HUD_main(object):
self.main_window.set_icon_stock(gtk.STOCK_HOME) self.main_window.set_icon_stock(gtk.STOCK_HOME)
if not options.hidden: if not options.hidden:
self.main_window.show_all() self.main_window.show_all()
gobject.timeout_add(100, self.check_tables) gobject.timeout_add(800, self.check_tables)
except: except:
log.exception("Error initializing main_window") log.exception("Error initializing main_window")

View File

@ -35,11 +35,15 @@ import Xlib.display
# FPDB modules # FPDB modules
from TableWindow import Table_Window from TableWindow import Table_Window
import Configuration
# We might as well do this once and make them globals # We might as well do this once and make them globals
disp = Xlib.display.Display() disp = Xlib.display.Display()
root = disp.screen().root root = disp.screen().root
c = Configuration.Config()
log = Configuration.get_logger("logging.conf", "hud", log_dir=c.dir_log, log_file='HUD-log.txt')
class Table(Table_Window): class Table(Table_Window):
def find_table_parameters(self): def find_table_parameters(self):
@ -56,14 +60,18 @@ class Table(Table_Window):
self.number = None self.number = None
for listing in os.popen('xwininfo -root -tree').readlines(): for listing in os.popen('xwininfo -root -tree').readlines():
if re.search(self.search_string, listing, re.I): if re.search(self.search_string, listing, re.I):
log.info(listing)
mo = re.match(reg, listing, re.VERBOSE) mo = re.match(reg, listing, re.VERBOSE)
title = re.sub('\"', '', mo.groupdict()["TITLE"]) title = re.sub('\"', '', mo.groupdict()["TITLE"])
if self.check_bad_words(title): continue if self.check_bad_words(title): continue
self.number = int( mo.groupdict()["XID"], 0 ) self.number = int( mo.groupdict()["XID"], 0 )
self.title = title self.title = title
if self.number is None:
log.error(_("Could not retrieve XID from table xwininfo. xwininfo is %s") % listing)
break break
if self.number is None: if self.number is None:
log.error(_("No match in XTables for table '%s'.") % self.search_string)
return None return None
(self.window, self.parent) = self.get_window_from_xid(self.number) (self.window, self.parent) = self.get_window_from_xid(self.number)
@ -157,4 +165,3 @@ def treewalk(parent):
for ww in treewalk(w): for ww in treewalk(w):
yield ww yield ww
yield w yield w

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,14 +1,14 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: fpdb\n" "Project-Id-Version: fpdb\n"
"POT-Creation-Date: 2011-02-18 01:11+CET\n" "POT-Creation-Date: 2011-02-23 16:58+CET\n"
"PO-Revision-Date: \n" "PO-Revision-Date: \n"
"Last-Translator: Javier Sánchez <donoban@gmail.com>\n" "Last-Translator: Javier Sánchez <donoban@gmail.com>\n"
"Language-Team: \n" "Language-Team: \n"
"Language: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Language: \n"
"X-Poedit-Language: Spanish\n" "X-Poedit-Language: Spanish\n"
"X-Poedit-Country: SPAIN\n" "X-Poedit-Country: SPAIN\n"
@ -624,7 +624,11 @@ msgstr "Anillo"
msgid "Tourney" msgid "Tourney"
msgstr "Torneo" msgstr "Torneo"
#: Filters.py:106 TourneyFilters.py:107 #: Filters.py:80
msgid "DEBUG: New packing box created!"
msgstr ""
#: Filters.py:106 TourneyFilters.py:114
msgid "Either 0 or more than one site matched (%s) - EEK" msgid "Either 0 or more than one site matched (%s) - EEK"
msgstr "" msgstr ""
@ -680,6 +684,23 @@ msgstr ""
msgid "No games returned from database" msgid "No games returned from database"
msgstr "" msgstr ""
#: Filters.py:827
msgid "Graphing Options:"
msgstr ""
#: Filters.py:839
msgid "Show Graph In:"
msgstr ""
#: Filters.py:859
msgid "Showdown Winnings"
msgstr ""
#: Filters.py:867
#, fuzzy
msgid "Non-Showdown Winnings"
msgstr "Non-showdown: $%.2f"
#: Filters.py:984 #: Filters.py:984
msgid "From:" msgid "From:"
msgstr "" msgstr ""
@ -2771,7 +2792,7 @@ msgstr ""
msgid "Tourney Type" msgid "Tourney Type"
msgstr "" msgstr ""
#: TourneyFilters.py:79 #: TourneyFilters.py:86
msgid "setting numTourneys:" msgid "setting numTourneys:"
msgstr "" msgstr ""
@ -2961,6 +2982,14 @@ msgstr ""
msgid "Failed to add streets. handtext=%s" msgid "Failed to add streets. handtext=%s"
msgstr "" msgstr ""
#: XTables.py:70
msgid "Could not retrieve XID from table xwininfo. xwininfo is %s"
msgstr ""
#: XTables.py:74
msgid "No match in XTables for table '%s'."
msgstr ""
#: fpdb.pyw:38 #: fpdb.pyw:38
msgid " - press return to continue\n" msgid " - press return to continue\n"
msgstr "" msgstr ""

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

Binary file not shown.

Binary file not shown.