Skip to content
Permalink
Browse files

Channel Filtering: Fix shortcut. Specific text.

* Fix/implement the bindable global shortcut for marking a channel hidden when filtering.
* Make text more specific to prevent misunderstanding.
  • Loading branch information...
Kissaki committed Jul 13, 2013
1 parent 9450d66 commit c0be6cbdadff6bc7026df4bce1e1e9d8b4bab3c4
Showing with 13 additions and 2 deletions.
  1. +12 −1 src/mumble/MainWindow.cpp
  2. +1 −1 src/mumble/MainWindow.ui
@@ -217,8 +217,9 @@ void MainWindow::createActions() {
gsMetaChannel=new GlobalShortcut(this, idx++, tr("Join Channel", "Global Shortcut"));
gsMetaChannel->setObjectName(QLatin1String("MetaChannel"));

gsHideChannel=new GlobalShortcut(this, idx++, tr("Hide Channel", "Global Shortcut"));
gsHideChannel=new GlobalShortcut(this, idx++, tr("Hide Channel when Filtering", "Global Shortcut"));
gsHideChannel->setObjectName(QLatin1String("HideChannel"));
gsHideChannel->qsToolTip = tr("Mark the channel to be hidden when Filtering is active.", "Global Shortcut");

gsToggleOverlay=new GlobalShortcut(this, idx++, tr("Toggle Overlay", "Global Shortcut"), false);
gsToggleOverlay->setObjectName(QLatin1String("ToggleOverlay"));
@@ -2300,6 +2301,16 @@ void MainWindow::on_gsWhisper_triggered(bool down, QVariant scdata) {
}
}

if (gsHideChannel->active()) {
if (! st.bUsers) {
Channel *c = mapChannel(st.iChannel);
if (c) {
c->bHidden = !c->bHidden;
}
return;
}
}

qsCurrentTargets.insert(st);
updateTarget();

@@ -792,7 +792,7 @@
<bool>true</bool>
</property>
<property name="text">
<string>&amp;Hide Channel</string>
<string>&amp;Hide Channel when Filtering</string>
</property>
</action>
<action name="qaUserCommentView">

0 comments on commit c0be6cb

Please sign in to comment.
You can’t perform that action at this time.