equal
deleted
inserted
replaced
248 |
248 |
249 m_isAdmin = false; |
249 m_isAdmin = false; |
250 |
250 |
251 if(gameSettings->value("frontend/sound", true).toBool()) |
251 if(gameSettings->value("frontend/sound", true).toBool()) |
252 { |
252 { |
253 if (notify) |
253 QStringList vpList = |
254 m_helloSound = HWDataManager::instance().findFileForRead( |
254 QStringList() << "Classic" << "Default" << "Mobster" << "Russian"; |
255 "Sounds/voices/Classic/Hello.ogg"); |
255 |
|
256 foreach (QString vp, vpList) |
|
257 { |
|
258 m_helloSounds.append(HWDataManager::instance().findFileForRead( |
|
259 QString("Sounds/voices/%1/Hello.ogg").arg(vp))); |
|
260 } |
256 |
261 |
257 m_hilightSound = HWDataManager::instance().findFileForRead( |
262 m_hilightSound = HWDataManager::instance().findFileForRead( |
258 "Sounds/beep.ogg"); |
263 "Sounds/beep.ogg"); |
259 |
264 |
260 //m_hilightSound = m_helloSound;//"Sounds/beep.ogg"; |
|
261 } |
265 } |
262 |
266 |
263 mainLayout.setSpacing(1); |
267 mainLayout.setSpacing(1); |
264 mainLayout.setMargin(1); |
268 mainLayout.setMargin(1); |
265 mainLayout.setSizeConstraint(QLayout::SetMinimumSize); |
269 mainLayout.setSizeConstraint(QLayout::SetMinimumSize); |
641 |
645 |
642 emit nickCountUpdate(chatNicks->count()); |
646 emit nickCountUpdate(chatNicks->count()); |
643 |
647 |
644 if(notifyNick && notify && gameSettings->value("frontend/sound", true).toBool()) |
648 if(notifyNick && notify && gameSettings->value("frontend/sound", true).toBool()) |
645 { |
649 { |
646 SDLInteraction::instance().playSoundFile(m_helloSound); |
650 SDLInteraction::instance().playSoundFile( |
|
651 m_helloSounds.at(rand() % m_helloSounds.size())); |
647 } |
652 } |
648 } |
653 } |
649 |
654 |
650 void HWChatWidget::nickRemoved(const QString& nick) |
655 void HWChatWidget::nickRemoved(const QString& nick) |
651 { |
656 { |