jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix #601; Fix #725 (#2126)

Browse source 
Analyze deck on tappedout
Fix small bug in deckstats interface
This commit is contained in:
ctrlaltca 2016-09-02 07:34:56 +02:00 • committed by Zach H
parent 680277ad6a
commit 7f28a7e844
10 changed files with 310 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

33
cockatrice/src/tab_deck_editor.cpp
View file

@ -34,6 +34,7 @@
#include "priceupdater.h"
#include "tab_supervisor.h"
#include "deckstats_interface.h"
#include "tappedout_interface.h"
#include "abstractclient.h"
#include "pending_command.h"
#include "pb/response.pb.h"
@ -226,8 +227,15 @@ void TabDeckEditor::createMenus()
aPrintDeck = new QAction(QString(), this);
connect(aPrintDeck, SIGNAL(triggered()), this, SLOT(actPrintDeck()));
aAnalyzeDeck = new QAction(QString(), this);
connect(aAnalyzeDeck, SIGNAL(triggered()), this, SLOT(actAnalyzeDeck()));
aAnalyzeDeckDeckstats = new QAction(QString(), this);
connect(aAnalyzeDeckDeckstats, SIGNAL(triggered()), this, SLOT(actAnalyzeDeckDeckstats()));
aAnalyzeDeckTappedout = new QAction(QString(), this);
connect(aAnalyzeDeckTappedout, SIGNAL(triggered()), this, SLOT(actAnalyzeDeckTappedout()));
analyzeDeckMenu = new QMenu(this);
analyzeDeckMenu->addAction(aAnalyzeDeckDeckstats);
analyzeDeckMenu->addAction(aAnalyzeDeckTappedout);
aClose = new QAction(QString(), this);
connect(aClose, SIGNAL(triggered()), this, SLOT(closeRequest()));
@ -250,7 +258,7 @@ void TabDeckEditor::createMenus()
deckMenu->addAction(aSaveDeckToClipboard);
deckMenu->addSeparator();
deckMenu->addAction(aPrintDeck);
deckMenu->addAction(aAnalyzeDeck);
deckMenu->addMenu(analyzeDeckMenu);
deckMenu->addSeparator();
deckMenu->addAction(aClearFilterOne);
deckMenu->addAction(aClearFilterAll);
@ -444,7 +452,7 @@ void TabDeckEditor::refreshShortcuts()
aSaveDeckAs->setShortcuts(settingsCache->shortcuts().getShortcut("TabDeckEditor/aSaveDeckAs"));
aLoadDeckFromClipboard->setShortcuts(settingsCache->shortcuts().getShortcut("TabDeckEditor/aLoadDeckFromClipboard"));
aPrintDeck->setShortcuts(settingsCache->shortcuts().getShortcut("TabDeckEditor/aPrintDeck"));
aAnalyzeDeck->setShortcuts(settingsCache->shortcuts().getShortcut("TabDeckEditor/aAnalyzeDeck"));
aAnalyzeDeckDeckstats->setShortcuts(settingsCache->shortcuts().getShortcut("TabDeckEditor/aAnalyzeDeck"));
aClose->setShortcuts(settingsCache->shortcuts().getShortcut("TabDeckEditor/aClose"));
aResetLayout->setShortcuts(settingsCache->shortcuts().getShortcut("TabDeckEditor/aResetLayout"));
aClearFilterAll->setShortcuts(settingsCache->shortcuts().getShortcut("TabDeckEditor/aClearFilterAll"));
@ -536,7 +544,11 @@ void TabDeckEditor::retranslateUi()
aLoadDeckFromClipboard->setText(tr("Load deck from cl&ipboard..."));
aSaveDeckToClipboard->setText(tr("Save deck to clip&board"));
aPrintDeck->setText(tr("&Print deck..."));
aAnalyzeDeck->setText(tr("&Analyze deck on deckstats.net"));
analyzeDeckMenu->setTitle(tr("&Analyze deck online"));
aAnalyzeDeckDeckstats->setText(tr("deckstats.net"));
aAnalyzeDeckTappedout->setText(tr("tappedout.net"));
aClose->setText(tr("&Close"));
aAddCard->setText(tr("Add card to &maindeck"));
@ -751,7 +763,7 @@ void TabDeckEditor::actPrintDeck()
dlg->exec();
}
void TabDeckEditor::actAnalyzeDeck()
void TabDeckEditor::actAnalyzeDeckDeckstats()
{
DeckStatsInterface *interface = new DeckStatsInterface(
*databaseModel->getDatabase(),
@ -760,6 +772,15 @@ void TabDeckEditor::actAnalyzeDeck()
interface->analyzeDeck(deckModel->getDeckList());
}
void TabDeckEditor::actAnalyzeDeckTappedout()
{
TappedOutInterface *interface = new TappedOutInterface(
*databaseModel->getDatabase(),
this
); // it deletes itself when done
interface->analyzeDeck(deckModel->getDeckList());
}
void TabDeckEditor::actClearFilterAll()
{
databaseDisplayModel->clearFilterAll();