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

Add global shortcuts support on MATE

Browse Source
This commit is contained in:
Jonas Kvinge
2021-05-29 20:35:55 +02:00
parent 0c5236ebcb
commit 1ced4e277b
15 changed files with 386 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
src/settings/globalshortcutssettingspage.cpp
View File

@@ -73,16 +73,19 @@ GlobalShortcutsSettingsPage::GlobalShortcutsSettingsPage(SettingsDialog *dialog)
#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
# ifdef HAVE_DBUS
QObject::connect(ui_->checkbox_gsd, &QCheckBox::toggled, this, &GlobalShortcutsSettingsPage::ShortcutOptionsChanged);
QObject::connect(ui_->checkbox_kde, &QCheckBox::toggled, this, &GlobalShortcutsSettingsPage::ShortcutOptionsChanged);
QObject::connect(ui_->button_gsd_open, &QPushButton::clicked, this, &GlobalShortcutsSettingsPage::OpenGnomeKeybindingProperties);
QObject::connect(ui_->checkbox_gnome, &QCheckBox::toggled, this, &GlobalShortcutsSettingsPage::ShortcutOptionsChanged);
QObject::connect(ui_->checkbox_mate, &QCheckBox::toggled, this, &GlobalShortcutsSettingsPage::ShortcutOptionsChanged);
QObject::connect(ui_->button_gnome_open, &QPushButton::clicked, this, &GlobalShortcutsSettingsPage::OpenGnomeKeybindingProperties);
QObject::connect(ui_->button_mate_open, &QPushButton::clicked, this, &GlobalShortcutsSettingsPage::OpenMateKeybindingProperties);
# endif
# if defined(HAVE_X11) && defined(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H)
QObject::connect(ui_->checkbox_x11, &QCheckBox::toggled, this, &GlobalShortcutsSettingsPage::ShortcutOptionsChanged);
# endif
#else
ui_->widget_gsd->hide();
ui_->widget_kde->hide();
ui_->widget_gnome->hide();
ui_->widget_mate->hide();
ui_->widget_x11->hide();
#endif // defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
@@ -119,15 +122,6 @@ void GlobalShortcutsSettingsPage::Load() {
QObject::connect(ui_->button_macos_open, &QPushButton::clicked, manager, &GlobalShortcutsManager::ShowMacAccessibilityDialog);
#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
if (manager->IsGsdAvailable()) {
qLog(Debug) << "Gnome (GSD) backend is available.";
ui_->widget_gsd->show();
}
else {
qLog(Debug) << "Gnome (GSD) backend is unavailable.";
ui_->widget_gsd->hide();
}
if (manager->IsKdeAvailable()) {
qLog(Debug) << "KDE (KGlobalAccel) backend is available.";
ui_->widget_kde->show();
@@ -137,6 +131,24 @@ void GlobalShortcutsSettingsPage::Load() {
ui_->widget_kde->hide();
}
if (manager->IsGnomeAvailable()) {
qLog(Debug) << "Gnome (GSD) backend is available.";
ui_->widget_gnome->show();
}
else {
qLog(Debug) << "Gnome (GSD) backend is unavailable.";
ui_->widget_gnome->hide();
}
if (manager->IsMateAvailable()) {
qLog(Debug) << "MATE backend is available.";
ui_->widget_mate->show();
}
else {
qLog(Debug) << "MATE backend is unavailable.";
ui_->widget_mate->hide();
}
if (manager->IsX11Available()) {
qLog(Debug) << "X11 backend is available.";
ui_->widget_x11->show();
@@ -167,14 +179,19 @@ void GlobalShortcutsSettingsPage::Load() {
}
#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
if (ui_->widget_gsd->isVisibleTo(this)) {
ui_->checkbox_gsd->setChecked(s.value("use_gsd", true).toBool());
}
if (ui_->widget_kde->isVisibleTo(this)) {
ui_->checkbox_kde->setChecked(s.value("use_kde", true).toBool());
}
if (ui_->widget_gnome->isVisibleTo(this)) {
ui_->checkbox_gnome->setChecked(s.value("use_gnome", true).toBool());
}
if (ui_->widget_mate->isVisibleTo(this)) {
ui_->checkbox_mate->setChecked(s.value("use_mate", true).toBool());
}
if (ui_->widget_x11->isVisibleTo(this)) {
ui_->checkbox_x11->setChecked(s.value("use_x11", false).toBool());
}
@@ -212,8 +229,9 @@ void GlobalShortcutsSettingsPage::Save() {
}
#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
s.setValue("use_gsd", ui_->checkbox_gsd->isChecked());
s.setValue("use_kde", ui_->checkbox_kde->isChecked());
s.setValue("use_gnome", ui_->checkbox_gnome->isChecked());
s.setValue("use_mate", ui_->checkbox_mate->isChecked());
s.setValue("use_x11", ui_->checkbox_x11->isChecked());
#endif
@@ -251,6 +269,16 @@ void GlobalShortcutsSettingsPage::OpenGnomeKeybindingProperties() {
}
void GlobalShortcutsSettingsPage::OpenMateKeybindingProperties() {
if (!QProcess::startDetached("mate-keybinding-properties", QStringList())) {
if (!QProcess::startDetached("mate-control-center", QStringList() << "keyboard")) {
QMessageBox::warning(this, "Error", tr("The \"%1\" command could not be started.").arg("mate-keybinding-properties"));
}
}
}
void GlobalShortcutsSettingsPage::SetShortcut(const QString &id, const QKeySequence &key) {
Shortcut &shortcut = shortcuts_[id];
@@ -316,14 +344,21 @@ void GlobalShortcutsSettingsPage::ChangeClicked() {
void GlobalShortcutsSettingsPage::X11Warning() {
if (de_.toLower() == "kde" || de_.toLower() == "gnome" || de_.toLower() == "x-cinnamon") {
QString de = de_.toLower();
if (de == "kde" || de == "gnome" || de == "x-cinnamon" || de == "mate") {
QString text(tr("Using X11 shortcuts on %1 is not recommended and can cause keyboard to become unresponsive!").arg(de_));
if (de_.toLower() == "kde")
if (de == "kde") {
text += tr(" Shortcuts on %1 are usually used through MPRIS and KGlobalAccel.").arg(de_);
else if (de_.toLower() == "gnome")
text += tr(" Shortcuts on %1 are usually used through GSD and should be configured in gnome-settings-daemon instead.").arg(de_);
else if (de_.toLower() == "x-cinnamon")
text += tr(" Shortcuts on %1 are usually used through GSD and should be configured in cinnamon-settings-daemon instead.").arg(de_);
}
else if (de == "gnome") {
text += tr(" Shortcuts on %1 are usually used through Gnome Settings Daemon and should be configured in gnome-settings-daemon instead.").arg(de_);
}
else if (de == "x-cinnamon") {
text += tr(" Shortcuts on %1 are usually used through Gnome Settings Daemon and should be configured in cinnamon-settings-daemon instead.").arg(de_);
}
else if (de == "mate") {
text += tr(" Shortcuts on %1 are usually used through MATE Settings Daemon and should be configured there instead.").arg(de_);
}
ui_->label_warn_text->setText(text);
ui_->widget_warning->show();
}

1
src/settings/globalshortcutssettingspage.h
View File

@@ -57,6 +57,7 @@ class GlobalShortcutsSettingsPage : public SettingsPage {
private slots:
void ShortcutOptionsChanged();
void OpenGnomeKeybindingProperties();
void OpenMateKeybindingProperties();
void ItemClicked(QTreeWidgetItem*);
void NoneClicked();

48
src/settings/globalshortcutssettingspage.ui
View File

@@ -19,7 +19,7 @@
</property>
<layout class="QVBoxLayout" name="layout_globalshortcutssettingspage">
<item>
<widget class="QWidget" name="widget_gsd" native="true">
<widget class="QWidget" name="widget_gnome" native="true">
<layout class="QHBoxLayout" name="layout_gsd">
<property name="leftMargin">
<number>0</number>
@@ -34,7 +34,7 @@
<number>0</number>
</property>
<item>
<widget class="QCheckBox" name="checkbox_gsd">
<widget class="QCheckBox" name="checkbox_gnome">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -47,7 +47,45 @@
</widget>
</item>
<item>
<widget class="QPushButton" name="button_gsd_open">
<widget class="QPushButton" name="button_gnome_open">
<property name="text">
<string>Open...</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QWidget" name="widget_mate" native="true">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QCheckBox" name="checkbox_mate">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Use MATE shortcuts when available</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="button_mate_open">
<property name="text">
<string>Open...</string>
</property>
@@ -319,8 +357,8 @@
</layout>
</widget>
<tabstops>
<tabstop>checkbox_gsd</tabstop>
<tabstop>button_gsd_open</tabstop>
<tabstop>checkbox_gnome</tabstop>
<tabstop>button_gnome_open</tabstop>
<tabstop>checkbox_x11</tabstop>
<tabstop>button_macos_open</tabstop>
<tabstop>list</tabstop>