diff --git a/build_scripts/Debian+Ubuntu/debian/dirs b/build_scripts/Debian+Ubuntu/debian/dirs index eeacec439..bac28ebe3 100644 --- a/build_scripts/Debian+Ubuntu/debian/dirs +++ b/build_scripts/Debian+Ubuntu/debian/dirs @@ -4,6 +4,7 @@ usr/share/pixmaps usr/share/applications/ usr/share/RetroShare06/ usr/share/RetroShare06/webui/ +usr/share/RetroShare06/sounds/ usr/share/icons/hicolor/24x24/apps/ usr/share/icons/hicolor/48x48/apps/ usr/share/icons/hicolor/64x64/apps/ diff --git a/build_scripts/Debian+Ubuntu/debian/rules b/build_scripts/Debian+Ubuntu/debian/rules index 3aa5cf330..de9a3cb38 100755 --- a/build_scripts/Debian+Ubuntu/debian/rules +++ b/build_scripts/Debian+Ubuntu/debian/rules @@ -61,6 +61,21 @@ install: build install -D -m 644 src/libresapi/src/webfiles/index.html $(CURDIR)/debian/retroshare06-nogui/usr/share/RetroShare06/webui/index.html install -D -m 644 src/libresapi/src/webfiles/react.js $(CURDIR)/debian/retroshare06-nogui/usr/share/RetroShare06/webui/react.js install -D -m 644 src/retroshare-gui/src/gui/images/logo/logo_splash.png $(CURDIR)/debian/retroshare06-nogui/usr/share/RetroShare06/webui/img/logo_splash.png + install -D -m 644 src/retroshare-gui/src/sounds/alert.wav $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/sounds/alert.wav + install -D -m 644 src/retroshare-gui/src/sounds/chat1.wav $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/sounds/chat1.wav + install -D -m 644 src/retroshare-gui/src/sounds/chat2.wav $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/sounds/chat2.wav + install -D -m 644 src/retroshare-gui/src/sounds/file.wav $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/sounds/file.wav + install -D -m 644 src/retroshare-gui/src/sounds/ft_complete.wav $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/sounds/ft_complete.wav + install -D -m 644 src/retroshare-gui/src/sounds/ft_incoming.wav $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/sounds/ft_incoming.wav + install -D -m 644 src/retroshare-gui/src/sounds/incomingchat.wav $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/sounds/incomingchat.wav + install -D -m 644 src/retroshare-gui/src/sounds/notify.wav $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/sounds/notify.wav + install -D -m 644 src/retroshare-gui/src/sounds/offline.wav $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/sounds/offline.wav + install -D -m 644 src/retroshare-gui/src/sounds/online1.wav $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/sounds/online1.wav + install -D -m 644 src/retroshare-gui/src/sounds/online2.wav $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/sounds/online2.wav + install -D -m 644 src/retroshare-gui/src/sounds/receive.wav $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/sounds/receive.wav + install -D -m 644 src/retroshare-gui/src/sounds/send1.wav $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/sounds/send1.wav + install -D -m 644 src/retroshare-gui/src/sounds/send2.wav $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/sounds/send2.wav + install -D -m 644 src/retroshare-gui/src/sounds/startup.wav $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/sounds/startup.wav # Add here commands to install the package into debian/your_appname # cd builddir && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/$(APPNAME) install diff --git a/retroshare-gui/src/gui/SoundManager.cpp b/retroshare-gui/src/gui/SoundManager.cpp index b99dab86f..11644bfbb 100644 --- a/retroshare-gui/src/gui/SoundManager.cpp +++ b/retroshare-gui/src/gui/SoundManager.cpp @@ -70,7 +70,11 @@ SoundManager::SoundManager() : QObject() void SoundManager::soundEvents(SoundEvents &events) { - QDir baseDir = QDir(qApp->applicationDirPath() + "/sounds"); +#ifdef WINDOWS_SYS + QDir baseDir = QDir(qApp->applicationDirPath() + "/sounds"); +#else + QDir baseDir = QDir("/usr/share/Retroshare06/sounds"); +#endif events.mDefaultPath = baseDir.absolutePath();