aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

move db udpate (#4015)

Browse source
This commit is contained in:
tooomm 2020-06-29 10:25:17 +02:00 committed by GitHub
parent 7fa1936d0f
commit 2a7268c088
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
cockatrice/src/window_main.cpp
View file

@ -637,18 +637,18 @@ void MainWindow::retranslateUi()
#endif #endif
dbMenu->setTitle(tr("C&ard Database")); dbMenu->setTitle(tr("C&ard Database"));
aManageSets->setText(tr("&Manage sets..."));
aEditTokens->setText(tr("Edit custom &tokens..."));
aOpenCustomFolder->setText(tr("Open custom image folder")); aOpenCustomFolder->setText(tr("Open custom image folder"));
aOpenCustomsetsFolder->setText(tr("Open custom sets folder")); aOpenCustomsetsFolder->setText(tr("Open custom sets folder"));
aAddCustomSet->setText(tr("Add custom sets/cards")); aAddCustomSet->setText(tr("Add custom sets/cards"));
aManageSets->setText(tr("&Manage sets..."));
aEditTokens->setText(tr("Edit custom &tokens..."));
helpMenu->setTitle(tr("&Help"));
aAbout->setText(tr("&About Cockatrice")); aAbout->setText(tr("&About Cockatrice"));
aTips->setText(tr("&Tip of the Day")); aTips->setText(tr("&Tip of the Day"));
aUpdate->setText(tr("Check for Client Updates")); aUpdate->setText(tr("Check for Client Updates"));
aViewLog->setText(tr("View &debug log")); aCheckCardUpdates->setText(tr("Check for Card Updates..."));
helpMenu->setTitle(tr("&Help")); aViewLog->setText(tr("View &Debug Log"));
aCheckCardUpdates->setText(tr("Check for card updates..."));
tabSupervisor->retranslateUi(); tabSupervisor->retranslateUi();
} }
@ -675,32 +675,27 @@ void MainWindow::createActions()
aExit = new QAction(this); aExit = new QAction(this);
connect(aExit, SIGNAL(triggered()), this, SLOT(actExit())); connect(aExit, SIGNAL(triggered()), this, SLOT(actExit()));
aManageSets = new QAction(QString(), this);
connect(aManageSets, SIGNAL(triggered()), this, SLOT(actManageSets()));
aEditTokens = new QAction(QString(), this);
connect(aEditTokens, SIGNAL(triggered()), this, SLOT(actEditTokens()));
aOpenCustomFolder = new QAction(QString(), this);
connect(aOpenCustomFolder, SIGNAL(triggered()), this, SLOT(actOpenCustomFolder()));
aOpenCustomsetsFolder = new QAction(QString(), this);
connect(aOpenCustomsetsFolder, SIGNAL(triggered()), this, SLOT(actOpenCustomsetsFolder()));
aAddCustomSet = new QAction(QString(), this);
connect(aAddCustomSet, SIGNAL(triggered()), this, SLOT(actAddCustomSet()));
aAbout = new QAction(this); aAbout = new QAction(this);
connect(aAbout, SIGNAL(triggered()), this, SLOT(actAbout())); connect(aAbout, SIGNAL(triggered()), this, SLOT(actAbout()));
aTips = new QAction(this); aTips = new QAction(this);
connect(aTips, SIGNAL(triggered()), this, SLOT(actTips())); connect(aTips, SIGNAL(triggered()), this, SLOT(actTips()));
aUpdate = new QAction(this); aUpdate = new QAction(this);
connect(aUpdate, SIGNAL(triggered()), this, SLOT(actUpdate())); connect(aUpdate, SIGNAL(triggered()), this, SLOT(actUpdate()));
aViewLog = new QAction(this);
connect(aViewLog, SIGNAL(triggered()), this, SLOT(actViewLog()));
aCheckCardUpdates = new QAction(this); aCheckCardUpdates = new QAction(this);
connect(aCheckCardUpdates, SIGNAL(triggered()), this, SLOT(actCheckCardUpdates())); connect(aCheckCardUpdates, SIGNAL(triggered()), this, SLOT(actCheckCardUpdates()));
aViewLog = new QAction(this);
aOpenCustomsetsFolder = new QAction(QString(), this); connect(aViewLog, SIGNAL(triggered()), this, SLOT(actViewLog()));
connect(aOpenCustomsetsFolder, SIGNAL(triggered()), this, SLOT(actOpenCustomsetsFolder()));
aOpenCustomFolder = new QAction(QString(), this);
connect(aOpenCustomFolder, SIGNAL(triggered()), this, SLOT(actOpenCustomFolder()));
aAddCustomSet = new QAction(QString(), this);
connect(aAddCustomSet, SIGNAL(triggered()), this, SLOT(actAddCustomSet()));
aManageSets = new QAction(QString(), this);
connect(aManageSets, SIGNAL(triggered()), this, SLOT(actManageSets()));
aEditTokens = new QAction(QString(), this);
connect(aEditTokens, SIGNAL(triggered()), this, SLOT(actEditTokens()));
#if defined(__APPLE__) /* For OSX */ #if defined(__APPLE__) /* For OSX */
aSettings->setMenuRole(QAction::PreferencesRole); aSettings->setMenuRole(QAction::PreferencesRole);
@ -751,8 +746,6 @@ void MainWindow::createMenus()
cockatriceMenu->addAction(aFullScreen); cockatriceMenu->addAction(aFullScreen);
cockatriceMenu->addSeparator(); cockatriceMenu->addSeparator();
cockatriceMenu->addAction(aSettings); cockatriceMenu->addAction(aSettings);
cockatriceMenu->addAction(aCheckCardUpdates);
cockatriceMenu->addSeparator();
cockatriceMenu->addAction(aExit); cockatriceMenu->addAction(aExit);
dbMenu = menuBar()->addMenu(QString()); dbMenu = menuBar()->addMenu(QString());
@ -768,7 +761,10 @@ void MainWindow::createMenus()
helpMenu = menuBar()->addMenu(QString()); helpMenu = menuBar()->addMenu(QString());
helpMenu->addAction(aAbout); helpMenu->addAction(aAbout);
helpMenu->addAction(aTips); helpMenu->addAction(aTips);
helpMenu->addSeparator();
helpMenu->addAction(aUpdate); helpMenu->addAction(aUpdate);
helpMenu->addAction(aCheckCardUpdates);
helpMenu->addSeparator();
helpMenu->addAction(aViewLog); helpMenu->addAction(aViewLog);
} }
@ -1180,10 +1176,10 @@ void MainWindow::refreshShortcuts()
aRegister->setShortcuts(settingsCache->shortcuts().getShortcut("MainWindow/aRegister")); aRegister->setShortcuts(settingsCache->shortcuts().getShortcut("MainWindow/aRegister"));
aSettings->setShortcuts(settingsCache->shortcuts().getShortcut("MainWindow/aSettings")); aSettings->setShortcuts(settingsCache->shortcuts().getShortcut("MainWindow/aSettings"));
aExit->setShortcuts(settingsCache->shortcuts().getShortcut("MainWindow/aExit")); aExit->setShortcuts(settingsCache->shortcuts().getShortcut("MainWindow/aExit"));
aCheckCardUpdates->setShortcuts(settingsCache->shortcuts().getShortcut("MainWindow/aCheckCardUpdates"));
aOpenCustomFolder->setShortcuts(settingsCache->shortcuts().getShortcut("MainWindow/aOpenCustomFolder"));
aManageSets->setShortcuts(settingsCache->shortcuts().getShortcut("MainWindow/aManageSets")); aManageSets->setShortcuts(settingsCache->shortcuts().getShortcut("MainWindow/aManageSets"));
aEditTokens->setShortcuts(settingsCache->shortcuts().getShortcut("MainWindow/aEditTokens")); aEditTokens->setShortcuts(settingsCache->shortcuts().getShortcut("MainWindow/aEditTokens"));
aOpenCustomFolder->setShortcuts(settingsCache->shortcuts().getShortcut("MainWindow/aOpenCustomFolder"));
aCheckCardUpdates->setShortcuts(settingsCache->shortcuts().getShortcut("MainWindow/aCheckCardUpdates"));
} }
void MainWindow::notifyUserAboutUpdate() void MainWindow::notifyUserAboutUpdate()