CodeCow/deskflow
1
0
Fork 0
mirror of https://github.com/deskflow/deskflow.git synced 2026-07-10 21:19:24 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix: Unify both Quit actions to use the same function
Some checks failed
CodeQL Analysis / Analyze (cpp) (push) Has been cancelled
Details
Continuous Integration / lint-check (push) Has been cancelled
Details
Continuous Integration / pr-comment-flags (push) Has been cancelled
Details
Continuous Integration / ci-passed (push) Has been cancelled
Details
Continuous Integration / test-results (push) Has been cancelled
Details
Continuous Integration / analyse-valgrind (push) Has been cancelled
Details
Continuous Integration / analyse-sonarcloud (push) Has been cancelled
Details
Continuous Integration / ${{ matrix.target.name }} (map[arch:arm64 config-args:-DCMAKE_OSX_ARCHITECTURES="arm64" name:macos-14-arm64 runs-on:macos-14 timeout:10]) (push) Has been cancelled
Details
Continuous Integration / ${{ matrix.target.name }} (map[config-args:-DCMAKE_OSX_ARCHITECTURES="x86_64" name:macos-13-x64 runs-on:macos-13 timeout:20]) (push) Has been cancelled
Details
Continuous Integration / ${{ matrix.target.name }} (map[config-args:-G Ninja -DCMAKE_INSTALL_PREFIX=/usr container:archlinux:latest like:arch name:archlinux-x86_84 runs-on:ubuntu-latest timeout:20]) (push) Has been cancelled
Details
Continuous Integration / ${{ matrix.target.name }} (map[config-args:-G Ninja -DCMAKE_INSTALL_PREFIX=/usr container:debian:trixie-slim like:debian name:debian-13-x86_64 runs-on:ubuntu-latest timeout:20]) (push) Has been cancelled
Details
Continuous Integration / ${{ matrix.target.name }} (map[config-args:-G Ninja -DCMAKE_INSTALL_PREFIX=/usr container:fedora:40 like:fedora name:fedora-40-x86_84 runs-on:ubuntu-latest timeout:20]) (push) Has been cancelled
Details
Continuous Integration / ${{ matrix.target.name }} (map[config-args:-G Ninja -DCMAKE_INSTALL_PREFIX=/usr container:fedora:41 like:fedora name:fedora-41-x86_64 runs-on:ubuntu-latest timeout:20]) (push) Has been cancelled
Details
Continuous Integration / ${{ matrix.target.name }} (map[config-args:-G Ninja -DCMAKE_INSTALL_PREFIX=/usr container:opensuse/tumbleweed:latest like:suse name:opensuse-x86_84 runs-on:ubuntu-latest timeout:20]) (push) Has been cancelled
Details
Continuous Integration / ${{ matrix.target.name }} (map[config-args:-G Ninja name:windows-2022-x64 runs-on:windows-2022 timeout:120]) (push) Has been cancelled
Details
Continuous Integration / unix-${{ matrix.distro.name }} (map[name:freebsd]) (push) Has been cancelled
Details
Continuous Integration / flatpak (push) Has been cancelled
Details
Continuous Integration / release (push) Has been cancelled
Details
Continuous Integration / winget-publish (push) Has been cancelled
Details

Browse Source 
Mac os tray quit not working
This commit is contained in:
sithlord48 2024-12-28 08:55:22 -05:00 committed by Nick Bolton
parent 13b58f2f7a
commit 2294981525
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/apps/deskflow-gui/MainWindow.cpp
View File

@ -271,12 +271,7 @@ void MainWindow::connectSlots()
connect(m_actionHelp, &QAction::triggered, this, &MainWindow::openHelpUrl);
connect(m_actionMinimize, &QAction::triggered, this, &MainWindow::hide);
connect(m_actionQuit, &QAction::triggered, qApp, [this] {
qDebug() << "quitting application";
m_Quitting = true;
QApplication::quit();
});
connect(m_actionQuit, &QAction::triggered, this, &MainWindow::quitApp);
connect(m_actionRestore, &QAction::triggered, this, &MainWindow::showAndActivate);
connect(m_actionSave, &QAction::triggered, this, &MainWindow::saveConfig);
connect(m_actionSettings, &QAction::triggered, this, &MainWindow::openSettings);
@ -534,6 +529,13 @@ void MainWindow::setModeClient()
m_ConfigScopes.save();
}
void MainWindow::quitApp()
{
qDebug() << "quitting application";
m_Quitting = true;
QApplication::quit();
}
void MainWindow::onWindowSaveTimerTimeout()
{
saveWindow();
@ -580,6 +582,7 @@ void MainWindow::open()
// 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::quitApp);
m_actionRestore->setText(tr("Open Deskflow"));
trayActions.insert(3, m_actionRestore);

1
src/apps/deskflow-gui/MainWindow.h
View File

@ -138,6 +138,7 @@ private slots:
private:
std::unique_ptr<Ui::MainWindow> ui;
void quitApp();
void updateSize();
AppConfig &appConfig()
{