mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-19 00:42:14 -07:00
remove visualDeckStorage from WindowMain
This commit is contained in:
parent
37e680f426
commit
1ba0c8127a
2 changed files with 3 additions and 19 deletions
|
|
@ -290,11 +290,6 @@ void MainWindow::localGameEnded()
|
||||||
aSinglePlayer->setEnabled(true);
|
aSinglePlayer->setEnabled(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::actVisualDeckStorage()
|
|
||||||
{
|
|
||||||
tabSupervisor->addVisualDeckStorageTab();
|
|
||||||
}
|
|
||||||
|
|
||||||
void MainWindow::actFullScreen(bool checked)
|
void MainWindow::actFullScreen(bool checked)
|
||||||
{
|
{
|
||||||
if (checked)
|
if (checked)
|
||||||
|
|
@ -664,7 +659,6 @@ void MainWindow::retranslateUi()
|
||||||
aDisconnect->setText(tr("&Disconnect"));
|
aDisconnect->setText(tr("&Disconnect"));
|
||||||
aSinglePlayer->setText(tr("Start &local game..."));
|
aSinglePlayer->setText(tr("Start &local game..."));
|
||||||
aWatchReplay->setText(tr("&Watch replay..."));
|
aWatchReplay->setText(tr("&Watch replay..."));
|
||||||
aVisualDeckStorage->setText(tr("&Visual Deck storage"));
|
|
||||||
aFullScreen->setText(tr("&Full screen"));
|
aFullScreen->setText(tr("&Full screen"));
|
||||||
aRegister->setText(tr("&Register to server..."));
|
aRegister->setText(tr("&Register to server..."));
|
||||||
aForgotPassword->setText(tr("&Restore password..."));
|
aForgotPassword->setText(tr("&Restore password..."));
|
||||||
|
|
@ -712,8 +706,6 @@ void MainWindow::createActions()
|
||||||
connect(aSinglePlayer, &QAction::triggered, this, &MainWindow::actSinglePlayer);
|
connect(aSinglePlayer, &QAction::triggered, this, &MainWindow::actSinglePlayer);
|
||||||
aWatchReplay = new QAction(this);
|
aWatchReplay = new QAction(this);
|
||||||
connect(aWatchReplay, &QAction::triggered, this, &MainWindow::actWatchReplay);
|
connect(aWatchReplay, &QAction::triggered, this, &MainWindow::actWatchReplay);
|
||||||
aVisualDeckStorage = new QAction(this);
|
|
||||||
connect(aVisualDeckStorage, &QAction::triggered, this, &MainWindow::actVisualDeckStorage);
|
|
||||||
aFullScreen = new QAction(this);
|
aFullScreen = new QAction(this);
|
||||||
aFullScreen->setCheckable(true);
|
aFullScreen->setCheckable(true);
|
||||||
connect(aFullScreen, &QAction::toggled, this, &MainWindow::actFullScreen);
|
connect(aFullScreen, &QAction::toggled, this, &MainWindow::actFullScreen);
|
||||||
|
|
@ -800,8 +792,6 @@ void MainWindow::createMenus()
|
||||||
cockatriceMenu->addAction(aSinglePlayer);
|
cockatriceMenu->addAction(aSinglePlayer);
|
||||||
cockatriceMenu->addAction(aWatchReplay);
|
cockatriceMenu->addAction(aWatchReplay);
|
||||||
cockatriceMenu->addSeparator();
|
cockatriceMenu->addSeparator();
|
||||||
cockatriceMenu->addAction(aVisualDeckStorage);
|
|
||||||
cockatriceMenu->addSeparator();
|
|
||||||
cockatriceMenu->addAction(aFullScreen);
|
cockatriceMenu->addAction(aFullScreen);
|
||||||
cockatriceMenu->addSeparator();
|
cockatriceMenu->addSeparator();
|
||||||
cockatriceMenu->addAction(aSettings);
|
cockatriceMenu->addAction(aSettings);
|
||||||
|
|
@ -889,10 +879,6 @@ MainWindow::MainWindow(QWidget *parent)
|
||||||
&MainWindow::refreshShortcuts);
|
&MainWindow::refreshShortcuts);
|
||||||
refreshShortcuts();
|
refreshShortcuts();
|
||||||
|
|
||||||
if (SettingsCache::instance().getVisualDeckStorageShowOnLoad()) {
|
|
||||||
connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseLoadingFinished, tabSupervisor,
|
|
||||||
&TabSupervisor::addVisualDeckStorageTab);
|
|
||||||
}
|
|
||||||
connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseLoadingFailed, this,
|
connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseLoadingFailed, this,
|
||||||
&MainWindow::cardDatabaseLoadingFailed);
|
&MainWindow::cardDatabaseLoadingFailed);
|
||||||
connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseNewSetsFound, this,
|
connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseNewSetsFound, this,
|
||||||
|
|
|
||||||
|
|
@ -73,7 +73,6 @@ private slots:
|
||||||
void actDisconnect();
|
void actDisconnect();
|
||||||
void actSinglePlayer();
|
void actSinglePlayer();
|
||||||
void actWatchReplay();
|
void actWatchReplay();
|
||||||
void actVisualDeckStorage();
|
|
||||||
void actFullScreen(bool checked);
|
void actFullScreen(bool checked);
|
||||||
void actRegister();
|
void actRegister();
|
||||||
void actSettings();
|
void actSettings();
|
||||||
|
|
@ -131,10 +130,9 @@ private:
|
||||||
|
|
||||||
QList<QMenu *> tabMenus;
|
QList<QMenu *> tabMenus;
|
||||||
QMenu *cockatriceMenu, *dbMenu, *tabsMenu, *helpMenu, *trayIconMenu;
|
QMenu *cockatriceMenu, *dbMenu, *tabsMenu, *helpMenu, *trayIconMenu;
|
||||||
QAction *aConnect, *aDisconnect, *aSinglePlayer, *aWatchReplay, *aVisualDeckStorage, *aFullScreen, *aSettings,
|
QAction *aConnect, *aDisconnect, *aSinglePlayer, *aWatchReplay, *aFullScreen, *aSettings, *aExit, *aAbout, *aTips,
|
||||||
*aExit, *aAbout, *aTips, *aCheckCardUpdates, *aRegister, *aForgotPassword, *aUpdate, *aViewLog, *aManageSets,
|
*aCheckCardUpdates, *aRegister, *aForgotPassword, *aUpdate, *aViewLog, *aManageSets, *aEditTokens,
|
||||||
*aEditTokens, *aOpenCustomFolder, *aOpenCustomsetsFolder, *aAddCustomSet, *aReloadCardDatabase, *aShow,
|
*aOpenCustomFolder, *aOpenCustomsetsFolder, *aAddCustomSet, *aReloadCardDatabase, *aShow, *aOpenSettingsFolder;
|
||||||
*aOpenSettingsFolder;
|
|
||||||
|
|
||||||
TabSupervisor *tabSupervisor;
|
TabSupervisor *tabSupervisor;
|
||||||
WndSets *wndSets;
|
WndSets *wndSets;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue