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

Use new connect syntax in global shortcuts manager

Browse Source
This commit is contained in:
Jonas Kvinge
2021-01-30 14:28:03 +01:00
parent ebf6ba9ca1
commit 2539b2333c
2 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/globalshortcuts/globalshortcutsmanager.cpp
View File

@@ -21,6 +21,8 @@
#include "config.h" #include "config.h"
#include <functional>
#include <QWidget> #include <QWidget>
#include <QVariant> #include <QVariant>
#include <QString> #include <QString>
@@ -63,25 +65,25 @@ GlobalShortcutsManager::GlobalShortcutsManager(QWidget *parent)
settings_.beginGroup(GlobalShortcutsSettingsPage::kSettingsGroup); settings_.beginGroup(GlobalShortcutsSettingsPage::kSettingsGroup);
// Create actions // Create actions
AddShortcut("play", "Play", SIGNAL(Play())); AddShortcut("play", "Play", std::bind(&GlobalShortcutsManager::Play, this));
AddShortcut("pause", "Pause", SIGNAL(Pause())); AddShortcut("pause", "Pause", std::bind(&GlobalShortcutsManager::Pause, this));
AddShortcut("play_pause", "Play/Pause", SIGNAL(PlayPause()), QKeySequence(Qt::Key_MediaPlay)); AddShortcut("play_pause", "Play/Pause", std::bind(&GlobalShortcutsManager::PlayPause, this), QKeySequence(Qt::Key_MediaPlay));
AddShortcut("stop", "Stop", SIGNAL(Stop()), QKeySequence(Qt::Key_MediaStop)); AddShortcut("stop", "Stop", std::bind(&GlobalShortcutsManager::Stop, this), QKeySequence(Qt::Key_MediaStop));
AddShortcut("stop_after", "Stop playing after current track", SIGNAL(StopAfter())); AddShortcut("stop_after", "Stop playing after current track", std::bind(&GlobalShortcutsManager::StopAfter, this));
AddShortcut("next_track", "Next track", SIGNAL(Next()), QKeySequence(Qt::Key_MediaNext)); AddShortcut("next_track", "Next track", std::bind(&GlobalShortcutsManager::Next, this), QKeySequence(Qt::Key_MediaNext));
AddShortcut("prev_track", "Previous track", SIGNAL(Previous()), QKeySequence(Qt::Key_MediaPrevious)); AddShortcut("prev_track", "Previous track", std::bind(&GlobalShortcutsManager::Previous, this), QKeySequence(Qt::Key_MediaPrevious));
AddShortcut("inc_volume", "Increase volume", SIGNAL(IncVolume())); AddShortcut("inc_volume", "Increase volume", std::bind(&GlobalShortcutsManager::IncVolume, this));
AddShortcut("dec_volume", "Decrease volume", SIGNAL(DecVolume())); AddShortcut("dec_volume", "Decrease volume", std::bind(&GlobalShortcutsManager::DecVolume, this));
AddShortcut("mute", tr("Mute"), SIGNAL(Mute())); AddShortcut("mute", tr("Mute"), std::bind(&GlobalShortcutsManager::Mute, this));
AddShortcut("seek_forward", "Seek forward", SIGNAL(SeekForward())); AddShortcut("seek_forward", "Seek forward", std::bind(&GlobalShortcutsManager::SeekForward, this));
AddShortcut("seek_backward", "Seek backward", SIGNAL(SeekBackward())); AddShortcut("seek_backward", "Seek backward", std::bind(&GlobalShortcutsManager::SeekBackward, this));
AddShortcut("show_hide", "Show/Hide", SIGNAL(ShowHide())); AddShortcut("show_hide", "Show/Hide", std::bind(&GlobalShortcutsManager::ShowHide, this));
AddShortcut("show_osd", "Show OSD", SIGNAL(ShowOSD())); AddShortcut("show_osd", "Show OSD", std::bind(&GlobalShortcutsManager::ShowOSD, this));
AddShortcut("toggle_pretty_osd", "Toggle Pretty OSD", SIGNAL(TogglePrettyOSD())); // Toggling possible only for pretty OSD AddShortcut("toggle_pretty_osd", "Toggle Pretty OSD", std::bind(&GlobalShortcutsManager::TogglePrettyOSD, this)); // Toggling possible only for pretty OSD
AddShortcut("shuffle_mode", "Change shuffle mode", SIGNAL(CycleShuffleMode())); AddShortcut("shuffle_mode", "Change shuffle mode", std::bind(&GlobalShortcutsManager::CycleShuffleMode, this));
AddShortcut("repeat_mode", "Change repeat mode", SIGNAL(CycleRepeatMode())); AddShortcut("repeat_mode", "Change repeat mode", std::bind(&GlobalShortcutsManager::CycleRepeatMode, this));
AddShortcut("toggle_scrobbling", "Enable/disable scrobbling", SIGNAL(ToggleScrobbling())); AddShortcut("toggle_scrobbling", "Enable/disable scrobbling", std::bind(&GlobalShortcutsManager::ToggleScrobbling, this));
AddShortcut("love", "Love", SIGNAL(Love())); AddShortcut("love", "Love", std::bind(&GlobalShortcutsManager::Love, this));
// Create backends - these do the actual shortcut registration // Create backends - these do the actual shortcut registration
#ifdef HAVE_DBUS #ifdef HAVE_DBUS
@@ -118,10 +120,10 @@ void GlobalShortcutsManager::ReloadSettings() {
} }
void GlobalShortcutsManager::AddShortcut(const QString &id, const QString &name, const char *signal, const QKeySequence &default_key) { void GlobalShortcutsManager::AddShortcut(const QString &id, const QString &name, std::function<void()> signal, const QKeySequence &default_key) {
Shortcut shortcut = AddShortcut(id, name, default_key); Shortcut shortcut = AddShortcut(id, name, default_key);
QObject::connect(shortcut.action, SIGNAL(triggered()), this, signal); QObject::connect(shortcut.action, &QAction::triggered, this, signal);
} }

4
src/globalshortcuts/globalshortcutsmanager.h
View File

@@ -24,6 +24,8 @@
#include "config.h" #include "config.h"
#include <functional>
#include <QObject> #include <QObject>
#include <QWidget> #include <QWidget>
#include <QMap> #include <QMap>
@@ -84,7 +86,7 @@ class GlobalShortcutsManager : public QWidget {
void Love(); void Love();
private: private:
void AddShortcut(const QString &id, const QString &name, const char *signal, const QKeySequence &default_key = QKeySequence(0)); void AddShortcut(const QString &id, const QString &name, std::function<void()> signal, const QKeySequence &default_key = QKeySequence(0));
Shortcut AddShortcut(const QString &id, const QString &name, const QKeySequence &default_key); Shortcut AddShortcut(const QString &id, const QString &name, const QKeySequence &default_key);
private: private: