Commit graph

871 commits

Author SHA1 Message Date
Fabio Bas
a6f299b247 fix #203 2014-07-09 17:42:35 +02:00
Fabio Bas
106e9d1538 Updated for new API
* Use the new, shortest API m=
 * for a card, grab prices for all sets
 * use the lower price for a card from all sets, but avoid prices=0
(e.g.: some M15 cards have no price yet)
2014-07-09 09:43:35 +02:00
pliu037
1a601d9509 Added better support for custom card images by prioritizing a check for card images in <Pictures path>/<CUSTOM> before all other checks. 2014-07-08 16:24:51 -04:00
Gavin Bisesi
73e5e12c24 Merge pull request #199 from arxanas/remember-game-filter-preferences
Fix #137: Game filter preferences are saved.
2014-07-08 12:49:45 -04:00
arxanas
1217689ed6 Hash the game type. 2014-07-07 19:04:01 -04:00
arxanas
8141901679 Fix #137: Game filter preferences are saved. 2014-07-07 17:41:16 -04:00
arxanas
810029ce15 Fix #117: Card tags now match disregarding case and punctuation. 2014-07-06 20:04:09 -04:00
Fabio Bas
aead0843af Room and Message tabs: focus input line when convenient; Fix #180
As suggest by Daenyth in #185
2014-07-06 14:28:48 +02:00
Fabio Bas
e9895d643f Merge remote-tracking branch 'upstream/master' into cmake_qt5 2014-07-03 16:40:04 +02:00
Gavin Bisesi
7f77082466 Merge pull request #151 from ctrlaltca/master_input_focus
Focus the Input line in chat when convenient (fixes #113)
2014-07-03 10:34:21 -04:00
Fabio Bas
6f18e3692d Chat room: ensure the line input has focus when the window gets created 2014-07-03 15:57:40 +02:00
Fabio Bas
06def7f46a Ensure all card prices are retrieved correctly
Query card database to get a multiverseis for a card.
Get card price using that id instead of card name.
Tested Aether, split cards, question elemental?, _____
2014-07-02 21:42:29 +02:00
Fabio Bas
d102733826 Added default cases to switch 2014-07-02 21:42:17 +02:00
Fabio Bas
9ca5908de5 Create an enum for price sources
Probably settingscache would have been the correct place for the enum,
but keeping it in the same class/file where price sources are defined
sounds cleaner to me
2014-07-02 21:42:04 +02:00
Fabio Bas
a9ffbf5d2d use a signal instead of calling QMetaObject::invokeMethod 2014-07-02 21:41:52 +02:00
Gavin Bisesi
fb4a7b3274 Give more friendly login error message 2014-07-01 12:04:33 -04:00
arxanas
7cbe410172 Fix #45: don't send tokens to deckstats. 2014-06-30 03:08:55 -04:00
Fabio Bas
922e98af67 Add pricing from deckbrew.com
* the previous PriceUpdater class has become abstract
* BLPPriceUpdater inherits the old code for blacklotusproject.com
* DBPriceUpdater is a new implementation for deckbrew.com
* add a setting to choose between the two
2014-06-29 23:33:03 +02:00
Daenyth
4d6f46b06e Change client ping send interval to 9 sec 2014-06-29 14:46:06 -04:00
Fabio Bas
d86fa410df Chat room: ensure focus on the input line 2014-06-29 19:32:03 +02:00
Fabio Bas
27bd00bec8 Direct chat: ensure focus is on the input line; fixes #113 2014-06-29 19:29:45 +02:00
Daenyth
09d6d26fb2 Merge branch 'master' into cmake_qt5
Conflicts:
	cockatrice/src/main.cpp
2014-06-28 09:13:10 -04:00
Daenyth
8d31fe6cbc Clean up deck load chat message 2014-06-28 09:04:45 -04:00
Daenyth
4c2a553f03 Have servatrice inform players of sideboard size
Ref #142
2014-06-28 00:36:43 -04:00
Daenyth
6d3fe428e7 Fix some warnings
Ref #127
2014-06-27 22:19:23 -04:00
Daenyth
1d02e0d5ec Clarify comment about typedef for OSX compiling 2014-06-27 20:00:29 -04:00
Fabio Bas
54805fb14e Merge remote-tracking branch 'upstream/master' into cmake_qt5 2014-06-27 15:21:01 +02:00
arxanas
080fd326ed Fixed #131: Compiles on OS X now. 2014-06-26 16:57:47 -04:00
Daenyth
144bb7fa89 Merge remote-tracking branch 'origin/invalid-windows-paths' 2014-06-25 20:26:46 -04:00
Gavin Bisesi
fcc62a1e1f Use defined(Q_OS_WIN) in #elif to satisfy MSVC
It's always windows.
2014-06-25 17:09:17 -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
809f390e2f Merge remote-tracking branch 'upstream/master' into cmake_qt5 2014-06-25 15:46:50 +02:00
Fabio Bas
7035150351 Deckstats: move QUrl handling into its own function; better separation of qt4/qt5 code 2014-06-25 09:07:02 +02:00
Daenyth
aee86ce45a Mark QGraphicsItem for AbstractGraphicsItem 2014-06-25 01:53:19 -04:00
Daenyth
d811fee2f3 Include missing qdebug
Dunno how I missed that.

Fix #128
2014-06-25 00:11:55 -04:00
Gavin Bisesi
65f59747c9 Merge pull request #116 from ctrlaltca/feature-cpack
Use cpack to create osx's dmg
2014-06-24 21:08:57 -04:00
Daenyth
df659e58fe Mask set shortcodes for windows illegal filenames
Ref #122
2014-06-24 20:49:03 -04:00
Fabio Bas
6dbdaafb33 Ported cockatrice 2014-06-24 19:13:47 +02:00
Fabio Bas
5c13c06982 Merge remote-tracking branch 'upstream/master' into cmake_qt5 2014-06-24 18:13:26 +02:00
Daenyth
e5d9692d78 Fall back to plain text load when xml load fails 2014-06-24 00:14:59 -04:00
Daenyth
0420f4f7af Log download failures 2014-06-23 23:44:13 -04:00
Daenyth
e925403bc5 Log cardname when downloading 2014-06-23 22:18:40 -04:00
Daenyth
ea08fe168c Fix Q_INTERFACES warnings
Fix #88
2014-06-22 22:32:53 -04:00
Daenyth
e5d15e8dbc Notify deck editor when price feature setting is changed
Ref #112
2014-06-22 21:20:14 -04:00
Daenyth
c54f7b9245 Log on failed path copy 2014-06-22 20:14:22 -04:00
Fabio Bas
66c87a1ee6 OSX: Handle sounds for first time installations
If the sounds path is unset in the settings and a “sounds” directory
doesn’t exists in the user’s data directory, install the sounds files
and set the settings value accordingly
2014-06-22 23:42:12 +02:00
Fabio Bas
0b4701c42f OSX: Handle zonebg for first time installations
If none of the gameboard images is set and and the user’s data
directory doesn’t contain a “zonebg” directory, create the directory,
copy contents from cockatrice’s app bundle and sets the config
accordingly.
2014-06-22 23:42:12 +02:00
Fabio Bas
55c4c464e4 OSX: get translation path from qt.conf instead of hardcoding it 2014-06-22 23:41:15 +02:00
Fabio Bas
2a5f6181aa Osx: removed plugins path detection and fixed translation path detection 2014-06-22 23:41:15 +02:00
Gavin Bisesi
1260ccc531 Merge pull request #111 from Daenyth/better-invalid-db-ux
Don't be a jerk when card database isn't usable.
2014-06-22 15:28:45 -04: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
Daenyth
27847e1551 Don't be a jerk when card database isn't usable.
Better error message and allow the user to still connect

Ref: #102
2014-06-21 15:53:13 -04:00
Daenyth
38b83acae0 Fix #105 - remove emdash from card type when getting main type 2014-06-21 12:42:46 -04:00
Daenyth
53d2b82e61 Use picUrl templates to download cards.
Add HQ card option
2014-06-21 01:12:47 -04:00
Daenyth
8281f63134 Add settings fields for pic urls 2014-06-20 22:10:26 -04:00
Daenyth
fa52ed00a3 Merge branch 'master' into mtgjson-importer 2014-06-20 20:43:19 -04:00
Mark Morschhäuser
6fa94dd475 Qt5: toAscii() and fromAscii() Methods are deprecated 2014-06-20 16:55:26 +02:00
Mark Morschhäuser
a903c231f2 Qt5: QDesktopServices::storageLocation deprecated 2014-06-20 16:54:46 +02:00
Mark Morschhäuser
648a6a3884 Qt5: QUrl addQueryItem moved to QUrlQuery 2014-06-20 16:53:45 +02:00
Mark Morschhäuser
929bcb55da Fixed bug in filtertree.cpp 2014-06-18 12:10:15 +02:00
Mark Morschhäuser
8708c96695 Merge remote-tracking branch 'origin/master' into win32
Conflicts:
	cockatrice/CMakeLists.txt
	oracle/CMakeLists.txt
2014-06-18 12:09:32 +02:00
Fabio Bas
f3a57d5506 Import data from mtgjson's allsets.xml
* add multiverse id to cards.xml
* remove pictures urls from cards.xml
TBD:
* fix/clean oracle’s gui
* add support in cockatrice
2014-06-16 00:27:33 +02:00
Daenyth
b749ddbc45 Add the ability to friend/ignore an offline user 2014-06-15 14:59:54 -04:00
Fabio Bas
84503483eb Added missing ifdefs around keysignals.h 2014-06-10 23:25:59 +02:00
Fabio Bas
39e2bf06f5 Merge branch 'master' into cmake-overhaul 2014-06-10 23:11:31 +02:00
Fabio Bas
20b9a538fa Split PendingCommand 's implementation to its own cpp to permit automoc 2014-06-10 22:33:21 +02:00
Gavin Bisesi
2b7d5d0ef2 Merge pull request #47 from sylvan-basilisk/editor-redesign
addition of advanced filtering features in deck editor
2014-06-10 10:37:35 -04:00
sylvanbasilisk
841847cda4 update to hotkey settings in deck editor tab
removed LEFT/RIGHT increment/decrement while
the card database/quicksearch edit have focus.
LEFT/RIGHT increment/decrement remains while the
deck view has focus.

also, now the card database delegates focus the
quicksearch editor so that any characters typed
while the card database has focus will narrow
the search down using the quicksearch filter.

`control`+`alt`+`-`/`=` now increment/decrement
the mainboard and `control`+`alt`+`[`/`]` now
increment/decrement the sideboard (alt could not
be used alone as OSX inserts special characters
using alt.
2014-04-24 20:17:21 +00:00
sylvanbasilisk
040d9d15a3 bug fix: move isEnabled test out of acceptCardAttr
in the case of AND'ed filter terms, returning true
from acceptCardAttr will be equivalent to ignoring the
disabled term, but in the case of OR'ed terms,
returning true will incorrectly cause all cards
to be accepted.

the fix is to test for whether the term is enabled
before calling acceptCardAttr and continue if
disabled.
2014-04-24 19:49:50 +00:00
sylvanbasilisk
cd4d04be3e change tabs into 4 spaces in new files 2014-03-25 02:29:45 +00:00
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
Mark Morschhäuser
d968f04b02 Improved file handling from commit e33debcb. 2014-03-18 12:10:46 +01:00
Matt Kelly
082ab73152 Add Tab shortcut for next phase 2014-03-13 01:08:49 -04:00
Mark Morschhäuser
e2615a0ff0 Fixed warning C4018 <,> signed/unsigned mismatch 2014-03-12 09:34:25 +01:00
Mark Morschhäuser
7c606af63e Fixed warning regarding virtual function overrides. Using C++ standard.
See http://msdn.microsoft.com/en-us/library/bb384874(v=vs.90).aspx
2014-03-12 09:11:01 +01:00
Mark Morschhäuser
32ad8ed24c Fixed MSVC++ compile error due to sqrt() usage. 2014-03-11 16:57:54 +01:00
Mark Morschhäuser
80da61dcbb Fix MSVC++ compile error caused by missing round() in math.h 2014-03-11 16:10:55 +01:00
Mark Morschhäuser
6e9f81461a Fixed VC++ 'M_PI' : undeclared identifier error. 2014-03-11 15:19:29 +01:00
Mark Morschhäuser
49227ad44c Fixed VC "'*/' found outside of comment" warning. 2014-03-11 15:04:26 +01:00
Mark Morschhäuser
e33debcbff Changed C to Qt file handling. VC warns because fopen may be unsafe. 2014-03-11 15:02:15 +01: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
Matt Kelly
a171df744d Convert to 4-space indents 2014-02-11 10:47:51 -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
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
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