openclaw/deskflow
1
0
Fork 0
Code Issues Pull Requests Actions 17 Packages Projects Releases Wiki Activity

feat: use platform native styles when possible

Browse Source 
With Qt 6.7+ Light and Dark theme support is now provided by the mac os default theme
This commit is contained in:
sithlord48
2024-11-09 09:29:58 -05:00
committed by Nick Bolton
parent 77c4707ec5
commit 4359075b06
3 changed files with 9 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/gui/src/DeskflowApplication.cpp
View File

@ -1,30 +0,0 @@
/*
* Deskflow -- mouse and keyboard sharing utility
* Copyright (C) 2012 Symless Ltd.
* Copyright (C) 2008 Volker Lanz (vl@fidra.de)
*
* This package is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* found in the file LICENSE that should have accompanied this file.
*
* This package is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "DeskflowApplication.h"
#include "MainWindow.h"
DeskflowApplication::DeskflowApplication(int &argc, char **argv) : QApplication(argc, argv)
{
if (qEnvironmentVariable("XDG_CURRENT_DESKTOP") != QLatin1String("KDE")) {
// causes dark mode to be used on some OS (e.g. Windows)
setStyle("fusion");
}
}

30
src/gui/src/DeskflowApplication.h
View File

@ -1,30 +0,0 @@
/*
* Deskflow -- mouse and keyboard sharing utility
* Copyright (C) 2012 Symless Ltd.
* Copyright (C) 2008 Volker Lanz (vl@fidra.de)
*
* This package is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* found in the file LICENSE that should have accompanied this file.
*
* This package is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include <QApplication>
class QSessionManager;
class DeskflowApplication : public QApplication
{
public:
DeskflowApplication(int &argc, char **argv);
~DeskflowApplication() override = default;
};

15
src/gui/src/main.cpp
View File

@ -16,7 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "DeskflowApplication.h"
#include "MainWindow.h"
#include "SetupWizard.h"
#include "common/constants.h"
@ -83,7 +82,14 @@ int main(int argc, char *argv[])
// used as a prefix for settings paths, and must not be a url.
QCoreApplication::setOrganizationDomain(kOrgDomain);
DeskflowApplication app(argc, argv);
QApplication app(argc, argv);
#if !defined(Q_OS_MAC)
// causes dark mode to be used on some DE's
if (qEnvironmentVariable("XDG_CURRENT_DESKTOP") != QLatin1String("KDE")) {
qApp->setStyle("fusion");
}
#endif
qInstallMessageHandler(deskflow::gui::messages::messageHandler);
QString version = QString::fromStdString(deskflow::version());
@ -136,16 +142,13 @@ int main(int argc, char *argv[])
}
MainWindow mainWindow(configScopes, appConfig);
QObject::connect(&app, &DeskflowApplication::aboutToQuit, &mainWindow, &MainWindow::onAppAboutToQuit);
mainWindow.open();
#ifdef DESKFLOW_GUI_HOOK_START
DESKFLOW_GUI_HOOK_START
#endif
return DeskflowApplication::exec();
return qApp->exec();
}
#if defined(Q_OS_MAC)