Commit graph

1263 commits

Author SHA1 Message Date
sylvanbasilisk
748aac7ee8 whitespace modifications in preparation for merge 2014-03-25 01:13:41 +00:00
sylvanbasilisk
378cc91c17 delete debug printf statements
this should fix the compilation issue mentioned by mattkelly
2014-03-25 00:07:58 +00:00
sylvanbasilisk
610f0b6f6f make sure filtertree stuff translates
The logic types and attribute names were not previously
being translated by the tr(...) function.
2014-03-24 23:52:30 +00:00
sylvanbasilisk
2b7ea0c983 refactored deck editor UI key shortcuts
The global shortcuts were removed in favor of key events
which are only triggered when a widget has focus. This is
necessary to allow different widgets to react differently
to the 'enter' key. The current key configuration is:
search edit focused:
  * left/right: decrease/increase card count for selected database card
  * enter: add selected card to deck
  * ctrl-enter: add selected card to deck sideboard
  * ctrl-left/right: decrease/increase card count in sideboard for selected card

database focused: the same as with search edit.

deckview focused:
  * left/right: decrease/increase card count for selected deckview card
  * enter: increase count for selected deckview card
  * delete/backspace: delete selected card from deck
2014-03-24 21:03:26 +00:00
sylvanbasilisk
f6e9676c75 revert cardinfowidget to its original content
reverted cardinfowidget to its original form at commit
95c6058dc3 before i messed with
it. i didnt intend to make changes to it.
2014-01-29 07:15:44 +00:00
sylvanbasilisk
f77054f20d refactor cardframe as a parent of a text card frame and a picture card frame
cardframe is now a stacked widget that prefers to show the card picture
only so that the screen can be more space efficient and the card pixel
map can be displayed as a larger size. however if the card pixel map
can not be loaded for some reason, the cardframe class will automatically
switch to the text version of the card.

a menu item was added under the database menu to allow for users to
prefer card text only.
2014-01-29 00:19:34 +00:00
sylvanbasilisk
5d223b5917 clear the filter term text edit box appropriately
clear the text box when the '+' button is pressed or
when the filter attribute is changed.

also changed the frame style to match the card frame style.
2014-01-28 23:51:18 +00:00
sylvanbasilisk
c786e180c3 reverted back to original deck editor layout but including filtertree
the original layout is actually more space efficient if using CardFrame
instead of CardInfoWidget and reducing the size of the deck editor
toolbar.

this commit also removes the old search feature by removing the search
button and the clear search button. the clear search menu item is left
in place, however it now clears the filtertree.

finally, the stretch factor for the right frame in the main layout was
reduced to zero so that the card database gets priority for extra space.
this makes more sense because the deck editor does not actually need
very much horizontal space.
2014-01-26 23:20:35 +00:00
sylvanbasilisk
16d30fb9e1 miscellaneous code cleanup
renamed filter list modules to filter tree to more accurately reflect
the nature of the data structure.
2014-01-22 20:52:52 +00:00
sylvanbasilisk
083005b8a9 implemented filter list enable/disable functionality
also refactored much of the filter list code to be much
cleaner and modular.
2014-01-22 08:32:00 +00:00
sylvanbasilisk
3202243ed0 connect filter list functionality to the CardDatabaseDisplayModel class
enable/disable check boxes still not functional
2014-01-21 23:37:22 +00:00
sylvanbasilisk
863e437d4c added filter builder widget and filter tree
filter builder takes filter options from user, then adds
completed filters to the filter tree. the filter tree does
not currently do anything. in the future it will filter the
cards in the database view.
2014-01-17 10:06:45 +00:00
sylvanbasilisk
0b2231639f initial experiment with editor layout 2014-01-05 09:47:50 +00:00
Daenyth
95c6058dc3 Merge pull request #25 from dreamcwli/master
Repeatly download text spoiler until a valid XML document is received
2013-12-17 08:08:25 -08:00
Chia-Wei Li
01277e9ad9 Repeatly download text spoiler until a valid XML document is received 2013-12-17 19:16:00 +08:00
Daenyth
611d61e48b Merge pull request #24 from arxanas/master
Added setting to enable/disable notifications
2013-12-10 12:25:58 -08:00
arxanas
b1af4237e7 Added setting to enable/disable notifications
When something happens, the taskbar icon lights up/the dock icon
bounces. This can be annoying, so here is a setting to disable that.
2013-12-06 21:04:00 -05:00
Daenyth
f699cd4b0f Merge pull request #23 from taw/master
Made Ctrl-V importer work more robust.
2013-11-12 09:49:24 -08:00
Tomasz Wegrzanowski
b57d628278 Made Ctrl-V importer work more robust. 2013-11-12 11:46:38 +00:00
Daenyth
92ff503832 Merge pull request #7 from skoh-fley/play-to-stack-option
Added a UI option to play all nonlands to the stack instead of the battlefield
2013-07-11 10:58:55 -07:00
Daenyth
db43a0609b Merge branch 'master' of github.com:Daenyth/Cockatrice 2013-07-11 13:51:18 -04:00
Frederik Holden
c0fdbb2cca Fix two bugs in the price tag feature
"The price tag feature currently has two bugs.
1. The final price that a card ends up with is the one in the last set
alphabetically, instead of the one from the set with the lowest price.
2. Black Lotus Project sometimes gets in prices for cards from Masters
Edition, for some reason. This set only exists in Magic the Gathering:
Online, i.e., not physically, and should not be considered. This might
be considered a BLP bug and not a Cockatrice bug.

This patch fixes those two bugs. I also changed the price value to be
based on BLP's "price" value instead of the "average" value. Seems more
logical."

Signed-off-by: Daenyth <Daenyth+git@gmail.com>
2013-07-11 13:50:31 -04:00
Daenyth
2dd5080294 Merge pull request #20 from solygen/master
some markdown
2013-05-23 06:33:17 -07:00
Frank Paczynski
7733f3014f added USERMANUAL markdown based on USERMANUAL.tex 2013-05-23 13:37:11 +02:00
Frank Paczynski
8b742e6f4b SHORTCUTS to markdown 2013-05-23 13:30:20 +02:00
Frank Paczynski
482ae82007 ADD_SETS to markdown 2013-05-23 13:23:48 +02:00
Frank Paczynski
81a8151ada FAQ to markdown 2013-05-23 13:21:49 +02:00
Frank Paczynski
a657aa403c TODO to markdown 2013-05-23 13:13:32 +02:00
Daenyth
6d69fe728a Merge pull request #19 from VanNostrand/documentation
Documentation-Branch v2
2013-05-15 13:13:35 -07:00
Mark Morschhäuser
69fe801034 Changed Arch Linux to Arch Linux (AUR). 2013-05-15 22:10:06 +02:00
Mark Morschhäuser
562de0553f Fixed compile warnings due to missing \n at EOF. 2013-05-15 21:31:47 +02:00
Mark Morschhäuser
187fa23fef Improved/added Linux/BSD compilation documentation. 2013-05-15 21:30:48 +02:00
Daenyth
8ba6424e0d Merge pull request #17 from VanNostrand/compilewarnings
Compilewarnings
2013-05-11 11:34:27 -07:00
Mark Morschhäuser
8484de4277 Added TODO list 2013-05-11 18:48:01 +02:00
Mark Morschhäuser
0022425687 Fixed implicit conversions from double to int warnings regarding
QPainter.drawRect()
2013-05-11 17:41:11 +02:00
Daenyth
d462870ea2 Merge pull request #16 from VanNostrand/smallfix
Changed sets.xml URL due to w32-qt ssl problem
2013-05-09 11:08:10 -07:00
Mark Morschhäuser
314db1f464 Changed sets.xml URL due to w32-qt ssl problem 2013-05-09 19:53:13 +02:00
Mark Morschhäuser
cf70843d0b Merge branch 'master' into smallfix 2013-05-09 19:46:24 +02:00
Daenyth
a1bdece3e8 Merge pull request #15 from VanNostrand/nsis
Add usermanual.pdf to startmenu if created.
2013-05-09 04:10:20 -07:00
Mark Morschhäuser
382394b54c Add usermanual.pdf to startmenu if created. 2013-05-09 08:17:11 +02:00
Daenyth
a5ee926862 Merge pull request #14 from VanNostrand/smallfix
Changed default server to woogerworks
2013-05-08 15:53:00 -07:00
Mark Morschhäuser
f801f4f64d Changed default server to woogerworks 2013-05-08 23:56:09 +02:00
Daenyth
c31a9526e3 Merge pull request #13 from VanNostrand/nsis
NSIS updates
2013-05-08 11:56:51 -07:00
Mark Morschhäuser
66f4041cb3 Updated usermanual to installer changes. 2013-05-08 20:48:05 +02:00
Mark Morschhäuser
90b64a257f Installer shows GPL, appends git hash, uses solid lzma now. 2013-05-08 20:46:57 +02:00
Mark Morschhäuser
204f457e2b Updated COPYING (GPLv2) with GPLv2 from GNU.org (trivial) 2013-05-08 20:45:38 +02:00
Mark Morschhäuser
284d2a8615 Merge branch 'documentation' 2013-05-08 15:09:37 +02:00
Daenyth
e449520a3e Merge pull request #12 from VanNostrand/documentation
Documentation
2013-05-08 06:02:41 -07:00
Mark Morschhäuser
6bf0045967 Installer: added usermanual, use default paths, add timestamp to exe. 2013-05-08 13:42:50 +02:00
Mark Morschhäuser
91366a6f43 Fixed the Windows howto, it uses the official nsis script now. 2013-05-08 13:41:43 +02:00