Commit Graph

2205 Commits

Author SHA1 Message Date
Ray
fd31ecc0bf Minor problem with rogue merge info in HHC.py. 2009-10-26 11:19:44 -04:00
Mika Bostrom
7b6581de7d Merge branch 'master' into good 2009-10-26 17:09:06 +02:00
Worros
6b7b46754c Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-10-26 23:00:08 +08:00
Mika Bostrom
35b24fa002 Remove a stray conflict marker 2009-10-26 16:53:18 +02:00
Ray
14115b759e Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-10-26 10:10:05 -04:00
Ray
9d42b46459 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-10-26 10:09:57 -04:00
Mika Bostrom
27fa27f370 GTK signal handlers need to return True/False
Since we deal with minimize/expose/show/hide routines ourselves, we
don't want these signals passed any further.

NOTE: if no return type is specified, it is automatically None which
usually is translated to False. That might trigger some weird behaviour,
up to and including rare and hard to reproduce GTK crashes.
2009-10-26 13:29:32 +02:00
Mika Bostrom
bb6b2ab9a2 Fix session timestamp range
PostgreSQL does automatic argument conversion/formatting when dealing
with timestamps. This simplification allows the session stats to be
generated with PostgreSQL as db backend.
2009-10-26 12:55:23 +02:00
Mika Bostrom
73262e808c Merge branch 'master' of git://git.assembla.com/fpdboz 2009-10-26 12:18:37 +02:00
Mika Bostrom
70426a70a0 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-10-26 12:12:56 +02:00
Worros
9360bd6894 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-10-26 17:27:29 +08:00
unknown
22b3d5de7f should minimize to tray in windows. windows 7's tray doesn't like it much, but it'll get over it for now 2009-10-26 05:03:25 -04:00
Worros
115c44e7b1 Move session stats query into SQL.py 2009-10-26 16:39:37 +08:00
sqlcoder
a87bcbb43a allow sort on all cols, tidy up some more details 2009-10-26 08:38:45 +00:00
Worros
e0c193b77d Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-10-26 14:41:11 +08:00
Worros
1f07fa9a14 Merge branch 'master' of git://git.assembla.com/fpdb-mme
Conflicts:
	docs/tabledesign.html
	pyfpdb/CarbonToFpdb.py
	pyfpdb/Configuration.py
	pyfpdb/Database.py
	pyfpdb/EverleafToFpdb.py
	pyfpdb/FpdbSQLQueries.py
	pyfpdb/GuiAutoImport.py
	pyfpdb/GuiBulkImport.py
	pyfpdb/GuiGraphViewer.py
	pyfpdb/GuiPlayerStats.py
	pyfpdb/GuiTableViewer.py
	pyfpdb/HUD_config.xml.example
	pyfpdb/HUD_main.py
	pyfpdb/HandHistoryConverter.py
	pyfpdb/Hud.py
	pyfpdb/Mucked.py
	pyfpdb/SQL.py
	pyfpdb/Stats.py
	pyfpdb/Tables.py
	pyfpdb/fpdb.py
	pyfpdb/fpdb_db.py
	pyfpdb/fpdb_import.py
	pyfpdb/fpdb_parse_logic.py
	pyfpdb/fpdb_simple.py
	pyfpdb/upd_indexes.sql
2009-10-26 14:40:11 +08:00
unknown
f15bb627c0 add trayicon, minimize to tray by default (doesn't work quite right on windows) 2009-10-26 01:36:29 -04:00
Worros
71eb683a3d Make cash cols sortable.
After sqlcoders effort this appears to work
2009-10-26 12:16:20 +08:00
sqlcoder
69b3c5a339 improve sorting but still not quite working right 2009-10-26 00:33:33 +00:00
Mika Bostrom
1dda03fda0 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-10-25 21:40:55 +02:00
Worros
0b049a128b Make green in PlayerStats darker 2009-10-25 20:51:46 +08:00
Worros
73e8544117 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-10-25 20:49:39 +08:00
unknown
0a084d1110 remove try..finally block in HUD_update idle_func function, move return to after the threads_leave() call, HUD now works in Win 7 2009-10-25 08:27:55 -04:00
unknown
3b54fab9e0 remove the exception handler in kill_hud() i think sqlcoder put it in - it doesn't help because the exception isn't a python exception, it's a GTK exception. (looks like a bug in GTK.. not that they'll ever acknowledge anything) 2009-10-25 07:34:07 -04:00
grindi
aff69287ff Merge branch 'master' of git://git.assembla.com/fpdboz 2009-10-25 14:23:08 +03:00
grindi
b4200f9f51 Tiny fix 2009-10-25 14:22:49 +03:00
fpdb-mme
1efdd7fc68 add DatabaseManager 2009-10-25 10:22:06 +01:00
fpdb-mme
0b0312d1ee Signed-off-by: fpdb-mme <jUrner@arcor.de>
initial commit
2009-10-25 00:13:35 +02:00
sqlcoder
b1d65dbadd default all values in hud_params when not passed into get_stats_from_hand 2009-10-24 20:01:24 +01:00
sqlcoder
d39a34686e tidy up main() output 2009-10-24 12:41:51 +01:00
sqlcoder
11f50765c9 fix main 2009-10-24 12:16:26 +01:00
Mika Bostrom
2ff0935aff Include example config file in debian package 2009-10-23 13:06:33 +03:00
Worros
914f930c5b GuiSessionViewer update.
Getting closer - added player and date tests. Not convinced the data coming back is koshur though - got a $3600 day in the middle of my data
2009-10-23 15:01:02 +08:00
Worros
a2309f704c More GuiSessionViewer updates
Getting closer to a decent layout
2009-10-23 13:50:06 +08:00
Worros
397f654789 GuiSession viewer update.
Still broken, got the math right in preparation for candlestick graph
2009-10-22 14:09:36 +08:00
Mika Bostrom
6ec309a685 Provide extra path for mucked cards image
Modified:
* Mucked.py

When running from outside source tree, the image containing mucked
cards' faces could not be loaded. Provide an extra path to load from.
2009-10-22 08:44:45 +03:00
Mika Bostrom
616c07a4eb Merge branch 'master' of git://git.assembla.com/fpdboz 2009-10-21 20:29:44 +03:00
Mika Bostrom
b8f19741e0 Fix packaging issues
Affected files:
* Configuration.py
* Database.py
* HandHistoryConverter.py
* fpdb_import.py

and setup.py to a lesser extent.

Logging requires a configuration file when initialising the class. If we
are executing from outside the source tree, this file is not present.
Catch config parser's error and try to provide the logging config file
from debian package path.

Update symlink target to match python-support from latest Debian and the
oncoming Ubuntu versions.
2009-10-21 20:24:46 +03:00
Mika Bostrom
89aa0fb726 Move other files to non-packaging 2009-10-21 16:42:34 +03:00
Worros
58707d2022 Update GuiSessionViewer.
Still horribly broken, but on its way
2009-10-21 17:22:47 +08:00
Mika Bostrom
690c00470b Add .desktop file 2009-10-21 10:18:34 +03:00
Mika Bostrom
ca714ddd54 Icon graphics
Pick up graphics from icontest branch. These may be used for packaging
improvements
2009-10-21 09:19:36 +03:00
grindi
ae6259e7ae Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-10-21 10:09:05 +04:00
Worros
4f754fa881 Add some prep work for sorting the stats page 2009-10-20 12:06:29 +08:00
Worros
b39f766941 Color cash columns in red and green 2009-10-19 19:39:46 +08:00
sqlcoder
6a029ccfa7 comment out debug statement 2009-10-19 00:36:31 +01:00
sqlcoder
2c7a853b3f keep heading on screen when scrolling stats windows 2009-10-19 00:36:08 +01:00
sqlcoder
35cc1b1314 fix mysql code for new stats options 2009-10-19 00:15:11 +01:00
sqlcoder
4b7aadd325 fix starting hand order 2009-10-18 23:19:26 +01:00
sqlcoder
c1a998b7d8 add all player (and min hands) ability to stats window 2009-10-18 22:56:10 +01:00