dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add warning when enabling X11 shortcuts on gnome, cinnamon and KDE

Browse Source
This commit is contained in:
Jonas Kvinge
2019-01-25 21:36:28 +01:00
parent 3241815a11
commit f90de75e3a
7 changed files with 147 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/globalshortcuts/globalshortcuts.cpp
View File

@@ -52,7 +52,7 @@ GlobalShortcuts::GlobalShortcuts(QWidget *parent)
: QWidget(parent),
dbus_backend_(nullptr),
system_backend_(nullptr),
use_dbus_(true),
use_gsd_(true),
use_x11_(false)
{
@@ -97,7 +97,7 @@ GlobalShortcuts::GlobalShortcuts(QWidget *parent)
void GlobalShortcuts::ReloadSettings() {
// The actual shortcuts have been set in our actions for us by the config dialog already - we just need to reread the gnome settings.
use_dbus_ = settings_.value("use_dbus", true).toBool();
use_gsd_ = settings_.value("use_gsd", true).toBool();
use_x11_ = settings_.value("use_x11", true).toBool();
Unregister();
@@ -152,7 +152,7 @@ bool GlobalShortcuts::IsX11Available() const {
}
void GlobalShortcuts::Register() {
if (use_dbus_ && dbus_backend_ && dbus_backend_->Register()) return;
if (use_gsd_ && dbus_backend_ && dbus_backend_->Register()) return;
#ifdef HAVE_X11 // If this system has X11, only use the system backend if X11 is enabled in the global shortcut settings
if (use_x11_)
#endif