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

use setting

Browse source
This commit is contained in:
RickyRister 2025-06-12 23:36:52 -07:00
parent 995e5d94aa
commit 9959bf2b5e
2 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -62,6 +62,7 @@
#include <QMenuBar> #include <QMenuBar>
#include <QMessageBox> #include <QMessageBox>
#include <QPixmapCache> #include <QPixmapCache>
#include <QStatusBar>
#include <QSystemTrayIcon> #include <QSystemTrayIcon>
#include <QThread> #include <QThread>
#include <QTimer> #include <QTimer>
@ -665,6 +666,7 @@ void MainWindow::retranslateUi()
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..."));
aStatusBar->setText(tr("Show Status Bar"));
aSettings->setText(tr("&Settings...")); aSettings->setText(tr("&Settings..."));
aSettings->setIcon(QPixmap("theme:icons/settings")); aSettings->setIcon(QPixmap("theme:icons/settings"));
aExit->setText(tr("&Exit")); aExit->setText(tr("&Exit"));
@ -709,6 +711,10 @@ 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);
aStatusBar = new QAction(this);
aStatusBar->setCheckable(true);
aStatusBar->setChecked(SettingsCache::instance().getShowStatusBar());
connect(aStatusBar, &QAction::triggered, &SettingsCache::instance(), &SettingsCache::showStatusBarChanged);
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);
@ -795,8 +801,10 @@ void MainWindow::createMenus()
cockatriceMenu->addAction(aSinglePlayer); cockatriceMenu->addAction(aSinglePlayer);
cockatriceMenu->addAction(aWatchReplay); cockatriceMenu->addAction(aWatchReplay);
cockatriceMenu->addSeparator(); cockatriceMenu->addSeparator();
cockatriceMenu->addAction(aStatusBar);
cockatriceMenu->addAction(aFullScreen); cockatriceMenu->addAction(aFullScreen);
cockatriceMenu->addSeparator(); cockatriceMenu->addSeparator();
cockatriceMenu->addAction(aSettings); cockatriceMenu->addAction(aSettings);
cockatriceMenu->addAction(aExit); cockatriceMenu->addAction(aExit);
@ -878,6 +886,11 @@ MainWindow::MainWindow(QWidget *parent)
createTrayIcon(); createTrayIcon();
} }
// status bar
connect(&SettingsCache::instance(), &SettingsCache::showStatusBarChanged, this,
[this](bool show) { statusBar()->setVisible(show); });
statusBar()->setVisible(SettingsCache::instance().getShowStatusBar());
connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this, connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this,
&MainWindow::refreshShortcuts); &MainWindow::refreshShortcuts);
refreshShortcuts(); refreshShortcuts();

3
cockatrice/src/client/ui/window_main.h
View file

@ -138,7 +138,8 @@ private:
QList<QMenu *> tabMenus; QList<QMenu *> tabMenus;
QMenu *cockatriceMenu, *dbMenu, *tabsMenu, *helpMenu, *trayIconMenu; QMenu *cockatriceMenu, *dbMenu, *tabsMenu, *helpMenu, *trayIconMenu;
QAction *aAbout, *aSettings, *aShow, *aExit; QAction *aAbout, *aSettings, *aShow, *aExit;
QAction *aConnect, *aDisconnect, *aRegister, *aForgotPassword, *aSinglePlayer, *aWatchReplay, *aFullScreen; QAction *aConnect, *aDisconnect, *aRegister, *aForgotPassword, *aSinglePlayer, *aWatchReplay, *aStatusBar,
*aFullScreen;
QAction *aManageSets, *aEditTokens, *aOpenCustomFolder, *aOpenCustomsetsFolder, *aAddCustomSet, QAction *aManageSets, *aEditTokens, *aOpenCustomFolder, *aOpenCustomsetsFolder, *aAddCustomSet,
*aReloadCardDatabase; *aReloadCardDatabase;
QAction *aTips, *aUpdate, *aCheckCardUpdates, *aViewLog, *aOpenSettingsFolder; QAction *aTips, *aUpdate, *aCheckCardUpdates, *aViewLog, *aOpenSettingsFolder;