Change UI to customize TTS message (#2288)

* Change UI to customize TTS message * Remove CustomInputDialog, not required anymore * Put TTS message into groupbox * Double click tooltip for check/uncheck --------- Co-authored-by: Bjørn Damstedt Rasmussen <contact@bearware.dk>
BearWare · May 19, 2024 · c7c3c97 · c7c3c97
1 parent f79a760
commit c7c3c97
Show file tree

Hide file tree

Showing 8 changed files with 154 additions and 167 deletions.
diff --git a/Client/qtTeamTalk/CMakeLists.txt b/Client/qtTeamTalk/CMakeLists.txt
@@ -89,8 +89,7 @@ if (Qt5_FOUND OR Qt6_FOUND)
     utilsound.h utilvideo.h utiltts.h utilui.h utilhotkey.h
     serverlogeventsmodel.h mytreeview.h textmessagecontainer.h
     useraccountsmodel.h encryptionsetupdlg.h utiltt.h utilxml.h
-    utilos.h serverdlg.h moveusersdlg.h custominputdialog.h
-
+    utilos.h serverdlg.h moveusersdlg.h
     main.cpp mainwindow.cpp preferencesdlg.cpp uservideowidget.cpp
     channelstree.cpp channeldlg.cpp userinfodlg.cpp
     bannedusersdlg.cpp useraccountsdlg.cpp videogridwidget.cpp
@@ -109,8 +108,7 @@ if (Qt5_FOUND OR Qt6_FOUND)
     utilsound.cpp utilvideo.cpp utiltts.cpp utilui.cpp utilhotkey.cpp
     serverlogeventsmodel.cpp mytreeview.cpp textmessagecontainer.cpp
     useraccountsmodel.cpp encryptionsetupdlg.cpp utiltt.cpp utilxml.cpp
-    utilos.cpp serverdlg.cpp moveusersdlg.cpp custominputdialog.cpp
-
+    utilos.cpp serverdlg.cpp moveusersdlg.cpp
     mainwindow.ui channel.ui preferences.ui
     serverlist.ui userinfo.ui bannedusers.ui useraccounts.ui
     serverproperties.ui uservideo.ui keycomp.ui textmessage.ui

diff --git a/Client/qtTeamTalk/custominputdialog.cpp b/Client/qtTeamTalk/custominputdialog.cpp
diff --git a/Client/qtTeamTalk/custominputdialog.h b/Client/qtTeamTalk/custominputdialog.h
diff --git a/Client/qtTeamTalk/mainwindow.pri b/Client/qtTeamTalk/mainwindow.pri
@@ -23,7 +23,7 @@ HEADERS    = mainwindow.h preferencesdlg.h uservideowidget.h \
              utilsound.h utilvideo.h utiltts.h utilui.h utilhotkey.h \
              serverlogeventsmodel.h mytreeview.h textmessagecontainer.h \
              useraccountsmodel.h encryptionsetupdlg.h utiltt.h utilxml.h \
-             utilos.h serverdlg.h moveusersdlg.h custominputdialog.h
+             utilos.h serverdlg.h moveusersdlg.h
 
 SOURCES    = main.cpp mainwindow.cpp preferencesdlg.cpp uservideowidget.cpp \
              channelstree.cpp channeldlg.cpp userinfodlg.cpp \
@@ -43,7 +43,7 @@ SOURCES    = main.cpp mainwindow.cpp preferencesdlg.cpp uservideowidget.cpp \
              utilsound.cpp utilvideo.cpp utiltts.cpp utilui.cpp utilhotkey.cpp \
              serverlogeventsmodel.cpp mytreeview.cpp textmessagecontainer.cpp \
              useraccountsmodel.cpp encryptionsetupdlg.cpp utiltt.cpp utilxml.cpp \
-             utilos.cpp serverdlg.cpp moveusersdlg.cpp custominputdialog.cpp
+             utilos.cpp serverdlg.cpp moveusersdlg.cpp
 
 FORMS      = mainwindow.ui channel.ui preferences.ui \
              serverlist.ui userinfo.ui bannedusers.ui useraccounts.ui \

diff --git a/Client/qtTeamTalk/preferences.ui b/Client/qtTeamTalk/preferences.ui
@@ -2154,9 +2154,12 @@
          <property name="title">
           <string>Enable/disable Text to Speech Events</string>
          </property>
-         <layout class="QVBoxLayout" name="verticalLayout_16">
+         <layout class="QVBoxLayout" name="verticalLayout_20">
           <item>
            <widget class="MyTreeView" name="ttsTreeView">
+            <property name="toolTip">
+             <string>Double click to check/uncheck</string>
+            </property>
             <property name="editTriggers">
              <set>QAbstractItemView::NoEditTriggers</set>
             </property>
@@ -2177,6 +2180,46 @@
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QGroupBox" name="groupBox_14">
+            <property name="title">
+             <string>Text to Speech Message</string>
+            </property>
+            <layout class="QVBoxLayout" name="verticalLayout_16">
+             <item>
+              <layout class="QHBoxLayout" name="horizontalLayout_29">
+               <item>
+                <widget class="QLabel" name="TTSMsgLabel">
+                 <property name="text">
+                  <string>Message</string>
+                 </property>
+                 <property name="buddy">
+                  <cstring>TTSMsgEdit</cstring>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QLineEdit" name="TTSMsgEdit"/>
+               </item>
+              </layout>
+             </item>
+             <item>
+              <widget class="QPushButton" name="TTSVarButton">
+               <property name="text">
+                <string>&amp;Variables...</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QPushButton" name="TTSDefValButton">
+               <property name="text">
+                <string>Reset to Default Value</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout_23">
             <item>