diff options
| author |  Fabio Bas | 2012-12-23 22:10:05 +0000 |
|---|---|---|
| committer | Fabio Bas | 2012-12-23 22:10:05 +0000 |
| commit | 2bba9b4665b992ce10d11ad356c91e4fb90f6a30 (patch) | |
| tree | d74bae21539821e0fb1893b4dd05803ad5e1da3c /src | |
| parent | fix incorrect usage of QString::contains() (diff) | |
| download | KVIrc-2bba9b4665b992ce10d11ad356c91e4fb90f6a30.tar.gz KVIrc-2bba9b4665b992ce10d11ad356c91e4fb90f6a30.tar.bz2 KVIrc-2bba9b4665b992ce10d11ad356c91e4fb90f6a30.zip | |
added a set of monochrome icons to be used on kde and osx
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6306 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/trayicon/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | src/modules/trayicon/kvi_dock_mono-0.png | bin | 0 -> 1401 bytes | |||
| -rw-r--r-- | src/modules/trayicon/kvi_dock_mono-1.png | bin | 0 -> 944 bytes | |||
| -rw-r--r-- | src/modules/trayicon/kvi_dock_mono-2.png | bin | 0 -> 946 bytes | |||
| -rw-r--r-- | src/modules/trayicon/libkvitrayicon.cpp | 6 |
5 files changed, 15 insertions, 3 deletions
diff --git a/src/modules/trayicon/CMakeLists.txt b/src/modules/trayicon/CMakeLists.txt index c5d2f3608..3dcaa3c27 100644 --- a/src/modules/trayicon/CMakeLists.txt +++ b/src/modules/trayicon/CMakeLists.txt @@ -5,19 +5,23 @@ set(kvitrayicon_SRCS ) set(unixFiles - kvi_dock.png kvi_dock_part-0.png kvi_dock_part-1.png kvi_dock_part-2.png ) set(win32Files - kvi_dock_win32.png kvi_dock_win32-0.png kvi_dock_win32-1.png kvi_dock_win32-2.png ) +set(monoFiles + kvi_dock_mono-0.png + kvi_dock_mono-1.png + kvi_dock_mono-2.png +) + file(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.png") set(kvi_module_name kvitrayicon) @@ -25,7 +29,9 @@ include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) if(UNIX) if(APPLE) - install(FILES ${unixFiles} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) + install(FILES ${monoFiles} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) + elseif(COMPILE_ON_KDE) + install(FILES ${monoFiles} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) else() # Assume linux install(FILES ${unixFiles} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) diff --git a/src/modules/trayicon/kvi_dock_mono-0.png b/src/modules/trayicon/kvi_dock_mono-0.png Binary files differnew file mode 100644 index 000000000..6a9a6a9a9 --- /dev/null +++ b/src/modules/trayicon/kvi_dock_mono-0.png diff --git a/src/modules/trayicon/kvi_dock_mono-1.png b/src/modules/trayicon/kvi_dock_mono-1.png Binary files differnew file mode 100644 index 000000000..7ae0b4b5c --- /dev/null +++ b/src/modules/trayicon/kvi_dock_mono-1.png diff --git a/src/modules/trayicon/kvi_dock_mono-2.png b/src/modules/trayicon/kvi_dock_mono-2.png Binary files differnew file mode 100644 index 000000000..977db5f56 --- /dev/null +++ b/src/modules/trayicon/kvi_dock_mono-2.png diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp index 0a3378e22..f3711e022 100644 --- a/src/modules/trayicon/libkvitrayicon.cpp +++ b/src/modules/trayicon/libkvitrayicon.cpp @@ -688,6 +688,8 @@ static bool trayicon_module_init(KviModule * m) QString buffer; #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) g_pApp->findImage(buffer,"kvi_dock_win32-0.png"); +#elif defined(COMPILE_KDE_SUPPORT) || defined(COMPILE_ON_MAC) + g_pApp->findImage(buffer,"kvi_dock_mono-0.png"); #else g_pApp->findImage(buffer,"kvi_dock_part-0.png"); #endif @@ -695,6 +697,8 @@ static bool trayicon_module_init(KviModule * m) #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) g_pApp->findImage(buffer,"kvi_dock_win32-1.png"); +#elif defined(COMPILE_KDE_SUPPORT) || defined(COMPILE_ON_MAC) + g_pApp->findImage(buffer,"kvi_dock_mono-1.png"); #else g_pApp->findImage(buffer,"kvi_dock_part-1.png"); #endif @@ -702,6 +706,8 @@ static bool trayicon_module_init(KviModule * m) #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) g_pApp->findImage(buffer,"kvi_dock_win32-2.png"); +#elif defined(COMPILE_KDE_SUPPORT) || defined(COMPILE_ON_MAC) + g_pApp->findImage(buffer,"kvi_dock_mono-2.png"); #else g_pApp->findImage(buffer,"kvi_dock_part-2.png"); #endif |
