Merge PR #3368: Change icon when muted/deafened

mumble-voip · Mar 11, 2018 · 80f3686 · 80f3686
2 parents ce8fd36 + 4877327
commit 80f3686
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 9 deletions.
diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp
@@ -601,6 +601,12 @@ void MainWindow::updateTrayIcon() {
 	}
 }
 
+void MainWindow::updateUserModel()
+{
+	UserModel *um = static_cast<UserModel *>(qtvUsers->model());
+	um->toggleChannelFiltered(NULL); // Force a UI refresh
+}
+
 void MainWindow::updateTransmitModeComboBox() {
 	switch (g.s.atTransmit) {
 		case Settings::Continuous:
@@ -2280,9 +2286,7 @@ void MainWindow::on_qaAudioReset_triggered() {
 
 void MainWindow::on_qaFilterToggle_triggered() {	
 	g.s.bFilterActive = qaFilterToggle->isChecked();
-
-	UserModel *um = static_cast<UserModel *>(qtvUsers->model());
-	um->toggleChannelFiltered(NULL); // force a UI refresh
+	updateUserModel();
 }
 
 void MainWindow::on_qaAudioMute_triggered() {
@@ -2382,9 +2386,7 @@ void MainWindow::on_qaConfigDialog_triggered() {
 		setupView(false);
 		updateTransmitModeComboBox();
 		updateTrayIcon();
-
-		UserModel *um = static_cast<UserModel *>(qtvUsers->model());
-		um->toggleChannelFiltered(NULL); // force a UI refresh
+		updateUserModel();
 
 		if (g.s.requireRestartToApply) {
 			if (g.s.requireRestartToApply && QMessageBox::question(
@@ -2491,6 +2493,7 @@ void MainWindow::pttReleased() {
 void MainWindow::on_PushToMute_triggered(bool down, QVariant) {
 	g.bPushToMute = down;
 	updateTrayIcon();
+	updateUserModel();
 }
 
 void MainWindow::on_VolumeUp_triggered(bool down, QVariant) {

diff --git a/src/mumble/MainWindow.h b/src/mumble/MainWindow.h
@@ -116,6 +116,7 @@ class MainWindow : public QMainWindow, public MessageHandler, public Ui::MainWin
 		void setOnTop(bool top);
 		void setShowDockTitleBars(bool doShow);
 		void updateTrayIcon();
+		void updateUserModel();
 		void focusNextMainWidget();
 		void updateTransmitModeComboBox();
 		QPair<QByteArray, QImage> openImageFile();

diff --git a/src/mumble/UserModel.cpp b/src/mumble/UserModel.cpp
@@ -195,6 +195,7 @@ UserModel::UserModel(QObject *p) : QAbstractItemModel(p) {
 	qiTalkingWhisper=QIcon(QLatin1String("skin:talking_whisper.svg"));
 	qiPrioritySpeaker=QIcon(QLatin1String("skin:priority_speaker.svg"));
 	qiRecording=QIcon(QLatin1String("skin:actions/media-record.svg"));
+	qiMutedPushToMute.addFile(QLatin1String("skin:muted_pushtomute.svg"));
 	qiMutedSelf=QIcon(QLatin1String("skin:muted_self.svg"));
 	qiMutedServer=QIcon(QLatin1String("skin:muted_server.svg"));
 	qiMutedLocal=QIcon(QLatin1String("skin:muted_local.svg"));
@@ -347,7 +348,24 @@ QVariant UserModel::data(const QModelIndex &idx, int role) const {
 	if (p) {
 		switch (role) {
 			case Qt::DecorationRole:
-				if (idx.column() == 0)
+				if (idx.column() == 0) {
+					ClientUser *pSelf = ClientUser::get(g.uiSession);
+					if (p == pSelf) {
+						if (g.s.bDeaf) {
+							return qiDeafenedSelf;
+						} else if (p->bDeaf) {
+							return qiDeafenedServer;
+						} else if (g.s.bMute) {
+							return qiMutedSelf;
+						} else if (p->bMute) {
+							return qiMutedServer;
+						} else if (p->bSuppress) {
+							return qiMutedSuppressed;
+						} else if (g.bPushToMute) {
+							return qiMutedPushToMute;
+						}
+					}
+
 					switch (p->tsState) {
 						case Settings::Talking:
 							return qiTalkingOn;
@@ -359,6 +377,7 @@ QVariant UserModel::data(const QModelIndex &idx, int role) const {
 						default:
 							return qiTalkingOff;
 					}
+				}
 				break;
 			case Qt::FontRole:
 				if ((idx.column() == 0) && (p->uiSession == g.uiSession)) {
@@ -1283,7 +1302,7 @@ void UserModel::userStateChanged() {
 	ClientUser *user = qobject_cast<ClientUser *>(sender());
 	if (user == NULL)
 		return;
-	
+
 	const QModelIndex idx = index(user);
 	emit dataChanged(idx, idx);
 

diff --git a/src/mumble/UserModel.h b/src/mumble/UserModel.h
@@ -64,7 +64,7 @@ class UserModel : public QAbstractItemModel {
 		Q_DISABLE_COPY(UserModel)
 	protected:
 		QIcon qiTalkingOn, qiTalkingWhisper, qiTalkingShout, qiTalkingOff;
-		QIcon qiMutedSelf, qiMutedServer, qiMutedLocal, qiIgnoredLocal, qiMutedSuppressed;
+		QIcon qiMutedPushToMute, qiMutedSelf, qiMutedServer, qiMutedLocal, qiIgnoredLocal, qiMutedSuppressed;
 		QIcon qiPrioritySpeaker;
 		QIcon qiRecording;
 		QIcon qiDeafenedSelf, qiDeafenedServer;