From 9ea1a7ab2466d0933383a0f00d55668360467b9e Mon Sep 17 00:00:00 2001 From: thunder2 Date: Fri, 26 Oct 2012 13:01:58 +0000 Subject: [PATCH] Renamed new sound event from "Download ready" to "Download complete". git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5726 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/SoundManager.h | 8 ++++---- retroshare-gui/src/gui/notifyqt.cpp | 2 +- retroshare-gui/src/gui/settings/SoundPage.cpp | 2 +- retroshare-gui/src/lang/retroshare_de.ts | 9 ++++++++- retroshare-gui/src/lang/retroshare_en.ts | 9 ++++++++- 5 files changed, 22 insertions(+), 8 deletions(-) diff --git a/retroshare-gui/src/gui/SoundManager.h b/retroshare-gui/src/gui/SoundManager.h index ae0082eea..3c3412dda 100644 --- a/retroshare-gui/src/gui/SoundManager.h +++ b/retroshare-gui/src/gui/SoundManager.h @@ -24,10 +24,10 @@ #include -#define SOUND_NEW_CHAT_MESSAGE "NewChatMessage" -#define SOUND_USER_ONLINE "User_go_Online" -#define SOUND_MESSAGE_ARRIVED "MessageArrived" -#define SOUND_DOWNLOAD_READY "DownloadReady" +#define SOUND_NEW_CHAT_MESSAGE "NewChatMessage" +#define SOUND_USER_ONLINE "User_go_Online" +#define SOUND_MESSAGE_ARRIVED "MessageArrived" +#define SOUND_DOWNLOAD_COMPLETE "DownloadComplete" class SoundEvents { diff --git a/retroshare-gui/src/gui/notifyqt.cpp b/retroshare-gui/src/gui/notifyqt.cpp index c654e2d18..9a2d4e85d 100644 --- a/retroshare-gui/src/gui/notifyqt.cpp +++ b/retroshare-gui/src/gui/notifyqt.cpp @@ -656,7 +656,7 @@ void NotifyQt::UpdateGUI() } break; case RS_POPUP_DOWNLOAD: - soundManager->play(SOUND_DOWNLOAD_READY); + soundManager->play(SOUND_DOWNLOAD_COMPLETE); if (popupflags & RS_POPUP_DOWNLOAD) { diff --git a/retroshare-gui/src/gui/settings/SoundPage.cpp b/retroshare-gui/src/gui/settings/SoundPage.cpp index dc32ef1b2..53190b773 100644 --- a/retroshare-gui/src/gui/settings/SoundPage.cpp +++ b/retroshare-gui/src/gui/settings/SoundPage.cpp @@ -134,7 +134,7 @@ void SoundPage::load() addItem(groupItem, tr("Message arrived"), SOUND_MESSAGE_ARRIVED); groupItem = addGroup(tr("Download")); - addItem(groupItem, tr("Download ready"), SOUND_DOWNLOAD_READY); + addItem(groupItem, tr("Download complete"), SOUND_DOWNLOAD_COMPLETE); /* add plugin events */ int pluginCount = rsPlugins->nbPlugins(); diff --git a/retroshare-gui/src/lang/retroshare_de.ts b/retroshare-gui/src/lang/retroshare_de.ts index 4478c582d..ec58d697e 100644 --- a/retroshare-gui/src/lang/retroshare_de.ts +++ b/retroshare-gui/src/lang/retroshare_de.ts @@ -3453,6 +3453,13 @@ p, li { white-space: pre-wrap; } Organization Organisation + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" 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> + + ExprParamElement @@ -10674,7 +10681,7 @@ p, li { white-space: pre-wrap; } Herunterladen - Download ready + Download complete diff --git a/retroshare-gui/src/lang/retroshare_en.ts b/retroshare-gui/src/lang/retroshare_en.ts index 02b3edf63..af2b3e01a 100644 --- a/retroshare-gui/src/lang/retroshare_en.ts +++ b/retroshare-gui/src/lang/retroshare_en.ts @@ -3389,6 +3389,13 @@ you plug it in. Organization + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" 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> + + ExprParamElement @@ -10416,7 +10423,7 @@ p, li { white-space: pre-wrap; } - Download ready + Download complete