jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-19 00:42:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

update ctor

Browse source
This commit is contained in:
RickyRister 2025-01-05 21:44:58 -08:00
parent 0ab812549c
commit aa7fef26c4
1 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
cockatrice/src/client/ui/window_main.cpp
View file

@ -834,7 +834,8 @@ MainWindow::MainWindow(QWidget *parent)
: QMainWindow(parent), localServer(nullptr), bHasActivated(false), askedForDbUpdater(false), : QMainWindow(parent), localServer(nullptr), bHasActivated(false), askedForDbUpdater(false),
cardUpdateProcess(nullptr), logviewDialog(nullptr) cardUpdateProcess(nullptr), logviewDialog(nullptr)
{ {
connect(&SettingsCache::instance(), SIGNAL(pixmapCacheSizeChanged(int)), this, SLOT(pixmapCacheSizeChanged(int))); connect(&SettingsCache::instance(), &SettingsCache::pixmapCacheSizeChanged, this,
&MainWindow::pixmapCacheSizeChanged);
pixmapCacheSizeChanged(SettingsCache::instance().getPixmapCacheSize()); pixmapCacheSizeChanged(SettingsCache::instance().getPixmapCacheSize());
client = new RemoteClient; client = new RemoteClient;
@ -866,9 +867,9 @@ MainWindow::MainWindow(QWidget *parent)
createMenus(); createMenus();
tabSupervisor = new TabSupervisor(client); tabSupervisor = new TabSupervisor(client);
connect(tabSupervisor, SIGNAL(setMenu(QList<QMenu *>)), this, SLOT(updateTabMenu(QList<QMenu *>))); connect(tabSupervisor, &TabSupervisor::setMenu, this, &MainWindow::updateTabMenu);
connect(tabSupervisor, SIGNAL(localGameEnded()), this, SLOT(localGameEnded())); connect(tabSupervisor, &TabSupervisor::localGameEnded, this, &MainWindow::localGameEnded);
connect(tabSupervisor, SIGNAL(showWindowIfHidden()), this, SLOT(showWindowIfHidden())); connect(tabSupervisor, &TabSupervisor::showWindowIfHidden, this, &MainWindow::showWindowIfHidden);
tabSupervisor->addDeckEditorTab(nullptr); tabSupervisor->addDeckEditorTab(nullptr);
setCentralWidget(tabSupervisor); setCentralWidget(tabSupervisor);
@ -884,19 +885,20 @@ MainWindow::MainWindow(QWidget *parent)
createTrayIcon(); createTrayIcon();
} }
connect(&SettingsCache::instance().shortcuts(), SIGNAL(shortCutChanged()), this, SLOT(refreshShortcuts())); connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this,
&MainWindow::refreshShortcuts);
refreshShortcuts(); refreshShortcuts();
if (SettingsCache::instance().getVisualDeckStorageShowOnLoad()) { if (SettingsCache::instance().getVisualDeckStorageShowOnLoad()) {
connect(CardDatabaseManager::getInstance(), SIGNAL(cardDatabaseLoadingFinished()), tabSupervisor, connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseLoadingFinished, tabSupervisor,
SLOT(addVisualDeckStorageTab())); &TabSupervisor::addVisualDeckStorageTab);
} }
connect(CardDatabaseManager::getInstance(), SIGNAL(cardDatabaseLoadingFailed()), this, connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseLoadingFailed, this,
SLOT(cardDatabaseLoadingFailed())); &MainWindow::cardDatabaseLoadingFailed);
connect(CardDatabaseManager::getInstance(), SIGNAL(cardDatabaseNewSetsFound(int, QStringList)), this, connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseNewSetsFound, this,
SLOT(cardDatabaseNewSetsFound(int, QStringList))); &MainWindow::cardDatabaseNewSetsFound);
connect(CardDatabaseManager::getInstance(), SIGNAL(cardDatabaseAllNewSetsEnabled()), this, connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseAllNewSetsEnabled, this,
SLOT(cardDatabaseAllNewSetsEnabled())); &MainWindow::cardDatabaseAllNewSetsEnabled);
tip = new DlgTipOfTheDay(); tip = new DlgTipOfTheDay();