aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/plugins/General/hotkey/hotkeymanager.h3
-rw-r--r--src/plugins/General/hotkey/hotkeymanager_x11.cpp1
-rw-r--r--src/plugins/General/hotkey/settingsdialog.cpp1
3 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/General/hotkey/hotkeymanager.h b/src/plugins/General/hotkey/hotkeymanager.h
index f892d0969..e464adce9 100644
--- a/src/plugins/General/hotkey/hotkeymanager.h
+++ b/src/plugins/General/hotkey/hotkeymanager.h
@@ -48,7 +48,8 @@ public:
VOLUME_DOWN,
FORWARD,
REWIND,
- JUMP_TO_TRACK
+ JUMP_TO_TRACK,
+ VOLUME_MUTE
};
Hotkey()
diff --git a/src/plugins/General/hotkey/hotkeymanager_x11.cpp b/src/plugins/General/hotkey/hotkeymanager_x11.cpp
index 0b90c6c13..1e9f8ff22 100644
--- a/src/plugins/General/hotkey/hotkeymanager_x11.cpp
+++ b/src/plugins/General/hotkey/hotkeymanager_x11.cpp
@@ -74,6 +74,7 @@ quint32 Hotkey::defaultKey(int act)
keyMap[FORWARD] = 0;
keyMap[REWIND] = 0;
keyMap[JUMP_TO_TRACK] = 0;
+ keyMap[VOLUME_MUTE] = XF86XK_AudioMute;
return keyMap[act];
}
diff --git a/src/plugins/General/hotkey/settingsdialog.cpp b/src/plugins/General/hotkey/settingsdialog.cpp
index 1faa503d6..29d351cb4 100644
--- a/src/plugins/General/hotkey/settingsdialog.cpp
+++ b/src/plugins/General/hotkey/settingsdialog.cpp
@@ -45,6 +45,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)
ui.tableWidget->setItem(9,0, new QTableWidgetItem(tr("Forward 5 seconds")));
ui.tableWidget->setItem(10,0, new QTableWidgetItem(tr("Rewind 5 seconds")));
ui.tableWidget->setItem(11,0, new QTableWidgetItem(tr("Jump to track")));
+ ui.tableWidget->setItem(12,0, new QTableWidgetItem(tr("Mute")));
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
settings.beginGroup("Hotkey");