Funkwhale
/
strawberry-audio-player-windows-mac-linux
mirror of https://github.com/strawberrymusicplayer/strawberry
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix loading shortcuts settings

This commit is contained in:
Jonas Kvinge 2019-01-08 23:25:01 +01:00
parent c0e1a9a359
commit 696dc0051e
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/settings/shortcutssettingspage.cpp
View File

@ -104,12 +104,21 @@ void GlobalShortcutsSettingsPage::Load() {
connect(ui_->button_macos_open, SIGNAL(clicked()), manager, SLOT(ShowMacAccessibilityDialog()));
if (!manager->IsGsdAvailable()) {
if (manager->IsGsdAvailable()) {
qLog(Debug) << "Gnome D-Bus backend is available.";
ui_->widget_dbus->show();
}
else {
qLog(Debug) << "Gnome D-Bus backend is unavailable.";
ui_->widget_dbus->hide();
settings_.setValue("use_dbus", false);
}
if (!manager->IsX11Available()) {
if (manager->IsX11Available()) {
qLog(Debug) << "X11 backend is available.";
ui_->widget_x11->show();
}
else {
qLog(Debug) << "X11 backend is unavailable.";
ui_->widget_x11->hide();
settings_.setValue("use_x11", false);
}
@ -141,6 +150,15 @@ void GlobalShortcutsSettingsPage::Load() {
ui_->checkbox_x11->setChecked(use_x11);
}
#if !defined(Q_OS_WIN) && !defined(Q_OS_MACOS)
#ifdef HAVE_DBUS
DBusChanged(true);
#endif
#ifdef HAVE_X11
X11Changed(true);
#endif
#endif
ui_->widget_macos->setVisible(!manager->IsMacAccessibilityEnabled());
#ifdef Q_OS_MACOS
qint32 macos_version = Utilities::GetMacOsVersion();
@ -169,7 +187,7 @@ void GlobalShortcutsSettingsPage::Save() {
#ifdef HAVE_X11
void GlobalShortcutsSettingsPage::X11Changed(bool) {
if (!ui_->widget_x11->isVisible()) return;
if (!ui_->widget_x11->isVisibleTo(this)) return;
if (ui_->checkbox_x11->isChecked()) {
ui_->list->setEnabled(true);
@ -183,7 +201,7 @@ void GlobalShortcutsSettingsPage::X11Changed(bool) {
#ifdef HAVE_DBUS
void GlobalShortcutsSettingsPage::DBusChanged(bool) {
if (!ui_->widget_dbus->isVisible()) return;
if (!ui_->widget_dbus->isVisibleTo(this)) return;
if (ui_->checkbox_dbus->isChecked()) {
if (ui_->checkbox_x11->isEnabled()) {