diff --git a/tools/chatgui/resources/chatgui.qrc b/tools/chatgui/resources/chatgui.qrc index 9189e49f..70c5b0f1 100644 --- a/tools/chatgui/resources/chatgui.qrc +++ b/tools/chatgui/resources/chatgui.qrc @@ -12,6 +12,7 @@ icons/app_icon.png sounds/msg_incoming.mp3 sounds/call_incoming.mp3 + sounds/radio_incoming.mp3 sounds/call_connecting.mp3 sounds/call_ringing.mp3 bg.png diff --git a/tools/chatgui/src/mainwindow.cpp b/tools/chatgui/src/mainwindow.cpp index 1c6038ae..defd87bd 100644 --- a/tools/chatgui/src/mainwindow.cpp +++ b/tools/chatgui/src/mainwindow.cpp @@ -402,6 +402,7 @@ void MainWindow::setupSoundFromConfig() { sm->loadSound("call_incoming", resolvePath(callInFile)); sm->loadSound("call_connecting", ":/sounds/call_connecting.mp3"); + sm->loadSound("radio_incoming", ":/sounds/radio_incoming.mp3"); sm->loadSound("call_ringing", ":/sounds/call_ringing.mp3"); if (!msgOutFile.isEmpty()) sm->loadSound("msg_outgoing", resolvePath(msgOutFile)); @@ -412,8 +413,8 @@ void MainWindow::setupSoundFromConfig() { sm->setEnabled(m_db->getUiStateInt("sound_enabled", 1)); sm->setVolume(m_db->getUiStateInt("sound_volume", 80) / 100.0f); QString se[] = {"msg_incoming", "msg_outgoing", "connect", "disconnect", - "call_incoming", "call_connecting", "call_ringing"}; - for (int i = 0; i < 7; i++) { + "call_incoming", "call_connecting", "call_ringing", "radio_incoming"}; + for (int i = 0; i < 8; i++) { const QString& ek = se[i]; sm->setEvent(ek, m_db->getUiStateInt(QStringLiteral("sound_%1_on").arg(ek), (i == 0 || i >= 4) ? 1 : 0), m_db->getUiStateInt(QStringLiteral("sound_%1_vol").arg(ek), 80) / 100.0f); @@ -841,7 +842,7 @@ void MainWindow::onRadioCallEvent(const uint8_t* data, int len) { } }); box->show(); box->raise(); box->activateWindow(); - SoundManager::instance()->playLoop(incoming ? "call_incoming" : "call_connecting"); + SoundManager::instance()->playLoop(incoming ? "radio_incoming" : "call_connecting"); if (incoming) { if (m_trayIcon && (!isVisible() || isMinimized())) m_trayIcon->showMessage(QCoreApplication::translate("ChatGui", "Radio call"), box->text());