Merge remote-tracking branch 'origin/master' into win32

Conflicts:
	cockatrice/CMakeLists.txt
	oracle/CMakeLists.txt

.gitignore

 tags
-build
+build*
 *.qm
 .directory

CMakeLists.txt

+# Cockatrice's main CMakeLists.txt
+#
+# This is basically a wrapper to enable/disable the compilation
+# of the different projects: servatrice, cockatrice, test
+# This file sets all the variables shared between the projects
+# like the installation path, compilation flags etc..
+
 cmake_minimum_required(VERSION 2.6)
+
+set(PROJECT_NAME "Cockatrice")
+set(PROJECT_VERSION_MAJOR 0)
+set(PROJECT_VERSION_MINOR 0)
+set(PROJECT_VERSION_PATCH 1)
+set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH} )
+
+# Defualt to "Release" build type
+# User-provided value for CMAKE_BUILD_TYPE must be checked before the PROJECT() call
+IF(DEFINED CMAKE_BUILD_TYPE)
+   SET(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "Type of build")
+ELSE()
+   SET(CMAKE_BUILD_TYPE Release CACHE STRING "Type of build")
+ENDIF()
+
+# A project name is needed for CPack
+PROJECT("${PROJECT_NAME}")
+
+# Set conventional loops
+set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
+
+# Define a proper install path
+if(UNIX)
+    if(APPLE)
+        # MacOS X
+        # Due to the special bundle structure ignore
+        # the prefix eventually set by the user.
+        set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/release)
+    else()
+        # Linux / BSD
+        if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+            #fix package build
+            if(PREFIX)
+                set(CMAKE_INSTALL_PREFIX ${PREFIX})
+            else()
+                set(CMAKE_INSTALL_PREFIX /usr/local)
+            endif()
+        endif()
+    endif()
+elseif(WIN32)
+    set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/release)
+endif()
+
+# Define proper compilation flags
+IF (CMAKE_COMPILER_IS_GNUCC)
+    # linux/gcc, bsd/gcc, windows/mingw
+    set(CMAKE_CXX_FLAGS_RELEASE "-s -O2")
+    set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -O0")
+else()
+    # other: osx/llvm, bsd/llvm
+    set(CMAKE_CXX_FLAGS_RELEASE "-O2")
+    set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
+ENDIF (CMAKE_COMPILER_IS_GNUCC)
+
+# GNU systems need to define the Mersenne exponent for the RNG to compile w/o warning
+IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+    ADD_DEFINITIONS("-DSFMT_MEXP=19937")
+ENDIF()
+
+#Find Qt4 and enable the needed features
+FIND_PACKAGE(Qt4 REQUIRED)
+
+set(CMAKE_AUTOMOC TRUE)
+
+# Find other needed libraries
+FIND_PACKAGE(Protobuf REQUIRED)
+
+# Compile servatrice (default off)
+option(WITH_SERVER "build servatrice" OFF)
 add_subdirectory(common)
 if(WITH_SERVER)
-	add_subdirectory(servatrice)
-endif(WITH_SERVER)
-if (NOT WITHOUT_CLIENT)
-	add_subdirectory(cockatrice)
-	add_subdirectory(oracle)
-endif(NOT WITHOUT_CLIENT)
-if (WITH_TESTCLIENT)
-	add_subdirectory(testclient)
-endif(WITH_TESTCLIENT)
+    add_subdirectory(servatrice)
+endif()
+
+# Compile cockatrice (default on)
+option(WITH_CLIENT "build cockatrice" ON)
+if(WITH_CLIENT)
+    add_subdirectory(cockatrice)
+    add_subdirectory(sounds)
+    add_subdirectory(zonebg)
+endif()
 
-FILE(GLOB sounds "${CMAKE_CURRENT_SOURCE_DIR}/sounds/*.raw")
-INSTALL(FILES ${sounds} DESTINATION share/cockatrice/sounds)
-FILE(GLOB zonebg "${CMAKE_CURRENT_SOURCE_DIR}/zonebg/*.*")
-INSTALL(FILES ${zonebg} DESTINATION share/cockatrice/zonebg)
+# Compile oracle (default on)
+option(WITH_ORACLE "build oracle" ON)
+if(WITH_ORACLE)
+    add_subdirectory(oracle)
+endif()
+
+# Compile testclient (default off)
+option(WITH_TESTCLIENT "build testclient" OFF)
+if (WITH_TESTCLIENT)
+    add_subdirectory(testclient)
+endif()
\ No newline at end of file

cockatrice/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
+# CMakeLists for cockatrice directory
+#
+# provides the cockatrice binary
+
 PROJECT(cockatrice)
 
 SET(cockatrice_SOURCES
- src/abstractcounter.cpp 
- src/counter_general.cpp 
- src/dlg_creategame.cpp 
- src/dlg_filter_games.cpp
- src/dlg_connect.cpp 
- src/dlg_create_token.cpp 
- src/dlg_edit_tokens.cpp
- src/abstractclient.cpp 
- src/remoteclient.cpp 
- src/main.cpp 
- src/window_main.cpp 
- src/gamesmodel.cpp 
- src/player.cpp 
- src/playertarget.cpp 
- src/cardzone.cpp 
- src/selectzone.cpp 
- src/cardlist.cpp 
- src/abstractcarditem.cpp 
- src/carditem.cpp 
- src/tablezone.cpp 
- src/handzone.cpp 
- src/handcounter.cpp 
- src/carddatabase.cpp 
- src/gameview.cpp 
- src/gameselector.cpp 
- src/decklistmodel.cpp 
- src/deck_loader.cpp 
- src/dlg_load_deck_from_clipboard.cpp 
- src/dlg_load_remote_deck.cpp 
- src/cardinfowidget.cpp 
- src/messagelogwidget.cpp 
- src/zoneviewzone.cpp 
- src/zoneviewwidget.cpp 
- src/pilezone.cpp 
- src/stackzone.cpp 
- src/carddragitem.cpp 
- src/carddatabasemodel.cpp 
- src/setsmodel.cpp 
- src/window_sets.cpp 
- src/abstractgraphicsitem.cpp 
- src/abstractcarddragitem.cpp 
- src/dlg_settings.cpp 
- src/dlg_cardsearch.cpp 
- src/phasestoolbar.cpp 
- src/gamescene.cpp 
- src/arrowitem.cpp 
- src/arrowtarget.cpp 
- src/tab.cpp 
- src/tab_server.cpp 
- src/tab_room.cpp 
- src/tab_message.cpp 
- src/tab_game.cpp 
- src/tab_deck_storage.cpp 
- src/tab_replays.cpp 
- src/tab_supervisor.cpp 
- src/tab_admin.cpp 
- src/tab_userlists.cpp 
- src/tab_deck_editor.cpp
- src/replay_timeline_widget.cpp
- src/deckstats_interface.cpp
- src/chatview.cpp 
- src/userlist.cpp 
- src/userinfobox.cpp 
- src/user_context_menu.cpp
- src/remotedecklist_treewidget.cpp 
- src/remotereplaylist_treewidget.cpp 
- src/deckview.cpp 
- src/playerlistwidget.cpp 
- src/pixmapgenerator.cpp 
- src/settingscache.cpp 
- src/localserver.cpp 
- src/localserverinterface.cpp 
- src/localclient.cpp 
- src/priceupdater.cpp 
- src/qt-json/json.cpp
- src/soundengine.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/version_string.cpp
-)
-SET(cockatrice_HEADERS
- src/round.h
- src/abstractcounter.h 
- src/counter_general.h 
- src/dlg_creategame.h 
- src/dlg_filter_games.h 
- src/dlg_connect.h 
- src/dlg_create_token.h 
- src/dlg_edit_tokens.h
- src/gamesmodel.h 
- src/abstractclient.h 
- src/remoteclient.h 
- src/window_main.h 
- src/cardzone.h 
- src/selectzone.h 
- src/player.h 
- src/playertarget.h 
- src/abstractcarditem.h 
- src/carditem.h 
- src/tablezone.h 
- src/handzone.h 
- src/handcounter.h 
- src/carddatabase.h 
- src/gameview.h 
- src/gameselector.h 
- src/decklistmodel.h 
- src/deck_loader.h 
- src/dlg_load_deck_from_clipboard.h 
- src/dlg_load_remote_deck.h 
- src/cardinfowidget.h 
- src/messagelogwidget.h 
- src/zoneviewzone.h 
- src/zoneviewwidget.h 
- src/pilezone.h 
- src/stackzone.h 
- src/carddragitem.h 
- src/carddatabasemodel.h 
- src/setsmodel.h 
- src/window_sets.h 
- src/abstractgraphicsitem.h 
- src/abstractcarddragitem.h 
- src/dlg_settings.h 
- src/dlg_cardsearch.h 
- src/phasestoolbar.h 
- src/gamescene.h 
- src/arrowitem.h 
- src/arrowtarget.h 
- src/tab.h 
- src/tab_server.h 
- src/tab_room.h 
- src/tab_message.h 
- src/tab_game.h 
- src/tab_deck_storage.h 
- src/tab_replays.h 
- src/tab_supervisor.h 
- src/tab_admin.h 
- src/tab_userlists.h 
- src/tab_deck_editor.h
- src/replay_timeline_widget.h
- src/deckstats_interface.h
- src/chatview.h 
- src/userlist.h 
- src/userinfobox.h 
- src/user_context_menu.h
- src/remotedecklist_treewidget.h 
- src/remotereplaylist_treewidget.h 
- src/deckview.h 
- src/playerlistwidget.h 
- src/settingscache.h 
- src/localserver.h 
- src/localserverinterface.h 
- src/localclient.h 
- src/priceupdater.h 
- src/soundengine.h 
- src/pending_command.h 
+    src/abstractcounter.cpp 
+    src/counter_general.cpp 
+    src/dlg_creategame.cpp 
+    src/dlg_filter_games.cpp
+    src/dlg_connect.cpp 
+    src/dlg_create_token.cpp 
+    src/dlg_edit_tokens.cpp
+    src/abstractclient.cpp 
+    src/remoteclient.cpp 
+    src/main.cpp 
+    src/window_main.cpp 
+    src/gamesmodel.cpp 
+    src/player.cpp 
+    src/playertarget.cpp 
+    src/cardzone.cpp 
+    src/selectzone.cpp 
+    src/cardlist.cpp 
+    src/abstractcarditem.cpp 
+    src/carditem.cpp 
+    src/tablezone.cpp 
+    src/handzone.cpp 
+    src/handcounter.cpp 
+    src/carddatabase.cpp 
+    src/keysignals.cpp
+    src/gameview.cpp 
+    src/gameselector.cpp 
+    src/decklistmodel.cpp 
+    src/deck_loader.cpp 
+    src/dlg_load_deck_from_clipboard.cpp 
+    src/dlg_load_remote_deck.cpp 
+    src/cardinfowidget.cpp 
+    src/cardframe.cpp
+    src/cardinfopicture.cpp
+    src/cardinfotext.cpp
+    src/filterbuilder.cpp
+    src/cardfilter.cpp
+    src/filtertreemodel.cpp
+    src/filtertree.cpp
+    src/messagelogwidget.cpp 
+    src/zoneviewzone.cpp 
+    src/zoneviewwidget.cpp 
+    src/pilezone.cpp 
+    src/stackzone.cpp 
+    src/carddragitem.cpp 
+    src/carddatabasemodel.cpp 
+    src/setsmodel.cpp 
+    src/window_sets.cpp 
+    src/abstractgraphicsitem.cpp 
+    src/abstractcarddragitem.cpp 
+    src/dlg_settings.cpp 
+    src/dlg_cardsearch.cpp 
+    src/phasestoolbar.cpp 
+    src/gamescene.cpp 
+    src/arrowitem.cpp 
+    src/arrowtarget.cpp 
+    src/tab.cpp 
+    src/tab_server.cpp 
+    src/tab_room.cpp 
+    src/tab_message.cpp 
+    src/tab_game.cpp 
+    src/tab_deck_storage.cpp 
+    src/tab_replays.cpp 
+    src/tab_supervisor.cpp 
+    src/tab_admin.cpp 
+    src/tab_userlists.cpp 
+    src/tab_deck_editor.cpp
+    src/replay_timeline_widget.cpp
+    src/deckstats_interface.cpp
+    src/chatview.cpp 
+    src/userlist.cpp 
+    src/userinfobox.cpp 
+    src/user_context_menu.cpp
+    src/remotedecklist_treewidget.cpp 
+    src/remotereplaylist_treewidget.cpp 
+    src/deckview.cpp 
+    src/playerlistwidget.cpp 
+    src/pixmapgenerator.cpp 
+    src/settingscache.cpp 
+    src/localserver.cpp 
+    src/localserverinterface.cpp 
+    src/localclient.cpp 
+    src/priceupdater.cpp 
+    src/qt-json/json.cpp
+    src/soundengine.cpp
+    src/pending_command.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/version_string.cpp
 )
 
 if (UNIX AND NOT APPLE)
-	set_source_files_properties(src/main.cpp PROPERTIES COMPILE_FLAGS -DTRANSLATION_PATH=\\"${CMAKE_INSTALL_PREFIX}/share/cockatrice/translations\\")
+    set_source_files_properties(src/main.cpp PROPERTIES COMPILE_FLAGS -DTRANSLATION_PATH=\\"${CMAKE_INSTALL_PREFIX}/share/cockatrice/translations\\")
 endif (UNIX AND NOT APPLE)
 
 set(cockatrice_RESOURCES cockatrice.qrc)
 set(cockatrice_TS
-#        translations/cockatrice_cs.ts
-        translations/cockatrice_de.ts
-        translations/cockatrice_en.ts
-        translations/cockatrice_es.ts
-#        translations/cockatrice_fr.ts
-        translations/cockatrice_it.ts
-        translations/cockatrice_ja.ts
-#        translations/cockatrice_pl.ts
-#        translations/cockatrice_pt-br.ts
-        translations/cockatrice_pt.ts
-#        translations/cockatrice_ru.ts
-#        translations/cockatrice_sk.ts
-	translations/cockatrice_sv.ts
-#	translations/cockatrice_zh_CN.ts
+#    translations/cockatrice_cs.ts
+    translations/cockatrice_de.ts
+    translations/cockatrice_en.ts
+    translations/cockatrice_es.ts
+#    translations/cockatrice_fr.ts
+    translations/cockatrice_it.ts
+    translations/cockatrice_ja.ts
+#    translations/cockatrice_pl.ts
+#    translations/cockatrice_pt-br.ts
+    translations/cockatrice_pt.ts
+#    translations/cockatrice_ru.ts
+#    translations/cockatrice_sk.ts
+    translations/cockatrice_sv.ts
+#    translations/cockatrice_zh_CN.ts
 )
 
 if(WIN32)
-  set(cockatrice_SOURCES ${cockatrice_SOURCES} cockatrice.rc)
+    set(cockatrice_SOURCES ${cockatrice_SOURCES} cockatrice.rc)
 endif(WIN32)
 
 if(APPLE)
-  set(MACOSX_BUNDLE_ICON_FILE appicon.icns)
-  set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
-  set(cockatrice_SOURCES ${cockatrice_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns)
+    set(MACOSX_BUNDLE_ICON_FILE appicon.icns)
+    set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+    set(cockatrice_SOURCES ${cockatrice_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns)
 ENDIF(APPLE)
+
+if (NOT QT_QTMULTIMEDIA_FOUND)
+    FIND_PACKAGE(QtMobility REQUIRED)
+endif (NOT QT_QTMULTIMEDIA_FOUND)
+
 SET(QT_USE_QTNETWORK TRUE)
 SET(QT_USE_QTMULTIMEDIA TRUE)
 SET(QT_USE_QTXML TRUE)
 SET(QT_USE_QTSVG TRUE)
-FIND_PACKAGE(Qt4 REQUIRED)
-if (NOT QT_QTMULTIMEDIA_FOUND)
-	FIND_PACKAGE(QtMobility REQUIRED)
-endif (NOT QT_QTMULTIMEDIA_FOUND)
-FIND_PACKAGE(Protobuf REQUIRED)
-FIND_PACKAGE(Threads)
 
-set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -O0")
-set(CMAKE_CXX_FLAGS_RELEASE "-s -O2")
-
-# paths
+# Declare path variables
 set(ICONDIR share/icons CACHE STRING "icon dir")
 set(DESKTOPDIR share/applications CACHE STRING "desktop file destination")
 
-
-QT4_WRAP_CPP(cockatrice_HEADERS_MOC ${cockatrice_HEADERS})
+# Let cmake chew Qt4's translations and resource files
+# Note: header files are MOC-ed automatically by cmake
 QT4_ADD_TRANSLATION(cockatrice_QM ${cockatrice_TS})
 QT4_ADD_RESOURCES(cockatrice_RESOURCES_RCC ${cockatrice_RESOURCES})
 
+# Include directories
 INCLUDE(${QT_USE_FILE})
 INCLUDE_DIRECTORIES(../common)
 INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
@@ -220,30 +152,58 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 INCLUDE_DIRECTORIES(${QT_MOBILITY_INCLUDE_DIR})
 INCLUDE_DIRECTORIES(${QT_MOBILITY_MULTIMEDIAKIT_INCLUDE_DIR})
 
-ADD_EXECUTABLE(cockatrice WIN32 MACOSX_BUNDLE ${cockatrice_SOURCES} ${cockatrice_QM} ${cockatrice_RESOURCES_RCC} ${cockatrice_HEADERS_MOC})
-TARGET_LINK_LIBRARIES(cockatrice cockatrice_common ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES} ${QT_MOBILITY_MULTIMEDIAKIT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
+# Build cockatrice binary and link it
+ADD_EXECUTABLE(cockatrice WIN32 MACOSX_BUNDLE ${cockatrice_SOURCES} ${cockatrice_QM} ${cockatrice_RESOURCES_RCC} ${cockatrice_MOC_SRCS})
+TARGET_LINK_LIBRARIES(cockatrice cockatrice_common ${QT_LIBRARIES} ${QT_MOBILITY_MULTIMEDIAKIT_LIBRARY})
 
-# This check is needed to link cockatrice with MSVC++
-if(WIN32)
-  if(MSVC)
-    set_target_properties(cockatrice PROPERTIES LINK_FLAGS "/SUBSYSTEM:WINDOWS")
-  endif()
-endif()
 
-IF (NOT APPLE)
-  INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/cockatrice DESTINATION bin)
-ELSE (APPLE)
-  INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/cockatrice.app DESTINATION bin)
-ENDIF (NOT APPLE)
-if (NOT WIN32 AND NOT APPLE)
-	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/cockatrice.png DESTINATION ${ICONDIR}/hicolor/48x48/apps)
-	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/cockatrice.svg DESTINATION ${ICONDIR}/hicolor/scalable/apps)
-	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cockatrice.desktop DESTINATION ${DESKTOPDIR})
-	INSTALL(FILES ${cockatrice_QM} DESTINATION share/cockatrice/translations)
-ENDIF(NOT WIN32 AND NOT APPLE)
+if(UNIX)
+    if(APPLE)
+        INSTALL(TARGETS cockatrice BUNDLE DESTINATION ./)
+        INSTALL(FILES ${cockatrice_QM} DESTINATION ./cockatrice.app/Contents/Resources/translations)
+    else()
+        # Assume linux
+        INSTALL(TARGETS cockatrice RUNTIME DESTINATION bin/)
+        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/cockatrice.png DESTINATION ${ICONDIR}/hicolor/48x48/apps)
+        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/cockatrice.svg DESTINATION ${ICONDIR}/hicolor/scalable/apps)
+        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cockatrice.desktop DESTINATION ${DESKTOPDIR})
+        INSTALL(FILES ${cockatrice_QM} DESTINATION share/cockatrice/translations)
+    endif()
+elseif(WIN32)
+        INSTALL(TARGETS cockatrice RUNTIME DESTINATION ./)
+        INSTALL(FILES ${cockatrice_QM} DESTINATION ./translations)
+endif()
 
 add_custom_command(
-	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version_string.cpp ${CMAKE_CURRENT_BINARY_DIR}/version_string.h
-	COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/../common/getversion.cmake
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version_string.cpp ${CMAKE_CURRENT_BINARY_DIR}/version_string.h
+    COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/../common/getversion.cmake
 )
 
+if(APPLE)
+    set(plugin_dest_dir ./cockatrice.app/Contents/Plugins)
+    set(qtconf_dest_dir ./cockatrice.app/Contents/Resources)
+
+    # note: no codecs in qt5
+    # note: phonon_backend => mediaservice
+    # note: needs platform on osx
+
+    if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+        install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
+            FILES_MATCHING REGEX "(codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms)/.*_debug\\.dylib")
+    else()
+        install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
+            FILES_MATCHING REGEX "(codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms)/[^_]*\\.dylib")
+    endif()
+
+    install(CODE "
+        file(WRITE \"${qtconf_dest_dir}/qt.conf\" \"[Paths]
+Plugins = Plugins\")
+        " COMPONENT Runtime)
+
+    install(CODE "
+        file(GLOB_RECURSE QTPLUGINS
+            \"${plugin_dest_dir}/*.dylib\")
+        include(BundleUtilities)
+        fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/cockatrice.app\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\")
+        " COMPONENT Runtime)
+endif()

cockatrice/src/carddatabasemodel.cpp

 #include "carddatabasemodel.h"
+#include "filtertree.h"
 
 CardDatabaseModel::CardDatabaseModel(CardDatabase *_db, QObject *parent)
     : QAbstractListModel(parent), db(_db)
@@ -109,6 +110,7 @@ CardDatabaseDisplayModel::CardDatabaseDisplayModel(QObject *parent)
     : QSortFilterProxyModel(parent),
       isToken(ShowAll)
 {
+    filterTree = NULL;
     setFilterCaseSensitivity(Qt::CaseInsensitive);
     setSortCaseSensitivity(Qt::CaseInsensitive);
 }
@@ -116,7 +118,6 @@ CardDatabaseDisplayModel::CardDatabaseDisplayModel(QObject *parent)
 bool CardDatabaseDisplayModel::filterAcceptsRow(int sourceRow, const QModelIndex & /*sourceParent*/) const
 {
     CardInfo const *info = static_cast<CardDatabaseModel *>(sourceModel())->getCard(sourceRow);
-    
     if (((isToken == ShowTrue) && !info->getIsToken()) || ((isToken == ShowFalse) && info->getIsToken()))
         return false;
     
@@ -144,6 +145,9 @@ bool CardDatabaseDisplayModel::filterAcceptsRow(int sourceRow, const QModelIndex
         if (!cardTypes.contains(info->getMainCardType()))
             return false;
 
+    if (filterTree != NULL)
+        return filterTree->acceptsCard(info);
+
     return true;
 }
 
@@ -153,5 +157,22 @@ void CardDatabaseDisplayModel::clearSearch()
     cardText.clear();
     cardTypes.clear();
     cardColors.clear();
+    if (filterTree != NULL)
+        filterTree->clear();
     invalidateFilter();
 }
+
+void CardDatabaseDisplayModel::setFilterTree(FilterTree *filterTree)
+{
+    if (this->filterTree != NULL)
+        disconnect(this->filterTree, 0, this, 0);
+
+    this->filterTree = filterTree;
+    connect(this->filterTree, SIGNAL(changed()), this, SLOT(filterTreeChanged()));
+    invalidate();
+}
+
+void CardDatabaseDisplayModel::filterTreeChanged()
+{
+    invalidate();
+}

cockatrice/src/carddatabasemodel.h

@@ -7,6 +7,8 @@
 #include <QSet>
 #include "carddatabase.h"
 
+class FilterTree;
+
 class CardDatabaseModel : public QAbstractListModel {
     Q_OBJECT
 public:
@@ -36,8 +38,10 @@ private:
     FilterBool isToken;
     QString cardNameBeginning, cardName, cardText;
     QSet<QString> cardNameSet, cardTypes, cardColors;
+    FilterTree *filterTree;
 public:
     CardDatabaseDisplayModel(QObject *parent = 0);
+    void setFilterTree(FilterTree *filterTree);
     void setIsToken(FilterBool _isToken) { isToken = _isToken; invalidate(); }
     void setCardNameBeginning(const QString &_beginning) { cardNameBeginning = _beginning; invalidate(); }
     void setCardName(const QString &_cardName) { cardName = _cardName; invalidate(); }
@@ -48,6 +52,8 @@ public:
     void clearSearch();
 protected:
     bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
+private slots:
+    void filterTreeChanged();
 };
 
 #endif

cockatrice/src/cardfilter.cpp

+#include "cardfilter.h"
+
+const char *CardFilter::typeName(Type t)
+{
+    switch (t) {
+        case TypeAnd:
+            return "and";
+        case TypeOr:
+            return "or";
+        case TypeAndNot:
+            return "and not";
+        case TypeOrNot:
+            return "or not";
+        default:
+            return "";
+    }
+}
+
+const char *CardFilter::attrName(Attr a)
+{
+    switch (a) {
+        case AttrName:
+            return "name";
+        case AttrType:
+            return "type";
+        case AttrColor:
+            return "color";
+        case AttrText:
+            return "text";
+        case AttrSet:
+            return "set";
+        case AttrManaCost:
+            return "mana cost";
+        default:
+            return "";
+    }
+}

cockatrice/src/cardfilter.h

+#ifndef CARDFILTER_H
+#define CARDFILTER_H
+
+#include <QString>
+
+class CardFilter {
+public:
+    enum Type {
+        TypeAnd = 0,
+        TypeOr,
+        TypeAndNot,
+        TypeOrNot,
+        TypeEnd
+    };
+
+    /* if you add an atribute here you also need to
+     * add its string representation in attrName */
+    enum Attr {
+        AttrName = 0,
+        AttrType,
+        AttrColor,
+        AttrText,
+        AttrSet,
+        AttrManaCost,
+        AttrEnd
+    };
+
+private:
+    enum Type t;
+    enum Attr a;
+    QString trm;
+
+public:
+    CardFilter(QString term, Type type, Attr attr) : trm(term), t(type), a(attr) {};
+
+    Type type() const { return t; }
+    const QString &term() const { return trm; }
+    Attr attr() const { return a; }
+
+    static const char *typeName(Type t);
+    static const char *attrName(Attr a);
+};
+
+#endif

cockatrice/src/cardframe.cpp

+#include "cardframe.h"
+
+#include "carditem.h"
+#include "carddatabase.h"
+#include "main.h"
+#include "cardinfopicture.h"
+#include "cardinfotext.h"
+
+CardFrame::CardFrame(int width, int height,
+                        const QString &cardName, QWidget *parent)
+    : QStackedWidget(parent)
+    , info(0)
+    , cardTextOnly(false)
+{
+    setFrameStyle(QFrame::Panel | QFrame::Raised);
+    setMaximumWidth(width);
+    setMinimumWidth(width);
+    setMaximumHeight(height);
+    setMinimumHeight(height);
+    pic = new CardInfoPicture(width);
+    addWidget(pic);
+    text = new CardInfoText();
+    addWidget(text);
+    connect(pic, SIGNAL(hasPictureChanged()), this, SLOT(hasPictureChanged()));
+    setCard(db->getCard(cardName));
+}
+
+void CardFrame::setCard(CardInfo *card)
+{
+    if (info)
+        disconnect(info, 0, this, 0);
+    info = card;
+    connect(info, SIGNAL(destroyed()), this, SLOT(clear()));
+    text->setCard(info);
+    pic->setCard(info);
+}
+
+void CardFrame::setCard(const QString &cardName)
+{
+    setCard(db->getCard(cardName));
+}
+
+void CardFrame::setCard(AbstractCardItem *card)
+{
+    setCard(card->getInfo());
+}
+
+void CardFrame::clear()
+{
+    setCard(db->getCard());
+}
+
+void CardFrame::hasPictureChanged()
+{
+    if (pic->hasPicture() && !cardTextOnly)
+        setCurrentWidget(pic);
+    else
+        setCurrentWidget(text);
+}

cockatrice/src/cardframe.h

+#ifndef CARDFRAME_H
+#define CARDFRAME_H
+
+#include <QStackedWidget>
+
+class AbstractCardItem;
+class CardInfo;
+class CardInfoPicture;
+class CardInfoText;
+
+class CardFrame : public QStackedWidget {
+    Q_OBJECT
+
+private:
+    CardInfo *info;
+    CardInfoPicture *pic;
+    CardInfoText *text;
+    bool cardTextOnly;
+
+public:
+    CardFrame(int width, int height, const QString &cardName = QString(),
+                QWidget *parent = 0);
+    void setCardTextOnly(bool status) { cardTextOnly = status; hasPictureChanged(); }
+
+public slots:
+    void setCard(CardInfo *card);
+    void setCard(const QString &cardName);
+    void setCard(AbstractCardItem *card);
+    void clear();
+
+private slots:
+    void hasPictureChanged();
+    void toggleCardTextOnly() { setCardTextOnly(!cardTextOnly); }
+};
+
+#endif

cockatrice/src/cardinfopicture.cpp

+#include "cardinfopicture.h"
+
+#include <QLabel>
+#include "carditem.h"
+#include "carddatabase.h"
+#include "main.h"
+
+CardInfoPicture::CardInfoPicture(int maximumWidth, QWidget *parent)
+    : QLabel(parent)
+    , info(0)
+    , noPicture(true)
+{
+    setMaximumWidth(maximumWidth);
+}
+
+void CardInfoPicture::setNoPicture(bool status)
+{
+    if (noPicture != status) {
+        noPicture = status;
+        emit hasPictureChanged();
+    }
+}
+
+void CardInfoPicture::setCard(CardInfo *card)
+{
+    if (info)
+        disconnect(info, 0, this, 0);
+    info = card;
+    connect(info, SIGNAL(pixmapUpdated()), this, SLOT(updatePixmap()));
+
+    updatePixmap();
+}
+
+void CardInfoPicture::updatePixmap()
+{
+    qreal aspectRatio = (qreal) CARD_HEIGHT / (qreal) CARD_WIDTH;
+    qreal pixmapWidth = this->width();
+
+    if (pixmapWidth == 0) {
+        setNoPicture(true);
+        return;
+    }
+
+    QPixmap *resizedPixmap = info->getPixmap(QSize(pixmapWidth, pixmapWidth * aspectRatio));
+    if (resizedPixmap) {
+        setNoPicture(false);
+        this->setPixmap(*resizedPixmap);
+    }
+    else {
+        setNoPicture(true);
+        this->setPixmap(*(db->getCard()->getPixmap(QSize(pixmapWidth, pixmapWidth * aspectRatio))));
+    }
+}

cockatrice/src/cardinfopicture.h

+#ifndef CARDINFOPICTURE_H
+#define CARDINFOPICTURE_H
+
+#include <QLabel>
+
+class AbstractCardItem;
+class CardInfo;
+
+class CardInfoPicture : public QLabel {
+    Q_OBJECT
+
+signals:
+    void hasPictureChanged();
+
+private:
+    CardInfo *info;
+    bool noPicture;
+
+public:
+    CardInfoPicture(int maximumWidth, QWidget *parent = 0);
+    bool hasPicture() const { return !noPicture; }
+
+private:
+    void setNoPicture(bool status);
+
+public slots:
+    void setCard(CardInfo *card);
+
+private slots:
+    void updatePixmap();
+
+};
+
+#endif

cockatrice/src/cardinfotext.cpp

+#include "cardinfotext.h"
+
+#include <QLabel>
+#include <QTextEdit>
+#include <QGridLayout>
+#include "carditem.h"
+#include "carddatabase.h"
+#include "main.h"
+
+CardInfoText::CardInfoText(QWidget *parent)
+    : QFrame(parent)
+    , info(0)
+{
+    nameLabel1 = new QLabel;
+    nameLabel2 = new QLabel;
+    nameLabel2->setWordWrap(true);
+    manacostLabel1 = new QLabel;
+    manacostLabel2 = new QLabel;
+    manacostLabel2->setWordWrap(true);
+    cardtypeLabel1 = new QLabel;
+    cardtypeLabel2 = new QLabel;
+    cardtypeLabel2->setWordWrap(true);
+    powtoughLabel1 = new QLabel;
+    powtoughLabel2 = new QLabel;
+    loyaltyLabel1 = new QLabel;
+    loyaltyLabel2 = new QLabel;
+
+    textLabel = new QTextEdit();
+    textLabel->setReadOnly(true);
+
+    QGridLayout *grid = new QGridLayout(this);
+    int row = 0;
+    grid->addWidget(nameLabel1, row, 0);
+    grid->addWidget(nameLabel2, row++, 1);
+    grid->addWidget(manacostLabel1, row, 0);
+    grid->addWidget(manacostLabel2, row++, 1);
+    grid->addWidget(cardtypeLabel1, row, 0);
+    grid->addWidget(cardtypeLabel2, row++, 1);
+    grid->addWidget(powtoughLabel1, row, 0);
+    grid->addWidget(powtoughLabel2, row++, 1);
+    grid->addWidget(loyaltyLabel1, row, 0);
+    grid->addWidget(loyaltyLabel2, row++, 1);
+    grid->addWidget(textLabel, row, 0, -1, 2);
+    grid->setRowStretch(row, 1);
+    grid->setColumnStretch(1, 1);
+
+    retranslateUi();
+}
+
+void CardInfoText::setCard(CardInfo *card)
+{
+    nameLabel2->setText(card->getName());
+    manacostLabel2->setText(card->getManaCost());
+    cardtypeLabel2->setText(card->getCardType());
+    powtoughLabel2->setText(card->getPowTough());
+    loyaltyLabel2->setText(card->getLoyalty() > 0 ? QString::number(card->getLoyalty()) : QString());
+    textLabel->setText(card->getText());
+}
+
+void CardInfoText::retranslateUi()
+{
+    nameLabel1->setText(tr("Name:"));
+    manacostLabel1->setText(tr("Mana cost:"));
+    cardtypeLabel1->setText(tr("Card type:"));
+    powtoughLabel1->setText(tr("P / T:"));
+    loyaltyLabel1->setText(tr("Loyalty:"));
+}

cockatrice/src/cardinfotext.h

+#ifndef CARDINFOTEXT_H
+#define CARDINFOTEXT_H
+
+#include <QFrame>
+
+class QLabel;
+class QTextEdit;
+class CardInfo;
+
+class CardInfoText : public QFrame {
+    Q_OBJECT
+
+private:
+    QLabel *nameLabel1, *nameLabel2;
+    QLabel *manacostLabel1, *manacostLabel2;
+    QLabel *cardtypeLabel1, *cardtypeLabel2;
+    QLabel *powtoughLabel1, *powtoughLabel2;
+    QLabel *loyaltyLabel1, *loyaltyLabel2;
+    QTextEdit *textLabel;
+
+    CardInfo *info;
+
+public:
+    CardInfoText(QWidget *parent = 0);
+    void retranslateUi();
+
+public slots:
+    void setCard(CardInfo *card);
+};
+
+#endif

cockatrice/src/decklistmodel.cpp

@@ -169,8 +169,7 @@ Qt::ItemFlags DeckListModel::flags(const QModelIndex &index) const
         return 0;
 
     Qt::ItemFlags result = Qt::ItemIsEnabled;
-    if (getNode<DecklistModelCardNode *>(index))
-        result |= Qt::ItemIsSelectable;
+    result |= Qt::ItemIsSelectable;
 
     return result;
 }
@@ -236,6 +235,38 @@ InnerDecklistNode *DeckListModel::createNodeIfNeeded(const QString &name, InnerD
     return newNode;
 }
 
+DecklistModelCardNode *DeckListModel::findCardNode(const QString &cardName, const QString &zoneName) const
+{
+    InnerDecklistNode *zoneNode, *typeNode;
+    CardInfo *info;
+    QString cardType;
+
+    zoneNode = dynamic_cast<InnerDecklistNode *>(root->findChild(zoneName));
+    if(!zoneNode)
+        return NULL;
+
+    info = db->getCard(cardName);
+    if(!info)
+        return NULL;
+
+    cardType = info->getMainCardType();
+    typeNode = dynamic_cast<InnerDecklistNode *>(zoneNode->findChild(cardType));
+    if(!typeNode)
+        return NULL;
+
+    return dynamic_cast<DecklistModelCardNode *>(typeNode->findChild(cardName));
+}
+
+QModelIndex DeckListModel::findCard(const QString &cardName, const QString &zoneName) const
+{
+    DecklistModelCardNode *cardNode;
+
+    cardNode = findCardNode(cardName, zoneName);
+    if(!cardNode)
+        return QModelIndex();
+    return nodeToIndex(cardNode);
+}
+
 QModelIndex DeckListModel::addCard(const QString &cardName, const QString &zoneName)
 {
     InnerDecklistNode *zoneNode = createNodeIfNeeded(zoneName, root);

cockatrice/src/decklistmodel.h

@@ -45,6 +45,7 @@ public:
     Qt::ItemFlags flags(const QModelIndex &index) const;
     bool setData(const QModelIndex &index, const QVariant &value, int role);
     bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
+    QModelIndex findCard(const QString &cardName, const QString &zoneName) const;
     QModelIndex addCard(const QString &cardName, const QString &zoneName);
     void sort(int column, Qt::SortOrder order = Qt::AscendingOrder);
     void cleanList();
@@ -56,6 +57,7 @@ private:
     InnerDecklistNode *root;
     InnerDecklistNode *createNodeIfNeeded(const QString &name, InnerDecklistNode *parent);
     QModelIndex nodeToIndex(AbstractDecklistNode *node) const;
+    DecklistModelCardNode *findCardNode(const QString &cardName, const QString &zoneName) const;
     void emitRecursiveUpdates(const QModelIndex &index);
     void sortHelper(InnerDecklistNode *node, Qt::SortOrder order);
 

cockatrice/src/filterbuilder.cpp

+#include "filterbuilder.h"
+
+#include <QHBoxLayout>
+#include <QComboBox>
+#include <QPushButton>
+#include <QLineEdit>
+
+#include "cardfilter.h"
+
+FilterBuilder::FilterBuilder(QWidget *parent)
+    : QFrame(parent)
+{
+    int i;
+
+    QVBoxLayout *layout = new QVBoxLayout;
+    QHBoxLayout *addFilter = new QHBoxLayout;
+
+    filterCombo = new QComboBox;
+    for (i = 0; i < CardFilter::AttrEnd; i++)
+        filterCombo->addItem(
+            tr(CardFilter::attrName(static_cast<CardFilter::Attr>(i))),
+            QVariant(i)
+        );
+
+    typeCombo = new QComboBox;
+    for (i = 0; i < CardFilter::TypeEnd; i++)
+        typeCombo->addItem(
+            tr(CardFilter::typeName(static_cast<CardFilter::Type>(i))),
+            QVariant(i)
+        );
+
+    QPushButton *ok = new QPushButton("+");
+    ok->setMaximumSize(20, 20);
+
+    addFilter->addWidget(ok);
+    addFilter->addWidget(typeCombo);
+    addFilter->addWidget(filterCombo, Qt::AlignLeft);
+
+    edit = new QLineEdit;
+    edit->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+    layout->addLayout(addFilter);
+    layout->addWidget(edit);
+
+    setFrameStyle(QFrame::Panel | QFrame::Raised);
+    layout->setAlignment(Qt::AlignTop);
+    setLayout(layout);
+
+    connect(edit, SIGNAL(returnPressed()), this, SLOT(emit_add()));
+    connect(ok, SIGNAL(released()), this, SLOT(emit_add()));
+    connect(filterCombo, SIGNAL(currentIndexChanged(int)), edit, SLOT(clear()));
+    fltr = NULL;
+}
+
+FilterBuilder::~FilterBuilder()
+{
+    destroyFilter();
+}
+
+void FilterBuilder::destroyFilter()
+{
+    if (fltr)
+        delete fltr;
+}
+
+static int comboCurrentIntData(const QComboBox *combo) 
+{
+    return combo->itemData(combo->currentIndex()).toInt();
+}
+
+void FilterBuilder::emit_add()
+{
+    QString txt;
+
+    txt = edit->text();
+    if (txt.length() < 1)
+        return;
+
+    destroyFilter();
+    fltr = new CardFilter(txt,
+                    static_cast<CardFilter::Type>(comboCurrentIntData(typeCombo)),
+                    static_cast<CardFilter::Attr>(comboCurrentIntData(filterCombo)));
+    emit add(fltr);
+    edit->clear();
+}

cockatrice/src/filterbuilder.h

+#ifndef FILTERBUILDER_H
+#define FILTERBUILDER_H
+
+#include <QFrame>
+
+class QCheckBox;
+class QComboBox;
+class QLineEdit;
+class CardFilter;
+
+class FilterBuilder : public QFrame {
+    Q_OBJECT
+
+private:
+    QComboBox *typeCombo;
+    QComboBox *filterCombo;
+    QLineEdit *edit;
+    CardFilter *fltr;
+
+    void destroyFilter();
+
+public:
+    FilterBuilder(QWidget *parent = 0);
+    ~FilterBuilder();
+
+signals:
+    void add(const CardFilter *f);
+
+public slots:
+private slots:
+    void emit_add();
+protected:
+};
+
+#endif