Shlomi Fish
b19f75b20f
Remove conflict lines.
2012-12-12 16:51:42 +02:00
Shlomi Fish
ce7a34ba5a
Merge branch 'solver_dialog_remove_so_called_solving_method' into deal_ms_cards
...
Conflicts:
pysollib/actions.py
pysollib/app.py
pysollib/game.py
pysollib/help.py
pysollib/images.py
pysollib/init.py
pysollib/layout.py
pysollib/main.py
pysollib/stack.py
2012-12-12 16:50:53 +02:00
Shlomi Fish
c8573e7ac6
Some fixes.
2012-12-07 16:42:53 +02:00
Shlomi Fish
e2a6c00606
Merge remote-tracking branch 'jimsize/master' into pysolfc_modules_modularization
...
Conflicts:
.gitignore
Makefile
pysollib/acard.py
pysollib/actions.py
pysollib/app.py
pysollib/customgame.py
pysollib/game.py
pysollib/gamedb.py
pysollib/games/__init__.py
pysollib/games/auldlangsyne.py
pysollib/games/braid.py
pysollib/games/calculation.py
pysollib/games/camelot.py
pysollib/games/canfield.py
pysollib/games/curdsandwhey.py
pysollib/games/fan.py
pysollib/games/golf.py
pysollib/games/klondike.py
pysollib/games/larasgame.py
pysollib/games/mahjongg/mahjongg.py
pysollib/games/mahjongg/shisensho.py
pysollib/games/matriarchy.py
pysollib/games/napoleon.py
pysollib/games/numerica.py
pysollib/games/osmosis.py
pysollib/games/pileon.py
pysollib/games/royalcotillion.py
pysollib/games/special/memory.py
pysollib/games/special/poker.py
pysollib/games/special/tarock.py
pysollib/games/spider.py
pysollib/games/takeaway.py
pysollib/games/terrace.py
pysollib/games/threepeaks.py
pysollib/games/tournament.py
pysollib/games/ultra/dashavatara.py
pysollib/games/ultra/hanafuda.py
pysollib/games/ultra/hanafuda1.py
pysollib/games/ultra/hanafuda_common.py
pysollib/games/ultra/hexadeck.py
pysollib/games/ultra/mughal.py
pysollib/games/yukon.py
pysollib/help.py
pysollib/hint.py
pysollib/images.py
pysollib/init.py
pysollib/layout.py
pysollib/main.py
pysollib/mfxutil.py
pysollib/options.py
pysollib/pysolgtk/colorsdialog.py
pysollib/pysolgtk/fontsdialog.py
pysollib/pysolgtk/menubar.py
pysollib/pysolgtk/playeroptionsdialog.py
pysollib/pysolgtk/selectcardset.py
pysollib/pysolgtk/selectgame.py
pysollib/pysolgtk/selecttile.py
pysollib/pysolgtk/soundoptionsdialog.py
pysollib/pysolgtk/statusbar.py
pysollib/pysolgtk/timeoutsdialog.py
pysollib/pysolgtk/tkhtml.py
pysollib/pysolgtk/tkstats.py
pysollib/pysolgtk/tkwidget.py
pysollib/pysolrandom.py
pysollib/pysoltk.py
pysollib/resource.py
pysollib/stack.py
pysollib/stats.py
pysollib/tile/colorsdialog.py
pysollib/tile/edittextdialog.py
pysollib/tile/findcarddialog.py
pysollib/tile/fontsdialog.py
pysollib/tile/gameinfodialog.py
pysollib/tile/menubar.py
pysollib/tile/playeroptionsdialog.py
pysollib/tile/selectcardset.py
pysollib/tile/selectgame.py
pysollib/tile/selecttile.py
pysollib/tile/solverdialog.py
pysollib/tile/soundoptionsdialog.py
pysollib/tile/statusbar.py
pysollib/tile/timeoutsdialog.py
pysollib/tile/tkconst.py
pysollib/tile/tkhtml.py
pysollib/tile/tkstats.py
pysollib/tile/tkwidget.py
pysollib/tile/toolbar.py
pysollib/tile/ttk.py
pysollib/tile/wizarddialog.py
pysollib/tk/colorsdialog.py
pysollib/tk/edittextdialog.py
pysollib/tk/findcarddialog.py
pysollib/tk/fontsdialog.py
pysollib/tk/gameinfodialog.py
pysollib/tk/menubar.py
pysollib/tk/playeroptionsdialog.py
pysollib/tk/selectcardset.py
pysollib/tk/selectgame.py
pysollib/tk/selecttile.py
pysollib/tk/solverdialog.py
pysollib/tk/soundoptionsdialog.py
pysollib/tk/statusbar.py
pysollib/tk/timeoutsdialog.py
pysollib/tk/tkconst.py
pysollib/tk/tkhtml.py
pysollib/tk/tkstats.py
pysollib/tk/tkwidget.py
pysollib/tk/toolbar.py
pysollib/tk/wizarddialog.py
pysollib/util.py
pysollib/winsystems/common.py
pysollib/wizardpresets.py
pysollib/wizardutil.py
setup_osx.py
2012-12-07 16:32:30 +02:00
Shlomi Fish
5dc2edda91
Get rid of gettext in init.
2012-11-25 19:43:46 +02:00
Shlomi Fish
912d576813
Add more.
2012-11-25 19:19:42 +02:00
Shlomi Fish
d9e3d83e9f
wizardutil.
2012-11-25 19:15:36 +02:00
Shlomi Fish
55cc8995ae
pysoltk.
2012-11-25 19:12:33 +02:00
Shlomi Fish
fe8c355a43
Add more.
2012-11-25 18:54:45 +02:00
Shlomi Fish
65cc6b918c
Convert to explicit imports.
2012-11-25 18:52:01 +02:00
Shlomi Fish
884a44ceb0
gamedb.
2012-11-25 18:07:40 +02:00
Shlomi Fish
0785307eb8
Test import of pysollib.util.
2012-11-25 18:00:48 +02:00
Shlomi Fish
03c83d7900
Convert to pysollib.resource.
...
This also includes a sys.path.insert(0, ...) fix (to prepend) instead of
sys.append in order to fix finding pysollib/__init.py__ in the global
path.
2012-11-25 17:55:43 +02:00
Shlomi Fish
308ede18ff
Convert mfxutil and settings imports to pysollib
2012-11-25 17:05:22 +02:00
skomoroh
23490fe487
* fixed bug #3046827
...
git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@267 efabe8c0-fbe8-4139-b769-b5e6d273206e
2011-03-06 07:16:40 +00:00
skomoroh
1a761a56cd
* fixed bug #3046827
...
git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@267 39dd0a4e-7c14-0410-91b3-c4f2d318f732
2011-03-06 07:16:40 +00:00
skomoroh
2f22c2f528
+ save aspect for background image
...
* minor fixes
git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@250 efabe8c0-fbe8-4139-b769-b5e6d273206e
2009-08-13 22:23:38 +00:00
skomoroh
7110cbb765
+ save aspect for background image
...
* minor fixes
git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@250 39dd0a4e-7c14-0410-91b3-c4f2d318f732
2009-08-13 22:23:38 +00:00
skomoroh
2744887cd4
* changed comments style
...
git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@243 efabe8c0-fbe8-4139-b769-b5e6d273206e
2009-07-22 21:36:22 +00:00
skomoroh
232dca18fb
* changed comments style
...
git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@243 39dd0a4e-7c14-0410-91b3-c4f2d318f732
2009-07-22 21:36:22 +00:00
skomoroh
dfe790a101
* changed GPL version to 3
...
* added config-file option sound_sample_buffer_size
* bugfixes
git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@234 efabe8c0-fbe8-4139-b769-b5e6d273206e
2009-06-12 09:32:43 +00:00
skomoroh
fb107c8727
* changed GPL version to 3
...
* added config-file option sound_sample_buffer_size
* bugfixes
git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@234 39dd0a4e-7c14-0410-91b3-c4f2d318f732
2009-06-12 09:32:43 +00:00
skomoroh
93e96d71db
* refactoring: sound=0' ->
sound=False' ...
...
* fixed loading options
* fixed some games
git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@189 efabe8c0-fbe8-4139-b769-b5e6d273206e
2007-07-31 21:31:52 +00:00
skomoroh
7f0cb89de2
* refactoring: sound=0' ->
sound=False' ...
...
* fixed loading options
* fixed some games
git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@189 39dd0a4e-7c14-0410-91b3-c4f2d318f732
2007-07-31 21:31:52 +00:00
skomoroh
6bb2e86dc9
+ 7 new games
...
* improved startup; progressbar has been shown before load/register games
* improved gettext; game names has been translated during registration
* updated russian translation
git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@185 efabe8c0-fbe8-4139-b769-b5e6d273206e
2007-07-20 22:15:07 +00:00
skomoroh
7eb0c5d2d3
+ 7 new games
...
* improved startup; progressbar has been shown before load/register games
* improved gettext; game names has been translated during registration
* updated russian translation
git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@185 39dd0a4e-7c14-0410-91b3-c4f2d318f732
2007-07-20 22:15:07 +00:00
skomoroh
959a14b1eb
+ 1 new game
...
* some changes in settings.py: added TITLE, renamed FC_VERSION to VERSION
git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@184 efabe8c0-fbe8-4139-b769-b5e6d273206e
2007-07-05 21:29:11 +00:00
skomoroh
e640164abb
+ 1 new game
...
* some changes in settings.py: added TITLE, renamed FC_VERSION to VERSION
git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@184 39dd0a4e-7c14-0410-91b3-c4f2d318f732
2007-07-05 21:29:11 +00:00
skomoroh
2477ad8845
* updated for Tk-8.5/Tile-0.8.0
...
git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@175 efabe8c0-fbe8-4139-b769-b5e6d273206e
2007-06-17 21:24:57 +00:00
skomoroh
f16e7dc60d
* updated for Tk-8.5/Tile-0.8.0
...
git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@175 39dd0a4e-7c14-0410-91b3-c4f2d318f732
2007-06-17 21:24:57 +00:00
skomoroh
85c0b50f5c
+ 1 game
...
* updated russian translation
* misc. improvements
git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@148 efabe8c0-fbe8-4139-b769-b5e6d273206e
2007-03-06 22:47:26 +00:00
skomoroh
acf717d877
+ 1 game
...
* updated russian translation
* misc. improvements
git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@148 39dd0a4e-7c14-0410-91b3-c4f2d318f732
2007-03-06 22:47:26 +00:00
skomoroh
03037a4e80
* added exception block for app.loadOptions
...
* updated dump/undump game
* updated russian translation
* bugfixes
git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@140 efabe8c0-fbe8-4139-b769-b5e6d273206e
2007-02-21 23:31:55 +00:00
skomoroh
f48809bc65
* added exception block for app.loadOptions
...
* updated dump/undump game
* updated russian translation
* bugfixes
git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@140 39dd0a4e-7c14-0410-91b3-c4f2d318f732
2007-02-21 23:31:55 +00:00
skomoroh
1e0df4b925
+ animated flip
...
* cleanup code
git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@128 efabe8c0-fbe8-4139-b769-b5e6d273206e
2006-12-21 22:18:22 +00:00
skomoroh
1831696309
+ animated flip
...
* cleanup code
git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@128 39dd0a4e-7c14-0410-91b3-c4f2d318f732
2006-12-21 22:18:22 +00:00
skomoroh
3e649f70eb
* renamed module tksettings to winsystems
...
* improved Tile/SingleGame_StatsDialog
* improved Tile/MfxDialog
* improved Tile/SelectGameDialogWithPreview
* cleanup code
git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@126 efabe8c0-fbe8-4139-b769-b5e6d273206e
2006-12-20 00:40:20 +00:00
skomoroh
4712261797
* renamed module tksettings to winsystems
...
* improved Tile/SingleGame_StatsDialog
* improved Tile/MfxDialog
* improved Tile/SelectGameDialogWithPreview
* cleanup code
git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@126 39dd0a4e-7c14-0410-91b3-c4f2d318f732
2006-12-20 00:40:20 +00:00
skomoroh
e22a6cf8f7
+ 1 new game
...
* bugs fixes
git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@122 efabe8c0-fbe8-4139-b769-b5e6d273206e
2006-12-16 22:43:15 +00:00
skomoroh
fd69d8a0ba
+ 1 new game
...
* bugs fixes
git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@122 39dd0a4e-7c14-0410-91b3-c4f2d318f732
2006-12-16 22:43:15 +00:00
skomoroh
76eea5a5a5
new module: pysollib.tksettings
...
files:
common.py - base classes for all platforms
win32.py, x11.py, aqua.py - platform-specific settings
classes:
initRootWindow - init window (main and html_help)
TkSettings - contain gui-options
git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@120 efabe8c0-fbe8-4139-b769-b5e6d273206e
2006-12-14 23:35:12 +00:00
skomoroh
10f10ecb9c
new module: pysollib.tksettings
...
files:
common.py - base classes for all platforms
win32.py, x11.py, aqua.py - platform-specific settings
classes:
initRootWindow - init window (main and html_help)
TkSettings - contain gui-options
git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@120 39dd0a4e-7c14-0410-91b3-c4f2d318f732
2006-12-14 23:35:12 +00:00
skomoroh
f987ae8488
* changed default sound module to PyGame
...
- removed `sound disabled' dialog
* improved Tile binding
* misc. bugs fixes
git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@100 efabe8c0-fbe8-4139-b769-b5e6d273206e
2006-11-27 22:15:01 +00:00
skomoroh
a185020088
* changed default sound module to PyGame
...
- removed `sound disabled' dialog
* improved Tile binding
* misc. bugs fixes
git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@100 39dd0a4e-7c14-0410-91b3-c4f2d318f732
2006-11-27 22:15:01 +00:00
skomoroh
6178cddeae
+ improved Tile bindings, added theme selection in options-menu
...
- removed `--theme' command-line option, removed settings.TILE_THEME
git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@98 efabe8c0-fbe8-4139-b769-b5e6d273206e
2006-11-15 22:13:08 +00:00
skomoroh
2857be5b4d
+ improved Tile bindings, added theme selection in options-menu
...
- removed `--theme' command-line option, removed settings.TILE_THEME
git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@98 39dd0a4e-7c14-0410-91b3-c4f2d318f732
2006-11-15 22:13:08 +00:00
skomoroh
7c17688df7
- removed app.debug variable
...
git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@95 efabe8c0-fbe8-4139-b769-b5e6d273206e
2006-11-13 23:59:28 +00:00
skomoroh
c5adcb6cb7
- removed app.debug variable
...
git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@95 39dd0a4e-7c14-0410-91b3-c4f2d318f732
2006-11-13 23:59:28 +00:00
skomoroh
6ec0b9ec66
+ 1 new game
...
* improved tile binding
* bugs fixes
git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@92 efabe8c0-fbe8-4139-b769-b5e6d273206e
2006-11-10 22:27:54 +00:00
skomoroh
356f3808e8
+ 1 new game
...
* improved tile binding
* bugs fixes
git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@92 39dd0a4e-7c14-0410-91b3-c4f2d318f732
2006-11-10 22:27:54 +00:00