diff options
| author |  Szymon Tomasz Stefanek | 2010-05-24 03:56:03 +0000 |
|---|---|---|
| committer | Szymon Tomasz Stefanek | 2010-05-24 03:56:03 +0000 |
| commit | 9b215ef20624244d41078605e1ea3f8b892091f7 (patch) | |
| tree | 5051329962d6cc683b181bf776c66b69127c7d65 /data | |
| parent | Tweak avatar selection a bit (diff) | |
| download | KVIrc-9b215ef20624244d41078605e1ea3f8b892091f7.tar.gz KVIrc-9b215ef20624244d41078605e1ea3f8b892091f7.tar.bz2 KVIrc-9b215ef20624244d41078605e1ea3f8b892091f7.zip | |
Kill some debug noise.
Fix painting of themed input editor under some styles (hm.. do we *REALLY* need to theme this ? under some themes it's ugly)
Some work on the sound module: fixes for the Oss+Audiofile and Phonon systems.
Add support for testing the sound system from the option dialog.
Add a basic jingle sound that can be used for the test above (maybe we could find something nicer and smaller ?)
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4371 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'data')
| -rw-r--r-- | data/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | data/audio/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | data/audio/jingle.wav | bin | 0 -> 64674 bytes |
3 files changed, 16 insertions, 1 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 4f6614aec..011411d56 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -1,7 +1,7 @@ # CMakeLists for data/ # Find subdirs -SUBDIRS(applnk config defscript deftheme helppics icons man msgcolors pics) +SUBDIRS(applnk audio config defscript deftheme helppics icons man msgcolors pics) IF(APPLE) # MacOS X diff --git a/data/audio/CMakeLists.txt b/data/audio/CMakeLists.txt new file mode 100644 index 000000000..6c8be27ef --- /dev/null +++ b/data/audio/CMakeLists.txt @@ -0,0 +1,15 @@ +# CMakeLists for data/pics + + +FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.wav") + +IF(UNIX) + IF(APPLE) + INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/audio/) + ELSE() + # Assume linux + INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/audio/) + ENDIF() +ELSEIF(WIN32) + INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/audio/) +ENDIF() diff --git a/data/audio/jingle.wav b/data/audio/jingle.wav Binary files differnew file mode 100644 index 000000000..aaf0bbfd5 --- /dev/null +++ b/data/audio/jingle.wav |