diff options
25 files changed, 87 insertions, 27 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 27bc60673..e18815502 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -184,6 +184,7 @@ PRINT_SUMMARY ("HAL support ......................." USE_HAL 1) PRINT_SUMMARY ("UDisks2 support ..................." USE_UDISKS2 1) PRINT_SUMMARY ("UDisks support ...................." USE_UDISKS 1) PRINT_SUMMARY ("Global hotkey support ............." USE_HOTKEY X11_FOUND) +PRINT_SUMMARY ("GNOME/Cinnamon hotkey support ....." USE_GNOMEHOTKEY 1) PRINT_SUMMARY ("File operations ..................." USE_FILEOPS 1) PRINT_SUMMARY ("Cover manager ....................." USE_COVER 1) PRINT_SUMMARY ("KDE4 notifications support ........" USE_KDENOTIFY 1) diff --git a/src/plugins/General/CMakeLists.txt b/src/plugins/General/CMakeLists.txt index d5b3003bb..3eb64595b 100644 --- a/src/plugins/General/CMakeLists.txt +++ b/src/plugins/General/CMakeLists.txt @@ -7,6 +7,7 @@ SET(USE_HAL TRUE CACHE BOOL "enable/disable hal plugin") SET(USE_UDISKS2 TRUE CACHE BOOL "enable/disable udisks2 plugin") SET(USE_UDISKS FALSE CACHE BOOL "enable/disable udisks plugin") SET(USE_HOTKEY TRUE CACHE BOOL "enable/disable global hotkey plugin") +SET(USE_GNOMEHOTKEY TRUE CACHE BOOL "enable/disable gnome hotkey plugin") SET(USE_FILEOPS TRUE CACHE BOOL "enable/disable fileops plugin") SET(USE_COVER TRUE CACHE BOOL "enable/disable cover manager plugin") SET(USE_KDENOTIFY TRUE CACHE BOOL "enable/disable kde notification plugin") @@ -84,3 +85,7 @@ ENDIF(USE_TRACKCHANGE) IF(USE_COPYPASTE) add_subdirectory(copypaste) ENDIF(USE_COPYPASTE) + +IF(USE_GNOMEHOTKEY) +add_subdirectory(gnomehotkey) +ENDIF(USE_GNOMEHOTKEY) diff --git a/src/plugins/General/gnomehotkey/CMakeLists.txt b/src/plugins/General/gnomehotkey/CMakeLists.txt new file mode 100644 index 000000000..af69b0483 --- /dev/null +++ b/src/plugins/General/gnomehotkey/CMakeLists.txt @@ -0,0 +1,54 @@ +project(libgnomehotkey) + +cmake_minimum_required(VERSION 2.4.8 FATAL_ERROR) + +SET (QT_USE_QTDBUS TRUE) + +INCLUDE(FindQt4) + +include(${QT_USE_FILE}) + +if(COMMAND cmake_policy) +cmake_policy(SET CMP0003 NEW) +endif(COMMAND cmake_policy) + +# qt plugin +ADD_DEFINITIONS( -Wall ) +ADD_DEFINITIONS(${QT_DEFINITIONS}) +ADD_DEFINITIONS(-DQT_PLUGIN) +ADD_DEFINITIONS(-DQT_NO_DEBUG) +ADD_DEFINITIONS(-DQT_SHARED) +ADD_DEFINITIONS(-DQT_THREAD) + +include_directories(${CMAKE_CURRENT_BINARY_DIR}) + +# libqmmpui & libqmmp +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) +link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) +link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) + +SET(libgnomehotkey_SRCS + gnomehotkeyfactory.cpp + mediakeys.cpp +) + +SET(libgnomehotkey_MOC_HDRS + gnomehotkeyfactory.h + mediakeys.h +) + +SET(libgnomehotkey_RCCS translations/translations.qrc) + +QT4_ADD_RESOURCES(libgnomehotkey_RCC_SRCS ${libgnomehotkey_RCCS}) + +QT4_WRAP_CPP(libgnomehotkey_MOC_SRCS ${libgnomehotkey_MOC_HDRS}) + + +# Don't forget to include output directory, otherwise +# the UI file won't be wrapped! +include_directories(${CMAKE_CURRENT_BINARY_DIR}) + +ADD_LIBRARY(gnomehotkey MODULE ${libgnomehotkey_SRCS} ${libgnomehotkey_MOC_SRCS} ${libgnomehotkey_RCC_SRCS}) +add_dependencies(gnomehotkey qmmpui) +target_link_libraries(gnomehotkey ${QT_LIBRARIES} -lqmmpui -lqmmp) +install(TARGETS gnomehotkey DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_cs.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_cs.ts index 7712622bc..d56ce47e4 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_cs.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_cs.ts @@ -20,7 +20,7 @@ </message> <message> <location filename="../gnomehotkeyfactory.cpp" line="52"/> - <source>This plugin adds support of the GNOME/Cinnamone hotkeys</source> + <source>This plugin adds support of the GNOME/Cinnamon hotkeys</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_de.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_de.ts index d04c9c1b3..5814e0b4a 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_de.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_de.ts @@ -20,7 +20,7 @@ </message> <message> <location filename="../gnomehotkeyfactory.cpp" line="52"/> - <source>This plugin adds support of the GNOME/Cinnamone hotkeys</source> + <source>This plugin adds support of the GNOME/Cinnamon hotkeys</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_es.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_es.ts index 80fa5fd32..06716b6d9 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_es.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_es.ts @@ -20,7 +20,7 @@ </message> <message> <location filename="../gnomehotkeyfactory.cpp" line="52"/> - <source>This plugin adds support of the GNOME/Cinnamone hotkeys</source> + <source>This plugin adds support of the GNOME/Cinnamon hotkeys</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_fr.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_fr.ts index c12361e03..7a598b741 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_fr.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_fr.ts @@ -20,7 +20,7 @@ </message> <message> <location filename="../gnomehotkeyfactory.cpp" line="52"/> - <source>This plugin adds support of the GNOME/Cinnamone hotkeys</source> + <source>This plugin adds support of the GNOME/Cinnamon hotkeys</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_gl_ES.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_gl_ES.ts index 336109b15..52b488c4f 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_gl_ES.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_gl_ES.ts @@ -20,7 +20,7 @@ </message> <message> <location filename="../gnomehotkeyfactory.cpp" line="52"/> - <source>This plugin adds support of the GNOME/Cinnamone hotkeys</source> + <source>This plugin adds support of the GNOME/Cinnamon hotkeys</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_he.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_he.ts index ab03bfde2..7765a3aa8 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_he.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_he.ts @@ -20,7 +20,7 @@ </message> <message> <location filename="../gnomehotkeyfactory.cpp" line="52"/> - <source>This plugin adds support of the GNOME/Cinnamone hotkeys</source> + <source>This plugin adds support of the GNOME/Cinnamon hotkeys</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_hu.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_hu.ts index 2808f2197..5a8f01607 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_hu.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_hu.ts @@ -20,7 +20,7 @@ </message> <message> <location filename="../gnomehotkeyfactory.cpp" line="52"/> - <source>This plugin adds support of the GNOME/Cinnamone hotkeys</source> + <source>This plugin adds support of the GNOME/Cinnamon hotkeys</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_it.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_it.ts index 10ee55812..daa37bdbe 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_it.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_it.ts @@ -20,7 +20,7 @@ </message> <message> <location filename="../gnomehotkeyfactory.cpp" line="52"/> - <source>This plugin adds support of the GNOME/Cinnamone hotkeys</source> + <source>This plugin adds support of the GNOME/Cinnamon hotkeys</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_ja.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_ja.ts index 948ee73b9..5e24aa9b8 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_ja.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_ja.ts @@ -20,7 +20,7 @@ </message> <message> <location filename="../gnomehotkeyfactory.cpp" line="52"/> - <source>This plugin adds support of the GNOME/Cinnamone hotkeys</source> + <source>This plugin adds support of the GNOME/Cinnamon hotkeys</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_kk.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_kk.ts index f53d03b63..b7ded5637 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_kk.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_kk.ts @@ -20,7 +20,7 @@ </message> <message> <location filename="../gnomehotkeyfactory.cpp" line="52"/> - <source>This plugin adds support of the GNOME/Cinnamone hotkeys</source> + <source>This plugin adds support of the GNOME/Cinnamon hotkeys</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_lt.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_lt.ts index 436dbf787..628e48d19 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_lt.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_lt.ts @@ -20,7 +20,7 @@ </message> <message> <location filename="../gnomehotkeyfactory.cpp" line="52"/> - <source>This plugin adds support of the GNOME/Cinnamone hotkeys</source> + <source>This plugin adds support of the GNOME/Cinnamon hotkeys</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_nl.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_nl.ts index 0dbf27f5b..29f7bd17c 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_nl.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_nl.ts @@ -20,7 +20,7 @@ </message> <message> <location filename="../gnomehotkeyfactory.cpp" line="52"/> - <source>This plugin adds support of the GNOME/Cinnamone hotkeys</source> + <source>This plugin adds support of the GNOME/Cinnamon hotkeys</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_pl_PL.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_pl_PL.ts index f1c36a869..2a051af31 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_pl_PL.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_pl_PL.ts @@ -20,7 +20,7 @@ </message> <message> <location filename="../gnomehotkeyfactory.cpp" line="52"/> - <source>This plugin adds support of the GNOME/Cinnamone hotkeys</source> + <source>This plugin adds support of the GNOME/Cinnamon hotkeys</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_pt_BR.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_pt_BR.ts index b89bf2a5b..ca8a1fda3 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_pt_BR.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_pt_BR.ts @@ -20,7 +20,7 @@ </message> <message> <location filename="../gnomehotkeyfactory.cpp" line="52"/> - <source>This plugin adds support of the GNOME/Cinnamone hotkeys</source> + <source>This plugin adds support of the GNOME/Cinnamon hotkeys</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_ru.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_ru.ts index 586bab9bc..6b6763fba 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_ru.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_ru.ts @@ -6,27 +6,27 @@ <message> <location filename="../gnomehotkeyfactory.cpp" line="29"/> <source>Gnome Hotkey Plugin</source> - <translation type="unfinished"></translation> + <translation>Модуль клавиш GNOME</translation> </message> <message> <location filename="../gnomehotkeyfactory.cpp" line="50"/> <source>About Gnome Hotkey Plugin</source> - <translation type="unfinished"></translation> + <translation>О модуле горячих клавиш GNOME</translation> </message> <message> <location filename="../gnomehotkeyfactory.cpp" line="51"/> <source>Qmmp Gnome Hotkey Plugin</source> - <translation type="unfinished"></translation> + <translation>Модуль горчих клавиш GNOME для Qmmp</translation> </message> <message> <location filename="../gnomehotkeyfactory.cpp" line="52"/> - <source>This plugin adds support of the GNOME/Cinnamone hotkeys</source> - <translation type="unfinished"></translation> + <source>This plugin adds support of the GNOME/Cinnamon hotkeys</source> + <translation>Этот модуль добавляет поддершку горячих клавиш GNOME/Cinnamon</translation> </message> <message> <location filename="../gnomehotkeyfactory.cpp" line="53"/> <source>Written by: Ilya Kotov <forkotov02@hotmail.ru></source> - <translation type="unfinished"></translation> + <translation>Разработчик: Илья Котов <forkotov02@hotmail.ru></translation> </message> </context> </TS> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sk.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sk.ts index c452d6660..52b0a12b9 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sk.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sk.ts @@ -20,7 +20,7 @@ </message> <message> <location filename="../gnomehotkeyfactory.cpp" line="52"/> - <source>This plugin adds support of the GNOME/Cinnamone hotkeys</source> + <source>This plugin adds support of the GNOME/Cinnamon hotkeys</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sr_BA.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sr_BA.ts index 024e4c0fe..05bd8497c 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sr_BA.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sr_BA.ts @@ -20,7 +20,7 @@ </message> <message> <location filename="../gnomehotkeyfactory.cpp" line="52"/> - <source>This plugin adds support of the GNOME/Cinnamone hotkeys</source> + <source>This plugin adds support of the GNOME/Cinnamon hotkeys</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sr_RS.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sr_RS.ts index 01c7c29d6..d5c94f115 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sr_RS.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sr_RS.ts @@ -20,7 +20,7 @@ </message> <message> <location filename="../gnomehotkeyfactory.cpp" line="52"/> - <source>This plugin adds support of the GNOME/Cinnamone hotkeys</source> + <source>This plugin adds support of the GNOME/Cinnamon hotkeys</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_tr.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_tr.ts index 921e9880e..080a372e9 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_tr.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_tr.ts @@ -20,7 +20,7 @@ </message> <message> <location filename="../gnomehotkeyfactory.cpp" line="52"/> - <source>This plugin adds support of the GNOME/Cinnamone hotkeys</source> + <source>This plugin adds support of the GNOME/Cinnamon hotkeys</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_uk_UA.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_uk_UA.ts index 2ef4b4da9..30a53f354 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_uk_UA.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_uk_UA.ts @@ -20,7 +20,7 @@ </message> <message> <location filename="../gnomehotkeyfactory.cpp" line="52"/> - <source>This plugin adds support of the GNOME/Cinnamone hotkeys</source> + <source>This plugin adds support of the GNOME/Cinnamon hotkeys</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_zh_CN.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_zh_CN.ts index d106055e2..2b4f9d565 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_zh_CN.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_zh_CN.ts @@ -20,7 +20,7 @@ </message> <message> <location filename="../gnomehotkeyfactory.cpp" line="52"/> - <source>This plugin adds support of the GNOME/Cinnamone hotkeys</source> + <source>This plugin adds support of the GNOME/Cinnamon hotkeys</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_zh_TW.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_zh_TW.ts index 9305d2851..c53a10c0b 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_zh_TW.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_zh_TW.ts @@ -20,7 +20,7 @@ </message> <message> <location filename="../gnomehotkeyfactory.cpp" line="52"/> - <source>This plugin adds support of the GNOME/Cinnamone hotkeys</source> + <source>This plugin adds support of the GNOME/Cinnamon hotkeys</source> <translation type="unfinished"></translation> </message> <message> |