diff --git a/cockatrice/src/client/ui/window_main.cpp b/cockatrice/src/client/ui/window_main.cpp index dac39c793..8bd368b58 100644 --- a/cockatrice/src/client/ui/window_main.cpp +++ b/cockatrice/src/client/ui/window_main.cpp @@ -290,11 +290,6 @@ void MainWindow::localGameEnded() aSinglePlayer->setEnabled(true); } -void MainWindow::actVisualDeckStorage() -{ - tabSupervisor->addVisualDeckStorageTab(); -} - void MainWindow::actFullScreen(bool checked) { if (checked) @@ -664,7 +659,6 @@ void MainWindow::retranslateUi() aDisconnect->setText(tr("&Disconnect")); aSinglePlayer->setText(tr("Start &local game...")); aWatchReplay->setText(tr("&Watch replay...")); - aVisualDeckStorage->setText(tr("&Visual Deck storage")); aFullScreen->setText(tr("&Full screen")); aRegister->setText(tr("&Register to server...")); aForgotPassword->setText(tr("&Restore password...")); @@ -712,8 +706,6 @@ void MainWindow::createActions() connect(aSinglePlayer, &QAction::triggered, this, &MainWindow::actSinglePlayer); aWatchReplay = new QAction(this); connect(aWatchReplay, &QAction::triggered, this, &MainWindow::actWatchReplay); - aVisualDeckStorage = new QAction(this); - connect(aVisualDeckStorage, &QAction::triggered, this, &MainWindow::actVisualDeckStorage); aFullScreen = new QAction(this); aFullScreen->setCheckable(true); connect(aFullScreen, &QAction::toggled, this, &MainWindow::actFullScreen); @@ -800,8 +792,6 @@ void MainWindow::createMenus() cockatriceMenu->addAction(aSinglePlayer); cockatriceMenu->addAction(aWatchReplay); cockatriceMenu->addSeparator(); - cockatriceMenu->addAction(aVisualDeckStorage); - cockatriceMenu->addSeparator(); cockatriceMenu->addAction(aFullScreen); cockatriceMenu->addSeparator(); cockatriceMenu->addAction(aSettings); @@ -889,10 +879,6 @@ MainWindow::MainWindow(QWidget *parent) &MainWindow::refreshShortcuts); refreshShortcuts(); - if (SettingsCache::instance().getVisualDeckStorageShowOnLoad()) { - connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseLoadingFinished, tabSupervisor, - &TabSupervisor::addVisualDeckStorageTab); - } connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseLoadingFailed, this, &MainWindow::cardDatabaseLoadingFailed); connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseNewSetsFound, this, diff --git a/cockatrice/src/client/ui/window_main.h b/cockatrice/src/client/ui/window_main.h index 8236b92c2..73f6c30cd 100644 --- a/cockatrice/src/client/ui/window_main.h +++ b/cockatrice/src/client/ui/window_main.h @@ -73,7 +73,6 @@ private slots: void actDisconnect(); void actSinglePlayer(); void actWatchReplay(); - void actVisualDeckStorage(); void actFullScreen(bool checked); void actRegister(); void actSettings(); @@ -131,10 +130,9 @@ private: QList tabMenus; QMenu *cockatriceMenu, *dbMenu, *tabsMenu, *helpMenu, *trayIconMenu; - QAction *aConnect, *aDisconnect, *aSinglePlayer, *aWatchReplay, *aVisualDeckStorage, *aFullScreen, *aSettings, - *aExit, *aAbout, *aTips, *aCheckCardUpdates, *aRegister, *aForgotPassword, *aUpdate, *aViewLog, *aManageSets, - *aEditTokens, *aOpenCustomFolder, *aOpenCustomsetsFolder, *aAddCustomSet, *aReloadCardDatabase, *aShow, - *aOpenSettingsFolder; + QAction *aConnect, *aDisconnect, *aSinglePlayer, *aWatchReplay, *aFullScreen, *aSettings, *aExit, *aAbout, *aTips, + *aCheckCardUpdates, *aRegister, *aForgotPassword, *aUpdate, *aViewLog, *aManageSets, *aEditTokens, + *aOpenCustomFolder, *aOpenCustomsetsFolder, *aAddCustomSet, *aReloadCardDatabase, *aShow, *aOpenSettingsFolder; TabSupervisor *tabSupervisor; WndSets *wndSets;