diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp index ed9b0ed5d..a31bd8fa0 100644 --- a/src/mumble/MainWindow.cpp +++ b/src/mumble/MainWindow.cpp @@ -251,6 +251,9 @@ void MainWindow::createActions() { gsCycleTransmitMode=new GlobalShortcut(this, idx++, tr("Cycle Transmit Mode", "Global Shortcut")); gsCycleTransmitMode->setObjectName(QLatin1String("gsCycleTransmitMode")); + gsChannelFilter=new GlobalShortcut(this, idx++, tr("Channel Filter", "Global Shortcut"), false, 0); + gsChannelFilter->setObjectName(QLatin1String("gsChannelFilter")); + #ifndef Q_OS_MAC qstiIcon->show(); #endif @@ -2324,6 +2327,17 @@ void MainWindow::on_gsWhisper_triggered(bool down, QVariant scdata) { } } +void MainWindow::on_gsChannelFilter_down(QVariant v) { + int val = v.toInt(); + if (((val > 0) && ! g.s.bFilterActive) || + ((val < 0) && g.s.bFilterActive) || + (val == 0) + ) { + qaFilterToggle->setChecked(! qaFilterToggle->isChecked()); + on_qaFilterToggle_triggered(); + } +} + void MainWindow::on_gsCycleTransmitMode_triggered(bool down, QVariant scdata) { if (down) diff --git a/src/mumble/MainWindow.h b/src/mumble/MainWindow.h index d47f5e40e..5c01d55d9 100644 --- a/src/mumble/MainWindow.h +++ b/src/mumble/MainWindow.h @@ -99,7 +99,7 @@ class MainWindow : public QMainWindow, public MessageHandler, public Ui::MainWin GlobalShortcut *gsPushTalk, *gsResetAudio, *gsMuteSelf, *gsDeafSelf; GlobalShortcut *gsUnlink, *gsPushMute, *gsJoinChannel, *gsToggleOverlay; GlobalShortcut *gsMinimal, *gsVolumeUp, *gsVolumeDown, *gsWhisper, *gsLinkChannel, *gsHideChannel; - GlobalShortcut *gsCycleTransmitMode; + GlobalShortcut *gsCycleTransmitMode, *gsChannelFilter; DockTitleBar *dtbLogDockTitle, *dtbChatDockTitle; ACLEditor *aclEdit; @@ -246,6 +246,7 @@ class MainWindow : public QMainWindow, public MessageHandler, public Ui::MainWin void on_gsDeafSelf_down(QVariant); void on_gsWhisper_triggered(bool, QVariant); void on_gsCycleTransmitMode_triggered(bool, QVariant); + void on_gsChannelFilter_down(QVariant v); void on_Reconnect_timeout(); void on_Icon_messageClicked(); void on_Icon_activated(QSystemTrayIcon::ActivationReason);