Commit graph

1280 commits

Author SHA1 Message Date
sylvanbasilisk
0770626270 Merge branch 'master' into editor-redesign
Conflicts:
	cockatrice/src/carddatabasemodel.cpp
	cockatrice/src/carddatabasemodel.h
	cockatrice/src/decklistmodel.cpp
	cockatrice/src/decklistmodel.h
	cockatrice/src/tab_deck_editor.cpp
	cockatrice/src/tab_deck_editor.h
2014-03-25 02:10:52 +00:00
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
Gavin Bisesi
ed5f02bf7a Merge pull request #52 from mattkelly/whitespace
Convert rest of source to 4-space indent
2014-02-21 20:53:18 -05:00
Gavin Bisesi
02d5fc64be Merge pull request #54 from mattkelly/pthread-fix
Fix pthread compile errors on Linux
2014-02-21 20:49:17 -05:00
Matt Kelly
b93317cc17 OS X still works with pthread fix - added explanation 2014-02-14 14:14:10 -05:00
Matt Kelly
e366bd7a71 Fixed for Linux - pushing to test on OS X 2014-02-14 13:58:54 -05:00
Matt Kelly
1bc48a7849 Convert rest of source to 4-space indent 2014-02-11 11:14:19 -05:00
Gavin Bisesi
cf26ecb8a1 Merge pull request #51 from mattkelly/master
Resolve all compiler warnings
2014-02-11 11:00:34 -05:00
Matt Kelly
a171df744d Convert to 4-space indents 2014-02-11 10:47:51 -05:00
Matt Kelly
ac8c967d10 Remove compiler warnings from TODO 2014-02-11 01:53:04 -05:00
Matt Kelly
96ec49936e Resolve all compiler warnings 2014-02-11 01:52:06 -05: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
Gavin Bisesi
44e83e91c6 Merge pull request #43 from VanNostrand/doc2
Improved Linux/BSD section in the usermanual.
2014-01-24 06:53:12 -08:00
Mark Morschhäuser
91138b7e84 Improved Linux/BSD section in the usermanual. 2014-01-24 14:00:29 +01: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
Gavin Bisesi
7ee396503b Merge pull request #36 from arxanas/master
Fix #34
2014-01-21 14:16:04 -08:00
arxanas
629668d7c0 Fix #34
This is @mcallahan's patch — see #35. I had to apply this diff by hand,
because both `git` and `patch` refused to apply it and I didn't know
how to resolve that. Consequently, there might be an error.
2014-01-17 20:30:06 -05: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
Daenyth
0da2647a7b Merge pull request #26 from jfreake/master
Deck Load Mods and Movable Tabs
2014-01-08 09:01:31 -08:00
jfreake
504a56cf95 Right aligned the regex check
decklist - Right aligned the regex check
2014-01-08 12:55:44 -04:00
jfreake
67c4d089be Deck Load Mods and Movable Tabs
Changes:
Deck Load - Default to all types *.*
Decklist - Strip "|edition" from .dec formats that include a pipe and
the edition after the card name
Tab_Supervisor - Make tabs movable (able to rearrange tabs)
2014-01-08 11:54:02 -04: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