Commit Graph

46 Commits

Author SHA1 Message Date
Fabio Bas 5cfb034452 merged with master 2015-08-31 22:48:14 +02:00
Fabio Bas 800a17e483 Force black text color on deck list; fix #1289 2015-07-24 19:35:31 +02:00
Fabio Bas 6b8ebe54e9 Theme manager
This is the first implementation of a theme manager. It’s a rebased and
revisited version of #792.
2015-06-15 14:35:58 +02:00
Fabio Bas 8f3421204e Optimize loop; refers #910 2015-04-08 12:52:02 +02:00
Fabio Bas cab1e096df Fix #118
Fix selection problem when sorting the deck list
2015-04-04 12:49:28 +02:00
Fabio Bas bf92e67002 Ensure the whole table gets refreshed when updating prices 2014-07-23 22:11:26 +02:00
Daenyth 09d6d26fb2 Merge branch 'master' into cmake_qt5
Conflicts:
	cockatrice/src/main.cpp
2014-06-28 09:13:10 -04:00
Daenyth 6d3fe428e7 Fix some warnings
Ref #127
2014-06-27 22:19:23 -04:00
Fabio Bas 2354ed6909 Require Qt4 >=4.8.0; remove some ifdefs on qt version 2014-06-25 16:00:48 +02:00
Fabio Bas 6dbdaafb33 Ported cockatrice 2014-06-24 19:13:47 +02:00
Daenyth 68c0932a2f Don't have decklist sort behavior rely on column order 2014-06-22 08:36:35 -04:00
Daenyth e99c1bbe6d Merge remote-tracking branch 'origin/master' into editor-sorting-v5 2014-06-22 08:10:22 -04:00
sylvanbasilisk 748aac7ee8 whitespace modifications in preparation for merge 2014-03-25 01:13:41 +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
Buce 401b34d22c Clean up DecklistModel::addCard()
Split common functionality out of the if-else block.
2014-02-28 15:45:29 -06:00
Buce 875df01424 Fix GUI glitches when adding cards to a deck
Since we no longer sort on just card names, we need to emit updates
for the parent of the card we add.
2014-02-28 15:44:46 -06:00
Buce b32374b453 Sort correctly when adding cards 2014-02-28 15:43:43 -06:00
Buce 6a5f2d2476 Allow sorting on different columns 2014-02-28 15:41:29 -06:00
Matt Kelly 1bc48a7849 Convert rest of source to 4-space indent 2014-02-11 11:14:19 -05:00
Max-Wilhelm Bruker 0eee6d7ab9 fixed issue #49: when editing a remote deck, be able to directly save it there 2012-05-09 21:52:09 +02:00
Max-Wilhelm Bruker 632e9bbff3 improved banning and deck hashing 2011-11-01 22:44:51 +01:00
unknown 0bb4ef8bb8 added deck hashing 2011-10-04 16:55:18 +02:00
Max-Wilhelm Bruker 6226e381de price tag feature by Marcio Ribeiro 2011-06-16 16:43:01 +02:00
Max-Wilhelm Bruker bd06cd5796 removed some debugging warnings; fixed card name and player name display; display avatar in game 2010-10-11 19:01:46 +02:00
Max-Wilhelm Bruker e0c7df1694 deck list editing in deck storage tab; mouse hover event for deck view 2009-12-19 20:34:33 +01:00
Max-Wilhelm Bruker 694070724c restructured protocol code 2009-11-29 03:07:28 +01:00
Max-Wilhelm Bruker cf21528a69 almost finished pre-game deck loading 2009-11-22 01:30:16 +01:00
Max-Wilhelm Bruker 34d2649f65 prepared deck list code to be moved out to common 2009-11-16 23:58:07 +01:00
marcus 74180b6bc9 hr bug fixed 2009-08-22 17:22:36 +02:00
Max-Wilhelm Bruker ecc6f7b20f fix for deck list model crash 2009-07-17 21:27:38 +02:00
Max-Wilhelm Bruker 3043157a1d bugfix and nicer decklist font 2009-07-11 21:29:47 +02:00
Max-Wilhelm Bruker bf868d5abc fixed deck editor bug 2009-07-02 15:40:44 +02:00
Max-Wilhelm Bruker 5d40996c0b nice decklist printing 2009-06-27 20:53:24 +02:00
Max-Wilhelm Bruker 33cc7a8859 started implementing deck printing 2009-06-26 15:25:32 +02:00
Max-Wilhelm Bruker fb03c5cdbb configurable set priority for card pictures 2009-06-20 20:09:19 +02:00
Max-Wilhelm Bruker 21daf9db99 foo 2009-06-06 13:55:30 +02:00
brukie e7e51f5f9d sanity checks 2009-06-04 14:57:20 +02:00
Max-Wilhelm Bruker 1da5c63726 deck editor 2009-06-03 00:15:06 +02:00
Max-Wilhelm Bruker 3502ec80e4 deck editor 2009-06-01 21:55:41 +02:00
Max-Wilhelm Bruker 9a277ccccf confirmation message box 2009-05-27 20:37:28 +02:00
Max-Wilhelm Bruker d9e51e58a3 deck editor... 2009-05-24 01:41:25 +02:00
Max-Wilhelm Bruker 3ae865178b Deck editor 2009-05-23 20:04:14 +02:00
Max-Wilhelm Bruker 0ef00dd437 new decklist file format 2009-05-19 21:57:23 +02:00
Max-Wilhelm Bruker 16cc20a603 removed thread 2009-04-16 18:27:10 +02:00
Max-Wilhelm Bruker e6d6162426 started implementing a simple deck editor 2009-04-04 19:51:23 +02:00
Max-Wilhelm Bruker a11f93df4d initial commit 2009-03-13 22:50:41 +01:00