Merge branch 'master' of git://git.assembla.com/fpdb
This commit is contained in:
commit
0254381ab3
|
@ -77,7 +77,7 @@ class Filters(threading.Thread):
|
|||
self.mainVBox = gtk.VBox(False, 0)
|
||||
self.sw.add_with_viewport(self.mainVBox)
|
||||
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.label = {}
|
||||
|
|
|
@ -116,7 +116,7 @@ class HUD_main(object):
|
|||
self.main_window.set_icon_stock(gtk.STOCK_HOME)
|
||||
if not options.hidden:
|
||||
self.main_window.show_all()
|
||||
gobject.timeout_add(100, self.check_tables)
|
||||
gobject.timeout_add(800, self.check_tables)
|
||||
|
||||
except:
|
||||
log.exception("Error initializing main_window")
|
||||
|
|
|
@ -35,11 +35,15 @@ import Xlib.display
|
|||
|
||||
# FPDB modules
|
||||
from TableWindow import Table_Window
|
||||
import Configuration
|
||||
|
||||
# We might as well do this once and make them globals
|
||||
disp = Xlib.display.Display()
|
||||
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):
|
||||
|
||||
def find_table_parameters(self):
|
||||
|
@ -56,14 +60,18 @@ class Table(Table_Window):
|
|||
self.number = None
|
||||
for listing in os.popen('xwininfo -root -tree').readlines():
|
||||
if re.search(self.search_string, listing, re.I):
|
||||
log.info(listing)
|
||||
mo = re.match(reg, listing, re.VERBOSE)
|
||||
title = re.sub('\"', '', mo.groupdict()["TITLE"])
|
||||
if self.check_bad_words(title): continue
|
||||
self.number = int( mo.groupdict()["XID"], 0 )
|
||||
self.title = title
|
||||
if self.number is None:
|
||||
log.error(_("Could not retrieve XID from table xwininfo. xwininfo is %s") % listing)
|
||||
break
|
||||
|
||||
if self.number is None:
|
||||
log.error(_("No match in XTables for table '%s'.") % self.search_string)
|
||||
return None
|
||||
(self.window, self.parent) = self.get_window_from_xid(self.number)
|
||||
|
||||
|
@ -157,4 +165,3 @@ def treewalk(parent):
|
|||
for ww in treewalk(w):
|
||||
yield ww
|
||||
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
|
@ -1,14 +1,14 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"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"
|
||||
"Last-Translator: Javier Sánchez <donoban@gmail.com>\n"
|
||||
"Language-Team: \n"
|
||||
"Language: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: \n"
|
||||
"X-Poedit-Language: Spanish\n"
|
||||
"X-Poedit-Country: SPAIN\n"
|
||||
|
||||
|
@ -624,7 +624,11 @@ msgstr "Anillo"
|
|||
msgid "Tourney"
|
||||
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"
|
||||
msgstr ""
|
||||
|
||||
|
@ -680,6 +684,23 @@ msgstr ""
|
|||
msgid "No games returned from database"
|
||||
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
|
||||
msgid "From:"
|
||||
msgstr ""
|
||||
|
@ -2771,7 +2792,7 @@ msgstr ""
|
|||
msgid "Tourney Type"
|
||||
msgstr ""
|
||||
|
||||
#: TourneyFilters.py:79
|
||||
#: TourneyFilters.py:86
|
||||
msgid "setting numTourneys:"
|
||||
msgstr ""
|
||||
|
||||
|
@ -2961,6 +2982,14 @@ msgstr ""
|
|||
msgid "Failed to add streets. handtext=%s"
|
||||
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
|
||||
msgid " - press return to continue\n"
|
||||
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.
Loading…
Reference in New Issue
Block a user