Skip to content
Permalink
Browse files

Merge PR #2747: Allow hiding Muble from the menu without minimizing

  • Loading branch information...
mkrautz committed Jan 22, 2017
2 parents 348d457 + 74572fd commit bf90fadd914e9bc906b9be6951409a3ed0e64bd0
Showing with 17 additions and 0 deletions.
  1. +5 −0 src/mumble/MainWindow.cpp
  2. +1 −0 src/mumble/MainWindow.h
  3. +11 −0 src/mumble/MainWindow.ui
@@ -1216,6 +1216,7 @@ void MainWindow::on_qmServer_aboutToShow() {
qmServer->addAction(qaServerUserList);
qmServer->addAction(qaServerBanList);
qmServer->addSeparator();
qmServer->addAction(qaHide);
qmServer->addAction(qaQuit);

qaServerBanList->setEnabled(g.pPermissions & (ChanACL::Ban | ChanACL::Write));
@@ -1793,6 +1794,10 @@ void MainWindow::on_qaUserInformation_triggered() {
g.sh->requestUserStats(p->uiSession, false);
}

void MainWindow::on_qaHide_triggered() {
hide();
}

void MainWindow::on_qaQuit_triggered() {
bSuppressAskOnQuit = true;
this->close();
@@ -239,6 +239,7 @@ class MainWindow : public QMainWindow, public MessageHandler, public Ui::MainWin
void on_qaHelpAboutQt_triggered();
void on_qaHelpVersionCheck_triggered();
void on_qaQuit_triggered();
void on_qaHide_triggered();
void on_qteChat_tabPressed();
void on_qteChat_backtabPressed();
void on_qteChat_ctrlSpacePressed();
@@ -207,6 +207,17 @@
<string>Ctrl+Q</string>
</property>
</action>
<action name="qaHide">
<property name="text">
<string>&amp;Hide Mumble</string>
</property>
<property name="toolTip">
<string>Hides the main Mumble window.</string>
</property>
<property name="whatsThis">
<string>Hides the main Mumble window. Restore by clicking on the tray icon or starting Mumble again.</string>
</property>
</action>
<action name="qaServerConnect">
<property name="icon">
<iconset>

0 comments on commit bf90fad

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