jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-20 09:22:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into new_visual_deck_storage

Browse source
This commit is contained in:
Zach H 2025-01-05 17:56:22 -05:00 • committed by GitHub
commit a659ec0bc1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
20 changed files with 205 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -366,6 +366,12 @@ void MainWindow::actViewLog()
logviewDialog->activateWindow();
}
void MainWindow::actOpenSettingsFolder()
{
QString dir = SettingsCache::instance().getSettingsPath();
QDesktopServices::openUrl(QUrl::fromLocalFile(dir));
}
void MainWindow::serverTimeout()
{
QMessageBox::critical(this, tr("Error"), tr("Server timeout"));
@ -687,6 +693,7 @@ void MainWindow::retranslateUi()
aUpdate->setText(tr("Check for Client Updates"));
aCheckCardUpdates->setText(tr("Check for Card Updates..."));
aViewLog->setText(tr("View &Debug Log"));
aOpenSettingsFolder->setText(tr("Open Settings Folder"));
aShow->setText(tr("Show/Hide"));
@ -743,6 +750,8 @@ void MainWindow::createActions()
connect(aCheckCardUpdates, SIGNAL(triggered()), this, SLOT(actCheckCardUpdates()));
aViewLog = new QAction(this);
connect(aViewLog, SIGNAL(triggered()), this, SLOT(actViewLog()));
aOpenSettingsFolder = new QAction(this);
connect(aOpenSettingsFolder, &QAction::triggered, this, &MainWindow::actOpenSettingsFolder);
aShow = new QAction(this);
connect(aShow, SIGNAL(triggered()), this, SLOT(actShow()));
@ -818,6 +827,7 @@ void MainWindow::createMenus()
helpMenu->addAction(aCheckCardUpdates);
helpMenu->addSeparator();
helpMenu->addAction(aViewLog);
helpMenu->addAction(aOpenSettingsFolder);
}
MainWindow::MainWindow(QWidget *parent)