Commit graph

80 commits

Author SHA1 Message Date
marco
c8d59eec5e Refactred settings to use settingscache & ini files 2015-08-22 01:05:15 +02:00
Jeff
05f2bc8392 Fix Conflicts 2015-08-20 22:27:46 -04:00
Jeff
e9bad2cacb Merge branch 'master' into fix_1387
Conflicts:
	cockatrice/CMakeLists.txt
	cockatrice/src/tab_game.h
	cockatrice/src/tab_room.cpp
2015-08-20 22:23:47 -04:00
marco
c6aba5a6d0 Renamed file + reduced window size + resfresh on change 2015-08-20 20:23:08 +02:00
Jeff
a64ea17357 Add LineEditCompleter to Tab_Game 2015-08-19 18:46:08 -04:00
marco
beaa4e9383 Configurable shortcuts 2015-08-16 13:46:57 +02:00
marco
b0bf94e378 Shorcut read from settings 2015-08-09 12:16:52 +02:00
Zach
7ebf817b17 Merge pull request #1197 from Cockatrice/cpp11 2015-07-13 13:23:18 -04:00
Fabio Bas
7f5f290c93 Profile management 2015-07-05 22:44:35 +02:00
Gavin Bises
8ed9d35724 Update project to C++11 compilation. 2015-07-03 10:02:31 -04:00
Fabio Bas
5ace0dd892 Almost completed registration
* added missing bits of serverside code;
 * added fronted in client;
 * removed demo python scripts;
2015-05-23 20:13:03 +02:00
Fabio Bas
e88bad786f Enable hidpi (retina) support under osx
* add to the application bundle a custom info.plist
 * fix a graphic glitch on the life counter
2015-04-26 22:50:59 +02:00
Fabio Bas
42c0b09fbd Remove dependency on QtXml (unused) 2015-04-16 12:26:02 +02:00
Fabio Bas
798dc09fe6 Translation updates to support Transifex
* ignore .tx folder
 * cmake: when UPDATE_TRANSLATIONS=ON, extract new strings only to the
english translation file.
 * added info in CONTRIBUTING.md
 * updated english translations
2015-02-13 15:56:17 +01:00
Gavin Bisesi
b38cd7833f Merge pull request #500 from ctrlaltca/translation_fixes
Translation fixes
2015-01-01 08:07:06 -05:00
Fabio Bas
54ce135e0c Optimize qt plugins installation
* Always install “release” plugins
 * install only plugins actually used
2014-12-28 22:21:45 +01:00
Fabio Bas
72ba5a1683 Parse header files for translatable strings
We previously parsed only .cpp files, but some strings are inlined in
header files.
2014-12-26 14:45:31 +01:00
Fabio Bas
c0ee060af4 Fixed vendor name 2014-11-09 23:14:36 +01:00
Fabio Bas
a716d73a42 OSX: Add proper infos to info.plist
fixes #411
2014-11-09 21:03:10 +01:00
Fabio Bas
9ef4d79c33 Install the audio/* plugins under windows and osx 2014-10-14 21:13:04 +02:00
Fabio Bas
dfb8be79cf Fix installation of libeay32.dll, ssleay32.dll while compiling the PACKAGE target 2014-10-10 17:22:29 +02:00
Fabio Bas
6f25e09132 Deploy openssl libraries under win32
They are needed to fetch prices from deckbrew and possibly, in the
future, for ssl server connections
2014-10-10 14:12:30 +02:00
Fabio Bas
a0b35ee60b Cockatrice - CMake: Include all existing translation files using a glob 2014-09-06 10:38:59 +02:00
Fabio Bas
e5eda9f172 Add a UPDATE_TRANSLATIONS options that actually updates translations! 2014-09-04 16:15:01 +02:00
Fabio Bas
fc24ffdec2 Cmake reorganization
* Move all cmake-related files in a new “cmake” folder
* move nsis files in there, too, since they are templates parsed by cake
* retrieve git version once when cmake is run, and use it for both
creating version_string.h/cpp and for package naming
2014-06-28 19:39:26 +02:00
Fabio Bas
096f200eb9 Install libraries and plugins automatically under windows
You won’t have to copy manually all the dlls in the release directory
anymore
2014-06-27 17:40:29 +02:00
Fabio Bas
34772cccab Compilation fix for MSVC+Qt5 2014-06-27 17:09:09 +02:00
Fabio Bas
c4458b16b2 Qt5: fix plugin installation 2014-06-25 15:53:25 +02:00
Fabio Bas
809f390e2f Merge remote-tracking branch 'upstream/master' into cmake_qt5 2014-06-25 15:46:50 +02:00
Daenyth
1c9540befa Set cmake module path to local for findqtmobility 2014-06-25 01:48:30 -04:00
Fabio Bas
6dbdaafb33 Ported cockatrice 2014-06-24 19:13:47 +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
2eebddea9a Port "make package" fix to oracle and servatrice 2014-06-22 23:41:15 +02:00
Fabio Bas
b44365b73c This finally fixes both make install and make package 2014-06-22 23:41:15 +02:00
Fabio Bas
6d1de0c617 Partially revert previous commits; ensure the bundle is fixed up correctly 2014-06-22 23:41:15 +02:00
Fabio Bas
41c7ce8022 Fix qt.conf file creation for "make package" 2014-06-22 23:41:15 +02:00
Fabio Bas
99f3519da5 Workaround permission problem in ixup_bundle
Without this change, make install and make package would require “sudo”
under osx
2014-06-22 23:41:15 +02:00
Fabio Bas
d7a962c055 CMake: support fir linking against qt5 2014-06-21 14:12:55 +02:00
Mark Morschhäuser
391e480d7a Restored MSVC linkflags after cmake update. 2014-06-18 12:11:58 +02:00
Fabio Bas
dd768ba7bd OSX: Move translations inside app bundle
Additional: remove duplicate if(linux) and merge rules together
2014-06-12 23:42:20 +02:00
Fabio Bas
eca318c34d Make install paths relative to prepare for CPack 2014-06-12 23:29:42 +02:00
Fabio Bas
721cf6fe4f Re-indent CMakeLists.txt using spaces 2014-06-11 18:08:30 +02:00
Fabio Bas
62f756e698 Remove pthread detection and linking: it's unused 2014-06-11 01:20:19 +02:00
Fabio Bas
0dd6567583 cockatrice's CMakeLists.txt: major overhaul
* Remove cockatrice_HEADERS (obsoleted by automoc)
* Remove compilation flags definition and Qt4 finding calls
* Make use of CMAKE_INSTALL_PREFIX
* use INSTALL(TARGETS) in place of INSTALL(PROGRAM)
* Osx: create a proper application bundle
* Added comments
2014-06-10 23:32:52 +02:00
Gavin Bisesi
50ac14e8ff Merge pull request #82 from ctrlaltca/osx-compilation-fix
Fix compiling on OSX
2014-06-10 14:06:23 -04:00
ctrlaltca
e2d17e983f Restored whitespaces in CMakeLists.txt 2014-06-10 20:05:24 +02:00
Fabio Bas
4fc6831784 Avoid using gcc-specific flags on not-gnu compilers 2014-06-10 11:42:41 +02: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
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
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