From 7ffb700564f028944224ebc1c5f19e77121e73b9 Mon Sep 17 00:00:00 2001 From: Stojce Slavkovski Date: Mon, 12 May 2014 20:55:24 +0200 Subject: [PATCH] fixed mention sounds dir for deployment --- .../mention => mention-sounds}/Mentioned A.wav | Bin .../mention => mention-sounds}/Mentioned B.wav | Bin .../mention => mention-sounds}/Mentioned C.wav | Bin interface/src/XmppClient.cpp | 2 +- interface/src/ui/ChatWindow.cpp | 2 +- 5 files changed, 2 insertions(+), 2 deletions(-) rename interface/resources/{sounds/mention => mention-sounds}/Mentioned A.wav (100%) rename interface/resources/{sounds/mention => mention-sounds}/Mentioned B.wav (100%) rename interface/resources/{sounds/mention => mention-sounds}/Mentioned C.wav (100%) diff --git a/interface/resources/sounds/mention/Mentioned A.wav b/interface/resources/mention-sounds/Mentioned A.wav similarity index 100% rename from interface/resources/sounds/mention/Mentioned A.wav rename to interface/resources/mention-sounds/Mentioned A.wav diff --git a/interface/resources/sounds/mention/Mentioned B.wav b/interface/resources/mention-sounds/Mentioned B.wav similarity index 100% rename from interface/resources/sounds/mention/Mentioned B.wav rename to interface/resources/mention-sounds/Mentioned B.wav diff --git a/interface/resources/sounds/mention/Mentioned C.wav b/interface/resources/mention-sounds/Mentioned C.wav similarity index 100% rename from interface/resources/sounds/mention/Mentioned C.wav rename to interface/resources/mention-sounds/Mentioned C.wav diff --git a/interface/src/XmppClient.cpp b/interface/src/XmppClient.cpp index 2d421b1afa..666906681c 100644 --- a/interface/src/XmppClient.cpp +++ b/interface/src/XmppClient.cpp @@ -16,7 +16,7 @@ #include "XmppClient.h" const QString DEFAULT_XMPP_SERVER = "chat.highfidelity.io"; -const QString DEFAULT_CHAT_ROOM = "test@public-chat.highfidelity.io"; +const QString DEFAULT_CHAT_ROOM = "public@public-chat.highfidelity.io"; XmppClient::XmppClient() : _xmppClient(), diff --git a/interface/src/ui/ChatWindow.cpp b/interface/src/ui/ChatWindow.cpp index fce900f352..611f955031 100644 --- a/interface/src/ui/ChatWindow.cpp +++ b/interface/src/ui/ChatWindow.cpp @@ -32,7 +32,7 @@ const int NUM_MESSAGES_TO_TIME_STAMP = 20; const QRegularExpression regexLinks("((?:(?:ftp)|(?:https?)|(?:hifi))://\\S+)"); const QRegularExpression regexHifiLinks("([#@]\\S+)"); -const QString mentionSoundsPath("/sounds/mention/"); +const QString mentionSoundsPath("/mention-sounds/"); const QString mentionRegex("@(\\b%1\\b)"); ChatWindow::ChatWindow(QWidget* parent) :