From b3d1e754557088c8d59ec1ac813f8b765f77b27c Mon Sep 17 00:00:00 2001 From: thunder2 Date: Tue, 23 Oct 2012 20:54:07 +0000 Subject: [PATCH] Added sounds when message has arrived and download was finished. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5717 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/SoundManager.h | 2 ++ retroshare-gui/src/gui/notifyqt.cpp | 4 +++ retroshare-gui/src/gui/settings/SoundPage.cpp | 6 +++++ retroshare-gui/src/lang/retroshare_de.ts | 22 ++++++++++++++- retroshare-gui/src/lang/retroshare_en.ts | 27 ++++++++++++++----- 5 files changed, 53 insertions(+), 8 deletions(-) diff --git a/retroshare-gui/src/gui/SoundManager.h b/retroshare-gui/src/gui/SoundManager.h index f02ebe74d..ae0082eea 100644 --- a/retroshare-gui/src/gui/SoundManager.h +++ b/retroshare-gui/src/gui/SoundManager.h @@ -26,6 +26,8 @@ #define SOUND_NEW_CHAT_MESSAGE "NewChatMessage" #define SOUND_USER_ONLINE "User_go_Online" +#define SOUND_MESSAGE_ARRIVED "MessageArrived" +#define SOUND_DOWNLOAD_READY "DownloadReady" class SoundEvents { diff --git a/retroshare-gui/src/gui/notifyqt.cpp b/retroshare-gui/src/gui/notifyqt.cpp index 555ced86e..c654e2d18 100644 --- a/retroshare-gui/src/gui/notifyqt.cpp +++ b/retroshare-gui/src/gui/notifyqt.cpp @@ -640,6 +640,8 @@ void NotifyQt::UpdateGUI() switch(type) { case RS_POPUP_MSG: + soundManager->play(SOUND_MESSAGE_ARRIVED); + if (popupflags & RS_POPUP_MSG) { toaster = new Toaster(new MessageToaster(id, QString::fromUtf8(title.c_str()), QString::fromUtf8(msg.c_str()))); @@ -654,6 +656,8 @@ void NotifyQt::UpdateGUI() } break; case RS_POPUP_DOWNLOAD: + soundManager->play(SOUND_DOWNLOAD_READY); + if (popupflags & RS_POPUP_DOWNLOAD) { /* id = file hash */ diff --git a/retroshare-gui/src/gui/settings/SoundPage.cpp b/retroshare-gui/src/gui/settings/SoundPage.cpp index 74e1d702a..dc32ef1b2 100644 --- a/retroshare-gui/src/gui/settings/SoundPage.cpp +++ b/retroshare-gui/src/gui/settings/SoundPage.cpp @@ -130,6 +130,12 @@ void SoundPage::load() groupItem = addGroup(tr("Chatmessage")); addItem(groupItem, tr("New Msg"), SOUND_NEW_CHAT_MESSAGE); + groupItem = addGroup(tr("Message")); + addItem(groupItem, tr("Message arrived"), SOUND_MESSAGE_ARRIVED); + + groupItem = addGroup(tr("Download")); + addItem(groupItem, tr("Download ready"), SOUND_DOWNLOAD_READY); + /* add plugin events */ int pluginCount = rsPlugins->nbPlugins(); for (int i = 0; i < pluginCount; ++i) { diff --git a/retroshare-gui/src/lang/retroshare_de.ts b/retroshare-gui/src/lang/retroshare_de.ts index 870529f9f..4478c582d 100644 --- a/retroshare-gui/src/lang/retroshare_de.ts +++ b/retroshare-gui/src/lang/retroshare_de.ts @@ -3392,7 +3392,7 @@ Das ist nützlich, wenn du eine externe Festplatte freigibst und die Dateien nic p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; font-weight:600;">Friends</span></p></body></html> - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; font-weight:600;">Freunde</span></p></body></html> @@ -4849,6 +4849,10 @@ p, li { white-space: pre-wrap; } Friends Freunde + + Search + Suchen + GamesDialog @@ -10657,6 +10661,22 @@ p, li { white-space: pre-wrap; } Sound Ton + + Message + + + + Message arrived + + + + Download + Herunterladen + + + Download ready + + SoundStatus diff --git a/retroshare-gui/src/lang/retroshare_en.ts b/retroshare-gui/src/lang/retroshare_en.ts index 1595a2cd8..02b3edf63 100644 --- a/retroshare-gui/src/lang/retroshare_en.ts +++ b/retroshare-gui/src/lang/retroshare_en.ts @@ -3333,13 +3333,6 @@ you plug it in. ExampleDialog - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; font-weight:600;">Friends</span></p></body></html> - - # @@ -4792,6 +4785,10 @@ p, li { white-space: pre-wrap; } Friends + + Search + + GamesDialog @@ -10406,6 +10403,22 @@ p, li { white-space: pre-wrap; } Sound + + Message + + + + Message arrived + + + + Download + + + + Download ready + + SoundStatus