1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-05 00:02:29 -04:00
Commit graph

547 commits

Author SHA1 Message Date
Shlomi Fish
d9ab7b2e4f menubar.py : move more code to base class. 2016-02-19 23:11:45 +02:00
Shlomi Fish
cde9bc5fb5 menubar: move more code to the base class. 2016-02-19 23:06:16 +02:00
Shlomi Fish
ee1114fb3b Continue moving more menubar func to base class. 2016-02-19 19:27:22 +02:00
Shlomi Fish
97a70ea882 More refactoring. 2016-02-19 19:19:18 +02:00
Shlomi Fish
e182ddd68f Refactor pysollib/hint.
Still a lot of ugliness showing but it's better than nothing.
2016-02-19 18:58:16 +02:00
Shlomi Fish
7780d6fccd Fix some import bugs in the menubar parent class. 2016-02-19 18:23:12 +02:00
Shlomi Fish
81b37f8673 Fix a bug with an unassigned var.
It prevented running the solver in mid play.
2016-02-19 18:15:28 +02:00
Shlomi Fish
8fcb811608 Move duplicate code to the menuar base class. 2016-02-19 17:55:30 +02:00
Shlomi Fish
2e557fde5d Unify the codebases of menubar.pys.
TODO : move to the base class.
2016-02-17 21:36:46 +02:00
Shlomi Fish
98fcd0a357 Move some methods to the base class.
I had to rename some attributes away from the leading two underscores ("__")
because it didn't work with them.
2016-02-17 21:21:26 +02:00
Shlomi Fish
3f962b7134 Extract some common code into a base class. 2016-02-16 18:19:13 +02:00
Shlomi Fish
9f7cc65a5f Merge {tile,tk}/tkwrap. 2016-02-14 16:45:10 +02:00
Shlomi Fish
5d8b82cabe Move {tk,tile}/{card,tkcanvas} to ui.tktile.
They were identical in both places.
2016-02-14 16:14:30 +02:00
Shlomi Fish
1d7fb6fd61 Merge tile/tkutil.py and tk/tkutil.py.
They were identical.
2016-02-14 15:27:54 +02:00
Shlomi Fish
118a83e6ba Correct to the right import path. 2016-02-13 23:48:33 +02:00
Shlomi Fish
4d6dac1316 Start extracting ui.tktile.menubar.
In the process made tkconst common to ui.tktile as well.

ui.tktile will be a common namespace for code common to the tk and tile
UIs.
2016-02-13 20:46:41 +02:00
Shlomi Fish
60257ce016 Reduce diff between {tk,tile}/menubar.py a little.
“Every journey of a thousand miles begins with one small step.”
2016-02-13 20:20:56 +02:00
Shlomi Fish
b03ec17350 Add "Export current layout".
A menu option in the tile (for now only that) menubar.

TODO: the tile and tk directories contain *a lot* of duplicate code.
One should extract base classes and abstract.
2016-02-13 19:30:00 +02:00
Shlomi Fish
8a5b8de137 Extract the calcBoard methods. 2016-02-10 15:33:00 +02:00
Shlomi Fish
0e91ce7750 Correct a typo in a comment 2016-01-08 21:41:11 +02:00
Shlomi Fish
d53e708a38 Correct some typos. 2014-11-06 14:19:06 +02:00
Shlomi Fish
d31855830d Fix the solver_state output with progress off.
Previously - it did not display anything if progress was off.
2014-11-06 13:55:39 +02:00
Shlomi Fish
5da836e778 distinguish between intractable and unsolvable. 2014-10-14 11:37:16 +03:00
Shlomi Fish
415c65194c Convert to a base class. 2014-05-09 17:06:05 +03:00
Shlomi Fish
d2c398881c Remove the import pdb and other cleanups. 2014-05-09 16:56:58 +03:00
Shlomi Fish
c07b60a65c Implement for All in a Row too. 2014-05-09 16:51:44 +03:00
Shlomi Fish
85ecb25e30 Got the solver for BlackHole to work.
Currently there's some duplicate code between it and the
FreeCellSolver_Hint and I haven't checked All in a Row yet.
2014-05-09 16:36:20 +03:00
Shlomi Fish
026025614b Add the Red Hat fix for Pillow.
Pillow is the fork of the Python Imaging Library. Currently using it
PySolFC crashes or causes a malloc corruption.
2013-07-08 20:05:07 +03:00
Shlomi Fish
8a3348962d Remove some unused code. 2013-05-22 13:51:15 +03:00
Shlomi Fish
8a8a7c2714 Convert the move matching to regexps. 2013-05-22 13:49:45 +03:00
Shlomi Fish
3eb36012b3 Start converting the move matches to regexps. 2013-05-22 13:24:26 +03:00
Shlomi Fish
4da89ccc8c Get rid of trailing space. 2013-05-22 12:57:18 +03:00
Shlomi Fish
c12d0c669b Bakers's Game now inherits from FreeCell.
Less duplicate code.
2013-04-15 19:04:39 +03:00
Shlomi Fish
506a2814e5 Remove trailing space. 2013-04-15 18:53:17 +03:00
Shlomi Fish
b2052c91aa Modernise to bonus +=. 2013-04-15 18:49:03 +03:00
Shlomi Fish
3b921faa61 Convert to regex. 2013-04-15 18:40:25 +03:00
Shlomi Fish
5a10318ede Add display and remember for ms[0-9]+ deals.
This causes them to display in the status bar and also to be remembered
when you choose a new deal.
2012-12-12 21:30:32 +02:00
Shlomi Fish
5821000061 Implement the ms[0-9]+ deals.
They are used to deal the Microsoft cards.
2012-12-12 20:16:56 +02:00
Shlomi Fish
826395fb5b Add more. 2012-12-12 16:52:15 +02:00
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
7f42260031 Remove 'Solving method' from the solver dialog.
The --method parameter affects only the current "soft thread" (= single
scan), may confuse laymen, and should not matter when an aggregate scan
preset or theme is specified, and those are in general superior and more
encouraged for fc-solve beginners and most experts a like. An aggregate
scan explicitly sets the --method for each scan individually, so there.

As a result, I don't see the point of having the 'Solving method' there.
Perhaps in the future, a more comprehensive GUI for editing the fc-solve
command line will be in order, but that may end up something like thess
monstrocities:

* http://www.codinghorror.com/blog/2006/11/this-is-what-happens-when-you-let-developers-create-ui.html

* http://i.stack.imgur.com/cVWub.gif
2012-12-11 17:26:24 +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
76b87a3780 Testing tk. 2012-11-25 19:58:01 +02:00
Shlomi Fish
5dc2edda91 Get rid of gettext in init. 2012-11-25 19:43:46 +02:00
Shlomi Fish
924f39db97 Add more. 2012-11-25 19:21:52 +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