Merge remote-tracking branch 'upstream/master' into pixmap_memory_2nd_attempt

Conflicts:
	cockatrice/src/dlg_settings.cpp
	cockatrice/src/dlg_settings.h

CMakeLists.txt

@@ -79,9 +79,9 @@ ELSEIF (CMAKE_COMPILER_IS_GNUCXX)
     include(CheckCXXCompilerFlag)
 
     set(CMAKE_CXX_FLAGS_RELEASE "-s -O2")
-    set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -O0 -Wall -Wextra -pedantic -Werror")
+    set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -O0 -Wall -Wextra -Werror")
 
-    set(ADDITIONAL_DEBUG_FLAGS -Wcast-align -Wmissing-declarations -Winline -Wno-long-long -Wno-error=extra -Wno-error=unused-parameter -Wno-inline -Wno-error=delete-non-virtual-dtor -Wno-error=sign-compare -Wno-error=reorder -Wno-error=missing-declarations)
+    set(ADDITIONAL_DEBUG_FLAGS -Wcast-align -Wmissing-declarations -Wno-long-long -Wno-error=extra -Wno-error=delete-non-virtual-dtor -Wno-error=sign-compare -Wno-error=missing-declarations)
 
     FOREACH(FLAG ${ADDITIONAL_DEBUG_FLAGS})
         CHECK_CXX_COMPILER_FLAG("${FLAG}" CXX_HAS_WARNING_${FLAG})

cockatrice/CMakeLists.txt

@@ -101,8 +101,8 @@ set(cockatrice_RESOURCES cockatrice.qrc)
 FILE(GLOB cockatrice_TS "${CMAKE_CURRENT_SOURCE_DIR}/translations/*.ts")
 
 IF(UPDATE_TRANSLATIONS)
-    FILE(GLOB_RECURSE translate_cockatrice_SRCS ${CMAKE_SOURCE_DIR}/cockatrice/src/*.cpp)
+    FILE(GLOB_RECURSE translate_cockatrice_SRCS ${CMAKE_SOURCE_DIR}/cockatrice/src/*.cpp ${CMAKE_SOURCE_DIR}/cockatrice/src/*.h)
-    FILE(GLOB_RECURSE translate_common_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/common/*.cpp)
+    FILE(GLOB_RECURSE translate_common_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/common/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/common/*.h)
     SET(translate_SRCS ${translate_cockatrice_SRCS} ${translate_common_SRCS})
 ENDIF(UPDATE_TRANSLATIONS)
 
@@ -269,18 +269,12 @@ if(APPLE)
     set(plugin_dest_dir cockatrice.app/Contents/Plugins)
     set(qtconf_dest_dir cockatrice.app/Contents/Resources)
 
-    # note: no codecs in qt5
+    # qt4: codecs, iconengines, imageformats, phonon_backend
-    # note: phonon_backend => audio | mediaservice
+    # qt5: audio, iconengines, imageformats, platforms, printsupport
-    # note: needs platform on osx
 
-    if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+    install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
-        install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
+        FILES_MATCHING REGEX "(audio|codecs|iconengines|imageformats|phonon_backend|platforms|printsupport)/.*\\.dylib"
-            FILES_MATCHING REGEX "(audio|codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms)/.*_debug\\.dylib")
+        REGEX ".*_debug\\.dylib" EXCLUDE)
-    else()
-        install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
-            FILES_MATCHING REGEX "(audio|codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms)/.*\\.dylib"
-            REGEX ".*_debug\\.dylib" EXCLUDE)
-    endif()
 
     install(CODE "
         file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]
@@ -303,17 +297,11 @@ if(WIN32)
     set(plugin_dest_dir Plugins)
     set(qtconf_dest_dir .)
 
-    # note: no codecs in qt5
+    # qt4: codecs, iconengines, imageformats, phonon_backend
-    # note: phonon_backend => audio | mediaservice
+    # qt5: audio, iconengines, imageformats, platforms, printsupport
-    # note: needs platform on osx
 
-    if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+    install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
-        install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
+        FILES_MATCHING REGEX "(audio|codecs|iconengines|imageformats|phonon_backend|platforms|printsupport)/.*[^d]\\.dll")
-            FILES_MATCHING REGEX "(audio|codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms)/.*d\\.dll")
-    else()
-        install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
-            FILES_MATCHING REGEX "(audio|codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms)/.*[^d]\\.dll")
-    endif()
 
     install(CODE "
         file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]

cockatrice/src/carddatabase.cpp

@@ -31,7 +31,7 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardSet *set)
 }
 
 CardSet::CardSet(const QString &_shortName, const QString &_longName, const QString &_setType, const QDate &_releaseDate)
-    : shortName(_shortName), longName(_longName), setType(_setType), releaseDate(_releaseDate)
+    : shortName(_shortName), longName(_longName), releaseDate(_releaseDate), setType(_setType)
 {
     updateSortKey();
 }

cockatrice/src/chatview.cpp

@@ -96,7 +96,7 @@ void ChatView::appendMessage(QString message, QString sender, UserLevelFlags use
         QTextCharFormat timeFormat;
         timeFormat.setForeground(Qt::black);
         cursor.setCharFormat(timeFormat);
-        cursor.insertText(QDateTime::currentDateTime().toString("[hh:mm] "));
+        cursor.insertText(QDateTime::currentDateTime().toString("[hh:mm:ss] "));
     }
     
     QTextCharFormat senderFormat;

cockatrice/src/dlg_connect.cpp

@@ -75,6 +75,7 @@ DlgConnect::DlgConnect(QWidget *parent)
 
 void DlgConnect::passwordSaved(int state)
 {
+    Q_UNUSED(state);
     if(savePasswordCheckBox->isChecked()) {
        autoConnectCheckBox->setEnabled(true);
     } else {

cockatrice/src/dlg_filter_games.cpp

@@ -12,49 +12,37 @@
 #include <QSettings>
 #include <QCryptographicHash>
 
-DlgFilterGames::DlgFilterGames(const QMap<int, QString> &_allGameTypes, QWidget *parent)
+DlgFilterGames::DlgFilterGames(const QMap<int, QString> &_allGameTypes, const GamesProxyModel *_gamesProxyModel, QWidget *parent)
     : QDialog(parent),
-      allGameTypes(_allGameTypes)
+      allGameTypes(_allGameTypes),
+      gamesProxyModel(_gamesProxyModel)
 {
     QSettings settings;
     settings.beginGroup("filter_games");
 
     unavailableGamesVisibleCheckBox = new QCheckBox(tr("Show &unavailable games"));
-    unavailableGamesVisibleCheckBox->setChecked(
+    unavailableGamesVisibleCheckBox->setChecked(gamesProxyModel->getUnavailableGamesVisible());
-        settings.value("unavailable_games_visible", false).toBool()
-    );
 
     passwordProtectedGamesVisibleCheckBox = new QCheckBox(tr("Show &password protected games"));
-    passwordProtectedGamesVisibleCheckBox->setChecked(
+    passwordProtectedGamesVisibleCheckBox->setChecked(gamesProxyModel->getPasswordProtectedGamesVisible());
-        settings.value("password_protected_games_visible", false).toBool()
+
-    );
-    
     gameNameFilterEdit = new QLineEdit;
-    gameNameFilterEdit->setText(
+    gameNameFilterEdit->setText(gamesProxyModel->getGameNameFilter());
-        settings.value("game_name_filter", "").toString()
-    );
     QLabel *gameNameFilterLabel = new QLabel(tr("Game &description:"));
     gameNameFilterLabel->setBuddy(gameNameFilterEdit);
-    
+
     creatorNameFilterEdit = new QLineEdit;
-    creatorNameFilterEdit->setText(
+    creatorNameFilterEdit->setText(gamesProxyModel->getCreatorNameFilter());
-        settings.value("creator_name_filter", "").toString()
-    );
     QLabel *creatorNameFilterLabel = new QLabel(tr("&Creator name:"));
     creatorNameFilterLabel->setBuddy(creatorNameFilterEdit);
-    
+
     QVBoxLayout *gameTypeFilterLayout = new QVBoxLayout;
     QMapIterator<int, QString> gameTypesIterator(allGameTypes);
     while (gameTypesIterator.hasNext()) {
         gameTypesIterator.next();
 
         QCheckBox *temp = new QCheckBox(gameTypesIterator.value());
-        temp->setChecked(
+        temp->setChecked(gamesProxyModel->getGameTypeFilter().contains(gameTypesIterator.key()));
-            settings.value(
-                "game_type/" + hashGameType(gameTypesIterator.value()),
-                false
-            ).toBool()
-        );
 
         gameTypeFilterCheckBoxes.insert(gameTypesIterator.key(), temp);
         gameTypeFilterLayout->addWidget(temp);
@@ -65,34 +53,30 @@ DlgFilterGames::DlgFilterGames(const QMap<int, QString> &_allGameTypes, QWidget
         gameTypeFilterGroupBox->setLayout(gameTypeFilterLayout);
     } else
         gameTypeFilterGroupBox = 0;
-    
+
     QLabel *maxPlayersFilterMinLabel = new QLabel(tr("at &least:"));
     maxPlayersFilterMinSpinBox = new QSpinBox;
     maxPlayersFilterMinSpinBox->setMinimum(1);
     maxPlayersFilterMinSpinBox->setMaximum(99);
-    maxPlayersFilterMinSpinBox->setValue(
+    maxPlayersFilterMinSpinBox->setValue(gamesProxyModel->getMaxPlayersFilterMin());
-        settings.value("min_players", 1).toInt()
-    );
     maxPlayersFilterMinLabel->setBuddy(maxPlayersFilterMinSpinBox);
-    
+
     QLabel *maxPlayersFilterMaxLabel = new QLabel(tr("at &most:"));
     maxPlayersFilterMaxSpinBox = new QSpinBox;
     maxPlayersFilterMaxSpinBox->setMinimum(1);
     maxPlayersFilterMaxSpinBox->setMaximum(99);
-    maxPlayersFilterMaxSpinBox->setValue(
+    maxPlayersFilterMaxSpinBox->setValue(gamesProxyModel->getMaxPlayersFilterMax());
-        settings.value("max_players", 99).toInt()
-    );
     maxPlayersFilterMaxLabel->setBuddy(maxPlayersFilterMaxSpinBox);
-    
+
     QGridLayout *maxPlayersFilterLayout = new QGridLayout;
     maxPlayersFilterLayout->addWidget(maxPlayersFilterMinLabel, 0, 0);
     maxPlayersFilterLayout->addWidget(maxPlayersFilterMinSpinBox, 0, 1);
     maxPlayersFilterLayout->addWidget(maxPlayersFilterMaxLabel, 1, 0);
     maxPlayersFilterLayout->addWidget(maxPlayersFilterMaxSpinBox, 1, 1);
-    
+
     QGroupBox *maxPlayersGroupBox = new QGroupBox(tr("Maximum player count"));
     maxPlayersGroupBox->setLayout(maxPlayersFilterLayout);
-    
+
     QGridLayout *leftGrid = new QGridLayout;
     leftGrid->addWidget(gameNameFilterLabel, 0, 0);
     leftGrid->addWidget(gameNameFilterEdit, 0, 1);
@@ -101,66 +85,34 @@ DlgFilterGames::DlgFilterGames(const QMap<int, QString> &_allGameTypes, QWidget
     leftGrid->addWidget(maxPlayersGroupBox, 2, 0, 1, 2);
     leftGrid->addWidget(unavailableGamesVisibleCheckBox, 3, 0, 1, 2);
     leftGrid->addWidget(passwordProtectedGamesVisibleCheckBox, 4, 0, 1, 2);
-    
+
     QVBoxLayout *leftColumn = new QVBoxLayout;
     leftColumn->addLayout(leftGrid);
     leftColumn->addStretch();
-    
+
     QVBoxLayout *rightColumn = new QVBoxLayout;
     rightColumn->addWidget(gameTypeFilterGroupBox);
-    
+
     QHBoxLayout *hbox = new QHBoxLayout;
     hbox->addLayout(leftColumn);
     hbox->addLayout(rightColumn);
-    
+
     QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
     connect(buttonBox, SIGNAL(accepted()), this, SLOT(actOk()));
     connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
-    
+
     QVBoxLayout *mainLayout = new QVBoxLayout;
     mainLayout->addLayout(hbox);
     mainLayout->addWidget(buttonBox);
-    
+
     setLayout(mainLayout);
     setWindowTitle(tr("Filter games"));
 }
 
 void DlgFilterGames::actOk() {
-    QSettings settings;
-    settings.beginGroup("filter_games");
-    settings.setValue(
-        "unavailable_games_visible",
-	unavailableGamesVisibleCheckBox->isChecked()
-    );
-    settings.setValue(
-        "password_protected_games_visible",
-        passwordProtectedGamesVisibleCheckBox->isChecked()
-    );
-    settings.setValue("game_name_filter", gameNameFilterEdit->text());
-    settings.setValue("creator_name_filter", creatorNameFilterEdit->text());
-
-    QMapIterator<int, QString> gameTypeIterator(allGameTypes);
-    QMapIterator<int, QCheckBox *> checkboxIterator(gameTypeFilterCheckBoxes);
-    while (gameTypeIterator.hasNext()) {
-        gameTypeIterator.next();
-        checkboxIterator.next();
-
-        settings.setValue(
-            "game_type/" + hashGameType(gameTypeIterator.value()),
-            checkboxIterator.value()->isChecked()
-        );
-    }
-
-    settings.setValue("min_players", maxPlayersFilterMinSpinBox->value());
-    settings.setValue("max_players", maxPlayersFilterMaxSpinBox->value());
-
     accept();
 }
 
-QString DlgFilterGames::hashGameType(const QString &gameType) const {
-    return QCryptographicHash::hash(gameType.toUtf8(), QCryptographicHash::Md5).toHex();
-}
-
 bool DlgFilterGames::getUnavailableGamesVisible() const
 {
     return unavailableGamesVisibleCheckBox->isChecked();

cockatrice/src/dlg_filter_games.h

@@ -4,6 +4,7 @@
 #include <QDialog>
 #include <QSet>
 #include <QMap>
+#include "gamesmodel.h"
 
 class QCheckBox;
 class QLineEdit;
@@ -21,17 +22,13 @@ private:
     QSpinBox *maxPlayersFilterMaxSpinBox;
 
     const QMap<int, QString> &allGameTypes;
+    const GamesProxyModel *gamesProxyModel;
 
-    /*
-     * The game type might contain special characters, so to use it in
-     * QSettings we just hash it.
-     */
-    QString hashGameType(const QString &gameType) const;
 private slots:
     void actOk();
 public:
-    DlgFilterGames(const QMap<int, QString> &allGameTypes, QWidget *parent = 0);
+    DlgFilterGames(const QMap<int, QString> &_allGameTypes, const GamesProxyModel *_gamesProxyModel, QWidget *parent = 0);
-    
+
     bool getUnavailableGamesVisible() const;
     void setUnavailableGamesVisible(bool _unavailableGamesVisible);
     bool getPasswordProtectedGamesVisible() const;

cockatrice/src/dlg_settings.cpp

@@ -44,7 +44,7 @@ GeneralSettingsPage::GeneralSettingsPage()
     picDownloadCheckBox = new QCheckBox;
     picDownloadCheckBox->setChecked(settingsCache->getPicDownload());
     
-    QPushButton *clearDownloadedPicsButton = new QPushButton(tr("Reset/Clear Downloaded Pictures"));
+    clearDownloadedPicsButton = new QPushButton();
     connect(clearDownloadedPicsButton, SIGNAL(clicked()), this, SLOT(clearDownloadedPicsButtonClicked()));
 
     picDownloadHqCheckBox = new QCheckBox;
@@ -239,6 +239,7 @@ void GeneralSettingsPage::retranslateUi()
     cardDatabasePathLabel->setText(tr("Card database:"));
     tokenDatabasePathLabel->setText(tr("Token database:"));
     pixmapCacheLabel->setText(tr("Picture cache size:"));
+    clearDownloadedPicsButton->setText(tr("Reset/Clear Downloaded Pictures"));
 }
 
 AppearanceSettingsPage::AppearanceSettingsPage()

cockatrice/src/dlg_settings.h

@@ -46,6 +46,7 @@ private:
     QCheckBox *picDownloadCheckBox;
     QCheckBox *picDownloadHqCheckBox;
     QLabel *languageLabel, *deckPathLabel, *replaysPathLabel, *picsPathLabel, *cardDatabasePathLabel, *tokenDatabasePathLabel, *pixmapCacheLabel;
+    QPushButton *clearDownloadedPicsButton;
 };
 
 class AppearanceSettingsPage : public AbstractSettingsPage {

cockatrice/src/filtertree.h

@@ -154,7 +154,7 @@ public:
     FilterTreeNode *termNode(const CardFilter *f);
     FilterTreeNode *attrTypeNode(CardFilter::Attr attr,
                                 CardFilter::Type type);
-    const char *textCStr() { return "root"; }
+    const char *textCStr() const { return "root"; }
     int index() const { return 0; }
 
     bool acceptsCard(const CardInfo *info) const;

cockatrice/src/gameselector.cpp

@@ -32,8 +32,12 @@ GameSelector::GameSelector(AbstractClient *_client, const TabSupervisor *_tabSup
     gameListView->setRootIsDecorated(true);
     if (_room)
         gameListView->header()->hideSection(gameListModel->roomColIndex());
-    else
+
-        gameListProxyModel->setUnavailableGamesVisible(true);
+    if (room)
+        gameTypeMap = gameListModel->getGameTypes().value(room->getRoomId());
+
+    gameListProxyModel->loadFilterParameters(gameTypeMap);
+
 #if QT_VERSION < 0x050000
     gameListView->header()->setResizeMode(0, QHeaderView::ResizeToContents);
 #else
@@ -44,7 +48,7 @@ GameSelector::GameSelector(AbstractClient *_client, const TabSupervisor *_tabSup
     connect(filterButton, SIGNAL(clicked()), this, SLOT(actSetFilter()));
     clearFilterButton = new QPushButton;
     clearFilterButton->setIcon(QIcon(":/resources/icon_clearsearch.svg"));
-    clearFilterButton->setEnabled(false);
+    clearFilterButton->setEnabled(true);
     connect(clearFilterButton, SIGNAL(clicked()), this, SLOT(actClearFilter()));
 
     if (room) {
@@ -82,29 +86,28 @@ GameSelector::GameSelector(AbstractClient *_client, const TabSupervisor *_tabSup
 
 void GameSelector::actSetFilter()
 {
-    GameTypeMap gameTypeMap;
+    DlgFilterGames dlg(gameTypeMap, gameListProxyModel, this);
-    if (room)
+
-        gameTypeMap = gameListModel->getGameTypes().value(room->getRoomId());
-    DlgFilterGames dlg(gameTypeMap, this);
-    
     if (!dlg.exec())
         return;
-    
+
     clearFilterButton->setEnabled(true);
-    
+
     gameListProxyModel->setUnavailableGamesVisible(dlg.getUnavailableGamesVisible());
     gameListProxyModel->setPasswordProtectedGamesVisible(dlg.getPasswordProtectedGamesVisible());
     gameListProxyModel->setGameNameFilter(dlg.getGameNameFilter());
     gameListProxyModel->setCreatorNameFilter(dlg.getCreatorNameFilter());
     gameListProxyModel->setGameTypeFilter(dlg.getGameTypeFilter());
     gameListProxyModel->setMaxPlayersFilter(dlg.getMaxPlayersFilterMin(), dlg.getMaxPlayersFilterMax());
+    gameListProxyModel->saveFilterParameters(gameTypeMap);
 }
 
 void GameSelector::actClearFilter()
 {
     clearFilterButton->setEnabled(false);
-    
+
     gameListProxyModel->resetFilterParameters();
+    gameListProxyModel->saveFilterParameters(gameTypeMap);
 }
 
 void GameSelector::actCreate()
@@ -136,7 +139,7 @@ void GameSelector::checkResponse(const Response &response)
 void GameSelector::actJoin()
 {
     bool spectator = sender() == spectateButton;
-    
+
     QModelIndex ind = gameListView->currentIndex();
     if (!ind.isValid())
         return;
@@ -149,19 +152,19 @@ void GameSelector::actJoin()
         if (!ok)
             return;
     }
-    
+
     Command_JoinGame cmd;
     cmd.set_game_id(game.game_id());
     cmd.set_password(password.toStdString());
     cmd.set_spectator(spectator);
     cmd.set_override_restrictions(overrideRestrictions);
-    
+
     TabRoom *r = tabSupervisor->getRoomTabs().value(game.room_id());
     if (!r) {
         QMessageBox::critical(this, tr("Error"), tr("Please join the respective room first."));
         return;
     }
-    
+
     PendingCommand *pend = r->prepareRoomCommand(cmd);
     connect(pend, SIGNAL(finished(Response, CommandContainer, QVariant)), this, SLOT(checkResponse(Response)));
     r->sendRoomCommand(pend);

cockatrice/src/gameselector.h

@@ -34,6 +34,7 @@ private:
     GamesModel *gameListModel;
     GamesProxyModel *gameListProxyModel;
     QPushButton *filterButton, *clearFilterButton, *createButton, *joinButton, *spectateButton;
+    GameTypeMap gameTypeMap;
 public:
     GameSelector(AbstractClient *_client, const TabSupervisor *_tabSupervisor, TabRoom *_room, const QMap<int, QString> &_rooms, const QMap<int, GameTypeMap> &_gameTypes, QWidget *parent = 0);
     void retranslateUi();

cockatrice/src/gamesmodel.cpp

@@ -3,6 +3,8 @@
 #include <QDebug>
 #include <QStringList>
 #include <QDateTime>
+#include <QSettings>
+#include <QCryptographicHash>
 
 namespace {
     const unsigned SECS_PER_MIN  = 60;
@@ -10,7 +12,7 @@ namespace {
 
     /**
      * Pretty print an integer number of seconds ago. Accurate to only one unit,
-     * rounded; <5 minutes and >5 hours are displayed as such. As a special case, 
+     * rounded; <5 minutes and >5 hours are displayed as such. As a special case,
      * time between 60 and 90 minutes will display both the hours and minutes.
      *
      * For example...
@@ -85,7 +87,7 @@ QVariant GamesModel::data(const QModelIndex &index, int role) const
             QDateTime then;
             then.setTime_t(g.start_time());
             unsigned int secs = then.secsTo(QDateTime::currentDateTime());
- 
+
             switch (role) {
                 case Qt::DisplayRole: return prettyPrintSecsAgo(secs);
                 case SORT_ROLE: return QVariant(secs);
@@ -221,12 +223,62 @@ void GamesProxyModel::resetFilterParameters()
     gameNameFilter = QString();
     creatorNameFilter = QString();
     gameTypeFilter.clear();
-    maxPlayersFilterMin = -1;
+    maxPlayersFilterMin = 1;
-    maxPlayersFilterMax = -1;
+    maxPlayersFilterMax = DEFAULT_MAX_PLAYERS_MAX;
 
     invalidateFilter();
 }
 
+void GamesProxyModel::loadFilterParameters(const QMap<int, QString> &allGameTypes)
+{
+    QSettings settings;
+    settings.beginGroup("filter_games");
+
+    unavailableGamesVisible = settings.value("unavailable_games_visible", false).toBool();
+    passwordProtectedGamesVisible = settings.value("password_protected_games_visible", false).toBool();
+    gameNameFilter = settings.value("game_name_filter", "").toString();
+    creatorNameFilter = settings.value("creator_name_filter", "").toString();
+    maxPlayersFilterMin = settings.value("min_players", 1).toInt();
+    maxPlayersFilterMax = settings.value("max_players", DEFAULT_MAX_PLAYERS_MAX).toInt();
+
+    QMapIterator<int, QString> gameTypesIterator(allGameTypes);
+    while (gameTypesIterator.hasNext()) {
+        gameTypesIterator.next();
+        if (settings.value("game_type/" + hashGameType(gameTypesIterator.value()), false).toBool()) {
+            gameTypeFilter.insert(gameTypesIterator.key());
+        }
+    }
+
+    invalidateFilter();
+}
+
+void GamesProxyModel::saveFilterParameters(const QMap<int, QString> &allGameTypes)
+{
+    QSettings settings;
+    settings.beginGroup("filter_games");
+
+    settings.setValue("unavailable_games_visible", unavailableGamesVisible);
+    settings.setValue(
+        "password_protected_games_visible",
+        passwordProtectedGamesVisible
+    );
+    settings.setValue("game_name_filter", gameNameFilter);
+    settings.setValue("creator_name_filter", creatorNameFilter);
+
+    QMapIterator<int, QString> gameTypeIterator(allGameTypes);
+    while (gameTypeIterator.hasNext()) {
+        gameTypeIterator.next();
+
+        settings.setValue(
+            "game_type/" + hashGameType(gameTypeIterator.value()),
+            gameTypeFilter.contains(gameTypeIterator.key())
+        );
+    }
+
+    settings.setValue("min_players", maxPlayersFilterMin);
+    settings.setValue("max_players", maxPlayersFilterMax);
+}
+
 bool GamesProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &/*sourceParent*/) const
 {
     GamesModel *model = qobject_cast<GamesModel *>(sourceModel());
@@ -265,3 +317,7 @@ bool GamesProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &/*sourc
 
     return true;
 }
+
+QString GamesProxyModel::hashGameType(const QString &gameType) const {
+    return QCryptographicHash::hash(gameType.toUtf8(), QCryptographicHash::Md5).toHex();
+}

cockatrice/src/gamesmodel.h

@@ -49,6 +49,14 @@ private:
     QString gameNameFilter, creatorNameFilter;
     QSet<int> gameTypeFilter;
     int maxPlayersFilterMin, maxPlayersFilterMax;
+
+    static const int DEFAULT_MAX_PLAYERS_MAX = 99;
+
+    /*
+     * The game type might contain special characters, so to use it in
+     * QSettings we just hash it.
+     */
+    QString hashGameType(const QString &gameType) const;
 public:
     GamesProxyModel(QObject *parent = 0, ServerInfo_User *_ownUser = 0);
 
@@ -66,6 +74,8 @@ public:
     int getMaxPlayersFilterMax() const { return maxPlayersFilterMax; }
     void setMaxPlayersFilter(int _maxPlayersFilterMin, int _maxPlayersFilterMax);
     void resetFilterParameters();
+    void loadFilterParameters(const QMap<int, QString> &allGameTypes);
+    void saveFilterParameters(const QMap<int, QString> &allGameTypes);
 protected:
     bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
 };

cockatrice/src/messagelogwidget.cpp

@@ -8,6 +8,7 @@
 #include "pb/context_move_card.pb.h"
 #include "pb/context_mulligan.pb.h"
 #include <QScrollBar>
+#include <QDateTime>
 
 QString MessageLogWidget::sanitizeHtml(QString dirty) const
 {
@@ -797,7 +798,7 @@ void MessageLogWidget::logSetActivePlayer(Player *player)
         str = tr("It is now %1's turn.", "female");
     else
         str = tr("It is now %1's turn.", "male");
-    appendHtml("<br><font color=\"green\"><b>" + str.arg(player->getName()) + "</b></font><br>");
+    appendHtml("<br><font color=\"green\"><b>" + QDateTime::currentDateTime().toString("[hh:mm:ss] ") + str.arg(player->getName()) + "</b></font><br>");
 }
 
 void MessageLogWidget::logSetActivePhase(int phase)
@@ -817,7 +818,7 @@ void MessageLogWidget::logSetActivePhase(int phase)
         case 9: phaseName = tr("second main phase"); break;
         case 10: phaseName = tr("ending phase"); break;
     }
-    appendHtml("<font color=\"green\"><b>" + tr("It is now the %1.").arg(phaseName) + "</b></font>");
+    appendHtml("<font color=\"green\"><b>" + QDateTime::currentDateTime().toString("[hh:mm:ss] ") + tr("It is now the %1.").arg(phaseName) + "</b></font>");
 }
 
 void MessageLogWidget::containerProcessingStarted(const GameEventContext &_context)
@@ -876,6 +877,6 @@ void MessageLogWidget::connectToPlayer(Player *player)
 }
 
 MessageLogWidget::MessageLogWidget(const TabSupervisor *_tabSupervisor, TabGame *_game, QWidget *parent)
-    : ChatView(_tabSupervisor, _game, false, parent), currentContext(MessageContext_None)
+    : ChatView(_tabSupervisor, _game, true, parent), currentContext(MessageContext_None)
 {
 }

cockatrice/src/player.cpp

@@ -2225,6 +2225,13 @@ qreal Player::getMinimumWidth() const
     return result;
 }
 
+void Player::setGameStarted()
+{
+    if (local)
+        aAlwaysRevealTopCard->setChecked(false);
+    setConceded(false);
+}
+
 void Player::setConceded(bool _conceded)
 {
     conceded = _conceded;

cockatrice/src/player.h

@@ -286,6 +286,8 @@ public:
     
     void setConceded(bool _conceded);
     bool getConceded() const { return conceded; }
+
+    void setGameStarted();
     
     qreal getMinimumWidth() const;
     void setMirrored(bool _mirrored);

cockatrice/src/playerlistwidget.cpp

@@ -70,13 +70,13 @@ PlayerListWidget::PlayerListWidget(TabSupervisor *_tabSupervisor, AbstractClient
     setMinimumHeight(60);
     setIconSize(QSize(20, 15));
     setColumnCount(6);
+    setColumnWidth(0, 20);
+    setColumnWidth(1, 20);
+    setColumnWidth(2, 20);
+    setColumnWidth(3, 20);
+    setColumnWidth(5, 20);
     setHeaderHidden(true);
     setRootIsDecorated(false);
-#if QT_VERSION < 0x050000
-    header()->setResizeMode(QHeaderView::ResizeToContents);
-#else
-    header()->setSectionResizeMode(QHeaderView::ResizeToContents);
-#endif
     retranslateUi();
 }
 
@@ -116,6 +116,7 @@ void PlayerListWidget::updatePlayerProperties(const ServerInfo_PlayerProperties
         player->setData(3, Qt::UserRole, prop.user_info().user_level());
         player->setIcon(3, QIcon(UserLevelPixmapGenerator::generatePixmap(12, UserLevelFlags(prop.user_info().user_level()))));
         player->setText(4, QString::fromStdString(prop.user_info().name()));
+	resizeColumnToContents(4);
         const QString country = QString::fromStdString(prop.user_info().country());
         if (!country.isEmpty())
             player->setIcon(4, QIcon(CountryPixmapGenerator::generatePixmap(12, country)));
@@ -123,8 +124,10 @@ void PlayerListWidget::updatePlayerProperties(const ServerInfo_PlayerProperties
     }
     if (prop.has_player_id())
         player->setData(4, Qt::UserRole + 1, prop.player_id());
-    if (prop.has_deck_hash())
+    if (prop.has_deck_hash()) {
         player->setText(5, QString::fromStdString(prop.deck_hash()));
+	resizeColumnToContents(5);
+    }
     if (prop.has_sideboard_locked())
         player->setIcon(5, prop.sideboard_locked() ? lockIcon : QIcon());
     if (prop.has_ping_seconds())

cockatrice/src/setsmodel.h

@@ -29,7 +29,7 @@ public:
     SetsModel(CardDatabase *_db, QObject *parent = 0);
     ~SetsModel();
     int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    int columnCount(const QModelIndex &parent = QModelIndex()) const { return NUM_COLS; }
+    int columnCount(const QModelIndex &parent = QModelIndex()) const { Q_UNUSED(parent); return NUM_COLS; }
     QVariant data(const QModelIndex &index, int role) const;
     QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
     Qt::ItemFlags flags(const QModelIndex &index) const;

cockatrice/src/tab.cpp

@@ -10,6 +10,10 @@ Tab::Tab(TabSupervisor *_tabSupervisor, QWidget *parent)
 
 void Tab::showCardInfoPopup(const QPoint &pos, const QString &cardName)
 {
+    if (infoPopup) {
+        infoPopup->deleteLater();
+    }
+	currentCardName = cardName;
     infoPopup = new CardInfoWidget(CardInfoWidget::ModePopUp, cardName, 0, Qt::Widget | Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint | Qt::WindowStaysOnTopHint);
     infoPopup->setAttribute(Qt::WA_TransparentForMouseEvents);
     QRect screenRect = qApp->desktop()->screenGeometry(this);
@@ -23,7 +27,7 @@ void Tab::showCardInfoPopup(const QPoint &pos, const QString &cardName)
 void Tab::deleteCardInfoPopup(const QString &cardName)
 {
     if (infoPopup) {
-        if ((infoPopup->getCardName() == cardName) || (cardName == "_")) {
+        if ((currentCardName == cardName) || (cardName == "_")) {
             infoPopup->deleteLater();
             infoPopup = 0;
         }

cockatrice/src/tab.h

@@ -19,6 +19,7 @@ protected slots:
     void showCardInfoPopup(const QPoint &pos, const QString &cardName);
     void deleteCardInfoPopup(const QString &cardName);
 private:
+    QString currentCardName;
     bool contentsChanged;
     CardInfoWidget *infoPopup;
     QList<QMenu *> tabMenus;

cockatrice/src/tab_game.cpp

@@ -872,7 +872,7 @@ void TabGame::startGame(bool resuming)
     if (!resuming) {
         QMapIterator<int, Player *> playerIterator(players);
         while (playerIterator.hasNext())
-            playerIterator.next().value()->setConceded(false);
+            playerIterator.next().value()->setGameStarted();
     }
 
     playerListWidget->setGameStarted(true, resuming);

cockatrice/src/tab_replays.cpp

@@ -119,7 +119,7 @@ void TabReplays::retranslateUi()
     aOpenRemoteReplay->setText(tr("Watch replay"));
     aDownload->setText(tr("Download replay"));
     aKeep->setText(tr("Toggle expiration lock"));
-    aDeleteLocalReplay->setText(tr("Delete"));
+    aDeleteRemoteReplay->setText(tr("Delete"));
 }
 
 void TabReplays::actOpenLocalReplay()

cockatrice/src/window_main.cpp

@@ -224,6 +224,7 @@ void MainWindow::actAbout()
         + tr("Portugese (Brazil):") + " Thiago Queiroz<br>"
         + tr("French:") + " Yannick Hammer, Arnaud Faes<br>"
         + tr("Japanese:") + " Nagase Task<br>"
+        + tr("Korean:") + " Jaeic Lee<br>"
         + tr("Russian:") + " Alexander Davidov<br>"
         + tr("Italian:") + " Luigi Sciolla<br>"
         + tr("Swedish:") + " Jessica Dahl<br>"
@@ -411,7 +412,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
     }
     event->accept();
     settingsCache->setMainWindowGeometry(saveGeometry());
-    delete tabSupervisor;
+    tabSupervisor->deleteLater();
 }
 
 void MainWindow::changeEvent(QEvent *event)

cockatrice/src/window_sets.cpp

@@ -37,6 +37,7 @@ WndSets::WndSets(QWidget *parent)
 
     view->sortByColumn(SetsModel::SortKeyCol, Qt::AscendingOrder);
     view->setColumnHidden(SetsModel::SortKeyCol, true);
+    view->setRootIsDecorated(false);
 
     saveButton = new QPushButton(tr("Save set ordering"));
     connect(saveButton, SIGNAL(clicked()), this, SLOT(actSave()));

oracle/CMakeLists.txt

@@ -138,17 +138,12 @@ if(APPLE)
     set(plugin_dest_dir oracle.app/Contents/Plugins)
     set(qtconf_dest_dir oracle.app/Contents/Resources)
 
-    # note: no codecs in qt5
+    # qt4: codecs, iconengines, imageformats
-    # note: phonon_backend => mediaservice
+    # qt5: iconengines, platforms
-    # note: needs platform on osx
 
-    if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+    install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
-        install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
+        FILES_MATCHING REGEX "(codecs|iconengines|platforms)/.*\\.dylib"
-            FILES_MATCHING REGEX "(codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms)/.*_debug\\.dylib")
+        REGEX ".*_debug\\.dylib" EXCLUDE)
-    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 \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]
@@ -170,17 +165,11 @@ IF(WIN32)
     set(plugin_dest_dir Plugins)
     set(qtconf_dest_dir .)
 
-    # note: no codecs in qt5
+    # qt4: codecs, iconengines, imageformats
-    # note: phonon_backend => mediaservice
+    # qt5: iconengines, imageformats, platforms
-    # note: needs platform on osx
 
-    if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+    install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
-        install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
+        FILES_MATCHING REGEX "(codecs|iconengines|platforms)/.*[^d]\\.dll")
-            FILES_MATCHING REGEX "(codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms)/.*d\\.dll")
-    else()
-        install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
-            FILES_MATCHING REGEX "(codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms)/.*[^d]\\.dll")
-    endif()
 
     install(CODE "
         file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]

oracle/src/oracleimporter.h

@@ -21,7 +21,7 @@ public:
     bool getImport() const { return import; }
     void setImport(bool _import) { import = _import; }
     SetToDownload(const QString &_shortName, const QString &_longName, const QVariant &_cards, bool _import, const QString &_setType = QString(), const QDate &_releaseDate = QDate())
-        : shortName(_shortName), longName(_longName), import(_import), cards(_cards), setType(_setType), releaseDate(_releaseDate)  { }
+        : shortName(_shortName), longName(_longName), import(_import), cards(_cards), releaseDate(_releaseDate), setType(_setType)  { }
     bool operator<(const SetToDownload &set) const { return longName.compare(set.longName, Qt::CaseInsensitive) < 0; }
 };
 

servatrice/CMakeLists.txt

@@ -139,17 +139,12 @@ if(APPLE)
     set(plugin_dest_dir servatrice.app/Contents/Plugins)
     set(qtconf_dest_dir servatrice.app/Contents/Resources)
 
-    # note: no codecs in qt5
+    # qt4: codecs, sqldrivers
-    # note: phonon_backend => mediaservice
+    # qt5: platforms, sqldrivers
-    # note: needs platform on osx
 
-    if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+    install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
-        install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
+        FILES_MATCHING REGEX "(codecs|platforms|sqldrivers)/.*\\.dylib"
-            FILES_MATCHING REGEX "(codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms)/.*_debug\\.dylib")
+        REGEX ".*_debug\\.dylib" EXCLUDE)
-    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 \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]
@@ -171,17 +166,11 @@ if(WIN32)
     set(plugin_dest_dir Plugins)
     set(qtconf_dest_dir .)
 
-    # note: no codecs in qt5
+    # qt4: codecs, sqldrivers
-    # note: phonon_backend => mediaservice
+    # qt5: platforms, sqldrivers
-    # note: needs platform on osx
 
-    if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+    install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
-        install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
+        FILES_MATCHING REGEX "(codecs|platforms|sqldrivers)/.*[^d]\\.dll")
-            FILES_MATCHING REGEX "(codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms)/.*d\\.dll")
-    else()
-        install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
-            FILES_MATCHING REGEX "(codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms)/.*[^d]\\.dll")
-    endif()
 
     install(CODE "
         file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]

servatrice/src/servatrice.cpp

@@ -108,7 +108,11 @@ void Servatrice_GameServer::incomingConnection(qintptr socketDescriptor)
     QMetaObject::invokeMethod(ssi, "initConnection", Qt::QueuedConnection, Q_ARG(int, socketDescriptor));
 }
 
+#if QT_VERSION < 0x050000
 void Servatrice_IslServer::incomingConnection(int socketDescriptor)
+#else
+void Servatrice_IslServer::incomingConnection(qintptr socketDescriptor)
+#endif
 {
     QThread *thread = new QThread;
     connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater()));

servatrice/src/servatrice.h

@@ -68,7 +68,11 @@ public:
 	Servatrice_IslServer(Servatrice *_server, const QSslCertificate &_cert, const QSslKey &_privateKey, QObject *parent = 0)
 		: QTcpServer(parent), server(_server), cert(_cert), privateKey(_privateKey) { }
 protected:
+#if QT_VERSION < 0x050000
 	void incomingConnection(int socketDescriptor);
+#else
+	void incomingConnection(qintptr socketDescriptor);
+#endif
 };
 
 class ServerProperties {

travis-compile.sh

@@ -6,7 +6,7 @@ mkdir build
 cd build
 prefix=""
 if [[ $TRAVIS_OS_NAME == "osx" && $QT4 == 0 ]]; then
-  prefix="-DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.3.2/"
+  prefix="-DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.4.0/"
 fi
 cmake .. -DWITH_SERVER=1 -DWITH_QT4=$QT4 $prefix
 make