Merge branch 'master' into mod_notify_onbanwarn

cockatrice/src/tab_logs.cpp

@@ -8,6 +8,7 @@
 #include <QLineEdit>
 #include <QCheckBox>
 #include <QRadioButton>
+#include <QTabWidget>
 #include "tab_logs.h"
 #include "abstractclient.h"
 #include "window_sets.h"
@@ -23,7 +24,27 @@
 TabLog::TabLog(TabSupervisor *_tabSupervisor, AbstractClient *_client, QWidget *parent)
     : Tab(_tabSupervisor, parent), client(_client)
 {
-    MainWindow = new QMainWindow;
+    roomTable = new QTableWidget();
+    roomTable->setColumnCount(6);
+    roomTable->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+    roomTable->setHorizontalHeaderLabels(QString(tr("Time;SenderName;SenderIP;Message;TargetID;TargetName")).split(";"));
+
+    gameTable = new QTableWidget();
+    gameTable->setColumnCount(6);
+    gameTable->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+    gameTable->setHorizontalHeaderLabels(QString(tr("Time;SenderName;SenderIP;Message;TargetID;TargetName")).split(";"));
+
+    chatTable = new QTableWidget();
+    chatTable->setColumnCount(6);
+    chatTable->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+    chatTable->setHorizontalHeaderLabels(QString(tr("Time;SenderName;SenderIP;Message;TargetID;TargetName")).split(";"));
+
+    QTabWidget *tabManager = new QTabWidget();
+    tabManager->addTab(roomTable, tr("Room Logs"));
+    tabManager->addTab(gameTable, tr("Game Logs"));
+    tabManager->addTab(chatTable, tr("Chat Logs"));
+    setCentralWidget(tabManager);
+
     createDock();
     restartLayout();
     clearClicked();
@@ -212,7 +233,7 @@ void TabLog::createDock()
     buttonGroupBox = new QGroupBox(tr(""));
     buttonGroupBox->setLayout(buttonGrid);
 
-    mainLayout = new QVBoxLayout(MainWindow);
+    mainLayout = new QVBoxLayout(this);
     mainLayout->addWidget(criteriaGroupBox);
     mainLayout->addWidget(locationGroupBox);
     mainLayout->addWidget(rangeGroupBox);
@@ -221,116 +242,94 @@ void TabLog::createDock()
     mainLayout->addWidget(buttonGroupBox);
     mainLayout->setAlignment(Qt::AlignCenter);
 
-    searchDockContents = new QWidget(MainWindow);
+    searchDockContents = new QWidget(this);
     searchDockContents->setLayout(mainLayout);
 
-    searchDock = new QDockWidget(MainWindow);
+    searchDock = new QDockWidget(this);
     searchDock->setFeatures(QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable);
     searchDock->setWidget(searchDockContents);
-
-    QVBoxLayout *mainVLayoutContent = new QVBoxLayout;
-    QHBoxLayout *mainHLayoutContent = new QHBoxLayout;
-    mainHLayoutContent->addWidget(MainWindow);
-    mainHLayoutContent->addLayout(mainVLayoutContent);
-    setLayout(mainHLayoutContent);
 }
 
 void TabLog::viewLogHistory_processResponse(const Response &resp)
 {
     const Response_ViewLogHistory &response = resp.GetExtension(Response_ViewLogHistory::ext);
-    if (resp.response_code() == Response::RespOk) {
-
-        if (response.log_message_size() > 0) {
-
-            int j = 0;
-            QTableWidget *roomTable = new QTableWidget();
-            roomTable->setWindowTitle(tr("Room Logs"));
-            roomTable->setRowCount(response.log_message_size());
-            roomTable->setColumnCount(6);
-            roomTable->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-            roomTable->setHorizontalHeaderLabels(QString(tr("Time;SenderName;SenderIP;Message;TargetID;TargetName")).split(";"));
-
-            int k = 0;
-            QTableWidget *gameTable = new QTableWidget();
-            gameTable->setWindowTitle(tr("Game Logs"));
-            gameTable->setRowCount(response.log_message_size());
-            gameTable->setColumnCount(6);
-            gameTable->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-            gameTable->setHorizontalHeaderLabels(QString(tr("Time;SenderName;SenderIP;Message;TargetID;TargetName")).split(";"));
-
-            int l = 0;
-            QTableWidget *chatTable = new QTableWidget();
-            chatTable->setWindowTitle(tr("Chat Logs"));
-            chatTable->setRowCount(response.log_message_size());
-            chatTable->setColumnCount(6);
-            chatTable->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-            chatTable->setHorizontalHeaderLabels(QString(tr("Time;SenderName;SenderIP;Message;TargetID;TargetName")).split(";"));
-
-            ServerInfo_ChatMessage message; for (int i = 0; i < response.log_message_size(); ++i) {
-                message = response.log_message(i);
-                if (QString::fromStdString(message.target_type()) == "room") {
-                    roomTable->setItem(j, 0, new QTableWidgetItem(QString::fromStdString(message.time())));
-                    roomTable->setItem(j, 1, new QTableWidgetItem(QString::fromStdString(message.sender_name())));
-                    roomTable->setItem(j, 2, new QTableWidgetItem(QString::fromStdString(message.sender_ip())));
-                    roomTable->setItem(j, 3, new QTableWidgetItem(QString::fromStdString(message.message())));
-                    roomTable->setItem(j, 4, new QTableWidgetItem(QString::fromStdString(message.target_id())));
-                    roomTable->setItem(j, 5, new QTableWidgetItem(QString::fromStdString(message.target_name())));
-                    ++j;
-                }
-
-                if (QString::fromStdString(message.target_type()) == "game") {
-                    gameTable->setItem(k, 0, new QTableWidgetItem(QString::fromStdString(message.time())));
-                    gameTable->setItem(k, 1, new QTableWidgetItem(QString::fromStdString(message.sender_name())));
-                    gameTable->setItem(k, 2, new QTableWidgetItem(QString::fromStdString(message.sender_ip())));
-                    gameTable->setItem(k, 3, new QTableWidgetItem(QString::fromStdString(message.message())));
-                    gameTable->setItem(k, 4, new QTableWidgetItem(QString::fromStdString(message.target_id())));
-                    gameTable->setItem(k, 5, new QTableWidgetItem(QString::fromStdString(message.target_name())));
-                    ++k;
-                }
-
-                if (QString::fromStdString(message.target_type()) == "chat") {
-                    chatTable->setItem(l, 0, new QTableWidgetItem(QString::fromStdString(message.time())));
-                    chatTable->setItem(l, 1, new QTableWidgetItem(QString::fromStdString(message.sender_name())));
-                    chatTable->setItem(l, 2, new QTableWidgetItem(QString::fromStdString(message.sender_ip())));
-                    chatTable->setItem(l, 3, new QTableWidgetItem(QString::fromStdString(message.message())));
-                    chatTable->setItem(l, 4, new QTableWidgetItem(QString::fromStdString(message.target_id())));
-                    chatTable->setItem(l, 5, new QTableWidgetItem(QString::fromStdString(message.target_name())));
-                    ++l;
-                }
-            }
-
-            roomTable->setRowCount(j);
-            roomTable->resizeColumnsToContents();
-            gameTable->setRowCount(k);
-            gameTable->resizeColumnsToContents();
-            chatTable->setRowCount(l);
-            chatTable->resizeColumnsToContents();
-
-            if (mainRoom->isChecked()) {
-                roomTable->resize(600, 200);
-                roomTable->show();
-            }
-
-            if (gameRoom->isChecked()) {
-                gameTable->resize(600, 200);
-                gameTable->show();
-            }
-
-            if (privateChat->isChecked()) {
-                chatTable->resize(600, 200);
-                chatTable->show();
-            }
-
-        } else
-            QMessageBox::information(static_cast<QWidget *>(parent()), tr("Message History"), tr("There are no messages for the selected filters."));
-
-    } else
+    if (resp.response_code() != Response::RespOk) {
         QMessageBox::critical(static_cast<QWidget *>(parent()), tr("Message History"), tr("Failed to collect message history information."));
+        return;
+    }
+
+    if (response.log_message_size() == 0) {
+        QMessageBox::information(static_cast<QWidget *>(parent()), tr("Message History"), tr("There are no messages for the selected filters."));
+        return;
+    }
+
+    int roomCounter = 0, gameCounter = 0, chatCounter = 0;
+    roomTable->setRowCount(roomCounter);
+    gameTable->setRowCount(gameCounter);
+    chatTable->setRowCount(chatCounter);
+
+    for (int i = 0; i < response.log_message_size(); ++i)
+    {
+        ServerInfo_ChatMessage message = response.log_message(i);
+        if (QString::fromStdString(message.target_type()) == "room") {
+            roomTable->insertRow(roomCounter);
+            roomTable->setItem(roomCounter, 0, new QTableWidgetItem(QString::fromStdString(message.time())));
+            roomTable->setItem(roomCounter, 1, new QTableWidgetItem(QString::fromStdString(message.sender_name())));
+            roomTable->setItem(roomCounter, 2, new QTableWidgetItem(QString::fromStdString(message.sender_ip())));
+            roomTable->setItem(roomCounter, 3, new QTableWidgetItem(QString::fromStdString(message.message())));
+            roomTable->setItem(roomCounter, 4, new QTableWidgetItem(QString::fromStdString(message.target_id())));
+            roomTable->setItem(roomCounter, 5, new QTableWidgetItem(QString::fromStdString(message.target_name())));
+            ++roomCounter;
+        }
+
+        if (QString::fromStdString(message.target_type()) == "game") {
+            gameTable->insertRow(gameCounter);
+            gameTable->setItem(gameCounter, 0, new QTableWidgetItem(QString::fromStdString(message.time())));
+            gameTable->setItem(gameCounter, 1, new QTableWidgetItem(QString::fromStdString(message.sender_name())));
+            gameTable->setItem(gameCounter, 2, new QTableWidgetItem(QString::fromStdString(message.sender_ip())));
+            gameTable->setItem(gameCounter, 3, new QTableWidgetItem(QString::fromStdString(message.message())));
+            gameTable->setItem(gameCounter, 4, new QTableWidgetItem(QString::fromStdString(message.target_id())));
+            gameTable->setItem(gameCounter, 5, new QTableWidgetItem(QString::fromStdString(message.target_name())));
+            ++gameCounter;
+        }
+
+        if (QString::fromStdString(message.target_type()) == "chat") {
+            chatTable->insertRow(chatCounter);
+            chatTable->setItem(chatCounter, 0, new QTableWidgetItem(QString::fromStdString(message.time())));
+            chatTable->setItem(chatCounter, 1, new QTableWidgetItem(QString::fromStdString(message.sender_name())));
+            chatTable->setItem(chatCounter, 2, new QTableWidgetItem(QString::fromStdString(message.sender_ip())));
+            chatTable->setItem(chatCounter, 3, new QTableWidgetItem(QString::fromStdString(message.message())));
+            chatTable->setItem(chatCounter, 4, new QTableWidgetItem(QString::fromStdString(message.target_id())));
+            chatTable->setItem(chatCounter, 5, new QTableWidgetItem(QString::fromStdString(message.target_name())));
+            ++chatCounter;
+        }
+    }
+
+    if (roomCounter) {
+        roomTable->show();
+        roomTable->resizeColumnsToContents();
+    } else {
+        roomTable->hide();
+    }
+
+    if (gameCounter) {
+        gameTable->resizeColumnsToContents();
+        gameTable->show();
+    } else {
+        gameTable->hide();
+    }
+
+    if (chatCounter) {
+        chatTable->resizeColumnsToContents();
+        chatTable->show();
+    } else {
+        chatTable->hide();
+    }
 }
 
 void TabLog::restartLayout()
 {
     searchDock->setFloating(false);
-    MainWindow->addDockWidget(Qt::TopDockWidgetArea, searchDock);
+    addDockWidget(Qt::LeftDockWidgetArea, searchDock);
     searchDock->setVisible(true);
 }
\ No newline at end of file

cockatrice/src/tab_logs.h

@@ -16,10 +16,10 @@ class QLabel;
 class QDockWidget;
 class QWidget;
 class QGridLayout;
+class QTableWidget;
 class CommandContainer;
 class Response;
 class AbstractClient;
-class QMainWindow;
 
 class TabLog : public Tab {
     Q_OBJECT
@@ -36,7 +36,7 @@ private:
     QGridLayout *criteriaGrid, *locationGrid, *rangeGrid, *maxResultsGrid, *descriptionGrid, *buttonGrid;
     QGroupBox *criteriaGroupBox, *locationGroupBox, *rangeGroupBox, *maxResultsGroupBox, *descriptionGroupBox, *buttonGroupBox;
     QVBoxLayout *mainLayout;
-    QMainWindow *MainWindow;
+    QTableWidget *roomTable, *gameTable, *chatTable;
 
     void createDock();
 signals:

cockatrice/src/tab_message.cpp

@@ -39,7 +39,10 @@ TabMessage::TabMessage(TabSupervisor *_tabSupervisor, AbstractClient *_client, c
     addTabMenu(messageMenu);
 
     retranslateUi();
-    setLayout(vbox);
+
+    QWidget * mainWidget = new QWidget(this);
+    mainWidget->setLayout(vbox);
+    setCentralWidget(mainWidget);
 }
 
 TabMessage::~TabMessage()

cockatrice/src/tab_replays.cpp

@@ -106,7 +106,10 @@ TabReplays::TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client)
     rightToolBar->addAction(aDeleteRemoteReplay);
     
     retranslateUi();
-    setLayout(hbox);
+
+    QWidget * mainWidget = new QWidget(this);
+    mainWidget->setLayout(hbox);
+    setCentralWidget(mainWidget);
     
     connect(client, SIGNAL(replayAddedEventReceived(const Event_ReplayAdded &)), this, SLOT(replayAddedEventReceived(const Event_ReplayAdded &)));
 }

cockatrice/src/tab_room.cpp

@@ -104,9 +104,6 @@ TabRoom::TabRoom(TabSupervisor *_tabSupervisor, AbstractClient *_client, ServerI
     roomMenu->addAction(aLeaveRoom);
     addTabMenu(roomMenu);
 
-    retranslateUi();
-    setLayout(hbox);
-
     const int userListSize = info.user_list_size();
     for (int i = 0; i < userListSize; ++i){
         userList->processUserInfo(info.user_list(i), true);
@@ -130,6 +127,12 @@ TabRoom::TabRoom(TabSupervisor *_tabSupervisor, AbstractClient *_client, ServerI
     actCompleterChanged();
     connect(&settingsCache->shortcuts(), SIGNAL(shortCutchanged()),this,SLOT(refreshShortcuts()));
     refreshShortcuts();
+
+    retranslateUi();
+
+    QWidget * mainWidget = new QWidget(this);
+    mainWidget->setLayout(hbox);
+    setCentralWidget(mainWidget);
 }
 
 TabRoom::~TabRoom()

cockatrice/src/tab_server.cpp

@@ -140,8 +140,12 @@ TabServer::TabServer(TabSupervisor *_tabSupervisor, AbstractClient *_client, QWi
     QVBoxLayout *vbox = new QVBoxLayout;
     vbox->addWidget(roomSelector);
     vbox->addWidget(serverInfoBox);
-    
-    setLayout(vbox);
+ 
+    retranslateUi();
+
+    QWidget * mainWidget = new QWidget(this);
+    mainWidget->setLayout(vbox);
+    setCentralWidget(mainWidget);
 }
 
 void TabServer::retranslateUi()

cockatrice/src/tab_userlists.cpp

@@ -2,6 +2,7 @@
 #include "userlist.h"
 #include "userinfobox.h"
 #include "abstractclient.h"
+#include "soundengine.h"
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 #include <QPushButton>
@@ -74,7 +75,11 @@ TabUserLists::TabUserLists(TabSupervisor *_tabSupervisor, AbstractClient *_clien
     mainLayout->addLayout(ignorePanel);
     mainLayout->addLayout(vbox);
 
-    setLayout(mainLayout);
+    retranslateUi();
+
+    QWidget * mainWidget = new QWidget(this);
+    mainWidget->setLayout(mainLayout);
+    setCentralWidget(mainWidget);
 }
 
 void TabUserLists::addToBuddyList()
@@ -146,12 +151,19 @@ void TabUserLists::processUserJoinedEvent(const Event_UserJoined &event)
     ignoreList->sortItems();
     buddyList->sortItems();
     
+    if (buddyList->getUsers().keys().contains(userName))
+        soundEngine->playSound("buddy_join");
+
     emit userJoined(info);
 }
 
 void TabUserLists::processUserLeftEvent(const Event_UserLeft &event)
 {
     QString userName = QString::fromStdString(event.name());
+
+    if (buddyList->getUsers().keys().contains(userName))
+        soundEngine->playSound("buddy_leave");
+
     if (allUsersList->deleteUser(userName)) {
         ignoreList->setUserOnline(userName, false);
         buddyList->setUserOnline(userName, false);

cockatrice/src/update_checker.cpp

+//
+// Created by miguel on 28/12/15.
+//
+
+#include <algorithm>
+#include <QMessageBox>
+
+#include "update_checker.h"
+#include "version_string.h"
+#include "qt-json/json.h"
+
+#define LATEST_FILES_URL "https://api.bintray.com/packages/cockatrice/Cockatrice/Cockatrice/files"
+
+UpdateChecker::UpdateChecker(QObject *parent) : QObject(parent){
+    //Parse the commit date. We'll use this to check for new versions
+    //We know the format because it's based on `git log` which is documented here:
+    //  https://git-scm.com/docs/git-log#_commit_formatting
+    buildDate = QDate::fromString(VERSION_DATE, "yyyy-MM-dd");
+    latestFilesUrl = QUrl(LATEST_FILES_URL);
+    response = NULL;
+    netMan = new QNetworkAccessManager(this);
+    build = NULL;
+}
+
+UpdateChecker::~UpdateChecker()
+{
+    delete build;
+}
+
+void UpdateChecker::check()
+{
+    response = netMan->get(QNetworkRequest(latestFilesUrl));
+    connect(response, SIGNAL(finished()),
+            this, SLOT(fileListFinished()));
+}
+
+#if defined(Q_OS_OSX)
+bool UpdateChecker::downloadMatchesCurrentOS(QVariant build)
+{
+   return build
+            .toMap()["name"]
+            .toString()
+            .contains("osx");
+}
+#elif defined(Q_OS_WIN)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+bool UpdateChecker::downloadMatchesCurrentOS(QVariant build)
+{
+       return build
+            .toMap()["name"]
+            .toString()
+            .contains("qt5.exe");
+}
+#else
+bool UpdateChecker::downloadMatchesCurrentOS(QVariant build)
+{
+       return build
+            .toMap()["name"]
+            .toString()
+            .contains("qt4.exe");
+}
+#endif
+#else
+
+bool UpdateChecker::downloadMatchesCurrentOS(QVariant)
+{
+    //If the OS doesn't fit one of the above #defines, then it will never match
+    return false;
+}
+
+#endif
+
+QDate UpdateChecker::dateFromBuild(QVariant build)
+{
+    QString formatString = "yyyy-MM-dd";
+    QString dateString = build.toMap()["date"].toString();
+    dateString = dateString.remove(formatString.length(), dateString.length());
+
+    return QDate::fromString(dateString, formatString);
+}
+
+QDate UpdateChecker::findOldestBuild(QVariantList allBuilds)
+{
+    //Map the build array into an array of dates
+    std::vector<QDate> dateArray(allBuilds.size());
+    std::transform(allBuilds.begin(), allBuilds.end(), dateArray.begin(), dateFromBuild);
+
+    //Return the first date
+    return *std::min_element(dateArray.begin(), dateArray.end());
+}
+
+QVariantMap *UpdateChecker::findCompatibleBuild(QVariantList allBuilds) {
+
+    QVariantList::iterator result = std::find_if(allBuilds.begin(), allBuilds.end(), downloadMatchesCurrentOS);
+
+    //If there is no compatible version, return NULL
+    if (result == allBuilds.end())
+        return NULL;
+    else
+    {
+        QVariantMap *ret = new QVariantMap;
+        *ret = (*result).toMap();
+        return ret;
+    }
+}
+
+void UpdateChecker::fileListFinished() {
+    try {
+        QVariantList builds = QtJson::Json::parse(response->readAll()).toList();
+        build = findCompatibleBuild(builds);
+        QDate bintrayBuildDate = findOldestBuild(builds);
+
+        bool needToUpdate = bintrayBuildDate > buildDate;
+        bool compatibleVersion = build != NULL;
+
+        emit finishedCheck(needToUpdate, compatibleVersion, build);
+    }
+    catch (const std::exception &exc){
+        emit error(exc.what());
+    }
+}

cockatrice/src/update_checker.h

+//
+// Created by miguel on 28/12/15.
+//
+
+#ifndef COCKATRICE_UPDATECHECKER_H
+#define COCKATRICE_UPDATECHECKER_H
+
+#include <QObject>
+#include <QUrl>
+#include <QDate>
+#include <QtNetwork>
+
+class UpdateChecker : public QObject {
+Q_OBJECT
+public:
+    UpdateChecker(QObject *parent);
+    ~UpdateChecker();
+    void check();
+signals:
+    void finishedCheck(bool needToUpdate, bool isCompatible, QVariantMap *build);
+    void error(QString errorString);
+private:
+    static QVariantMap *findCompatibleBuild();
+    static QDate findOldestBuild(QVariantList allBuilds);
+    static QDate dateFromBuild(QVariant build);
+    static QVariantMap *findCompatibleBuild(QVariantList allBuilds);
+    static bool downloadMatchesCurrentOS(QVariant build);
+    QVariantMap *build;
+    QUrl latestFilesUrl;
+    QDate buildDate;
+    QNetworkAccessManager *netMan;
+    QNetworkReply *response;
+private slots:
+    void fileListFinished();
+};
+
+
+#endif //COCKATRICE_UPDATECHECKER_H

cockatrice/src/update_downloader.cpp

+#include <QUrl>
+
+#include "update_downloader.h"
+
+UpdateDownloader::UpdateDownloader(QObject *parent) : QObject(parent) {
+    netMan = new QNetworkAccessManager(this);
+}
+
+void UpdateDownloader::beginDownload(QUrl downloadUrl) {
+
+    //Save the original URL because we need it for the filename
+    if (originalUrl.isEmpty())
+        originalUrl = downloadUrl;
+
+    response = netMan->get(QNetworkRequest(downloadUrl));
+    connect(response, SIGNAL(finished()),
+            this, SLOT(fileFinished()));
+    connect(response, SIGNAL(readyRead()),
+            this, SLOT(fileReadyRead()));
+    connect(response, SIGNAL(downloadProgress(qint64, qint64)),
+            this, SLOT(downloadProgress(qint64, qint64)));
+    connect(response, SIGNAL(error(QNetworkReply::NetworkError)),
+            this, SLOT(downloadError(QNetworkReply::NetworkError)));
+}
+
+void UpdateDownloader::downloadError(QNetworkReply::NetworkError) {
+    emit error(response->errorString().toUtf8());
+}
+
+void UpdateDownloader::fileFinished() {
+    //If we finished but there's a redirect, follow it
+    QVariant redirect = response->attribute(QNetworkRequest::RedirectionTargetAttribute);
+    if (!redirect.isNull())
+    {
+        beginDownload(redirect.toUrl());
+        return;
+    }
+
+    //Handle any errors we had
+    if (response->error())
+    {
+        emit error(response->errorString());
+        return;
+    }
+
+    //Work out the file name of the download
+    QString fileName = QDir::temp().path() + QDir::separator() + originalUrl.toString().section('/', -1);
+
+    //Save the build in a temporary directory
+    QFile file(fileName);
+    if (!file.open(QIODevice::WriteOnly)) {
+        emit error("Could not open the file for reading.");
+        return;
+    }
+
+    file.write(response->readAll());
+    file.close();
+
+    //Emit the success signal with a URL to the download file
+    emit downloadSuccessful(QUrl::fromLocalFile(fileName));
+}
+
+void UpdateDownloader::downloadProgress(qint64 bytesRead, qint64 totalBytes) {
+    emit progressMade(bytesRead, totalBytes);
+}
+

cockatrice/src/update_downloader.h

+//
+// Created by miguel on 28/12/15.
+//
+
+#ifndef COCKATRICE_UPDATEDOWNLOADER_H
+#define COCKATRICE_UPDATEDOWNLOADER_H
+
+#include <QObject>
+#include <QUrl>
+#include <QDate>
+#include <QtNetwork>
+
+class UpdateDownloader : public QObject {
+Q_OBJECT
+public:
+    UpdateDownloader(QObject *parent);
+    void beginDownload(QUrl url);
+signals:
+    void downloadSuccessful(QUrl filepath);
+    void progressMade(qint64 bytesRead, qint64 totalBytes);
+    void error(QString errorString);
+private:
+    QUrl originalUrl;
+    QNetworkAccessManager *netMan;
+    QNetworkReply *response;
+private slots:
+    void fileFinished();
+    void downloadProgress(qint64 bytesRead, qint64 totalBytes);
+    void downloadError(QNetworkReply::NetworkError);
+};
+
+
+#endif //COCKATRICE_UPDATEDOWNLOADER_H

cockatrice/src/window_main.cpp

@@ -30,6 +30,7 @@
 #include <QDateTime>
 #include <QSystemTrayIcon>
 #include <QApplication>
+#include <QtNetwork>
 
 #if QT_VERSION < 0x050000
     #include <QtGui/qtextdocument.h> // for Qt::escape()
@@ -40,6 +41,7 @@
 #include "dlg_connect.h"
 #include "dlg_register.h"
 #include "dlg_settings.h"
+#include "dlg_update.h"
 #include "tab_supervisor.h"
 #include "remoteclient.h"
 #include "localserver.h"
@@ -48,12 +50,14 @@
 #include "settingscache.h"
 #include "tab_game.h"
 #include "version_string.h"
+#include "update_checker.h"
 
 #include "pb/game_replay.pb.h"
 #include "pb/room_commands.pb.h"
 #include "pb/event_connection_closed.pb.h"
 #include "pb/event_server_shutdown.pb.h"
 
+#define GITHUB_PAGES_URL "https://cockatrice.github.io"
 #define GITHUB_CONTRIBUTORS_URL "https://github.com/Cockatrice/Cockatrice/graphs/contributors?type=c"
 #define GITHUB_CONTRIBUTE_URL "https://github.com/Cockatrice/Cockatrice#cockatrice"
 #define GITHUB_TRANSLATOR_RECOGNIZE_URL "https://github.com/Cockatrice/Cockatrice/wiki/Translators"
@@ -62,6 +66,8 @@
 #define GITHUB_TROUBLESHOOTING_URL "https://github.com/Cockatrice/Cockatrice/wiki/Troubleshooting"
 #define GITHUB_FAQ_URL "https://github.com/Cockatrice/Cockatrice/wiki/Frequently-Asked-Questions"
 
+#define DOWNLOAD_URL "https://dl.bintray.com/cockatrice/Cockatrice/"
+
 const QString MainWindow::appName = "Cockatrice";
 
 void MainWindow::updateTabMenu(const QList<QMenu *> &newMenuList)
@@ -273,6 +279,7 @@ void MainWindow::actAbout()
     QMessageBox::about(this, tr("About Cockatrice"), QString(
         "<font size=\"8\"><b>Cockatrice</b></font><br>"
         + tr("Version %1").arg(VERSION_STRING)
+        + "<br><br><b><a href='" + GITHUB_PAGES_URL + "'>" + tr("Cockatrice Webpage") + "</a></b><br>"
         + "<br><br><b>" + tr("Project Manager:") + "</b><br>Gavin Bisesi<br><br>"
         + "<b>" + tr("Past Project Managers:") + "</b><br>Max-Wilhelm Bruker<br>Marcus Schütz<br><br>"
         + "<b>" + tr("Developers:") + "</b><br>"
@@ -288,6 +295,12 @@ void MainWindow::actAbout()
     ));
 }
 
+void MainWindow::actUpdate()
+{
+    DlgUpdate dlg(this);
+    dlg.exec();
+}
+
 void MainWindow::serverTimeout()
 {
     QMessageBox::critical(this, tr("Error"), tr("Server timeout"));
@@ -495,6 +508,7 @@ void MainWindow::retranslateUi()
 #endif
 
     aAbout->setText(tr("&About Cockatrice"));
+    aUpdate->setText(tr("&Update Cockatrice"));
     helpMenu->setTitle(tr("&Help"));
     aCheckCardUpdates->setText(tr("Check for card updates..."));
     tabSupervisor->retranslateUi();
@@ -525,6 +539,8 @@ void MainWindow::createActions()
 
     aAbout = new QAction(this);
     connect(aAbout, SIGNAL(triggered()), this, SLOT(actAbout()));
+    aUpdate = new QAction(this);
+    connect(aUpdate, SIGNAL(triggered()), this, SLOT(actUpdate()));
 
     aCheckCardUpdates = new QAction(this);
     connect(aCheckCardUpdates, SIGNAL(triggered()), this, SLOT(actCheckCardUpdates()));
@@ -566,6 +582,7 @@ void MainWindow::createMenus()
 
     helpMenu = menuBar()->addMenu(QString());
     helpMenu->addAction(aAbout);
+    helpMenu->addAction(aUpdate);
 }
 
 MainWindow::MainWindow(QWidget *parent)

cockatrice/src/window_main.h

@@ -25,8 +25,11 @@
 #include <QSystemTrayIcon>
 #include <QProcess>
 #include <QMessageBox>
+#include <QtNetwork>
+
 #include "abstractclient.h"
 #include "pb/response.pb.h"
+#include "update_checker.h"
 
 class TabSupervisor;
 class RemoteClient;
@@ -66,6 +69,7 @@ private slots:
     void actExit();
     
     void actAbout();
+    void actUpdate();
 
     void iconActivated(QSystemTrayIcon::ActivationReason reason);
 
@@ -90,7 +94,7 @@ private:
     QList<QMenu *> tabMenus;
     QMenu *cockatriceMenu, *helpMenu;
     QAction *aConnect, *aDisconnect, *aSinglePlayer, *aWatchReplay, *aDeckEditor, *aFullScreen, *aSettings, *aExit,
-        *aAbout, *aCheckCardUpdates, *aRegister;
+        *aAbout, *aCheckCardUpdates, *aRegister, *aUpdate;
     TabSupervisor *tabSupervisor;
 
     QMenu *trayIconMenu;
@@ -105,6 +109,7 @@ private:
 
     QMessageBox serverShutdownMessageBox;
     QProcess * cardUpdateProcess;
+
 public:
     MainWindow(QWidget *parent = 0);
     ~MainWindow();