Option to announce server name for some server related TTS events (#2167)

* Option to announce server name for some server related TTS events

* Enable new option by default and use limitText

Author: CoBC

ChangeLog.txt

@@ -5,6 +5,7 @@
 Version 5.16, unreleased
 Default Qt Client
 - Option to show server's message of the day in a welcome dialog box
+- Option to announce server name on some server related TTS events
 - Don't display server name when disconnected from server where not authentified
 - Option to show channel topic in channel list
 - Fixed "Gender" property not being saved in .tt files

Client/qtTeamTalk/mainwindow.cpp

@@ -1113,7 +1113,7 @@ void MainWindow::clienteventCmdUserLoggedIn(const User& user)
     {
         addStatusMsg(STATUSBAR_USER_LOGGEDIN, tr("%1 has logged in").arg(getDisplayName(user)));
         playSoundEvent(SOUNDEVENT_USERLOGGEDIN);
-        addTextToSpeechMessage(TTS_USER_LOGGEDIN, QString(tr("%1 has logged in").arg(getDisplayName(user))));
+        addTextToSpeechMessage(TTS_USER_LOGGEDIN, (ttSettings->value(SETTINGS_TTS_SRVNAME, SETTINGS_TTS_SRVNAME_DEFAULT).toBool()?QString(tr("%1 has logged in on %2").arg(getDisplayName(user)).arg(limitText(_Q(m_srvprop.szServerName)))):QString(tr("%1 has logged in").arg(getDisplayName(user)))));
     }
 
     // sync user settings from cache
@@ -1131,7 +1131,7 @@ void MainWindow::clienteventCmdUserLoggedOut(const User& user)
     {
         addStatusMsg(STATUSBAR_USER_LOGGEDOUT, ((user.nStatusMode & STATUSMODE_FEMALE)?tr("%1 has logged out", "For female").arg(getDisplayName(user)):tr("%1 has logged out", "For male and neutral").arg(getDisplayName(user))));
         playSoundEvent(SOUNDEVENT_USERLOGGEDOUT);
-        addTextToSpeechMessage(TTS_USER_LOGGEDOUT, QString(((user.nStatusMode & STATUSMODE_FEMALE)?tr("%1 has logged out", "For female").arg(getDisplayName(user)):tr("%1 has logged out", "For male and neutral").arg(getDisplayName(user)))));
+        addTextToSpeechMessage(TTS_USER_LOGGEDOUT, (ttSettings->value(SETTINGS_TTS_SRVNAME, SETTINGS_TTS_SRVNAME_DEFAULT).toBool()?QString(((user.nStatusMode & STATUSMODE_FEMALE)?tr("%1 has logged out from %2", "For female").arg(getDisplayName(user).arg(limitText(_Q(m_srvprop.szServerName)))):tr("%1 has logged out from %2", "For male and neutral").arg(getDisplayName(user)).arg(limitText(_Q(m_srvprop.szServerName))))):QString(((user.nStatusMode & STATUSMODE_FEMALE)?tr("%1 has logged out", "For female").arg(getDisplayName(user)):tr("%1 has logged out", "For male and neutral").arg(getDisplayName(user))))));
     }
 
     // sync user settings to cache

Client/qtTeamTalk/preferences.ui

@@ -2387,10 +2387,10 @@
               </property>
              </widget>
             </item>
-            <item row="10" column="1">
-             <widget class="QCheckBox" name="ttsLogServernameChkBox">
+            <item row="11" column="0">
+             <widget class="QCheckBox" name="ttsSrvNameChkBox">
               <property name="text">
-               <string>Announce server name for user logs in/out events</string>
+               <string>Announce server name for server events</string>
               </property>
              </widget>
             </item>

Client/qtTeamTalk/preferencesdlg.cpp

@@ -1165,6 +1165,7 @@ void PreferencesDlg::slotSaveChanges()
 #endif
 #endif
         ttSettings->setValue(SETTINGS_DISPLAY_TTSHEADER, ui.ttsTreeView->header()->saveState());
+        ttSettings->setValue(SETTINGS_TTS_SRVNAME, ui.ttsSrvNameChkBox->isChecked());
     }
 }
 
@@ -1736,6 +1737,7 @@ void PreferencesDlg::slotUpdateTTSTab()
     case TTSENGINE_NONE :
     break;
     }
+    ui.ttsSrvNameChkBox->setChecked(ttSettings->value(SETTINGS_TTS_SRVNAME, SETTINGS_TTS_SRVNAME_DEFAULT).toBool());
 }
 
 void PreferencesDlg::slotTTSLocaleChanged(const QString& locale)

Client/qtTeamTalk/settings.h

@@ -338,6 +338,8 @@
 #define SETTINGS_TTS_SPEAKLISTS_DEFAULT                 true
 #endif
 #endif
+#define SETTINGS_TTS_SRVNAME                         "texttospeech/announce-server-name"
+#define SETTINGS_TTS_SRVNAME_DEFAULT                 true
 
 #define SETTINGS_MEDIASTORAGE_MODE                  "media-storage/audio-storage-mode"
 #define SETTINGS_MEDIASTORAGE_AUDIOFOLDER           "media-storage/audio-storage-folder"