smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: MainWindow setupTrayIcon in method

Browse source 
remove unused MainWindow::createStatusBar and MainWinow::createTrayIcon
This commit is contained in:
sithlord48 2025-01-07 00:22:48 -05:00 committed by Nick Bolton
parent d5e651bae9
commit f505bfd3e7
2 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/apps/deskflow-gui/MainWindow.cpp
View file

@ -136,7 +136,7 @@ MainWindow::MainWindow(ConfigScopes &configScopes, AppConfig &appConfig)
setupControls();
connectSlots();
setIcon();
setupTrayIcon();
m_ConfigScopes.signalReady();
@ -568,25 +568,6 @@ void MainWindow::moveEvent(QMoveEvent *event)
void MainWindow::open()
{
auto trayMenu = new QMenu(this);
trayMenu->addActions({m_actionStartCore, m_actionStopCore, m_actionQuit});
trayMenu->insertSeparator(m_actionQuit);
#ifdef Q_OS_MAC
// Duplicate quit needed for mac os tray menu
QAction *actionTrayQuit = new QAction(tr("Quit Deskflow"), this);
actionTrayQuit->setShortcut(QKeySequence::Quit);
connect(actionTrayQuit, &QAction::triggered, this, &MainWindow::close);
m_actionRestore->setText(tr("Open Deskflow"));
trayMenu->addActions({m_actionRestore, actionTrayQuit});
trayMenu->insertSeparator(actionTrayQuit);
#endif
m_trayIcon->setContextMenu(trayMenu);
// Show will show the tray when it can (if it can)
m_trayIcon->show();
if (!m_AppConfig.enableUpdateCheck().has_value()) {
m_AppConfig.setEnableUpdateCheck(messages::showUpdateCheckOption(this));
m_ConfigScopes.save();
@ -663,6 +644,27 @@ void MainWindow::createMenuBar()
setMenuBar(menuBar);
}
void MainWindow::setupTrayIcon()
{
auto trayMenu = new QMenu(this);
trayMenu->addActions({m_actionStartCore, m_actionStopCore, m_actionQuit});
trayMenu->insertSeparator(m_actionQuit);
#ifdef Q_OS_MAC
// Duplicate quit needed for mac os tray menu
QAction *actionTrayQuit = new QAction(tr("Quit Deskflow"), this);
actionTrayQuit->setShortcut(QKeySequence::Quit);
connect(actionTrayQuit, &QAction::triggered, this, &MainWindow::close);
m_actionRestore->setText(tr("Open Deskflow"));
trayMenu->addActions({m_actionRestore, actionTrayQuit});
trayMenu->insertSeparator(actionTrayQuit);
#endif
setIcon();
m_trayIcon->setContextMenu(trayMenu);
m_trayIcon->show();
}
void MainWindow::applyConfig()
{
enableServer(m_AppConfig.serverGroupChecked());

3
src/apps/deskflow-gui/MainWindow.h
View file

@ -156,8 +156,7 @@ private:
return m_AppConfig;
}
void createMenuBar();
void createStatusBar();
void createTrayIcon();
void setupTrayIcon();
void applyConfig();
void setIcon();
bool checkForApp(int which, QString &app);