From 8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sat, 25 Nov 2017 18:00:06 +0000 Subject: copy 1.2 branch to trunk git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7772 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/General/CMakeLists.txt | 29 +-- src/plugins/General/General.pro | 4 - src/plugins/General/converter/CMakeLists.txt | 21 +- src/plugins/General/converter/converter.cpp | 16 +- src/plugins/General/converter/converterdialog.cpp | 8 +- src/plugins/General/converter/converterfactory.cpp | 5 +- src/plugins/General/converter/converterfactory.h | 1 + .../converter/translations/converter_plugin_bg.ts | 24 +- .../converter/translations/converter_plugin_cs.ts | 24 +- .../converter/translations/converter_plugin_de.ts | 24 +- .../converter/translations/converter_plugin_el.ts | 24 +- .../converter/translations/converter_plugin_en.ts | 24 +- .../converter/translations/converter_plugin_es.ts | 24 +- .../converter/translations/converter_plugin_fi.ts | 24 +- .../converter/translations/converter_plugin_fr.ts | 24 +- .../translations/converter_plugin_gl_ES.ts | 24 +- .../converter/translations/converter_plugin_he.ts | 24 +- .../converter/translations/converter_plugin_hu.ts | 24 +- .../converter/translations/converter_plugin_id.ts | 24 +- .../converter/translations/converter_plugin_it.ts | 24 +- .../converter/translations/converter_plugin_ja.ts | 24 +- .../converter/translations/converter_plugin_kk.ts | 24 +- .../converter/translations/converter_plugin_lt.ts | 24 +- .../converter/translations/converter_plugin_nl.ts | 24 +- .../translations/converter_plugin_pl_PL.ts | 24 +- .../converter/translations/converter_plugin_pt.ts | 24 +- .../translations/converter_plugin_pt_BR.ts | 24 +- .../converter/translations/converter_plugin_ru.ts | 24 +- .../converter/translations/converter_plugin_sk.ts | 24 +- .../translations/converter_plugin_sr_BA.ts | 24 +- .../translations/converter_plugin_sr_RS.ts | 24 +- .../converter/translations/converter_plugin_tr.ts | 24 +- .../translations/converter_plugin_uk_UA.ts | 24 +- .../translations/converter_plugin_zh_CN.ts | 24 +- .../translations/converter_plugin_zh_TW.ts | 24 +- src/plugins/General/copypaste/CMakeLists.txt | 19 +- src/plugins/General/copypaste/copypastefactory.cpp | 7 +- src/plugins/General/copypaste/copypastefactory.h | 1 + .../copypaste/translations/copypaste_plugin_bg.ts | 10 +- .../copypaste/translations/copypaste_plugin_cs.ts | 10 +- .../copypaste/translations/copypaste_plugin_de.ts | 10 +- .../copypaste/translations/copypaste_plugin_el.ts | 10 +- .../copypaste/translations/copypaste_plugin_en.ts | 10 +- .../copypaste/translations/copypaste_plugin_es.ts | 10 +- .../copypaste/translations/copypaste_plugin_fi.ts | 10 +- .../copypaste/translations/copypaste_plugin_fr.ts | 10 +- .../translations/copypaste_plugin_gl_ES.ts | 10 +- .../copypaste/translations/copypaste_plugin_he.ts | 10 +- .../copypaste/translations/copypaste_plugin_hu.ts | 10 +- .../copypaste/translations/copypaste_plugin_id.ts | 10 +- .../copypaste/translations/copypaste_plugin_it.ts | 10 +- .../copypaste/translations/copypaste_plugin_ja.ts | 10 +- .../copypaste/translations/copypaste_plugin_kk.ts | 10 +- .../copypaste/translations/copypaste_plugin_lt.ts | 10 +- .../copypaste/translations/copypaste_plugin_nl.ts | 10 +- .../translations/copypaste_plugin_pl_PL.ts | 10 +- .../copypaste/translations/copypaste_plugin_pt.ts | 10 +- .../translations/copypaste_plugin_pt_BR.ts | 10 +- .../copypaste/translations/copypaste_plugin_ru.ts | 10 +- .../copypaste/translations/copypaste_plugin_sk.ts | 10 +- .../translations/copypaste_plugin_sr_BA.ts | 10 +- .../translations/copypaste_plugin_sr_RS.ts | 10 +- .../copypaste/translations/copypaste_plugin_tr.ts | 10 +- .../translations/copypaste_plugin_uk_UA.ts | 10 +- .../translations/copypaste_plugin_zh_CN.ts | 10 +- .../translations/copypaste_plugin_zh_TW.ts | 10 +- src/plugins/General/covermanager/CMakeLists.txt | 19 +- .../General/covermanager/covermanagerfactory.cpp | 7 +- .../General/covermanager/covermanagerfactory.h | 1 + .../translations/covermanager_plugin_bg.ts | 8 +- .../translations/covermanager_plugin_cs.ts | 8 +- .../translations/covermanager_plugin_de.ts | 8 +- .../translations/covermanager_plugin_el.ts | 8 +- .../translations/covermanager_plugin_en.ts | 8 +- .../translations/covermanager_plugin_es.ts | 8 +- .../translations/covermanager_plugin_fi.ts | 8 +- .../translations/covermanager_plugin_fr.ts | 8 +- .../translations/covermanager_plugin_gl_ES.ts | 8 +- .../translations/covermanager_plugin_he.ts | 8 +- .../translations/covermanager_plugin_hu.ts | 8 +- .../translations/covermanager_plugin_id.ts | 8 +- .../translations/covermanager_plugin_it.ts | 8 +- .../translations/covermanager_plugin_ja.ts | 8 +- .../translations/covermanager_plugin_kk.ts | 8 +- .../translations/covermanager_plugin_lt.ts | 8 +- .../translations/covermanager_plugin_nl.ts | 8 +- .../translations/covermanager_plugin_pl_PL.ts | 8 +- .../translations/covermanager_plugin_pt.ts | 8 +- .../translations/covermanager_plugin_pt_BR.ts | 8 +- .../translations/covermanager_plugin_ru.ts | 8 +- .../translations/covermanager_plugin_sk.ts | 8 +- .../translations/covermanager_plugin_sr_BA.ts | 8 +- .../translations/covermanager_plugin_sr_RS.ts | 8 +- .../translations/covermanager_plugin_tr.ts | 8 +- .../translations/covermanager_plugin_uk_UA.ts | 8 +- .../translations/covermanager_plugin_zh_CN.ts | 8 +- .../translations/covermanager_plugin_zh_TW.ts | 8 +- src/plugins/General/fileops/CMakeLists.txt | 21 +- src/plugins/General/fileops/fileopsfactory.cpp | 7 +- src/plugins/General/fileops/fileopsfactory.h | 1 + src/plugins/General/fileops/settingsdialog.cpp | 8 +- .../fileops/translations/fileops_plugin_bg.ts | 8 +- .../fileops/translations/fileops_plugin_cs.ts | 8 +- .../fileops/translations/fileops_plugin_de.ts | 8 +- .../fileops/translations/fileops_plugin_el.ts | 8 +- .../fileops/translations/fileops_plugin_en.ts | 8 +- .../fileops/translations/fileops_plugin_es.ts | 8 +- .../fileops/translations/fileops_plugin_fi.ts | 8 +- .../fileops/translations/fileops_plugin_fr.ts | 8 +- .../fileops/translations/fileops_plugin_gl_ES.ts | 8 +- .../fileops/translations/fileops_plugin_he.ts | 8 +- .../fileops/translations/fileops_plugin_hu.ts | 8 +- .../fileops/translations/fileops_plugin_id.ts | 8 +- .../fileops/translations/fileops_plugin_it.ts | 8 +- .../fileops/translations/fileops_plugin_ja.ts | 8 +- .../fileops/translations/fileops_plugin_kk.ts | 8 +- .../fileops/translations/fileops_plugin_lt.ts | 8 +- .../fileops/translations/fileops_plugin_nl.ts | 8 +- .../fileops/translations/fileops_plugin_pl_PL.ts | 8 +- .../fileops/translations/fileops_plugin_pt.ts | 8 +- .../fileops/translations/fileops_plugin_pt_BR.ts | 8 +- .../fileops/translations/fileops_plugin_ru.ts | 8 +- .../fileops/translations/fileops_plugin_sk.ts | 8 +- .../fileops/translations/fileops_plugin_sr_BA.ts | 8 +- .../fileops/translations/fileops_plugin_sr_RS.ts | 8 +- .../fileops/translations/fileops_plugin_tr.ts | 8 +- .../fileops/translations/fileops_plugin_uk_UA.ts | 8 +- .../fileops/translations/fileops_plugin_zh_CN.ts | 8 +- .../fileops/translations/fileops_plugin_zh_TW.ts | 8 +- src/plugins/General/gnomehotkey/CMakeLists.txt | 19 +- .../General/gnomehotkey/gnomehotkeyfactory.cpp | 5 +- .../General/gnomehotkey/gnomehotkeyfactory.h | 1 + .../translations/gnomehotkey_plugin_bg.ts | 10 +- .../translations/gnomehotkey_plugin_cs.ts | 10 +- .../translations/gnomehotkey_plugin_de.ts | 10 +- .../translations/gnomehotkey_plugin_el.ts | 10 +- .../translations/gnomehotkey_plugin_en.ts | 10 +- .../translations/gnomehotkey_plugin_es.ts | 10 +- .../translations/gnomehotkey_plugin_fi.ts | 10 +- .../translations/gnomehotkey_plugin_fr.ts | 10 +- .../translations/gnomehotkey_plugin_gl_ES.ts | 10 +- .../translations/gnomehotkey_plugin_he.ts | 10 +- .../translations/gnomehotkey_plugin_hu.ts | 10 +- .../translations/gnomehotkey_plugin_id.ts | 10 +- .../translations/gnomehotkey_plugin_it.ts | 10 +- .../translations/gnomehotkey_plugin_ja.ts | 10 +- .../translations/gnomehotkey_plugin_kk.ts | 10 +- .../translations/gnomehotkey_plugin_lt.ts | 10 +- .../translations/gnomehotkey_plugin_nl.ts | 10 +- .../translations/gnomehotkey_plugin_pl_PL.ts | 10 +- .../translations/gnomehotkey_plugin_pt.ts | 10 +- .../translations/gnomehotkey_plugin_pt_BR.ts | 10 +- .../translations/gnomehotkey_plugin_ru.ts | 10 +- .../translations/gnomehotkey_plugin_sk.ts | 10 +- .../translations/gnomehotkey_plugin_sr_BA.ts | 10 +- .../translations/gnomehotkey_plugin_sr_RS.ts | 10 +- .../translations/gnomehotkey_plugin_tr.ts | 10 +- .../translations/gnomehotkey_plugin_uk_UA.ts | 10 +- .../translations/gnomehotkey_plugin_zh_CN.ts | 10 +- .../translations/gnomehotkey_plugin_zh_TW.ts | 10 +- src/plugins/General/hal/CMakeLists.txt | 21 +- src/plugins/General/hal/halfactory.cpp | 7 +- src/plugins/General/hal/halfactory.h | 1 + .../General/hal/translations/hal_plugin_bg.ts | 12 +- .../General/hal/translations/hal_plugin_cs.ts | 12 +- .../General/hal/translations/hal_plugin_de.ts | 12 +- .../General/hal/translations/hal_plugin_el.ts | 12 +- .../General/hal/translations/hal_plugin_en.ts | 12 +- .../General/hal/translations/hal_plugin_es.ts | 12 +- .../General/hal/translations/hal_plugin_fi.ts | 12 +- .../General/hal/translations/hal_plugin_fr.ts | 12 +- .../General/hal/translations/hal_plugin_gl_ES.ts | 12 +- .../General/hal/translations/hal_plugin_he.ts | 12 +- .../General/hal/translations/hal_plugin_hu.ts | 12 +- .../General/hal/translations/hal_plugin_id.ts | 12 +- .../General/hal/translations/hal_plugin_it.ts | 12 +- .../General/hal/translations/hal_plugin_ja.ts | 12 +- .../General/hal/translations/hal_plugin_kk.ts | 12 +- .../General/hal/translations/hal_plugin_lt.ts | 12 +- .../General/hal/translations/hal_plugin_nl.ts | 12 +- .../General/hal/translations/hal_plugin_pl_PL.ts | 12 +- .../General/hal/translations/hal_plugin_pt.ts | 12 +- .../General/hal/translations/hal_plugin_pt_BR.ts | 12 +- .../General/hal/translations/hal_plugin_ru.ts | 12 +- .../General/hal/translations/hal_plugin_sk.ts | 12 +- .../General/hal/translations/hal_plugin_sr_BA.ts | 12 +- .../General/hal/translations/hal_plugin_sr_RS.ts | 12 +- .../General/hal/translations/hal_plugin_tr.ts | 12 +- .../General/hal/translations/hal_plugin_uk_UA.ts | 12 +- .../General/hal/translations/hal_plugin_zh_CN.ts | 12 +- .../General/hal/translations/hal_plugin_zh_TW.ts | 12 +- src/plugins/General/hotkey/CMakeLists.txt | 20 +- src/plugins/General/hotkey/hotkey.pro | 1 + src/plugins/General/hotkey/hotkeyfactory.cpp | 7 +- src/plugins/General/hotkey/hotkeyfactory.h | 1 + src/plugins/General/hotkey/hotkeymanager.h | 5 +- src/plugins/General/hotkey/hotkeymanager_x11.cpp | 13 +- src/plugins/General/hotkey/settingsdialog.cpp | 4 +- .../hotkey/translations/hotkey_plugin_bg.ts | 10 +- .../hotkey/translations/hotkey_plugin_cs.ts | 10 +- .../hotkey/translations/hotkey_plugin_de.ts | 10 +- .../hotkey/translations/hotkey_plugin_el.ts | 10 +- .../hotkey/translations/hotkey_plugin_en.ts | 10 +- .../hotkey/translations/hotkey_plugin_es.ts | 10 +- .../hotkey/translations/hotkey_plugin_fi.ts | 10 +- .../hotkey/translations/hotkey_plugin_fr.ts | 10 +- .../hotkey/translations/hotkey_plugin_gl_ES.ts | 10 +- .../hotkey/translations/hotkey_plugin_he.ts | 10 +- .../hotkey/translations/hotkey_plugin_hu.ts | 10 +- .../hotkey/translations/hotkey_plugin_id.ts | 10 +- .../hotkey/translations/hotkey_plugin_it.ts | 10 +- .../hotkey/translations/hotkey_plugin_ja.ts | 10 +- .../hotkey/translations/hotkey_plugin_kk.ts | 10 +- .../hotkey/translations/hotkey_plugin_lt.ts | 10 +- .../hotkey/translations/hotkey_plugin_nl.ts | 10 +- .../hotkey/translations/hotkey_plugin_pl_PL.ts | 10 +- .../hotkey/translations/hotkey_plugin_pt.ts | 10 +- .../hotkey/translations/hotkey_plugin_pt_BR.ts | 10 +- .../hotkey/translations/hotkey_plugin_ru.ts | 10 +- .../hotkey/translations/hotkey_plugin_sk.ts | 10 +- .../hotkey/translations/hotkey_plugin_sr_BA.ts | 10 +- .../hotkey/translations/hotkey_plugin_sr_RS.ts | 10 +- .../hotkey/translations/hotkey_plugin_tr.ts | 10 +- .../hotkey/translations/hotkey_plugin_uk_UA.ts | 10 +- .../hotkey/translations/hotkey_plugin_zh_CN.ts | 10 +- .../hotkey/translations/hotkey_plugin_zh_TW.ts | 10 +- src/plugins/General/kdenotify/CMakeLists.txt | 31 +-- src/plugins/General/kdenotify/kdenotifyfactory.cpp | 5 +- src/plugins/General/kdenotify/kdenotifyfactory.h | 5 +- .../kdenotify/translations/kdenotify_plugin_bg.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_cs.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_de.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_el.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_en.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_es.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_fi.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_fr.ts | 6 +- .../translations/kdenotify_plugin_gl_ES.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_he.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_hu.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_id.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_it.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_ja.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_kk.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_lt.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_nl.ts | 6 +- .../translations/kdenotify_plugin_pl_PL.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_pt.ts | 6 +- .../translations/kdenotify_plugin_pt_BR.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_ru.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_sk.ts | 6 +- .../translations/kdenotify_plugin_sr_BA.ts | 6 +- .../translations/kdenotify_plugin_sr_RS.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_tr.ts | 6 +- .../translations/kdenotify_plugin_uk_UA.ts | 6 +- .../translations/kdenotify_plugin_zh_CN.ts | 6 +- .../translations/kdenotify_plugin_zh_TW.ts | 6 +- src/plugins/General/lyrics/CMakeLists.txt | 25 +- src/plugins/General/lyrics/lyricsfactory.cpp | 7 +- src/plugins/General/lyrics/lyricsfactory.h | 1 + src/plugins/General/lyrics/lyricswindow.cpp | 4 +- .../lyrics/translations/lyrics_plugin_bg.ts | 10 +- .../lyrics/translations/lyrics_plugin_cs.ts | 10 +- .../lyrics/translations/lyrics_plugin_de.ts | 10 +- .../lyrics/translations/lyrics_plugin_el.ts | 10 +- .../lyrics/translations/lyrics_plugin_en.ts | 10 +- .../lyrics/translations/lyrics_plugin_es.ts | 10 +- .../lyrics/translations/lyrics_plugin_fi.ts | 10 +- .../lyrics/translations/lyrics_plugin_fr.ts | 10 +- .../lyrics/translations/lyrics_plugin_gl_ES.ts | 10 +- .../lyrics/translations/lyrics_plugin_he.ts | 10 +- .../lyrics/translations/lyrics_plugin_hu.ts | 10 +- .../lyrics/translations/lyrics_plugin_id.ts | 10 +- .../lyrics/translations/lyrics_plugin_it.ts | 10 +- .../lyrics/translations/lyrics_plugin_ja.ts | 10 +- .../lyrics/translations/lyrics_plugin_kk.ts | 10 +- .../lyrics/translations/lyrics_plugin_lt.ts | 10 +- .../lyrics/translations/lyrics_plugin_nl.ts | 10 +- .../lyrics/translations/lyrics_plugin_pl_PL.ts | 10 +- .../lyrics/translations/lyrics_plugin_pt.ts | 10 +- .../lyrics/translations/lyrics_plugin_pt_BR.ts | 10 +- .../lyrics/translations/lyrics_plugin_ru.ts | 10 +- .../lyrics/translations/lyrics_plugin_sk.ts | 10 +- .../lyrics/translations/lyrics_plugin_sr_BA.ts | 10 +- .../lyrics/translations/lyrics_plugin_sr_RS.ts | 10 +- .../lyrics/translations/lyrics_plugin_tr.ts | 10 +- .../lyrics/translations/lyrics_plugin_uk_UA.ts | 10 +- .../lyrics/translations/lyrics_plugin_zh_CN.ts | 10 +- .../lyrics/translations/lyrics_plugin_zh_TW.ts | 10 +- src/plugins/General/mpris/CMakeLists.txt | 23 +- src/plugins/General/mpris/mprisfactory.cpp | 7 +- src/plugins/General/mpris/mprisfactory.h | 1 + .../General/mpris/translations/mpris_plugin_bg.ts | 8 +- .../General/mpris/translations/mpris_plugin_cs.ts | 8 +- .../General/mpris/translations/mpris_plugin_de.ts | 8 +- .../General/mpris/translations/mpris_plugin_el.ts | 8 +- .../General/mpris/translations/mpris_plugin_en.ts | 8 +- .../General/mpris/translations/mpris_plugin_es.ts | 8 +- .../General/mpris/translations/mpris_plugin_fi.ts | 8 +- .../General/mpris/translations/mpris_plugin_fr.ts | 8 +- .../mpris/translations/mpris_plugin_gl_ES.ts | 8 +- .../General/mpris/translations/mpris_plugin_he.ts | 8 +- .../General/mpris/translations/mpris_plugin_hu.ts | 8 +- .../General/mpris/translations/mpris_plugin_id.ts | 8 +- .../General/mpris/translations/mpris_plugin_it.ts | 8 +- .../General/mpris/translations/mpris_plugin_ja.ts | 8 +- .../General/mpris/translations/mpris_plugin_kk.ts | 8 +- .../General/mpris/translations/mpris_plugin_lt.ts | 8 +- .../General/mpris/translations/mpris_plugin_nl.ts | 8 +- .../mpris/translations/mpris_plugin_pl_PL.ts | 8 +- .../General/mpris/translations/mpris_plugin_pt.ts | 8 +- .../mpris/translations/mpris_plugin_pt_BR.ts | 8 +- .../General/mpris/translations/mpris_plugin_ru.ts | 8 +- .../General/mpris/translations/mpris_plugin_sk.ts | 8 +- .../mpris/translations/mpris_plugin_sr_BA.ts | 8 +- .../mpris/translations/mpris_plugin_sr_RS.ts | 8 +- .../General/mpris/translations/mpris_plugin_tr.ts | 8 +- .../mpris/translations/mpris_plugin_uk_UA.ts | 8 +- .../mpris/translations/mpris_plugin_zh_CN.ts | 8 +- .../mpris/translations/mpris_plugin_zh_TW.ts | 8 +- src/plugins/General/notifier/CMakeLists.txt | 29 +-- src/plugins/General/notifier/notifier.cpp | 2 +- src/plugins/General/notifier/notifier.pro | 5 +- src/plugins/General/notifier/notifierfactory.cpp | 7 +- src/plugins/General/notifier/notifierfactory.h | 1 + .../notifier/translations/notifier_plugin_bg.ts | 8 +- .../notifier/translations/notifier_plugin_cs.ts | 8 +- .../notifier/translations/notifier_plugin_de.ts | 8 +- .../notifier/translations/notifier_plugin_el.ts | 8 +- .../notifier/translations/notifier_plugin_en.ts | 8 +- .../notifier/translations/notifier_plugin_es.ts | 8 +- .../notifier/translations/notifier_plugin_fi.ts | 8 +- .../notifier/translations/notifier_plugin_fr.ts | 8 +- .../notifier/translations/notifier_plugin_gl_ES.ts | 8 +- .../notifier/translations/notifier_plugin_he.ts | 8 +- .../notifier/translations/notifier_plugin_hu.ts | 8 +- .../notifier/translations/notifier_plugin_id.ts | 8 +- .../notifier/translations/notifier_plugin_it.ts | 8 +- .../notifier/translations/notifier_plugin_ja.ts | 8 +- .../notifier/translations/notifier_plugin_kk.ts | 8 +- .../notifier/translations/notifier_plugin_lt.ts | 8 +- .../notifier/translations/notifier_plugin_nl.ts | 8 +- .../notifier/translations/notifier_plugin_pl_PL.ts | 8 +- .../notifier/translations/notifier_plugin_pt.ts | 8 +- .../notifier/translations/notifier_plugin_pt_BR.ts | 8 +- .../notifier/translations/notifier_plugin_ru.ts | 8 +- .../notifier/translations/notifier_plugin_sk.ts | 8 +- .../notifier/translations/notifier_plugin_sr_BA.ts | 8 +- .../notifier/translations/notifier_plugin_sr_RS.ts | 8 +- .../notifier/translations/notifier_plugin_tr.ts | 8 +- .../notifier/translations/notifier_plugin_uk_UA.ts | 8 +- .../notifier/translations/notifier_plugin_zh_CN.ts | 8 +- .../notifier/translations/notifier_plugin_zh_TW.ts | 8 +- src/plugins/General/rgscan/CMakeLists.txt | 21 +- src/plugins/General/rgscan/rgscandialog.cpp | 23 +- src/plugins/General/rgscan/rgscandialog.h | 5 - src/plugins/General/rgscan/rgscanfactory.cpp | 7 +- src/plugins/General/rgscan/rgscanfactory.h | 1 + .../rgscan/translations/rgscan_plugin_bg.ts | 30 +-- .../rgscan/translations/rgscan_plugin_cs.ts | 30 +-- .../rgscan/translations/rgscan_plugin_de.ts | 30 +-- .../rgscan/translations/rgscan_plugin_el.ts | 30 +-- .../rgscan/translations/rgscan_plugin_en.ts | 30 +-- .../rgscan/translations/rgscan_plugin_es.ts | 30 +-- .../rgscan/translations/rgscan_plugin_fi.ts | 30 +-- .../rgscan/translations/rgscan_plugin_fr.ts | 30 +-- .../rgscan/translations/rgscan_plugin_gl_ES.ts | 30 +-- .../rgscan/translations/rgscan_plugin_he.ts | 30 +-- .../rgscan/translations/rgscan_plugin_hu.ts | 30 +-- .../rgscan/translations/rgscan_plugin_id.ts | 30 +-- .../rgscan/translations/rgscan_plugin_it.ts | 30 +-- .../rgscan/translations/rgscan_plugin_ja.ts | 30 +-- .../rgscan/translations/rgscan_plugin_kk.ts | 30 +-- .../rgscan/translations/rgscan_plugin_lt.ts | 30 +-- .../rgscan/translations/rgscan_plugin_nl.ts | 30 +-- .../rgscan/translations/rgscan_plugin_pl_PL.ts | 30 +-- .../rgscan/translations/rgscan_plugin_pt.ts | 30 +-- .../rgscan/translations/rgscan_plugin_pt_BR.ts | 30 +-- .../rgscan/translations/rgscan_plugin_ru.ts | 30 +-- .../rgscan/translations/rgscan_plugin_sk.ts | 30 +-- .../rgscan/translations/rgscan_plugin_sr_BA.ts | 30 +-- .../rgscan/translations/rgscan_plugin_sr_RS.ts | 30 +-- .../rgscan/translations/rgscan_plugin_tr.ts | 30 +-- .../rgscan/translations/rgscan_plugin_uk_UA.ts | 30 +-- .../rgscan/translations/rgscan_plugin_zh_CN.ts | 30 +-- .../rgscan/translations/rgscan_plugin_zh_TW.ts | 30 +-- src/plugins/General/scrobbler/CMakeLists.txt | 21 +- src/plugins/General/scrobbler/scrobbler.cpp | 31 ++- src/plugins/General/scrobbler/scrobblercache.cpp | 2 +- src/plugins/General/scrobbler/scrobblerfactory.cpp | 7 +- src/plugins/General/scrobbler/scrobblerfactory.h | 1 + .../scrobbler/translations/scrobbler_plugin_bg.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_cs.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_de.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_el.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_en.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_es.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_fi.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_fr.ts | 8 +- .../translations/scrobbler_plugin_gl_ES.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_he.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_hu.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_id.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_it.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_ja.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_kk.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_lt.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_nl.ts | 8 +- .../translations/scrobbler_plugin_pl_PL.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_pt.ts | 8 +- .../translations/scrobbler_plugin_pt_BR.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_ru.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_sk.ts | 8 +- .../translations/scrobbler_plugin_sr_BA.ts | 8 +- .../translations/scrobbler_plugin_sr_RS.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_tr.ts | 8 +- .../translations/scrobbler_plugin_uk_UA.ts | 8 +- .../translations/scrobbler_plugin_zh_CN.ts | 8 +- .../translations/scrobbler_plugin_zh_TW.ts | 8 +- src/plugins/General/statusicon/CMakeLists.txt | 19 +- src/plugins/General/statusicon/qmmptrayicon.cpp | 34 ++- src/plugins/General/statusicon/qmmptrayicon.h | 6 +- src/plugins/General/statusicon/settingsdialog.cpp | 4 +- src/plugins/General/statusicon/statusicon.cpp | 2 +- .../General/statusicon/statusiconfactory.cpp | 7 +- src/plugins/General/statusicon/statusiconfactory.h | 1 + .../General/statusicon/statusiconpopupwidget.cpp | 3 +- .../General/statusicon/statusiconpopupwidget.h | 4 +- .../translations/statusicon_plugin_bg.ts | 12 +- .../translations/statusicon_plugin_cs.ts | 12 +- .../translations/statusicon_plugin_de.ts | 12 +- .../translations/statusicon_plugin_el.ts | 12 +- .../translations/statusicon_plugin_en.ts | 12 +- .../translations/statusicon_plugin_es.ts | 12 +- .../translations/statusicon_plugin_fi.ts | 12 +- .../translations/statusicon_plugin_fr.ts | 12 +- .../translations/statusicon_plugin_gl_ES.ts | 12 +- .../translations/statusicon_plugin_he.ts | 12 +- .../translations/statusicon_plugin_hu.ts | 12 +- .../translations/statusicon_plugin_id.ts | 12 +- .../translations/statusicon_plugin_it.ts | 12 +- .../translations/statusicon_plugin_ja.ts | 12 +- .../translations/statusicon_plugin_kk.ts | 12 +- .../translations/statusicon_plugin_lt.ts | 12 +- .../translations/statusicon_plugin_nl.ts | 12 +- .../translations/statusicon_plugin_pl_PL.ts | 12 +- .../translations/statusicon_plugin_pt.ts | 12 +- .../translations/statusicon_plugin_pt_BR.ts | 12 +- .../translations/statusicon_plugin_ru.ts | 12 +- .../translations/statusicon_plugin_sk.ts | 12 +- .../translations/statusicon_plugin_sr_BA.ts | 12 +- .../translations/statusicon_plugin_sr_RS.ts | 12 +- .../translations/statusicon_plugin_tr.ts | 12 +- .../translations/statusicon_plugin_uk_UA.ts | 12 +- .../translations/statusicon_plugin_zh_CN.ts | 12 +- .../translations/statusicon_plugin_zh_TW.ts | 12 +- src/plugins/General/streambrowser/CMakeLists.txt | 25 +- .../General/streambrowser/streambrowserfactory.cpp | 7 +- .../General/streambrowser/streambrowserfactory.h | 1 + src/plugins/General/streambrowser/streamwindow.cpp | 7 +- .../translations/streambrowser_plugin_bg.ts | 38 +-- .../translations/streambrowser_plugin_cs.ts | 38 +-- .../translations/streambrowser_plugin_de.ts | 38 +-- .../translations/streambrowser_plugin_el.ts | 38 +-- .../translations/streambrowser_plugin_en.ts | 38 +-- .../translations/streambrowser_plugin_es.ts | 38 +-- .../translations/streambrowser_plugin_fi.ts | 38 +-- .../translations/streambrowser_plugin_fr.ts | 38 +-- .../translations/streambrowser_plugin_gl_ES.ts | 38 +-- .../translations/streambrowser_plugin_he.ts | 38 +-- .../translations/streambrowser_plugin_hu.ts | 38 +-- .../translations/streambrowser_plugin_id.ts | 38 +-- .../translations/streambrowser_plugin_it.ts | 38 +-- .../translations/streambrowser_plugin_ja.ts | 38 +-- .../translations/streambrowser_plugin_kk.ts | 38 +-- .../translations/streambrowser_plugin_lt.ts | 38 +-- .../translations/streambrowser_plugin_nl.ts | 38 +-- .../translations/streambrowser_plugin_pl_PL.ts | 38 +-- .../translations/streambrowser_plugin_pt.ts | 38 +-- .../translations/streambrowser_plugin_pt_BR.ts | 38 +-- .../translations/streambrowser_plugin_ru.ts | 38 +-- .../translations/streambrowser_plugin_sk.ts | 38 +-- .../translations/streambrowser_plugin_sr_BA.ts | 38 +-- .../translations/streambrowser_plugin_sr_RS.ts | 38 +-- .../translations/streambrowser_plugin_tr.ts | 38 +-- .../translations/streambrowser_plugin_uk_UA.ts | 38 +-- .../translations/streambrowser_plugin_zh_CN.ts | 38 +-- .../translations/streambrowser_plugin_zh_TW.ts | 38 +-- src/plugins/General/trackchange/CMakeLists.txt | 21 +- src/plugins/General/trackchange/trackchange.pro | 27 ++- .../General/trackchange/trackchangefactory.cpp | 7 +- .../General/trackchange/trackchangefactory.h | 1 + .../translations/trackchange_plugin_bg.ts | 10 +- .../translations/trackchange_plugin_cs.ts | 10 +- .../translations/trackchange_plugin_de.ts | 10 +- .../translations/trackchange_plugin_el.ts | 10 +- .../translations/trackchange_plugin_en.ts | 10 +- .../translations/trackchange_plugin_es.ts | 10 +- .../translations/trackchange_plugin_fi.ts | 10 +- .../translations/trackchange_plugin_fr.ts | 10 +- .../translations/trackchange_plugin_gl_ES.ts | 10 +- .../translations/trackchange_plugin_he.ts | 10 +- .../translations/trackchange_plugin_hu.ts | 10 +- .../translations/trackchange_plugin_id.ts | 10 +- .../translations/trackchange_plugin_it.ts | 10 +- .../translations/trackchange_plugin_ja.ts | 10 +- .../translations/trackchange_plugin_kk.ts | 10 +- .../translations/trackchange_plugin_lt.ts | 10 +- .../translations/trackchange_plugin_nl.ts | 10 +- .../translations/trackchange_plugin_pl_PL.ts | 10 +- .../translations/trackchange_plugin_pt.ts | 10 +- .../translations/trackchange_plugin_pt_BR.ts | 10 +- .../translations/trackchange_plugin_ru.ts | 10 +- .../translations/trackchange_plugin_sk.ts | 10 +- .../translations/trackchange_plugin_sr_BA.ts | 10 +- .../translations/trackchange_plugin_sr_RS.ts | 10 +- .../translations/trackchange_plugin_tr.ts | 10 +- .../translations/trackchange_plugin_uk_UA.ts | 10 +- .../translations/trackchange_plugin_zh_CN.ts | 10 +- .../translations/trackchange_plugin_zh_TW.ts | 10 +- src/plugins/General/udisks/CMakeLists.txt | 51 ---- src/plugins/General/udisks/settingsdialog.cpp | 58 ----- src/plugins/General/udisks/settingsdialog.h | 46 ---- src/plugins/General/udisks/settingsdialog.ui | 122 ---------- .../General/udisks/translations/translations.qrc | 32 --- .../udisks/translations/udisks_plugin_bg.ts | 83 ------- .../udisks/translations/udisks_plugin_cs.ts | 83 ------- .../udisks/translations/udisks_plugin_de.ts | 83 ------- .../udisks/translations/udisks_plugin_el.ts | 83 ------- .../udisks/translations/udisks_plugin_en.ts | 83 ------- .../udisks/translations/udisks_plugin_es.ts | 83 ------- .../udisks/translations/udisks_plugin_fi.ts | 83 ------- .../udisks/translations/udisks_plugin_fr.ts | 83 ------- .../udisks/translations/udisks_plugin_gl_ES.ts | 83 ------- .../udisks/translations/udisks_plugin_he.ts | 83 ------- .../udisks/translations/udisks_plugin_hu.ts | 83 ------- .../udisks/translations/udisks_plugin_id.ts | 83 ------- .../udisks/translations/udisks_plugin_it.ts | 83 ------- .../udisks/translations/udisks_plugin_ja.ts | 83 ------- .../udisks/translations/udisks_plugin_kk.ts | 83 ------- .../udisks/translations/udisks_plugin_lt.ts | 83 ------- .../udisks/translations/udisks_plugin_nl.ts | 83 ------- .../udisks/translations/udisks_plugin_pl_PL.ts | 83 ------- .../udisks/translations/udisks_plugin_pt.ts | 83 ------- .../udisks/translations/udisks_plugin_pt_BR.ts | 83 ------- .../udisks/translations/udisks_plugin_ru.ts | 83 ------- .../udisks/translations/udisks_plugin_sk.ts | 83 ------- .../udisks/translations/udisks_plugin_sr_BA.ts | 83 ------- .../udisks/translations/udisks_plugin_sr_RS.ts | 83 ------- .../udisks/translations/udisks_plugin_tr.ts | 83 ------- .../udisks/translations/udisks_plugin_uk_UA.ts | 83 ------- .../udisks/translations/udisks_plugin_zh_CN.ts | 83 ------- .../udisks/translations/udisks_plugin_zh_TW.ts | 83 ------- src/plugins/General/udisks/udisks.pro | 26 -- src/plugins/General/udisks/udisksdevice.cpp | 50 ---- src/plugins/General/udisks/udisksdevice.h | 54 ----- src/plugins/General/udisks/udisksfactory.cpp | 66 ----- src/plugins/General/udisks/udisksfactory.h | 45 ---- src/plugins/General/udisks/udisksmanager.cpp | 61 ----- src/plugins/General/udisks/udisksmanager.h | 52 ---- src/plugins/General/udisks/udisksplugin.cpp | 269 --------------------- src/plugins/General/udisks/udisksplugin.h | 65 ----- src/plugins/General/udisks2/CMakeLists.txt | 20 +- .../udisks2/translations/udisks2_plugin_bg.ts | 10 +- .../udisks2/translations/udisks2_plugin_cs.ts | 10 +- .../udisks2/translations/udisks2_plugin_de.ts | 10 +- .../udisks2/translations/udisks2_plugin_el.ts | 10 +- .../udisks2/translations/udisks2_plugin_en.ts | 10 +- .../udisks2/translations/udisks2_plugin_es.ts | 10 +- .../udisks2/translations/udisks2_plugin_fi.ts | 10 +- .../udisks2/translations/udisks2_plugin_fr.ts | 10 +- .../udisks2/translations/udisks2_plugin_gl_ES.ts | 10 +- .../udisks2/translations/udisks2_plugin_he.ts | 10 +- .../udisks2/translations/udisks2_plugin_hu.ts | 10 +- .../udisks2/translations/udisks2_plugin_id.ts | 10 +- .../udisks2/translations/udisks2_plugin_it.ts | 10 +- .../udisks2/translations/udisks2_plugin_ja.ts | 10 +- .../udisks2/translations/udisks2_plugin_kk.ts | 10 +- .../udisks2/translations/udisks2_plugin_lt.ts | 10 +- .../udisks2/translations/udisks2_plugin_nl.ts | 10 +- .../udisks2/translations/udisks2_plugin_pl_PL.ts | 10 +- .../udisks2/translations/udisks2_plugin_pt.ts | 10 +- .../udisks2/translations/udisks2_plugin_pt_BR.ts | 10 +- .../udisks2/translations/udisks2_plugin_ru.ts | 10 +- .../udisks2/translations/udisks2_plugin_sk.ts | 10 +- .../udisks2/translations/udisks2_plugin_sr_BA.ts | 10 +- .../udisks2/translations/udisks2_plugin_sr_RS.ts | 10 +- .../udisks2/translations/udisks2_plugin_tr.ts | 10 +- .../udisks2/translations/udisks2_plugin_uk_UA.ts | 10 +- .../udisks2/translations/udisks2_plugin_zh_CN.ts | 10 +- .../udisks2/translations/udisks2_plugin_zh_TW.ts | 10 +- src/plugins/General/udisks2/udisks2device.cpp | 9 +- src/plugins/General/udisks2/udisks2factory.cpp | 5 +- src/plugins/General/udisks2/udisks2factory.h | 1 + 594 files changed, 3349 insertions(+), 6951 deletions(-) delete mode 100644 src/plugins/General/udisks/CMakeLists.txt delete mode 100644 src/plugins/General/udisks/settingsdialog.cpp delete mode 100644 src/plugins/General/udisks/settingsdialog.h delete mode 100644 src/plugins/General/udisks/settingsdialog.ui delete mode 100644 src/plugins/General/udisks/translations/translations.qrc delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_bg.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_cs.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_de.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_el.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_en.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_es.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_fi.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_fr.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_gl_ES.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_he.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_hu.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_id.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_it.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_ja.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_kk.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_lt.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_nl.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_pl_PL.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_pt.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_pt_BR.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_ru.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_sk.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_sr_BA.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_sr_RS.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_tr.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_uk_UA.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_zh_CN.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_zh_TW.ts delete mode 100644 src/plugins/General/udisks/udisks.pro delete mode 100644 src/plugins/General/udisks/udisksdevice.cpp delete mode 100644 src/plugins/General/udisks/udisksdevice.h delete mode 100644 src/plugins/General/udisks/udisksfactory.cpp delete mode 100644 src/plugins/General/udisks/udisksfactory.h delete mode 100644 src/plugins/General/udisks/udisksmanager.cpp delete mode 100644 src/plugins/General/udisks/udisksmanager.h delete mode 100644 src/plugins/General/udisks/udisksplugin.cpp delete mode 100644 src/plugins/General/udisks/udisksplugin.h (limited to 'src/plugins/General') diff --git a/src/plugins/General/CMakeLists.txt b/src/plugins/General/CMakeLists.txt index bbeec67cf..80acaf8b2 100644 --- a/src/plugins/General/CMakeLists.txt +++ b/src/plugins/General/CMakeLists.txt @@ -5,7 +5,6 @@ SET(USE_NOTIFIER TRUE CACHE BOOL "enable/disable notifier plugin") SET(USE_LYRICS TRUE CACHE BOOL "enable/disable lyrics version") SET(USE_HAL (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") 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") @@ -17,9 +16,9 @@ SET(USE_SB TRUE CACHE BOOL "enable/disable stream browser plugin") SET(USE_TRACKCHANGE TRUE CACHE BOOL "enable/disable track change plugin") SET(USE_COPYPASTE TRUE CACHE BOOL "enable/disable copy/paste change plugin") -IF(USE_MPRIS) +IF(USE_MPRIS AND Qt5DBus_FOUND) add_subdirectory(mpris) -ENDIF(USE_MPRIS) +ENDIF(USE_MPRIS AND Qt5DBus_FOUND) IF(USE_SCROBBLER) add_subdirectory(scrobbler) @@ -37,21 +36,17 @@ IF(USE_LYRICS) add_subdirectory(lyrics) ENDIF(USE_LYRICS) -IF(USE_HAL) +IF(USE_HAL AND Qt5DBus_FOUND) add_subdirectory(hal) -ENDIF(USE_HAL) +ENDIF(USE_HAL AND Qt5DBus_FOUND) -IF(USE_UDISKS2) +IF(USE_UDISKS2 AND Qt5DBus_FOUND) add_subdirectory(udisks2) -ENDIF(USE_UDISKS2) +ENDIF(USE_UDISKS2 AND Qt5DBus_FOUND) -IF(USE_UDISKS) -add_subdirectory(udisks) -ENDIF(USE_UDISKS) - -IF(USE_HOTKEY) +IF(USE_HOTKEY AND Qt5X11Extras_FOUND) add_subdirectory(hotkey) -ENDIF(USE_HOTKEY) +ENDIF(USE_HOTKEY AND Qt5X11Extras_FOUND) IF(USE_FILEOPS) add_subdirectory(fileops) @@ -61,9 +56,9 @@ IF(USE_COVER) add_subdirectory(covermanager) ENDIF(USE_COVER) -IF(USE_KDENOTIFY) +IF(USE_KDENOTIFY AND Qt5DBus_FOUND) add_subdirectory(kdenotify) -ENDIF(USE_KDENOTIFY) +ENDIF(USE_KDENOTIFY AND Qt5DBus_FOUND) IF(USE_CONVERTER AND TAGLIB_FOUND) add_subdirectory(converter) @@ -85,6 +80,6 @@ IF(USE_COPYPASTE) add_subdirectory(copypaste) ENDIF(USE_COPYPASTE) -IF(USE_GNOMEHOTKEY) +IF(USE_GNOMEHOTKEY AND Qt5DBus_FOUND) add_subdirectory(gnomehotkey) -ENDIF(USE_GNOMEHOTKEY) +ENDIF(USE_GNOMEHOTKEY AND Qt5DBus_FOUND) diff --git a/src/plugins/General/General.pro b/src/plugins/General/General.pro index 9484a4b3d..03727ba7d 100644 --- a/src/plugins/General/General.pro +++ b/src/plugins/General/General.pro @@ -16,10 +16,6 @@ unix:SUBDIRS += mpris \ converter \ gnomehotkey -contains(CONFIG, UDISKS_PLUGIN){ - unix:SUBDIRS += udisks -} - contains(CONFIG, UDISKS2_PLUGIN){ unix:SUBDIRS += udisks2 } diff --git a/src/plugins/General/converter/CMakeLists.txt b/src/plugins/General/converter/CMakeLists.txt index 2d67bd731..e9de97024 100644 --- a/src/plugins/General/converter/CMakeLists.txt +++ b/src/plugins/General/converter/CMakeLists.txt @@ -1,22 +1,7 @@ project(libconverter) -include(${QT_USE_FILE}) - -# 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}) -SET(QT_INCLUDES - ${QT_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ -) - # libqmmpui & libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -39,7 +24,7 @@ SET(libconverter_SRCS SET(libconverter_RCCS translations/translations.qrc presets.qrc) -QT4_ADD_RESOURCES(libconverter_RCC_SRCS ${libconverter_RCCS}) +QT5_ADD_RESOURCES(libconverter_RCC_SRCS ${libconverter_RCCS}) # user interface @@ -48,12 +33,12 @@ SET(libconverter_UIS preseteditor.ui ) -QT4_WRAP_UI(libconverter_UIS_H ${libconverter_UIS}) +QT5_WRAP_UI(libconverter_UIS_H ${libconverter_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(converter MODULE ${libconverter_SRCS} ${libconverter_UIS_H} ${libconverter_RCC_SRCS}) add_dependencies(converter qmmpui) -target_link_libraries(converter ${QT_LIBRARIES} qmmpui libqmmp ${TAGLIB_LDFLAGS}) +target_link_libraries(converter Qt5::Widgets -lqmmpui -lqmmp ${TAGLIB_LDFLAGS}) install(TARGETS converter DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/converter/converter.cpp b/src/plugins/General/converter/converter.cpp index 32a63ec53..f11a28ca5 100644 --- a/src/plugins/General/converter/converter.cpp +++ b/src/plugins/General/converter/converter.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include @@ -33,8 +33,6 @@ #include #include "converter.h" -#define QStringToTString_qt4(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8) - Converter::Converter(QObject *parent) : QObject(parent), QRunnable() { m_user_stop = false; @@ -170,7 +168,7 @@ void Converter::run() QString command = m_preset["command"].toString(); command.replace("%o", "\"" + full_path + "\""); - QString tmp_path = QDesktopServices::storageLocation(QDesktopServices::TempLocation) + "/tmp.wav"; + QString tmp_path = QStandardPaths::writableLocation(QStandardPaths::TempLocation) + "/tmp.wav"; bool use_file = command.contains("%i"); command.replace("%i", "\"" + tmp_path + "\""); @@ -258,11 +256,11 @@ void Converter::run() TagLib::FileRef file(qPrintable(full_path)); if(file.tag()) { - file.tag()->setTitle(QStringToTString_qt4(metadata[Qmmp::TITLE])); - file.tag()->setArtist(QStringToTString_qt4(metadata[Qmmp::ARTIST])); - file.tag()->setAlbum(QStringToTString_qt4(metadata[Qmmp::ALBUM])); - file.tag()->setGenre(QStringToTString_qt4(metadata[Qmmp::GENRE])); - file.tag()->setComment(QStringToTString_qt4(metadata[Qmmp::COMMENT])); + file.tag()->setTitle(QStringToTString(metadata[Qmmp::TITLE])); + file.tag()->setArtist(QStringToTString(metadata[Qmmp::ARTIST])); + file.tag()->setAlbum(QStringToTString(metadata[Qmmp::ALBUM])); + file.tag()->setGenre(QStringToTString(metadata[Qmmp::GENRE])); + file.tag()->setComment(QStringToTString(metadata[Qmmp::COMMENT])); file.tag()->setYear(metadata[Qmmp::YEAR].toUInt()); file.tag()->setTrack(metadata[Qmmp::TRACK].toUInt()); diff --git a/src/plugins/General/converter/converterdialog.cpp b/src/plugins/General/converter/converterdialog.cpp index 11266e611..2325b125b 100644 --- a/src/plugins/General/converter/converterdialog.cpp +++ b/src/plugins/General/converter/converterdialog.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include -#include +#include #include #include #include @@ -40,7 +40,7 @@ ConverterDialog::ConverterDialog(QList tracks, QWidget *paren { m_ui.setupUi(this); m_ui.tableWidget->verticalHeader()->setDefaultSectionSize(fontMetrics().height() + 3); - m_ui.tableWidget->verticalHeader()->setResizeMode(QHeaderView::Fixed); + m_ui.tableWidget->verticalHeader()->setSectionResizeMode(QHeaderView::Fixed); QStringList paths; MetaDataFormatter formatter("%if(%p&%t,%p - %t,%f) - %l"); @@ -72,7 +72,7 @@ ConverterDialog::ConverterDialog(QList tracks, QWidget *paren QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("Converter"); - QString music_path = QDesktopServices::storageLocation(QDesktopServices::MusicLocation); + QString music_path = QStandardPaths::writableLocation(QStandardPaths::MusicLocation); m_ui.outDirEdit->setText(settings.value("out_dir", music_path).toString()); m_ui.outFileEdit->setText(settings.value("file_name","%p - %t").toString()); m_ui.overwriteCheckBox->setChecked(settings.value("overwrite",false).toBool()); @@ -272,7 +272,7 @@ void ConverterDialog::readPresets(const QString &path) QList dataList; while(!file.atEnd()) { - QString line = QString::fromUtf8(file.readLine().trimmed().constData()); + QString line = QString::fromUtf8(file.readLine().trimmed()); if(!line.contains("=")) continue; QString key = line.split("=").at(0); diff --git a/src/plugins/General/converter/converterfactory.cpp b/src/plugins/General/converter/converterfactory.cpp index 6b2e32a43..cda17108c 100644 --- a/src/plugins/General/converter/converterfactory.cpp +++ b/src/plugins/General/converter/converterfactory.cpp @@ -18,9 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ + #include -#include -#include #include "converterhelper.h" #include "converterfactory.h" @@ -62,5 +61,3 @@ QTranslator *ConverterFactory::createTranslator(QObject *parent) translator->load(QString(":/converter_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(converter, ConverterFactory) diff --git a/src/plugins/General/converter/converterfactory.h b/src/plugins/General/converter/converterfactory.h index 27b340296..88017bfcf 100644 --- a/src/plugins/General/converter/converterfactory.h +++ b/src/plugins/General/converter/converterfactory.h @@ -33,6 +33,7 @@ class ConverterFactory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; diff --git a/src/plugins/General/converter/translations/converter_plugin_bg.ts b/src/plugins/General/converter/translations/converter_plugin_bg.ts index d68f7c317..cd633677d 100644 --- a/src/plugins/General/converter/translations/converter_plugin_bg.ts +++ b/src/plugins/General/converter/translations/converter_plugin_bg.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled - - + + Error - + Converting - + Encoding - + Finished @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin - + About Converter Plugin - + Qmmp Converter Plugin - + This plugin converts supported audio files to other file formats using external command-line encoders - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_cs.ts b/src/plugins/General/converter/translations/converter_plugin_cs.ts index c4cc65d8e..18400f78d 100644 --- a/src/plugins/General/converter/translations/converter_plugin_cs.ts +++ b/src/plugins/General/converter/translations/converter_plugin_cs.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled - - + + Error Chyba - + Converting - + Encoding - + Finished @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin Modul konvertoru - + About Converter Plugin O modulu konvertoru - + Qmmp Converter Plugin Modul Qmmp pro konverzi - + This plugin converts supported audio files to other file formats using external command-line encoders Tento modul konvertuje podporované zvukové soubory do jiných formátů pomocí externích kodérů - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_de.ts b/src/plugins/General/converter/translations/converter_plugin_de.ts index 566175bde..aa7244830 100644 --- a/src/plugins/General/converter/translations/converter_plugin_de.ts +++ b/src/plugins/General/converter/translations/converter_plugin_de.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled Abgebrochen - - + + Error Fehler - + Converting Konvertierungsvorgang - + Encoding Kodierung - + Finished Fertiggestellt @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin Konvertermodul - + About Converter Plugin Über Konvertermodul - + Qmmp Converter Plugin Qmmp Konvertermodul - + This plugin converts supported audio files to other file formats using external command-line encoders Dieses Modul konvertiert unterstützte Audiodateien durch externe Befehlszeilen-Kodierer in andere Formate - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_el.ts b/src/plugins/General/converter/translations/converter_plugin_el.ts index 2b0eb5c5a..b1e2624bd 100644 --- a/src/plugins/General/converter/translations/converter_plugin_el.ts +++ b/src/plugins/General/converter/translations/converter_plugin_el.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled Ακυρώθηκε - - + + Error Σφάλμα - + Converting Μετατρέπεται - + Encoding Κωδικοποίηση - + Finished Ολοκληρώθηκε @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin Πρόσθετο Μετατροπέας - + About Converter Plugin Σχετικά με το πρόσθετο Μετατροπέας - + Qmmp Converter Plugin Qmmp πρόσθετο Μετατροπέας - + This plugin converts supported audio files to other file formats using external command-line encoders Αυτό το πρόσθετο μετατρέπει υποστηριζόμενους τύπους αρχείων ήχου σε άλλες μορφές χρησιμοποιώντας κωδικοποιητές της γραμμής εντολών - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_en.ts b/src/plugins/General/converter/translations/converter_plugin_en.ts index 4faaa7d45..90bff91ea 100644 --- a/src/plugins/General/converter/translations/converter_plugin_en.ts +++ b/src/plugins/General/converter/translations/converter_plugin_en.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled - - + + Error - + Converting - + Encoding - + Finished @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin - + About Converter Plugin - + Qmmp Converter Plugin - + This plugin converts supported audio files to other file formats using external command-line encoders - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_es.ts b/src/plugins/General/converter/translations/converter_plugin_es.ts index ef23b1be2..801c09b3e 100644 --- a/src/plugins/General/converter/translations/converter_plugin_es.ts +++ b/src/plugins/General/converter/translations/converter_plugin_es.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled Cancelado - - + + Error Error - + Converting Convirtiendo - + Encoding Codificando - + Finished Finalizado @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin Módulo Convertidor - + About Converter Plugin Acerca del Módulo Convertidor - + Qmmp Converter Plugin Módulo Convertidor de Qmmp - + This plugin converts supported audio files to other file formats using external command-line encoders Este módulo convierte archivos de audio soportados hacia otros formatos utilizando codificadores externos de consola - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_fi.ts b/src/plugins/General/converter/translations/converter_plugin_fi.ts index 62e46df78..7b273ff46 100644 --- a/src/plugins/General/converter/translations/converter_plugin_fi.ts +++ b/src/plugins/General/converter/translations/converter_plugin_fi.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled Peruttu - - + + Error Virhe - + Converting - + Encoding - + Finished @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin - + About Converter Plugin - + Qmmp Converter Plugin - + This plugin converts supported audio files to other file formats using external command-line encoders - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_fr.ts b/src/plugins/General/converter/translations/converter_plugin_fr.ts index 656c3e8f7..069337923 100644 --- a/src/plugins/General/converter/translations/converter_plugin_fr.ts +++ b/src/plugins/General/converter/translations/converter_plugin_fr.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled Annulé - - + + Error Erreur - + Converting Conversion - + Encoding Encodage - + Finished Terminé @@ -135,27 +135,27 @@ ConverterFactory - + Converter Plugin Greffon de conversion - + About Converter Plugin À propos du greffon de conversion - + Qmmp Converter Plugin Greffon de conversion pour Qmmp - + This plugin converts supported audio files to other file formats using external command-line encoders Ce greffon convertit les fichiers audio supportés dans d'autres formats en utilisant des encodeurs en ligne de commande - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_gl_ES.ts b/src/plugins/General/converter/translations/converter_plugin_gl_ES.ts index 81a019566..de42b71b0 100644 --- a/src/plugins/General/converter/translations/converter_plugin_gl_ES.ts +++ b/src/plugins/General/converter/translations/converter_plugin_gl_ES.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled Cancelado - - + + Error Erro - + Converting Convertendo - + Encoding Codificando - + Finished Rematado @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin Engadido Converter - + About Converter Plugin Sobre o engadido Converter - + Qmmp Converter Plugin Engadido Qmmp Converter - + This plugin converts supported audio files to other file formats using external command-line encoders Este engadido converte ficheiros de audio soportados a outros formatos de ficheiro usando codificadores por liña de comandos externos - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_he.ts b/src/plugins/General/converter/translations/converter_plugin_he.ts index 29ee7569d..624cc0624 100644 --- a/src/plugins/General/converter/translations/converter_plugin_he.ts +++ b/src/plugins/General/converter/translations/converter_plugin_he.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled בוטלה - - + + Error שגיאה - + Converting המרה - + Encoding קידוד - + Finished נסתיימה @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin תוסף ממיר - + About Converter Plugin אודות תוסף ממיר - + Qmmp Converter Plugin תוסף ממיר של Qmmp - + This plugin converts supported audio files to other file formats using external command-line encoders תוסף זה ממיר קבצי שמע נתמכים לפורמט קובץ באמצעות שורת פקודה של מקודדים חיצוניים - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_hu.ts b/src/plugins/General/converter/translations/converter_plugin_hu.ts index fae3f3b6f..a13158f8c 100644 --- a/src/plugins/General/converter/translations/converter_plugin_hu.ts +++ b/src/plugins/General/converter/translations/converter_plugin_hu.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled - - + + Error - + Converting - + Encoding - + Finished @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin - + About Converter Plugin - + Qmmp Converter Plugin - + This plugin converts supported audio files to other file formats using external command-line encoders - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_id.ts b/src/plugins/General/converter/translations/converter_plugin_id.ts index 046fdfbf1..72c447932 100644 --- a/src/plugins/General/converter/translations/converter_plugin_id.ts +++ b/src/plugins/General/converter/translations/converter_plugin_id.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled Dibatalkan - - + + Error Galat - + Converting Mengkonversi - + Encoding Mengenkode - + Finished Selesai @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin Plugin Converter - + About Converter Plugin Tentang Plugin Converter - + Qmmp Converter Plugin Plugin Converter Qmmp - + This plugin converts supported audio files to other file formats using external command-line encoders Plugin ini mengkonversi file audio yang didukung ke format file lainnya menggunakan enkoder baris-perintah eksternal - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_it.ts b/src/plugins/General/converter/translations/converter_plugin_it.ts index ef317b5da..cd94bee4d 100644 --- a/src/plugins/General/converter/translations/converter_plugin_it.ts +++ b/src/plugins/General/converter/translations/converter_plugin_it.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled - - + + Error - + Converting - + Encoding - + Finished @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin - + About Converter Plugin - + Qmmp Converter Plugin - + This plugin converts supported audio files to other file formats using external command-line encoders - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_ja.ts b/src/plugins/General/converter/translations/converter_plugin_ja.ts index a581d8bc1..21264f0a1 100644 --- a/src/plugins/General/converter/translations/converter_plugin_ja.ts +++ b/src/plugins/General/converter/translations/converter_plugin_ja.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled 中止しました - - + + Error エラーです - + Converting 転換しています - + Encoding 符号化しています - + Finished 完了しました @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin ファイル形式転換プラグイン - + About Converter Plugin 転換プラグインについて - + Qmmp Converter Plugin QMMP 転換プラグイン - + This plugin converts supported audio files to other file formats using external command-line encoders このプラグインは外部のコマンドライン方式のエンコーダーを利用してサポート対象形式間で音声ファイルを転換し別の音声ファイルを生成します。 - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_kk.ts b/src/plugins/General/converter/translations/converter_plugin_kk.ts index 08897f006..c2ec6aab0 100644 --- a/src/plugins/General/converter/translations/converter_plugin_kk.ts +++ b/src/plugins/General/converter/translations/converter_plugin_kk.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled - - + + Error - + Converting - + Encoding - + Finished @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin - + About Converter Plugin - + Qmmp Converter Plugin - + This plugin converts supported audio files to other file formats using external command-line encoders - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_lt.ts b/src/plugins/General/converter/translations/converter_plugin_lt.ts index 722a4a228..c646e5162 100644 --- a/src/plugins/General/converter/translations/converter_plugin_lt.ts +++ b/src/plugins/General/converter/translations/converter_plugin_lt.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled - - + + Error - + Converting - + Encoding - + Finished @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin Perkodavimo įskiepis - + About Converter Plugin Apie perkodavimo įskiepį - + Qmmp Converter Plugin Qmmp perkodavimo įskiepis - + This plugin converts supported audio files to other file formats using external command-line encoders Šis įskiepis perkoduoja palaikomas audio bylas, naudodamasis išorinėmis perkodavimo programomis - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_nl.ts b/src/plugins/General/converter/translations/converter_plugin_nl.ts index 07fbcc05e..0f3063cf2 100644 --- a/src/plugins/General/converter/translations/converter_plugin_nl.ts +++ b/src/plugins/General/converter/translations/converter_plugin_nl.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled - - + + Error - + Converting - + Encoding - + Finished @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin Converteer Module - + About Converter Plugin Over de Converteer Module - + Qmmp Converter Plugin Converteer Module voor Qmmp - + This plugin converts supported audio files to other file formats using external command-line encoders Deze module converteert ondersteunde audiobestanden naar andere formaten door gebruik van externe commando prompt encoders - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_pl_PL.ts b/src/plugins/General/converter/translations/converter_plugin_pl_PL.ts index 18b51ab85..a64d143ab 100644 --- a/src/plugins/General/converter/translations/converter_plugin_pl_PL.ts +++ b/src/plugins/General/converter/translations/converter_plugin_pl_PL.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled - - + + Error Błąd - + Converting - + Encoding - + Finished @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin Wtyczka konwertera - + About Converter Plugin O wtyczce Konwerter - + Qmmp Converter Plugin Wtyczka Konwerter dla Qmmp - + This plugin converts supported audio files to other file formats using external command-line encoders Ta wtyczka konwertuje wspierane pliki dźwiękowe do innego formatu przy użyciu zewnętrznych programów - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_pt.ts b/src/plugins/General/converter/translations/converter_plugin_pt.ts index ff2f4d30c..14d7b535a 100644 --- a/src/plugins/General/converter/translations/converter_plugin_pt.ts +++ b/src/plugins/General/converter/translations/converter_plugin_pt.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled Cancelada - - + + Error Erro - + Converting Conversão - + Encoding Codificação - + Finished Terminada @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin Suplemento Converter - + About Converter Plugin Sobre o suplemento Converter - + Qmmp Converter Plugin Suplemento Qmmp Converter - + This plugin converts supported audio files to other file formats using external command-line encoders Este suplemento converte os ficheiros áudio suportados para outros formatos através da utilização de codificadores externos - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_pt_BR.ts b/src/plugins/General/converter/translations/converter_plugin_pt_BR.ts index 7edb6c99e..bc2bf1a63 100644 --- a/src/plugins/General/converter/translations/converter_plugin_pt_BR.ts +++ b/src/plugins/General/converter/translations/converter_plugin_pt_BR.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled Cancelada - - + + Error Erro - + Converting Conversão - + Encoding Codificação - + Finished Terminada @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin Plugin Converter - + About Converter Plugin Sobre o plugin Converter - + Qmmp Converter Plugin Plugin Qmmp Converter - + This plugin converts supported audio files to other file formats using external command-line encoders Este plugin converte os arquivos de áudio suportados para outros formatos através da utilização de codificadores externos - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_ru.ts b/src/plugins/General/converter/translations/converter_plugin_ru.ts index 3414b2879..0c253645f 100644 --- a/src/plugins/General/converter/translations/converter_plugin_ru.ts +++ b/src/plugins/General/converter/translations/converter_plugin_ru.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled Отменено - - + + Error Ошибка - + Converting Преобразование - + Encoding Кодирование - + Finished Завершено @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin Модуль преобр. форматов - + About Converter Plugin О преобразователе форматов - + Qmmp Converter Plugin Модуль преобразования аудио-форматов для Qmmp - + This plugin converts supported audio files to other file formats using external command-line encoders Этот модуль предназначен для преобразования поддерживаемых аудио-файлов в другой формат с использованием внешних консольных программ - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_sk.ts b/src/plugins/General/converter/translations/converter_plugin_sk.ts index afabc8b6f..b0153dbcf 100644 --- a/src/plugins/General/converter/translations/converter_plugin_sk.ts +++ b/src/plugins/General/converter/translations/converter_plugin_sk.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled - - + + Error - + Converting - + Encoding - + Finished @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin - + About Converter Plugin - + Qmmp Converter Plugin - + This plugin converts supported audio files to other file formats using external command-line encoders - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_sr_BA.ts b/src/plugins/General/converter/translations/converter_plugin_sr_BA.ts index dfffab661..5522c4f73 100644 --- a/src/plugins/General/converter/translations/converter_plugin_sr_BA.ts +++ b/src/plugins/General/converter/translations/converter_plugin_sr_BA.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled - - + + Error - + Converting - + Encoding - + Finished @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin Претварач - + About Converter Plugin О претварачу - + Qmmp Converter Plugin Кумп прикључак за претварање - + This plugin converts supported audio files to other file formats using external command-line encoders Претвара подржане фајлове звука у остале формате користећи спољашње програме - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_sr_RS.ts b/src/plugins/General/converter/translations/converter_plugin_sr_RS.ts index 8c8d525e3..67cb72af9 100644 --- a/src/plugins/General/converter/translations/converter_plugin_sr_RS.ts +++ b/src/plugins/General/converter/translations/converter_plugin_sr_RS.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled - - + + Error - + Converting - + Encoding - + Finished @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin Претварач - + About Converter Plugin О претварачу - + Qmmp Converter Plugin Кумп прикључак за претварање - + This plugin converts supported audio files to other file formats using external command-line encoders Претвара подржане фајлове звука у остале формате користећи спољашње програме - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_tr.ts b/src/plugins/General/converter/translations/converter_plugin_tr.ts index 9cb1ff6a4..791d4ea54 100644 --- a/src/plugins/General/converter/translations/converter_plugin_tr.ts +++ b/src/plugins/General/converter/translations/converter_plugin_tr.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled - - + + Error - + Converting - + Encoding - + Finished @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin - + About Converter Plugin - + Qmmp Converter Plugin - + This plugin converts supported audio files to other file formats using external command-line encoders - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_uk_UA.ts b/src/plugins/General/converter/translations/converter_plugin_uk_UA.ts index ece5917c3..cdae9dc5d 100644 --- a/src/plugins/General/converter/translations/converter_plugin_uk_UA.ts +++ b/src/plugins/General/converter/translations/converter_plugin_uk_UA.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled Скасовано - - + + Error Помилка - + Converting Конвертування - + Encoding Кодування - + Finished Завершено @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin Модуль конвертера - + About Converter Plugin Про модуль конвертера - + Qmmp Converter Plugin Модуль конвертера для Qmmp - + This plugin converts supported audio files to other file formats using external command-line encoders Цей модуль призначений для конвертування аудіофайлів, що підтримуються, в інший формат з використанням зовнішніх консольних програм - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_zh_CN.ts b/src/plugins/General/converter/translations/converter_plugin_zh_CN.ts index 448987a41..b23b6c488 100644 --- a/src/plugins/General/converter/translations/converter_plugin_zh_CN.ts +++ b/src/plugins/General/converter/translations/converter_plugin_zh_CN.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled 已取消 - - + + Error 错误 - + Converting 转化中 - + Encoding 编码中 - + Finished 完成 @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin 转换器插件 - + About Converter Plugin 关于转换器插件 - + Qmmp Converter Plugin Qmmp转换器插件 - + This plugin converts supported audio files to other file formats using external command-line encoders 该插件使用外置命令行编码器转换支持格式的音频文件 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_zh_TW.ts b/src/plugins/General/converter/translations/converter_plugin_zh_TW.ts index 4d50ddb1e..c0bb91df4 100644 --- a/src/plugins/General/converter/translations/converter_plugin_zh_TW.ts +++ b/src/plugins/General/converter/translations/converter_plugin_zh_TW.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled - - + + Error 錯誤 - + Converting - + Encoding - + Finished @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin - + About Converter Plugin - + Qmmp Converter Plugin - + This plugin converts supported audio files to other file formats using external command-line encoders - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/CMakeLists.txt b/src/plugins/General/copypaste/CMakeLists.txt index a1d3842d9..1172ef9a2 100644 --- a/src/plugins/General/copypaste/CMakeLists.txt +++ b/src/plugins/General/copypaste/CMakeLists.txt @@ -1,22 +1,7 @@ project(libcopypaste) -include(${QT_USE_FILE}) - -# 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}) -SET(QT_INCLUDES - ${QT_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ -) - # libqmmpui & libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -30,7 +15,7 @@ SET(libcopypaste_SRCS SET(libcopypaste_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libcopypaste_RCC_SRCS ${libcopypaste_RCCS}) +QT5_ADD_RESOURCES(libcopypaste_RCC_SRCS ${libcopypaste_RCCS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! @@ -38,5 +23,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(copypaste MODULE ${libcopypaste_SRCS} ${libcopypaste_UIS_H} ${libcopypaste_RCC_SRCS}) add_dependencies(copypaste qmmpui) -target_link_libraries(copypaste ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(copypaste Qt5::Widgets -lqmmpui -lqmmp) install(TARGETS copypaste DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/copypaste/copypastefactory.cpp b/src/plugins/General/copypaste/copypastefactory.cpp index b4fd61a6b..bbd189c55 100644 --- a/src/plugins/General/copypaste/copypastefactory.cpp +++ b/src/plugins/General/copypaste/copypastefactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2016 by Ilya Kotov * + * Copyright (C) 2013 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -18,9 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ + #include -#include -#include #include "copypaste.h" #include "copypastefactory.h" @@ -60,5 +59,3 @@ QTranslator *CopyPasteFactory::createTranslator(QObject *parent) translator->load(QString(":/copypaste_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(copypaste, CopyPasteFactory) diff --git a/src/plugins/General/copypaste/copypastefactory.h b/src/plugins/General/copypaste/copypastefactory.h index 2e157cb2e..0b8f5c7fa 100644 --- a/src/plugins/General/copypaste/copypastefactory.h +++ b/src/plugins/General/copypaste/copypastefactory.h @@ -32,6 +32,7 @@ class CopyPasteFactory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_bg.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_bg.ts index 98c0085ea..6a1fc53cc 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_bg.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_bg.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin - + About Copy/Paste Plugin - + Qmmp Copy/Paste Plugin - + This plugin allows one to copy selected tracks from one playlist to another - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_cs.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_cs.ts index dfdd321eb..c3ec00d4e 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_cs.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_cs.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Modul kopírování/vkládání - + About Copy/Paste Plugin O modulu kopírování/vkládání - + Qmmp Copy/Paste Plugin Modul Qmmp pro kopírování a vkládání - + This plugin allows one to copy selected tracks from one playlist to another Tento modul umožňuje kopírovat vybrané stopy z jednoho seznamu stop do jiného - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_de.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_de.ts index d8d6286fb..5ed18042a 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_de.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_de.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Kopieren/Einfügen-Modul - + About Copy/Paste Plugin Über Kopieren/Einfügen-Modul - + Qmmp Copy/Paste Plugin Qmmp Kopieren/Einfügen-Modul - + This plugin allows one to copy selected tracks from one playlist to another Dieses Modul ermöglicht es, ausgewählte Titel aus einer Wiedergabeliste in eine andere zu kopieren - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_el.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_el.ts index 720a80754..19b184fc8 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_el.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_el.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Πρόσθετο Αντιγραφής/Επικόλλησης - + About Copy/Paste Plugin Σχετικά με το πρόσθετο Αντιγραφής/Επικόλλησης - + Qmmp Copy/Paste Plugin Qmmp πρόσθετο Αντιγραφής/Επικόλλησης - + This plugin allows one to copy selected tracks from one playlist to another Αυτό το πρόσθετο επιτρέπει την αντιγραφή επιλεγμένων κομματιών από μια λίστα αναπαραγωγής σε μια άλλη. - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_en.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_en.ts index fb3629321..263380368 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_en.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_en.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin - + About Copy/Paste Plugin - + Qmmp Copy/Paste Plugin - + This plugin allows one to copy selected tracks from one playlist to another - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_es.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_es.ts index 3560d5d4a..98f1fef60 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_es.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_es.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Módulo Copiar/Pegar - + About Copy/Paste Plugin Acerca del Módulo Copiar/Pegar - + Qmmp Copy/Paste Plugin Módulo Copiar/Pegar de Qmmp - + This plugin allows one to copy selected tracks from one playlist to another Este módulo permite copiar pistas seleccionadas desde una lista de hacia otra - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_fi.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_fi.ts index f07c1e26c..7c5d22969 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_fi.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_fi.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Kopioi/liitä-liitännäinen - + About Copy/Paste Plugin - + Qmmp Copy/Paste Plugin - + This plugin allows one to copy selected tracks from one playlist to another - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_fr.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_fr.ts index 93fdf5ce2..ded128787 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_fr.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_fr.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Greffon copier/coller - + About Copy/Paste Plugin À propos du greffon copier/coller - + Qmmp Copy/Paste Plugin Greffon copier/coller pour Qmmp - + This plugin allows one to copy selected tracks from one playlist to another Ce greffon permet de copier les pistes sélectionnées d'une liste à une autre. - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_gl_ES.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_gl_ES.ts index 9c17ed948..3a36baad5 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_gl_ES.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_gl_ES.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Engadido Copiar/Pegar - + About Copy/Paste Plugin Sobre o engadido Copiar/Pegar - + Qmmp Copy/Paste Plugin Engadido Qmmp Copiar/Pegar - + This plugin allows one to copy selected tracks from one playlist to another Este engadido permite copiar pistas seleccionadas dunha lista de reprodución a outra - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_he.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_he.ts index 96da5b8dd..1bf897c2c 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_he.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_he.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin תוסף העתק/הדבק - + About Copy/Paste Plugin אודות תוסף העתק/הדבק - + Qmmp Copy/Paste Plugin תוסף העתק/הדבק של Qmmp - + This plugin allows one to copy selected tracks from one playlist to another תוסף זה מתיר לך להעתיק רצועות נבחרות מתוך רשימת נגינה אחת לאחרת - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_hu.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_hu.ts index 27fdd105b..4acb2b44c 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_hu.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_hu.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin - + About Copy/Paste Plugin - + Qmmp Copy/Paste Plugin - + This plugin allows one to copy selected tracks from one playlist to another - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_id.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_id.ts index cabe5a2e6..9d16d31b0 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_id.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_id.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Plugin Salin/Tempel - + About Copy/Paste Plugin Tentang Plugin Salin/Tempel - + Qmmp Copy/Paste Plugin Plugin Salin/Tempel Qmmp - + This plugin allows one to copy selected tracks from one playlist to another Plugin ini membolehkan untuk menyalin track terpilih dari salah satu daftarmain ke yang lain - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_it.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_it.ts index dc692ff30..493e8b2c8 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_it.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_it.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin - + About Copy/Paste Plugin - + Qmmp Copy/Paste Plugin - + This plugin allows one to copy selected tracks from one playlist to another - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_ja.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_ja.ts index 44b1f77b7..62823b594 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_ja.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_ja.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin プレイリスト切り貼りプラグイン - + About Copy/Paste Plugin 切り貼りプラグインについて - + Qmmp Copy/Paste Plugin QMMP 切り貼りプラグイン - + This plugin allows one to copy selected tracks from one playlist to another このプラグインでプレイリストからトラックを選んで他のプレイリストにコピーできます - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_kk.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_kk.ts index 43be73333..a129f2c50 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_kk.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_kk.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin - + About Copy/Paste Plugin - + Qmmp Copy/Paste Plugin - + This plugin allows one to copy selected tracks from one playlist to another - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_lt.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_lt.ts index c7b356987..e7d3b1990 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_lt.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_lt.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Copy/Paste Įskiepis - + About Copy/Paste Plugin Apie Copy/Paste Įskiepį - + Qmmp Copy/Paste Plugin Qmmp Copy/Paste Įskiepis - + This plugin allows one to copy selected tracks from one playlist to another Šis įskiepis leidžia kopijuoti pasirinktus takelius iš vieno grojaraščio į kitą - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_nl.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_nl.ts index bcab01a99..7916a1f7b 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_nl.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_nl.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin - + About Copy/Paste Plugin - + Qmmp Copy/Paste Plugin - + This plugin allows one to copy selected tracks from one playlist to another - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_pl_PL.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_pl_PL.ts index 9812d857e..a17772781 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_pl_PL.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_pl_PL.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Wtyczka Kopiuj/Wklej - + About Copy/Paste Plugin O wtyczce Kopiuj/Wklej - + Qmmp Copy/Paste Plugin Wtyczka Kopiuj/Wklej dla Qmmp - + This plugin allows one to copy selected tracks from one playlist to another Ta wtyczka pozwala na kopiowanie wybranych utworów z jednej listy odtwarzania do innej - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_pt.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_pt.ts index 745e7289f..bdd3d57c5 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_pt.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_pt.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Suplemento Copy/Paste - + About Copy/Paste Plugin Sobre o suplemento Copy/Paste - + Qmmp Copy/Paste Plugin Suplemento Qmmp Copy/Paste - + This plugin allows one to copy selected tracks from one playlist to another Este suplemento permite copiar as faixas entre as várias listas de reprodução - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_pt_BR.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_pt_BR.ts index 856091efb..7afcdc247 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_pt_BR.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_pt_BR.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Plugin Copy/Paste - + About Copy/Paste Plugin Sobre o plugin Copy/Paste - + Qmmp Copy/Paste Plugin Plugin Qmmp Copy/Paste - + This plugin allows one to copy selected tracks from one playlist to another Este plugin permite copiar faixas selecionadas de uma lista de reprodução para outra - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_ru.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_ru.ts index 59bfbac8e..c3be5e484 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_ru.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_ru.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Модуль копир./вставки - + About Copy/Paste Plugin О модуле копирования/вставки - + Qmmp Copy/Paste Plugin Модуль копирования/вставки - + This plugin allows one to copy selected tracks from one playlist to another Данный модуль позволяет копировать выбранные треки из одного списка воспроизведения в другой - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_sk.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_sk.ts index c1d42d10a..613222d83 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_sk.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_sk.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin - + About Copy/Paste Plugin - + Qmmp Copy/Paste Plugin - + This plugin allows one to copy selected tracks from one playlist to another - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_sr_BA.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_sr_BA.ts index 8e7ac2b66..ebaa94376 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_sr_BA.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_sr_BA.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Копирај/налијепи - + About Copy/Paste Plugin О прикључку за копирање/лијепљење - + Qmmp Copy/Paste Plugin Кумп прикључак за копирање/лијепљење - + This plugin allows one to copy selected tracks from one playlist to another Омогућује копирање изабране нумере са једне листе нумера на другу - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_sr_RS.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_sr_RS.ts index 52b7a0a6b..b970f6f73 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_sr_RS.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_sr_RS.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Копирај/налепи - + About Copy/Paste Plugin О прикључку за копирање/лепљење - + Qmmp Copy/Paste Plugin Кумп прикључак за копирање/лепљење - + This plugin allows one to copy selected tracks from one playlist to another Омогућује копирање изабране нумере са једне листе нумера на другу - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_tr.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_tr.ts index c09e0e0f6..41ee131bb 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_tr.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_tr.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin - + About Copy/Paste Plugin - + Qmmp Copy/Paste Plugin - + This plugin allows one to copy selected tracks from one playlist to another - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_uk_UA.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_uk_UA.ts index f41f666fc..16aafe9eb 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_uk_UA.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_uk_UA.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Модуль копіюв./вставки - + About Copy/Paste Plugin Про модуль копіювання/вставки - + Qmmp Copy/Paste Plugin Модуль копіювання/вставки Qmmp - + This plugin allows one to copy selected tracks from one playlist to another Даний модуль дозволяє копіювати выбрані треки з одного переліка відтворення в інший - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_zh_CN.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_zh_CN.ts index 4ecc73538..bc0edef2e 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_zh_CN.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_zh_CN.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin 复制/粘贴插件 - + About Copy/Paste Plugin 关于复制/粘贴插件 - + Qmmp Copy/Paste Plugin Qmmp复制/粘贴插件 - + This plugin allows one to copy selected tracks from one playlist to another 此插件允许操作者从一个播放列表中复制选定的曲目到另一个播放列表中 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_zh_TW.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_zh_TW.ts index 6352cd0b6..4b1042d3e 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_zh_TW.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_zh_TW.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin - + About Copy/Paste Plugin - + Qmmp Copy/Paste Plugin - + This plugin allows one to copy selected tracks from one playlist to another - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/CMakeLists.txt b/src/plugins/General/covermanager/CMakeLists.txt index 10265b03a..54a1d83d3 100644 --- a/src/plugins/General/covermanager/CMakeLists.txt +++ b/src/plugins/General/covermanager/CMakeLists.txt @@ -1,18 +1,5 @@ project(libcovermanager) -SET(QT_USE_QTNETWORK TRUE) -INCLUDE(FindQt4) - -include(${QT_USE_FILE}) - -# 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}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) @@ -33,7 +20,7 @@ SET(libcovermanager_RCCS images/cm_images.qrc ) -QT4_ADD_RESOURCES(libcovermanager_RCC_SRCS ${libcovermanager_RCCS}) +QT5_ADD_RESOURCES(libcovermanager_RCC_SRCS ${libcovermanager_RCCS}) # user interface @@ -41,7 +28,7 @@ QT4_ADD_RESOURCES(libcovermanager_RCC_SRCS ${libcovermanager_RCCS}) SET(libcovermanager_UIS ) -QT4_WRAP_UI(libcovermanager_UIS_H ${libcovermanager_UIS}) +QT5_WRAP_UI(libcovermanager_UIS_H ${libcovermanager_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -49,5 +36,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(covermanager MODULE ${libcovermanager_SRCS} ${libcovermanager_UIS_H} ${libcovermanager_RCC_SRCS}) add_dependencies(covermanager qmmpui) -target_link_libraries(covermanager ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(covermanager Qt5::Widgets -lqmmpui -lqmmp) install(TARGETS covermanager DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/covermanager/covermanagerfactory.cpp b/src/plugins/General/covermanager/covermanagerfactory.cpp index ad44dc095..1bdc22f99 100644 --- a/src/plugins/General/covermanager/covermanagerfactory.cpp +++ b/src/plugins/General/covermanager/covermanagerfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2016 by Ilya Kotov * + * Copyright (C) 2009-2012 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -18,9 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ + #include -#include -#include #include #include "covermanager.h" #include "covermanagerfactory.h" @@ -60,5 +59,3 @@ QTranslator *CoverManagerFactory::createTranslator(QObject *parent) translator->load(QString(":/covermanager_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(covermanager, CoverManagerFactory) diff --git a/src/plugins/General/covermanager/covermanagerfactory.h b/src/plugins/General/covermanager/covermanagerfactory.h index 02a37bdb6..c0394cc75 100644 --- a/src/plugins/General/covermanager/covermanagerfactory.h +++ b/src/plugins/General/covermanager/covermanagerfactory.h @@ -32,6 +32,7 @@ class CoverManagerFactory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_bg.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_bg.ts index 36054e560..d7a04d25e 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_bg.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_bg.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin - + About Cover Manager Plugin - + Qmmp Cover Manager Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_cs.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_cs.ts index 58d111983..2c9b8114c 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_cs.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_cs.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Modul správy obalů - + About Cover Manager Plugin O modulu správy obalů - + Qmmp Cover Manager Plugin Modul Qmmp pro správu obalů - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_de.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_de.ts index bbf0a5793..2ba056074 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_de.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_de.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Cover-Verwaltungsmodul - + About Cover Manager Plugin Über Cover-Verwaltungsmodul - + Qmmp Cover Manager Plugin Qmmp Cover-Verwaltungsmodul - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_el.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_el.ts index e9308d20e..b0ecbb6a7 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_el.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_el.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Πρόσθετο διαχείρισης εξώφυλλων - + About Cover Manager Plugin Σχετικά με το πρόσθετο διαχείρισης εξώφυλλων - + Qmmp Cover Manager Plugin Qmmp πρόσθετο διαχείρισης εξώφυλλων - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_en.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_en.ts index aeecb3ed1..786e9dc23 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_en.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_en.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin - + About Cover Manager Plugin - + Qmmp Cover Manager Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_es.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_es.ts index f5f7fe12a..c8e5ba723 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_es.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_es.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Módulo de gestión de carátulas - + About Cover Manager Plugin Acerca del módulo de gestión de carátulas - + Qmmp Cover Manager Plugin Módulo de gestión de carátulas para Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_fi.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_fi.ts index d3fa5e060..de0134b5f 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_fi.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_fi.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Kansikuvien hallinta -liitännäinen - + About Cover Manager Plugin Tietoja - Kansikuvien hallinta -liitännäinen - + Qmmp Cover Manager Plugin Qmmp:n kansikuvien hallinta -liitännäinen - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_fr.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_fr.ts index f3a747e5a..eea98e9f8 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_fr.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_fr.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Greffon de gestion des couvertures - + About Cover Manager Plugin À propos du greffon de gestion des couvertures - + Qmmp Cover Manager Plugin Greffon de gestion des couvertures pour Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_gl_ES.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_gl_ES.ts index b04ea5fa0..781e86ab3 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_gl_ES.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_gl_ES.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Engadido de manexador de cubertas - + About Cover Manager Plugin Sobre o engadido de cubertas - + Qmmp Cover Manager Plugin Engadido Qmmp de cubertas - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_he.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_he.ts index c7ce80f40..a8f8975eb 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_he.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_he.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin תוסף ניהול כיסוי - + About Cover Manager Plugin אודות תוסף ניהול כיסוי - + Qmmp Cover Manager Plugin תוסף ניהול כיסוי של Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_hu.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_hu.ts index 463a3437f..bffdebca3 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_hu.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_hu.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin - + About Cover Manager Plugin - + Qmmp Cover Manager Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_id.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_id.ts index b6f66d1bc..389523fc4 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_id.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_id.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Plugin Manager Cover - + About Cover Manager Plugin Tentang Plugin Manager Cover - + Qmmp Cover Manager Plugin Plugin Manager Cover Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_it.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_it.ts index 5cd2b3d8b..e43f8e3f3 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_it.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_it.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Plugin gestione copertine - + About Cover Manager Plugin Info sul Plugin gestione copertine - + Qmmp Cover Manager Plugin Plugin gestione copertine - + Written by: Ilya Kotov <forkotov02@ya.ru> Autori: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_ja.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_ja.ts index 9b90fbb62..7946c511d 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_ja.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_ja.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin カバーマネージャープラグイン - + About Cover Manager Plugin カバーマネージャープラグインについて - + Qmmp Cover Manager Plugin QMMP カバーマネージャープラグイン - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_kk.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_kk.ts index 89a77f328..632fad5da 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_kk.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_kk.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin - + About Cover Manager Plugin - + Qmmp Cover Manager Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_lt.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_lt.ts index c4a71d988..35a147168 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_lt.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_lt.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Viršelų tvarkyklės įskiepis - + About Cover Manager Plugin Apie viršelių tvarkyklės įskiepį - + Qmmp Cover Manager Plugin Qmmp viršelių tvarkyklės įskiepis - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_nl.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_nl.ts index 0e96d8153..947d3320d 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_nl.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_nl.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Albumhoes Module - + About Cover Manager Plugin Over de Albumhoes Module - + Qmmp Cover Manager Plugin Albumhoes Module voor Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_pl_PL.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_pl_PL.ts index 8c65ea8fe..b0d2b3718 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_pl_PL.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_pl_PL.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Wtyczka zarządzania okładkami - + About Cover Manager Plugin O wtyczce Menedżer okładek - + Qmmp Cover Manager Plugin Wtyczka Menedżer Okładek dla Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_pt.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_pt.ts index 4bfbd0408..cf962eb0b 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_pt.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_pt.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Suplemento Cover Manager - + About Cover Manager Plugin Sobre o suplemento Cover Manager - + Qmmp Cover Manager Plugin Suplemento Qmmp Cover Manager - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_pt_BR.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_pt_BR.ts index dca0516ed..b8c5323fc 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_pt_BR.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_pt_BR.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Plugin Cover Manager - + About Cover Manager Plugin Sobre o plugin Cover Manager - + Qmmp Cover Manager Plugin Plugin Qmmp Cover Manager - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_ru.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_ru.ts index 9b3ac359c..8d1559277 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_ru.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_ru.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Модуль упр. обложками - + About Cover Manager Plugin О модуле управления обложками - + Qmmp Cover Manager Plugin Модуль управления обложками для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_sk.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_sk.ts index 39ce0a23c..c1d9e1f9b 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_sk.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_sk.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin - + About Cover Manager Plugin - + Qmmp Cover Manager Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_sr_BA.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_sr_BA.ts index 0041f3697..4c95579b2 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_sr_BA.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_sr_BA.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Уређивач омота - + About Cover Manager Plugin О уређивачу омота - + Qmmp Cover Manager Plugin Кумп прикључак за уређивање омота - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_sr_RS.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_sr_RS.ts index ca31ff855..a76af955b 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_sr_RS.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_sr_RS.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Уређивач омота - + About Cover Manager Plugin О уређивачу омота - + Qmmp Cover Manager Plugin Кумп прикључак за уређивање омота - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_tr.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_tr.ts index 6ecb14e7c..c9bb6e420 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_tr.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_tr.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin - + About Cover Manager Plugin - + Qmmp Cover Manager Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_uk_UA.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_uk_UA.ts index 0e815804a..7b894e7fc 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_uk_UA.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_uk_UA.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Модуль керування обкладинками - + About Cover Manager Plugin Про модуль керування обкладинками - + Qmmp Cover Manager Plugin Модуль керування обкладинками для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_zh_CN.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_zh_CN.ts index 97ddd4afe..25de03aa3 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_zh_CN.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_zh_CN.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin 封面管理插件 - + About Cover Manager Plugin 关于封面管理插件 - + Qmmp Cover Manager Plugin Qmmp 封面管理插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_zh_TW.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_zh_TW.ts index e65bb82d3..2d19c820d 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_zh_TW.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_zh_TW.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin 封面管理插件 - + About Cover Manager Plugin 關於封面管理插件 - + Qmmp Cover Manager Plugin Qmmp 封面管理插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/CMakeLists.txt b/src/plugins/General/fileops/CMakeLists.txt index a66716870..bdfd43e42 100644 --- a/src/plugins/General/fileops/CMakeLists.txt +++ b/src/plugins/General/fileops/CMakeLists.txt @@ -1,22 +1,7 @@ project(libfileops) -include(${QT_USE_FILE}) - -# 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}) -SET(QT_INCLUDES - ${QT_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ -) - # libqmmpui & libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -32,7 +17,7 @@ SET(libfileops_SRCS SET(libfileops_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libfileops_RCC_SRCS ${libfileops_RCCS}) +QT5_ADD_RESOURCES(libfileops_RCC_SRCS ${libfileops_RCCS}) # user interface @@ -41,12 +26,12 @@ SET(libfileops_UIS hotkeydialog.ui ) -QT4_WRAP_UI(libfileops_UIS_H ${libfileops_UIS}) +QT5_WRAP_UI(libfileops_UIS_H ${libfileops_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(fileops MODULE ${libfileops_SRCS} ${libfileops_UIS_H} ${libfileops_RCC_SRCS}) add_dependencies(fileops qmmpui) -target_link_libraries(fileops ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(fileops Qt5::Widgets -lqmmpui -lqmmp) install(TARGETS fileops DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/fileops/fileopsfactory.cpp b/src/plugins/General/fileops/fileopsfactory.cpp index 854afb31c..799d9e3db 100644 --- a/src/plugins/General/fileops/fileopsfactory.cpp +++ b/src/plugins/General/fileops/fileopsfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2016 by Ilya Kotov * + * Copyright (C) 2009-2012 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -18,9 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ + #include -#include -#include #include "fileops.h" #include "settingsdialog.h" #include "fileopsfactory.h" @@ -60,5 +59,3 @@ QTranslator *FileOpsFactory::createTranslator(QObject *parent) translator->load(QString(":/fileops_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(fileops, FileOpsFactory) diff --git a/src/plugins/General/fileops/fileopsfactory.h b/src/plugins/General/fileops/fileopsfactory.h index e95fa581b..5d070c2a6 100644 --- a/src/plugins/General/fileops/fileopsfactory.h +++ b/src/plugins/General/fileops/fileopsfactory.h @@ -33,6 +33,7 @@ class FileOpsFactory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; diff --git a/src/plugins/General/fileops/settingsdialog.cpp b/src/plugins/General/fileops/settingsdialog.cpp index 702602082..2431a8ba2 100644 --- a/src/plugins/General/fileops/settingsdialog.cpp +++ b/src/plugins/General/fileops/settingsdialog.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include @@ -34,9 +34,9 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent) { m_ui.setupUi(this); - m_ui.tableWidget->verticalHeader()->setResizeMode(QHeaderView::ResizeToContents); + m_ui.tableWidget->verticalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents); m_ui.tableWidget->verticalHeader()->hide(); - m_ui.tableWidget->horizontalHeader()->setResizeMode(QHeaderView::ResizeToContents); + m_ui.tableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents); QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("FileOps"); @@ -135,7 +135,7 @@ void SettingsDialog::on_newButton_clicked() comboBox->setFocusPolicy (Qt::NoFocus); ActionItem *item = new ActionItem(tr("New action")); - item->setDestination(QDesktopServices::storageLocation(QDesktopServices::MusicLocation)); + item->setDestination(QStandardPaths::writableLocation(QStandardPaths::MusicLocation)); item->setPattern("%p - %t"); connect(comboBox, SIGNAL(activated(int)), SLOT(updateLineEdits())); diff --git a/src/plugins/General/fileops/translations/fileops_plugin_bg.ts b/src/plugins/General/fileops/translations/fileops_plugin_bg.ts index f9877102a..e454d3f85 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_bg.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_bg.ts @@ -71,22 +71,22 @@ FileOpsFactory - + File Operations Plugin - + About File Operations Plugin - + Qmmp File Operations Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_cs.ts b/src/plugins/General/fileops/translations/fileops_plugin_cs.ts index 0e9cd90b9..4c09f617c 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_cs.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_cs.ts @@ -73,22 +73,22 @@ FileOpsFactory - + File Operations Plugin Modul pro operace se soubory - + About File Operations Plugin O modulu pro operace se soubory - + Qmmp File Operations Plugin Modul Qmmp pro operace se soubory - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_de.ts b/src/plugins/General/fileops/translations/fileops_plugin_de.ts index 532dc3a0b..030e06274 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_de.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_de.ts @@ -71,22 +71,22 @@ FileOpsFactory - + File Operations Plugin Dateioperationsmodul - + About File Operations Plugin Über Dateioperationsmodul - + Qmmp File Operations Plugin Qmmp Dateioperationsmodul - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_el.ts b/src/plugins/General/fileops/translations/fileops_plugin_el.ts index 95fa888c6..0673d58db 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_el.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_el.ts @@ -71,22 +71,22 @@ FileOpsFactory - + File Operations Plugin Πρόσθετο λειτουργιών αρχείων - + About File Operations Plugin Σχετικά με το πρόσθετο λειτουργιών αρχείων - + Qmmp File Operations Plugin Qmmp πρόσθετο λειτουργιών αρχείων - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_en.ts b/src/plugins/General/fileops/translations/fileops_plugin_en.ts index ef6da3239..6c86cfb71 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_en.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_en.ts @@ -71,22 +71,22 @@ FileOpsFactory - + File Operations Plugin - + About File Operations Plugin - + Qmmp File Operations Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_es.ts b/src/plugins/General/fileops/translations/fileops_plugin_es.ts index 139fbc9ab..633990cbc 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_es.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_es.ts @@ -71,22 +71,22 @@ FileOpsFactory - + File Operations Plugin Módulo de operaciones de archivo - + About File Operations Plugin Acerca del módulo de operaciones de archivo - + Qmmp File Operations Plugin Módulo de operaciones de archivo para Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_fi.ts b/src/plugins/General/fileops/translations/fileops_plugin_fi.ts index c0280fc89..6cf2a6ec3 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_fi.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_fi.ts @@ -71,22 +71,22 @@ FileOpsFactory - + File Operations Plugin - + About File Operations Plugin - + Qmmp File Operations Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_fr.ts b/src/plugins/General/fileops/translations/fileops_plugin_fr.ts index 9ac01c381..eeaf0374f 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_fr.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_fr.ts @@ -71,22 +71,22 @@ FileOpsFactory - + File Operations Plugin Greffon d'opérations sur fichiers - + About File Operations Plugin À propos du greffon d'opérations sur fichiers - + Qmmp File Operations Plugin Greffon d'opérations sur fichiers pour Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_gl_ES.ts b/src/plugins/General/fileops/translations/fileops_plugin_gl_ES.ts index fd94b8204..42b653ec4 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_gl_ES.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_gl_ES.ts @@ -71,22 +71,22 @@ FileOpsFactory - + File Operations Plugin Engadido de operacións de ficheiro - + About File Operations Plugin Sobre o engadido de operacións de ficheiro - + Qmmp File Operations Plugin Engadido Qmmp operacións de ficheiro - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_he.ts b/src/plugins/General/fileops/translations/fileops_plugin_he.ts index cee1652c8..e3e8fcff7 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_he.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_he.ts @@ -71,22 +71,22 @@ FileOpsFactory - + File Operations Plugin תוסף מבצעי קובץ - + About File Operations Plugin אודות תוסף מבצעי קובץ - + Qmmp File Operations Plugin תוסף מבצעי קובץ של Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_hu.ts b/src/plugins/General/fileops/translations/fileops_plugin_hu.ts index 4823e46f9..26620e5e2 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_hu.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_hu.ts @@ -69,22 +69,22 @@ FileOpsFactory - + File Operations Plugin - + About File Operations Plugin - + Qmmp File Operations Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_id.ts b/src/plugins/General/fileops/translations/fileops_plugin_id.ts index a095eab3a..e628148df 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_id.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_id.ts @@ -69,22 +69,22 @@ FileOpsFactory - + File Operations Plugin Plugin Operasi File - + About File Operations Plugin Tentang Plugin Operasi File - + Qmmp File Operations Plugin Plugin Operasi File Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_it.ts b/src/plugins/General/fileops/translations/fileops_plugin_it.ts index ed0790d0e..4aab3d8c5 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_it.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_it.ts @@ -69,22 +69,22 @@ FileOpsFactory - + File Operations Plugin Modulo Operazioni su file - + About File Operations Plugin Info sul modulo Operazioni file - + Qmmp File Operations Plugin Modulo Operazioni su file di Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_ja.ts b/src/plugins/General/fileops/translations/fileops_plugin_ja.ts index 7efc2da0e..1adf20234 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_ja.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_ja.ts @@ -69,22 +69,22 @@ FileOpsFactory - + File Operations Plugin ファイル操作プラグイン - + About File Operations Plugin ファイル操作プラグインについて - + Qmmp File Operations Plugin QMMP ファイル操作プラグイン - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_kk.ts b/src/plugins/General/fileops/translations/fileops_plugin_kk.ts index f4ce01c4a..90d530d19 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_kk.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_kk.ts @@ -71,22 +71,22 @@ FileOpsFactory - + File Operations Plugin - + About File Operations Plugin - + Qmmp File Operations Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_lt.ts b/src/plugins/General/fileops/translations/fileops_plugin_lt.ts index a682ef81c..92abdab75 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_lt.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_lt.ts @@ -73,22 +73,22 @@ FileOpsFactory - + File Operations Plugin Bylų įskiepis - + About File Operations Plugin Apie bylų įskiepį - + Qmmp File Operations Plugin Qmmp bylų įskiepis - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_nl.ts b/src/plugins/General/fileops/translations/fileops_plugin_nl.ts index f965bd95f..39d45ccec 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_nl.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_nl.ts @@ -71,22 +71,22 @@ FileOpsFactory - + File Operations Plugin Bestands Beheer Module - + About File Operations Plugin Over de Bestands Beheer Module - + Qmmp File Operations Plugin Bestands Beheer Module voor Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_pl_PL.ts b/src/plugins/General/fileops/translations/fileops_plugin_pl_PL.ts index 816e81695..e7d039a8b 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_pl_PL.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_pl_PL.ts @@ -73,22 +73,22 @@ FileOpsFactory - + File Operations Plugin Wtyczka Operacji na plikach - + About File Operations Plugin O wtyczce Operacje na plikach - + Qmmp File Operations Plugin Wtyczka Operacje na plikach dla Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_pt.ts b/src/plugins/General/fileops/translations/fileops_plugin_pt.ts index f3e0096d3..259920ff8 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_pt.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_pt.ts @@ -71,22 +71,22 @@ FileOpsFactory - + File Operations Plugin Suplemento File Operations - + About File Operations Plugin Sobre o suplemento File Operations - + Qmmp File Operations Plugin Suplemento Qmmp File Operations - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_pt_BR.ts b/src/plugins/General/fileops/translations/fileops_plugin_pt_BR.ts index cf5b612aa..8a99af994 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_pt_BR.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_pt_BR.ts @@ -71,22 +71,22 @@ FileOpsFactory - + File Operations Plugin Plugin File Operations - + About File Operations Plugin Sobre o plugin File Operations - + Qmmp File Operations Plugin Plugin Qmmp File Operations - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_ru.ts b/src/plugins/General/fileops/translations/fileops_plugin_ru.ts index db2051784..c33768f33 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_ru.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_ru.ts @@ -73,22 +73,22 @@ FileOpsFactory - + File Operations Plugin Модуль файловых операций - + About File Operations Plugin О модуле файловых операций - + Qmmp File Operations Plugin Модуль работы с файлами для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_sk.ts b/src/plugins/General/fileops/translations/fileops_plugin_sk.ts index ca25c3d9c..fcccf0d63 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_sk.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_sk.ts @@ -73,22 +73,22 @@ FileOpsFactory - + File Operations Plugin - + About File Operations Plugin - + Qmmp File Operations Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_sr_BA.ts b/src/plugins/General/fileops/translations/fileops_plugin_sr_BA.ts index ce71614a1..34db0d704 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_sr_BA.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_sr_BA.ts @@ -73,22 +73,22 @@ FileOpsFactory - + File Operations Plugin Руковање фајловима - + About File Operations Plugin О прикључку за руковање фајловима - + Qmmp File Operations Plugin Кумп прикључак за руковање фајловима - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_sr_RS.ts b/src/plugins/General/fileops/translations/fileops_plugin_sr_RS.ts index 00eba52b3..7c6541e76 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_sr_RS.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_sr_RS.ts @@ -73,22 +73,22 @@ FileOpsFactory - + File Operations Plugin Руковање фајловима - + About File Operations Plugin О прикључку за руковање фајловима - + Qmmp File Operations Plugin Кумп прикључак за руковање фајловима - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_tr.ts b/src/plugins/General/fileops/translations/fileops_plugin_tr.ts index 1eff3830b..03389fdd0 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_tr.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_tr.ts @@ -69,22 +69,22 @@ FileOpsFactory - + File Operations Plugin Dosya İşlemleri Eklentisi - + About File Operations Plugin Dosya İşlemleri Eklentisi Hakkında - + Qmmp File Operations Plugin Qmmp Dosya İşlemleri Eklentisi - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_uk_UA.ts b/src/plugins/General/fileops/translations/fileops_plugin_uk_UA.ts index ac1ccdc9b..4f4f6790e 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_uk_UA.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_uk_UA.ts @@ -73,22 +73,22 @@ FileOpsFactory - + File Operations Plugin Модуль файлових операцій - + About File Operations Plugin Про модуль файлових операцій - + Qmmp File Operations Plugin Модуль роботи з файлами для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_zh_CN.ts b/src/plugins/General/fileops/translations/fileops_plugin_zh_CN.ts index d7cfb3b55..dfd9166a6 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_zh_CN.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_zh_CN.ts @@ -69,22 +69,22 @@ FileOpsFactory - + File Operations Plugin 文件操作插件 - + About File Operations Plugin 关于文件操作插件 - + Qmmp File Operations Plugin Qmmp 文件操作插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_zh_TW.ts b/src/plugins/General/fileops/translations/fileops_plugin_zh_TW.ts index 090b033bd..64a40d430 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_zh_TW.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_zh_TW.ts @@ -69,22 +69,22 @@ FileOpsFactory - + File Operations Plugin 檔案操作插件 - + About File Operations Plugin 關於檔案操作插件 - + Qmmp File Operations Plugin Qmmp 檔案操作插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/CMakeLists.txt b/src/plugins/General/gnomehotkey/CMakeLists.txt index 2916ada2f..a43c99e0d 100644 --- a/src/plugins/General/gnomehotkey/CMakeLists.txt +++ b/src/plugins/General/gnomehotkey/CMakeLists.txt @@ -1,20 +1,5 @@ project(libgnomehotkey) - -SET (QT_USE_QTDBUS TRUE) - -INCLUDE(FindQt4) - -include(${QT_USE_FILE}) - -# 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 @@ -29,7 +14,7 @@ SET(libgnomehotkey_SRCS SET(libgnomehotkey_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libgnomehotkey_RCC_SRCS ${libgnomehotkey_RCCS}) +QT5_ADD_RESOURCES(libgnomehotkey_RCC_SRCS ${libgnomehotkey_RCCS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! @@ -37,5 +22,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(gnomehotkey MODULE ${libgnomehotkey_SRCS} ${libgnomehotkey_RCC_SRCS}) add_dependencies(gnomehotkey qmmpui) -target_link_libraries(gnomehotkey ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(gnomehotkey Qt5::Widgets Qt5::DBus -lqmmpui -lqmmp) install(TARGETS gnomehotkey DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/gnomehotkey/gnomehotkeyfactory.cpp b/src/plugins/General/gnomehotkey/gnomehotkeyfactory.cpp index dd7e8699d..82c535c28 100644 --- a/src/plugins/General/gnomehotkey/gnomehotkeyfactory.cpp +++ b/src/plugins/General/gnomehotkey/gnomehotkeyfactory.cpp @@ -18,9 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ + #include -#include -#include #include #include "mediakeys.h" #include "gnomehotkeyfactory.h" @@ -62,5 +61,3 @@ QTranslator *GnomeHotkeyFactory::createTranslator(QObject *parent) translator->load(QString(":/gnomehotkey_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(gnomehotkey, GnomeHotkeyFactory) diff --git a/src/plugins/General/gnomehotkey/gnomehotkeyfactory.h b/src/plugins/General/gnomehotkey/gnomehotkeyfactory.h index 1a4230783..0210dde80 100644 --- a/src/plugins/General/gnomehotkey/gnomehotkeyfactory.h +++ b/src/plugins/General/gnomehotkey/gnomehotkeyfactory.h @@ -32,6 +32,7 @@ class GnomeHotkeyFactory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_bg.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_bg.ts index 7e22e4cc3..bcaf9052f 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_bg.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_bg.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin - + About Gnome Hotkey Plugin - + Qmmp Gnome Hotkey Plugin - + This plugin adds support of the GNOME/Cinnamon hotkeys - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_cs.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_cs.ts index 02d4728a8..7cba177eb 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_cs.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_cs.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin - + About Gnome Hotkey Plugin - + Qmmp Gnome Hotkey Plugin Modul Qmmp Gnome pro klávesové zkratky - + This plugin adds support of the GNOME/Cinnamon hotkeys - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_de.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_de.ts index 0709ba086..b15be7861 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_de.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_de.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin Gnome-Kurzbefehle-Modul - + About Gnome Hotkey Plugin Über Gnome-Kurzbefehle-Modul - + Qmmp Gnome Hotkey Plugin Qmmp Gnome-Kurzbefehle-Modul - + This plugin adds support of the GNOME/Cinnamon hotkeys Dieses Modul fügt die Unterstützung der GNOME/Cinnamon-Kurzbefehle hinzu - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_el.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_el.ts index a3ce13f72..154fc1fd0 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_el.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_el.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin Πρόσθετο συντομεύσεων Gnome - + About Gnome Hotkey Plugin Σχετικά με το πρόσθετο συντομεύσεων Gnome - + Qmmp Gnome Hotkey Plugin Qmmp πρόσθετο συντομεύσεων Gnome - + This plugin adds support of the GNOME/Cinnamon hotkeys Αυτό το πρόσθετο προσθέτει υποστήριξη συντομεύσεων για GNOME/Cinnamon - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_en.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_en.ts index 6e5e5c890..d93939c40 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_en.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_en.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin - + About Gnome Hotkey Plugin - + Qmmp Gnome Hotkey Plugin - + This plugin adds support of the GNOME/Cinnamon hotkeys - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_es.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_es.ts index ebc48ecbf..bb2acfb07 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_es.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_es.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin Módulo Acceso Rápido de GNOME - + About Gnome Hotkey Plugin Acerca del Módulo Acceso Rápido de GNOME - + Qmmp Gnome Hotkey Plugin Módulo Acceso Rápido de GNOME de Qmmp - + This plugin adds support of the GNOME/Cinnamon hotkeys El módulo añade soporte para los accesos rápidos de GNOME/Cinnamon - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_fi.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_fi.ts index 89c711e02..cd6c35c30 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_fi.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_fi.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin - + About Gnome Hotkey Plugin - + Qmmp Gnome Hotkey Plugin - + This plugin adds support of the GNOME/Cinnamon hotkeys - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_fr.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_fr.ts index dcb76af75..fbdb26571 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_fr.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_fr.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin Greffon de raccourci clavier pour Gnome - + About Gnome Hotkey Plugin À propos du greffon de raccourci clavier pour Gnome - + Qmmp Gnome Hotkey Plugin Greffon de raccourci clavier pour Gnome, pour Qmmp - + This plugin adds support of the GNOME/Cinnamon hotkeys Ce greffon ajoute le support des raccourcis clavier pour Gnome/Cinnamon - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> 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 067396eab..5581bf660 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_gl_ES.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_gl_ES.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin Engadido teclas de acceso rápido para Gnome - + About Gnome Hotkey Plugin Acerca do engadido de teclas de acceso rápido para Gnome - + Qmmp Gnome Hotkey Plugin Engadido Qmmp teclas de acceso rápido para Gnome - + This plugin adds support of the GNOME/Cinnamon hotkeys Este engadido engade soporte para as teclas de acceso rápido de GNOME/Cinnamon - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_he.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_he.ts index 680d55e69..9bd2968bb 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_he.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_he.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin תוסף מקשים חמים Gnome - + About Gnome Hotkey Plugin אודות תוסף מקשים חמים Gnome - + Qmmp Gnome Hotkey Plugin מקשים חמים Gnome של Qmmp - + This plugin adds support of the GNOME/Cinnamon hotkeys תוסף זה מוסיף תמיכה למקשים חמים של GNOME/Cinnamon - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_hu.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_hu.ts index 864afccbb..c9cfed5ff 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_hu.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_hu.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin - + About Gnome Hotkey Plugin - + Qmmp Gnome Hotkey Plugin - + This plugin adds support of the GNOME/Cinnamon hotkeys - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_id.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_id.ts index 6acf6e7cd..cda05cb01 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_id.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_id.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin Plugin Hotkey Gnome - + About Gnome Hotkey Plugin Tentang Plugin Hotkey Gnome - + Qmmp Gnome Hotkey Plugin Plugin Hotkey Gnome Qmmp - + This plugin adds support of the GNOME/Cinnamon hotkeys Plugin ini menambahkan dukungan pada hotkey GNOME/Cinnamon - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_it.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_it.ts index 134276c08..4a1a2905b 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_it.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_it.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin - + About Gnome Hotkey Plugin - + Qmmp Gnome Hotkey Plugin - + This plugin adds support of the GNOME/Cinnamon hotkeys - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_ja.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_ja.ts index 127f1b694..c7af561ed 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_ja.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_ja.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin GNOME ホットキープラグイン - + About Gnome Hotkey Plugin GNOME ホットキープラグインについて - + Qmmp Gnome Hotkey Plugin QMMP GNOME ホットキープラグイン - + This plugin adds support of the GNOME/Cinnamon hotkeys このプラグインは GNOME/Cinnamon ホットキーをサポートします - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_kk.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_kk.ts index 26a60afd6..28fe62edb 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_kk.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_kk.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin - + About Gnome Hotkey Plugin - + Qmmp Gnome Hotkey Plugin - + This plugin adds support of the GNOME/Cinnamon hotkeys - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_lt.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_lt.ts index bf1745c01..8ca518be6 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_lt.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_lt.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin Gnome Hotkey įskiepis - + About Gnome Hotkey Plugin Apie Gnome Hotkey Įskiepį - + Qmmp Gnome Hotkey Plugin Qmmp Gnome Hotkey Įskiepis - + This plugin adds support of the GNOME/Cinnamon hotkeys Šis įskiepis įgalina GNOME/Cinnamon sparčiūjų klavišų palaikymą - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_nl.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_nl.ts index aca7a8998..ab038921e 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_nl.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_nl.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin - + About Gnome Hotkey Plugin - + Qmmp Gnome Hotkey Plugin - + This plugin adds support of the GNOME/Cinnamon hotkeys - + Written by: Ilya Kotov <forkotov02@ya.ru> 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 0fc2d0722..50675ad19 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_pl_PL.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_pl_PL.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin Wtyczka Skrótów Klawiszowych Gnome - + About Gnome Hotkey Plugin O wtyczce Skrótów Klawiszowych dla Gnome - + Qmmp Gnome Hotkey Plugin Wtyczka Skrótów Klawiszowych Gnome dla Qmmp - + This plugin adds support of the GNOME/Cinnamon hotkeys Ta wtyczka dodaje wsparcie skrótów klawiszowych dla GNOME/Cinnamon - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_pt.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_pt.ts index e2697e82c..ddfced0fb 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_pt.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_pt.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin Suplemento Gnome Hotkey - + About Gnome Hotkey Plugin Sobre o suplemento Gnome Hotkey - + Qmmp Gnome Hotkey Plugin Suplemento Qmmp Gnome Hotkey - + This plugin adds support of the GNOME/Cinnamon hotkeys Este suplemento adiciona suporte as teclas de atalho GNOME/Cinnamon - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> 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 f59e8455f..80e8e94a1 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_pt_BR.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_pt_BR.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin Plugin Gnome Hotkey - + About Gnome Hotkey Plugin Sobre o plugin Gnome Hotkey - + Qmmp Gnome Hotkey Plugin Plugin Qmmp Gnome Hotkey - + This plugin adds support of the GNOME/Cinnamon hotkeys Este plugin adiciona suporte as teclas de atalho GNOME/Cinnamon - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_ru.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_ru.ts index f5085913b..47eadf8c4 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_ru.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_ru.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin Модуль клавиш GNOME - + About Gnome Hotkey Plugin О модуле горячих клавиш GNOME - + Qmmp Gnome Hotkey Plugin Модуль горчих клавиш GNOME для Qmmp - + This plugin adds support of the GNOME/Cinnamon hotkeys Этот модуль добавляет поддержку горячих клавиш GNOME/Cinnamon - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sk.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sk.ts index 2cc7bdaa5..5395e9526 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sk.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sk.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin - + About Gnome Hotkey Plugin - + Qmmp Gnome Hotkey Plugin - + This plugin adds support of the GNOME/Cinnamon hotkeys - + Written by: Ilya Kotov <forkotov02@ya.ru> 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 c6d7afb01..5a6ec8c01 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sr_BA.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sr_BA.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin Пречице за Гном - + About Gnome Hotkey Plugin О пречицама за Гном - + Qmmp Gnome Hotkey Plugin Кумп прикључак за пречице за Гном - + This plugin adds support of the GNOME/Cinnamon hotkeys Функционалност пречица за Гном/Цинамон - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> 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 4c3b5c34b..46486fa76 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sr_RS.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sr_RS.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin Пречице за Гном - + About Gnome Hotkey Plugin О пречицама за Гном - + Qmmp Gnome Hotkey Plugin Кумп прикључак за пречице за Гном - + This plugin adds support of the GNOME/Cinnamon hotkeys Функционалност пречица за Гном/Цинамон - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_tr.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_tr.ts index acc8d166c..cad47fe52 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_tr.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_tr.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin - + About Gnome Hotkey Plugin - + Qmmp Gnome Hotkey Plugin - + This plugin adds support of the GNOME/Cinnamon hotkeys - + Written by: Ilya Kotov <forkotov02@ya.ru> 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 435b1243c..0372cb90a 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_uk_UA.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_uk_UA.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin Модуль гарячих клавіш GNOME - + About Gnome Hotkey Plugin Про модуль гарячих клавіш GNOME - + Qmmp Gnome Hotkey Plugin Модуль гарячих клавіш GNOME для Qmmp - + This plugin adds support of the GNOME/Cinnamon hotkeys Цей модуль додає підтримку гарячих клавіш GNOME/Cinnamon - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> 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 7c4eda20b..d4fd7d18f 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_zh_CN.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_zh_CN.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin Gnome热键插件 - + About Gnome Hotkey Plugin 关于Gnome热键插件 - + Qmmp Gnome Hotkey Plugin Qmmp Gnome 热键插件 - + This plugin adds support of the GNOME/Cinnamon hotkeys 此插件增加了对GNOME/Cinnamon热键的支持 - + Written by: Ilya Kotov <forkotov02@ya.ru> 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 c89ede0dc..9b79fcc5a 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_zh_TW.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_zh_TW.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin - + About Gnome Hotkey Plugin - + Qmmp Gnome Hotkey Plugin - + This plugin adds support of the GNOME/Cinnamon hotkeys - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hal/CMakeLists.txt b/src/plugins/General/hal/CMakeLists.txt index 0ed5eb996..d6f786962 100644 --- a/src/plugins/General/hal/CMakeLists.txt +++ b/src/plugins/General/hal/CMakeLists.txt @@ -1,20 +1,5 @@ project(libhal) - -SET (QT_USE_QTDBUS TRUE) - -INCLUDE(FindQt4) - -include(${QT_USE_FILE}) - -# 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 @@ -32,7 +17,7 @@ SET(libhal_SRCS SET(libhal_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libhal_RCC_SRCS ${libhal_RCCS}) +QT5_ADD_RESOURCES(libhal_RCC_SRCS ${libhal_RCCS}) # user interface @@ -40,12 +25,12 @@ SET(libhal_UIS settingsdialog.ui ) -QT4_WRAP_UI(libhal_UIS_H ${libhal_UIS}) +QT5_WRAP_UI(libhal_UIS_H ${libhal_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(hal MODULE ${libhal_SRCS} ${libhal_UIS_H} ${libhal_RCC_SRCS}) add_dependencies(hal qmmpui) -target_link_libraries(hal ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(hal Qt5::Widgets Qt5::DBus -lqmmpui -lqmmp) install(TARGETS hal DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/hal/halfactory.cpp b/src/plugins/General/hal/halfactory.cpp index f28207645..cbdd0d825 100644 --- a/src/plugins/General/hal/halfactory.cpp +++ b/src/plugins/General/hal/halfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2016 by Ilya Kotov * + * Copyright (C) 2009-2012 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -18,9 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ + #include -#include -#include #include #include "settingsdialog.h" #include "halplugin.h" @@ -63,5 +62,3 @@ QTranslator *HalFactory::createTranslator(QObject *parent) translator->load(QString(":/hal_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(hal, HalFactory) diff --git a/src/plugins/General/hal/halfactory.h b/src/plugins/General/hal/halfactory.h index 1a78b7e25..02c063993 100644 --- a/src/plugins/General/hal/halfactory.h +++ b/src/plugins/General/hal/halfactory.h @@ -32,6 +32,7 @@ class HalFactory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; diff --git a/src/plugins/General/hal/translations/hal_plugin_bg.ts b/src/plugins/General/hal/translations/hal_plugin_bg.ts index a9f991fe9..dddaac30d 100644 --- a/src/plugins/General/hal/translations/hal_plugin_bg.ts +++ b/src/plugins/General/hal/translations/hal_plugin_bg.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin - + About HAL Plugin - + Qmmp HAL Plugin - + This plugin provides removable devices detection using HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) diff --git a/src/plugins/General/hal/translations/hal_plugin_cs.ts b/src/plugins/General/hal/translations/hal_plugin_cs.ts index c60b36002..1f28066c8 100644 --- a/src/plugins/General/hal/translations/hal_plugin_cs.ts +++ b/src/plugins/General/hal/translations/hal_plugin_cs.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin Modul HAL - + About HAL Plugin O modulu HAL - + Qmmp HAL Plugin Modul Qmmp HAL - + This plugin provides removable devices detection using HAL Tento modul umožňuje detekci odpojitelných zařízení prostřednictvím HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Založeno na Solid (knihovna KDE pro hardware) diff --git a/src/plugins/General/hal/translations/hal_plugin_de.ts b/src/plugins/General/hal/translations/hal_plugin_de.ts index f73ab613d..62cf2c6a7 100644 --- a/src/plugins/General/hal/translations/hal_plugin_de.ts +++ b/src/plugins/General/hal/translations/hal_plugin_de.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin HAL-Modul - + About HAL Plugin Über HAL-Modul - + Qmmp HAL Plugin Qmmp HAL-Modul - + This plugin provides removable devices detection using HAL Dieses Modul bietet Wechsellaufwerkerkennung unter Verwendung von HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Basiert auf Solid (KDE Hardware-Bibliothek) diff --git a/src/plugins/General/hal/translations/hal_plugin_el.ts b/src/plugins/General/hal/translations/hal_plugin_el.ts index c9cf9935e..236863f5c 100644 --- a/src/plugins/General/hal/translations/hal_plugin_el.ts +++ b/src/plugins/General/hal/translations/hal_plugin_el.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin Πρόσθετο HAL - + About HAL Plugin Σχετικά με το πρόσθετο HAL - + Qmmp HAL Plugin Qmmp πρόσθετο HAL - + This plugin provides removable devices detection using HAL Αυτό το πρόσθετο παρέχει την ανίχνευση των αφαιρούμενων συσκευών μέσω του HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> - + Based on Solid (KDE hardware library) Βασίζεται στο Solid (Βιβλιοθήκη υλικού του KDE) diff --git a/src/plugins/General/hal/translations/hal_plugin_en.ts b/src/plugins/General/hal/translations/hal_plugin_en.ts index 3e3a33e99..5a30c027d 100644 --- a/src/plugins/General/hal/translations/hal_plugin_en.ts +++ b/src/plugins/General/hal/translations/hal_plugin_en.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin - + About HAL Plugin - + Qmmp HAL Plugin - + This plugin provides removable devices detection using HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) diff --git a/src/plugins/General/hal/translations/hal_plugin_es.ts b/src/plugins/General/hal/translations/hal_plugin_es.ts index 394856189..102c88965 100644 --- a/src/plugins/General/hal/translations/hal_plugin_es.ts +++ b/src/plugins/General/hal/translations/hal_plugin_es.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin Módulo HAL - + About HAL Plugin Acerca del módulo HAL - + Qmmp HAL Plugin Módulo HAL para Qmmp - + This plugin provides removable devices detection using HAL Este módulo proporciona detección de dispositivos extraibles mediante HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Basado en Solid (librería de hardware KDE) diff --git a/src/plugins/General/hal/translations/hal_plugin_fi.ts b/src/plugins/General/hal/translations/hal_plugin_fi.ts index b9ff9f39f..095de115f 100644 --- a/src/plugins/General/hal/translations/hal_plugin_fi.ts +++ b/src/plugins/General/hal/translations/hal_plugin_fi.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin HAL-liitännäinen - + About HAL Plugin - + Qmmp HAL Plugin Qmmp:n HAL-liitännäinen - + This plugin provides removable devices detection using HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) diff --git a/src/plugins/General/hal/translations/hal_plugin_fr.ts b/src/plugins/General/hal/translations/hal_plugin_fr.ts index a3badfe75..a265aff6c 100644 --- a/src/plugins/General/hal/translations/hal_plugin_fr.ts +++ b/src/plugins/General/hal/translations/hal_plugin_fr.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin Greffon HAL - + About HAL Plugin À propos du greffon HAL - + Qmmp HAL Plugin Greffon HAL pour Qmmp - + This plugin provides removable devices detection using HAL Ce greffon fournit une détection de périphériques amovibles en utilisant HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Basé sur Solid (bibliothèque matérielle KDE) diff --git a/src/plugins/General/hal/translations/hal_plugin_gl_ES.ts b/src/plugins/General/hal/translations/hal_plugin_gl_ES.ts index dfce0774e..dce0b5a33 100644 --- a/src/plugins/General/hal/translations/hal_plugin_gl_ES.ts +++ b/src/plugins/General/hal/translations/hal_plugin_gl_ES.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin Engadido HAL - + About HAL Plugin Sobre engadido HAL - + Qmmp HAL Plugin Engadido Qmmp HAL - + This plugin provides removable devices detection using HAL Este engadido provén detección de dispositivos extraíbles usando HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Baseado en Solid (librería hardware KDE) diff --git a/src/plugins/General/hal/translations/hal_plugin_he.ts b/src/plugins/General/hal/translations/hal_plugin_he.ts index c5a9205a6..de1cdf012 100644 --- a/src/plugins/General/hal/translations/hal_plugin_he.ts +++ b/src/plugins/General/hal/translations/hal_plugin_he.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin תוסף HAL - + About HAL Plugin אודות תוסף HAL - + Qmmp HAL Plugin תוסף HAL של Qmmp - + This plugin provides removable devices detection using HAL תוסף זה מספק איתור של התקנים נשלפים באמצעות HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) מבוססת על Solid (ספריית קושחה של KDE) diff --git a/src/plugins/General/hal/translations/hal_plugin_hu.ts b/src/plugins/General/hal/translations/hal_plugin_hu.ts index 9600266c9..14878f981 100644 --- a/src/plugins/General/hal/translations/hal_plugin_hu.ts +++ b/src/plugins/General/hal/translations/hal_plugin_hu.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin - + About HAL Plugin - + Qmmp HAL Plugin - + This plugin provides removable devices detection using HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) diff --git a/src/plugins/General/hal/translations/hal_plugin_id.ts b/src/plugins/General/hal/translations/hal_plugin_id.ts index 33e66fef7..dc6612b61 100644 --- a/src/plugins/General/hal/translations/hal_plugin_id.ts +++ b/src/plugins/General/hal/translations/hal_plugin_id.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin Plugin HAL - + About HAL Plugin Tentang Plugin HAL - + Qmmp HAL Plugin Plugin HAL Qmmp - + This plugin provides removable devices detection using HAL Plugin ini menyediakan deteksi perangkat dapat-dilepas menggunakan HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Berdasarkan pada Solid (pustaka hardware KDE) diff --git a/src/plugins/General/hal/translations/hal_plugin_it.ts b/src/plugins/General/hal/translations/hal_plugin_it.ts index e1b974362..8ea018ac5 100644 --- a/src/plugins/General/hal/translations/hal_plugin_it.ts +++ b/src/plugins/General/hal/translations/hal_plugin_it.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin Modulo HAL - + About HAL Plugin Info sul modulo HAL - + Qmmp HAL Plugin Modulo HAL per Qmmp - + This plugin provides removable devices detection using HAL Modulo che permette il rilevamento di dispositivi rimovibili utilizzando HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Basato su Solid (libreria hardware KDE) diff --git a/src/plugins/General/hal/translations/hal_plugin_ja.ts b/src/plugins/General/hal/translations/hal_plugin_ja.ts index 4db80dd2e..68129193d 100644 --- a/src/plugins/General/hal/translations/hal_plugin_ja.ts +++ b/src/plugins/General/hal/translations/hal_plugin_ja.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin HAL プラグイン - + About HAL Plugin HAL プラグインについて - + Qmmp HAL Plugin QMMP HAL プラグイン - + This plugin provides removable devices detection using HAL このプラグインは着脱可能なデバイスの検知機能を HAL によって提供します - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Solid (KDE ハードウェアライブラリ) を基に作成 diff --git a/src/plugins/General/hal/translations/hal_plugin_kk.ts b/src/plugins/General/hal/translations/hal_plugin_kk.ts index 4cbf7df9e..c6e959023 100644 --- a/src/plugins/General/hal/translations/hal_plugin_kk.ts +++ b/src/plugins/General/hal/translations/hal_plugin_kk.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin - + About HAL Plugin - + Qmmp HAL Plugin - + This plugin provides removable devices detection using HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) diff --git a/src/plugins/General/hal/translations/hal_plugin_lt.ts b/src/plugins/General/hal/translations/hal_plugin_lt.ts index 6cbe1ca01..5162bd0d6 100644 --- a/src/plugins/General/hal/translations/hal_plugin_lt.ts +++ b/src/plugins/General/hal/translations/hal_plugin_lt.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin HAL įskiepis - + About HAL Plugin Apie HAL įskiepį - + Qmmp HAL Plugin qmmp HAL įskiepis - + This plugin provides removable devices detection using HAL Šis įskiepis atlieka išorinių prijungiamų įrenginių aptikimą naudojant HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov - + Based on Solid (KDE hardware library) Sukurta Solid pagrindu (KDE biblioteka) diff --git a/src/plugins/General/hal/translations/hal_plugin_nl.ts b/src/plugins/General/hal/translations/hal_plugin_nl.ts index 0c3ccfbbb..bb5b72eef 100644 --- a/src/plugins/General/hal/translations/hal_plugin_nl.ts +++ b/src/plugins/General/hal/translations/hal_plugin_nl.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin HAL Module - + About HAL Plugin Over de HAL Module - + Qmmp HAL Plugin HAL Module voor Qmmp - + This plugin provides removable devices detection using HAL Deze module faciliteert detectie van verwisselbare apparaten, gebruikmakend van HAL (Verouderd, gebruik UDisks module) - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Gebasseerd op Solid (KDE hardware bibliotheek) diff --git a/src/plugins/General/hal/translations/hal_plugin_pl_PL.ts b/src/plugins/General/hal/translations/hal_plugin_pl_PL.ts index 30aca83ac..c82edcfe8 100644 --- a/src/plugins/General/hal/translations/hal_plugin_pl_PL.ts +++ b/src/plugins/General/hal/translations/hal_plugin_pl_PL.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin Wtyczka HAL - + About HAL Plugin O wtyczce HAL - + Qmmp HAL Plugin Wtyczka HAL dla Qmmp - + This plugin provides removable devices detection using HAL Ta wtyczka umożliwia detekcję urządzeń przenośnych dzięki HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Oparte na Solid (biblioteka urządzeń dla KDE) diff --git a/src/plugins/General/hal/translations/hal_plugin_pt.ts b/src/plugins/General/hal/translations/hal_plugin_pt.ts index db1defafa..1288ad2cc 100644 --- a/src/plugins/General/hal/translations/hal_plugin_pt.ts +++ b/src/plugins/General/hal/translations/hal_plugin_pt.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin Suplemento HAL - + About HAL Plugin Sobre o suplemento HAL - + Qmmp HAL Plugin Suplemento Qmmp HAL - + This plugin provides removable devices detection using HAL Este suplemento permite a deteção de discos amovíveis através do serviço HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Baseado no Solid (biblioteca do KDE) diff --git a/src/plugins/General/hal/translations/hal_plugin_pt_BR.ts b/src/plugins/General/hal/translations/hal_plugin_pt_BR.ts index 7726b5449..396d4c0b8 100644 --- a/src/plugins/General/hal/translations/hal_plugin_pt_BR.ts +++ b/src/plugins/General/hal/translations/hal_plugin_pt_BR.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin Plugin HAL - + About HAL Plugin Sobre o plugin HAL - + Qmmp HAL Plugin Plugin Qmmp HAL - + This plugin provides removable devices detection using HAL Este plugin permite a detecção de dispositivos removíveis através do serviço HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Baseado no Solid (biblioteca do KDE) diff --git a/src/plugins/General/hal/translations/hal_plugin_ru.ts b/src/plugins/General/hal/translations/hal_plugin_ru.ts index 6e4a552b4..fa74fa422 100644 --- a/src/plugins/General/hal/translations/hal_plugin_ru.ts +++ b/src/plugins/General/hal/translations/hal_plugin_ru.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin Модуль HAL - + About HAL Plugin О Модуле HAL - + Qmmp HAL Plugin Модуль HAL для Qmmp - + This plugin provides removable devices detection using HAL Этот модуль отслеживает съёмные устройства с помощью HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Основан на базе Solid (библиотека KDE) diff --git a/src/plugins/General/hal/translations/hal_plugin_sk.ts b/src/plugins/General/hal/translations/hal_plugin_sk.ts index 21c5771c5..82a8531e7 100644 --- a/src/plugins/General/hal/translations/hal_plugin_sk.ts +++ b/src/plugins/General/hal/translations/hal_plugin_sk.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin - + About HAL Plugin - + Qmmp HAL Plugin - + This plugin provides removable devices detection using HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) diff --git a/src/plugins/General/hal/translations/hal_plugin_sr_BA.ts b/src/plugins/General/hal/translations/hal_plugin_sr_BA.ts index 0f263b198..fc686c047 100644 --- a/src/plugins/General/hal/translations/hal_plugin_sr_BA.ts +++ b/src/plugins/General/hal/translations/hal_plugin_sr_BA.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin ХАЛ - + About HAL Plugin О прикључку за ХАЛ - + Qmmp HAL Plugin Кумп прикључак за ХАЛ - + This plugin provides removable devices detection using HAL Омогућује откривање уклоњивих уређаја користећи ХАЛ - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Заснован на Солиду (КДЕ-овој библиотеци) diff --git a/src/plugins/General/hal/translations/hal_plugin_sr_RS.ts b/src/plugins/General/hal/translations/hal_plugin_sr_RS.ts index bf117ebb3..955c69c7d 100644 --- a/src/plugins/General/hal/translations/hal_plugin_sr_RS.ts +++ b/src/plugins/General/hal/translations/hal_plugin_sr_RS.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin ХАЛ - + About HAL Plugin О прикључку за ХАЛ - + Qmmp HAL Plugin Кумп прикључак за ХАЛ - + This plugin provides removable devices detection using HAL Омогућује откривање уклоњивих уређаја користећи ХАЛ - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Заснован на Солиду (КДЕ-овој библиотеци) diff --git a/src/plugins/General/hal/translations/hal_plugin_tr.ts b/src/plugins/General/hal/translations/hal_plugin_tr.ts index 757797614..0e4339d04 100644 --- a/src/plugins/General/hal/translations/hal_plugin_tr.ts +++ b/src/plugins/General/hal/translations/hal_plugin_tr.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin HAL Eklentisi - + About HAL Plugin HAL Eklentisi Hakkında - + Qmmp HAL Plugin Qmmp HAL Eklentisi - + This plugin provides removable devices detection using HAL Bu eklenti HAL kullanarak çıkarılabilir aygıtların tanınmasını sağlar - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Solid (KDE donanım kitaplığı) temellidir diff --git a/src/plugins/General/hal/translations/hal_plugin_uk_UA.ts b/src/plugins/General/hal/translations/hal_plugin_uk_UA.ts index 4ccb1535f..00fdf1ec6 100644 --- a/src/plugins/General/hal/translations/hal_plugin_uk_UA.ts +++ b/src/plugins/General/hal/translations/hal_plugin_uk_UA.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin Модуль HAL - + About HAL Plugin Про модуль HAL - + Qmmp HAL Plugin Модуль HAL для Qmmp - + This plugin provides removable devices detection using HAL Цей модуль відстежує з'ємні пристрої за допомогою HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Базується на базі Solid (бібліотека KDE) diff --git a/src/plugins/General/hal/translations/hal_plugin_zh_CN.ts b/src/plugins/General/hal/translations/hal_plugin_zh_CN.ts index 730ade340..f30201fd8 100644 --- a/src/plugins/General/hal/translations/hal_plugin_zh_CN.ts +++ b/src/plugins/General/hal/translations/hal_plugin_zh_CN.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin HAL 插件 - + About HAL Plugin 关于 HAL 插件 - + Qmmp HAL Plugin Qmmp HAL 插件 - + This plugin provides removable devices detection using HAL 此插件利用 HAL 提供可移动设备的检测 - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) 基于 Solid (KDE 硬件库) diff --git a/src/plugins/General/hal/translations/hal_plugin_zh_TW.ts b/src/plugins/General/hal/translations/hal_plugin_zh_TW.ts index ab0da5153..9eb86eb1b 100644 --- a/src/plugins/General/hal/translations/hal_plugin_zh_TW.ts +++ b/src/plugins/General/hal/translations/hal_plugin_zh_TW.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin HAL 外掛 - + About HAL Plugin 關於 HAL 外掛 - + Qmmp HAL Plugin Qmmp HAL 外掛 - + This plugin provides removable devices detection using HAL 此插件利用 HAL 提供可移動設備的檢測 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) 基於 Solid (KDE 硬件程式庫) diff --git a/src/plugins/General/hotkey/CMakeLists.txt b/src/plugins/General/hotkey/CMakeLists.txt index 9cf51d112..ca8188a31 100644 --- a/src/plugins/General/hotkey/CMakeLists.txt +++ b/src/plugins/General/hotkey/CMakeLists.txt @@ -2,22 +2,8 @@ project(libhotkey) INCLUDE(CheckIncludeFile) -# 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) -ADD_DEFINITIONS(${X11_CFLAGS}) - include_directories(${CMAKE_CURRENT_BINARY_DIR}) -SET(QT_INCLUDES - ${QT_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ -) - include_directories(${X11_INCLUDE_DIRS}) link_directories(${X11_LIBRARY_DIRS}) @@ -45,7 +31,7 @@ SET(libhotkey_RCCS translations/translations.qrc ) -QT4_ADD_RESOURCES(libhotkey_RCC_SRCS ${libhotkey_RCCS}) +QT5_ADD_RESOURCES(libhotkey_RCC_SRCS ${libhotkey_RCCS}) # user interface @@ -55,7 +41,7 @@ SET(libhotkey_UIS hotkeydialog.ui ) -QT4_WRAP_UI(libhotkey_UIS_H ${libhotkey_UIS}) +QT5_WRAP_UI(libhotkey_UIS_H ${libhotkey_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -64,6 +50,6 @@ IF(X11_FOUND) set_property(SOURCE hotkeymanager_x11.cpp PROPERTY SKIP_AUTOMOC ON) ADD_LIBRARY(hotkey MODULE ${libhotkey_SRCS} ${libhotkey_UIS_H} ${libhotkey_RCC_SRCS}) add_dependencies(hotkey qmmpui) -target_link_libraries(hotkey ${QT_LIBRARIES} qmmpui libqmmp ${X11_LDFLAGS}) +target_link_libraries(hotkey Qt5::Widgets Qt5::X11Extras -lqmmpui -lqmmp ${X11_LDFLAGS}) install(TARGETS hotkey DESTINATION ${LIB_DIR}/qmmp/General) ENDIF(X11_FOUND) diff --git a/src/plugins/General/hotkey/hotkey.pro b/src/plugins/General/hotkey/hotkey.pro index 7195a5811..e8477431e 100644 --- a/src/plugins/General/hotkey/hotkey.pro +++ b/src/plugins/General/hotkey/hotkey.pro @@ -25,4 +25,5 @@ unix { INSTALLS += target PKGCONFIG += x11 DEFINES += HAVE_XKBLIB_H + QT += x11extras } diff --git a/src/plugins/General/hotkey/hotkeyfactory.cpp b/src/plugins/General/hotkey/hotkeyfactory.cpp index de944514e..7c0c176de 100644 --- a/src/plugins/General/hotkey/hotkeyfactory.cpp +++ b/src/plugins/General/hotkey/hotkeyfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2016 by Ilya Kotov * + * Copyright (C) 2009-2012 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -18,9 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ + #include -#include -#include #include #include "settingsdialog.h" #include "hotkeymanager.h" @@ -62,5 +61,3 @@ QTranslator *HotkeyFactory::createTranslator(QObject *parent) translator->load(QString(":/hotkey_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(hotkey, HotkeyFactory) diff --git a/src/plugins/General/hotkey/hotkeyfactory.h b/src/plugins/General/hotkey/hotkeyfactory.h index caae05029..d4f1618a5 100644 --- a/src/plugins/General/hotkey/hotkeyfactory.h +++ b/src/plugins/General/hotkey/hotkeyfactory.h @@ -32,6 +32,7 @@ class HotkeyFactory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; diff --git a/src/plugins/General/hotkey/hotkeymanager.h b/src/plugins/General/hotkey/hotkeymanager.h index cf816dd6f..200aa68f4 100644 --- a/src/plugins/General/hotkey/hotkeymanager.h +++ b/src/plugins/General/hotkey/hotkeymanager.h @@ -20,6 +20,7 @@ #ifndef HOTKEYMANAGER_H #define HOTKEYMANAGER_H +#include #include #include #include @@ -80,13 +81,13 @@ public: static QList ignModifiersList(); static quint32 keycodeToKeysym(quint32 keycode); -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 protected: virtual bool eventFilter(QObject* o, QEvent* e); #endif private: -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 static void ensureModifiers(); QList m_grabbedKeys; static long m_alt_mask; diff --git a/src/plugins/General/hotkey/hotkeymanager_x11.cpp b/src/plugins/General/hotkey/hotkeymanager_x11.cpp index 3954eebb3..05b46280a 100644 --- a/src/plugins/General/hotkey/hotkeymanager_x11.cpp +++ b/src/plugins/General/hotkey/hotkeymanager_x11.cpp @@ -21,7 +21,7 @@ ***************************************************************************/ #include -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 #include #include #include @@ -80,6 +80,12 @@ quint32 Hotkey::defaultKey(int act) HotkeyManager::HotkeyManager(QObject *parent) : QObject(parent) { +#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) + //Workaround Qt regression of no longer delivering events for the root window + //See qtbase commit 2b34aefcf02f09253473b096eb4faffd3e62b5f4 + //More information: https://bugs.kde.org/show_bug.cgi?id=360841 + qApp->desktop()->winId(); +#endif QCoreApplication::instance()->installEventFilter(this); WId rootWindow = QX11Info::appRootWindow(); QSettings settings(Qmmp::configFile(), QSettings::IniFormat); //load settings @@ -138,8 +144,7 @@ const QString HotkeyManager::getKeyString(quint32 key, quint32 modifiers) bool HotkeyManager::eventFilter(QObject* o, QEvent* e) { - //receive events from active and root windows only - if (e->type() == QEvent::KeyPress && (o == qApp->desktop () || o == qApp->activeWindow ())) + if (e->type() == QEvent::KeyPress) { QKeyEvent* k = static_cast(e); quint32 key = keycodeToKeysym(k->nativeScanCode()); @@ -198,7 +203,7 @@ bool HotkeyManager::eventFilter(QObject* o, QEvent* e) break; } - qApp->processEvents(); + return true; } } return QObject::eventFilter(o, e); diff --git a/src/plugins/General/hotkey/settingsdialog.cpp b/src/plugins/General/hotkey/settingsdialog.cpp index 08d429227..2830e58ee 100644 --- a/src/plugins/General/hotkey/settingsdialog.cpp +++ b/src/plugins/General/hotkey/settingsdialog.cpp @@ -30,9 +30,9 @@ SettingsDialog::SettingsDialog(QWidget *parent) { m_ui.setupUi(this); m_ui.tableWidget->verticalHeader()->setDefaultSectionSize(fontMetrics().height()); - m_ui.tableWidget->verticalHeader()->setResizeMode(QHeaderView::Fixed); + m_ui.tableWidget->verticalHeader()->setSectionResizeMode(QHeaderView::Fixed); m_ui.tableWidget->verticalHeader()->hide(); - m_ui.tableWidget->horizontalHeader()->setResizeMode(QHeaderView::Stretch); + m_ui.tableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch); m_ui.tableWidget->setRowCount (13); m_ui.tableWidget->setItem(0,0, new QTableWidgetItem(tr("Play"))); m_ui.tableWidget->setItem(1,0, new QTableWidgetItem(tr("Stop"))); diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_bg.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_bg.ts index 5b0d9cf86..fb4ee116d 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_bg.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_bg.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin - + About Global Hotkey Plugin - + Qmmp Global Hotkey Plugin - + This plugin adds support for multimedia keys or global key combinations - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_cs.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_cs.ts index f50bb126d..e0af4d5ad 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_cs.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_cs.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Modul klávesových zkratek - + About Global Hotkey Plugin O modulu klávesových zkratek - + Qmmp Global Hotkey Plugin Modul Qmmp pro klávesové zkratky - + This plugin adds support for multimedia keys or global key combinations Tento modul přidává podporu multimediálních kláves a globálních klávesových zkratek - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_de.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_de.ts index 0df163b93..7458400df 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_de.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_de.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Globales Kurzbefehle-Modul - + About Global Hotkey Plugin Über Globales Kurzbefehle-Modul - + Qmmp Global Hotkey Plugin Qmmp Globales Kurzbefehle-Modul - + This plugin adds support for multimedia keys or global key combinations Dieses Modul fügt Unterstützung für Multimedia-Tasten oder allgemeine Tastaturkombinationen hinzu - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_el.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_el.ts index 4e1a449fe..49476d733 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_el.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_el.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Πρόσθετο καθολικών συντομεύσεων - + About Global Hotkey Plugin Σχετικά με το πρόσθετο καθολικών συντομεύσεων - + Qmmp Global Hotkey Plugin Qmmp πρόσθετο καθολικών συντομεύσεων - + This plugin adds support for multimedia keys or global key combinations Αυτό το πρόσθετο προσθέτει υποστήριξη για συνδυασμό πλήκτρων πληκτρολογίου ή πολυμέσων - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_en.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_en.ts index 42e4c65a9..c6e3a99bf 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_en.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_en.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin - + About Global Hotkey Plugin - + Qmmp Global Hotkey Plugin - + This plugin adds support for multimedia keys or global key combinations - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_es.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_es.ts index 1a30c5d43..bcf035c72 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_es.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_es.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Módulo de atajos de teclado global - + About Global Hotkey Plugin Acerca del módulo de atajos de teclado global - + Qmmp Global Hotkey Plugin Módulo de atajos de teclado global para Qmmp - + This plugin adds support for multimedia keys or global key combinations Este módulo añade soporte para teclas multimedia o combinaciones de teclas globales - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_fi.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_fi.ts index 6164beda1..ad49e3973 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_fi.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_fi.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin - + About Global Hotkey Plugin - + Qmmp Global Hotkey Plugin - + This plugin adds support for multimedia keys or global key combinations - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_fr.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_fr.ts index a999d317f..666de769c 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_fr.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_fr.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Greffon de raccourci clavier global - + About Global Hotkey Plugin À propos du greffon de raccourci clavier global - + Qmmp Global Hotkey Plugin Greffon de raccourci clavier global pour Qmmp - + This plugin adds support for multimedia keys or global key combinations Ce greffon ajoute un support pour des touches multimédia ou des combinaisons globales de touches - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_gl_ES.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_gl_ES.ts index eea0cad45..79b5cd202 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_gl_ES.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_gl_ES.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Engadido Global Hotkey - + About Global Hotkey Plugin Sobre o engadido Global Hotkey - + Qmmp Global Hotkey Plugin Engadido Qmmp Global Hotkey - + This plugin adds support for multimedia keys or global key combinations Este engadido ofrece soporte para teclas multimedia ou combinacións de teclas globais - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_he.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_he.ts index 8db3d759c..1e7357a01 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_he.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_he.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin תוסף מקש חם גלובלי - + About Global Hotkey Plugin אודות תוסף מקש חם גלובלי - + Qmmp Global Hotkey Plugin תוסף מקש חם גלובלי של Qmmp - + This plugin adds support for multimedia keys or global key combinations תוסף זה מוסיף תמיכה למקשי מולטימדיה או צירופי מקש גלובלי - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_hu.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_hu.ts index 35ec12deb..6977a2e40 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_hu.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_hu.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin - + About Global Hotkey Plugin - + Qmmp Global Hotkey Plugin - + This plugin adds support for multimedia keys or global key combinations - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_id.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_id.ts index a85361684..930f51e4b 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_id.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_id.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Plugin Hotkey Global - + About Global Hotkey Plugin Tentang Plugin Hotkey Global - + Qmmp Global Hotkey Plugin Plugin Hotkey Global Qmmp - + This plugin adds support for multimedia keys or global key combinations Plugin ini menambahkan dukungan untuk tombol multimedia atau kombinasi tombol global - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_it.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_it.ts index 146fab9b5..10166150f 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_it.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_it.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Modulo scorciatoie globali - + About Global Hotkey Plugin Info sul modulo scorciatoie globali - + Qmmp Global Hotkey Plugin Modulo scorciatoie globali per Qmmp - + This plugin adds support for multimedia keys or global key combinations Modulo che aggiunge il supporto per combinazione di tasti multimedia o scorciatoie - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_ja.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_ja.ts index 48ca697e2..2a53c59c9 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_ja.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_ja.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin 共通ホットキープラグイン - + About Global Hotkey Plugin 共通ホットキープラグインについて - + Qmmp Global Hotkey Plugin QMMP 通用ホットキープラグイン - + This plugin adds support for multimedia keys or global key combinations このプラグインはマルティミディアキーや共通キーを組み合わせるサポートを加えます - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_kk.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_kk.ts index 1c4373e0f..b6717ce8e 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_kk.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_kk.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin - + About Global Hotkey Plugin - + Qmmp Global Hotkey Plugin - + This plugin adds support for multimedia keys or global key combinations - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_lt.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_lt.ts index fcbfc62cc..4a4a74e7f 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_lt.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_lt.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Global Hotkey klavišų įskiepis - + About Global Hotkey Plugin Apie Global Hotkey įskiepį - + Qmmp Global Hotkey Plugin Qmmp Global Hotkey įskiepis - + This plugin adds support for multimedia keys or global key combinations This plugin adds support for multimedia keys or global key combinations - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_nl.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_nl.ts index 56e1ea8ac..4278e1cc0 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_nl.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_nl.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Globale Sneltoets Module - + About Global Hotkey Plugin Over de Globale Sneltoets Module - + Qmmp Global Hotkey Plugin Globale Sneltoets Module voor Qmmp - + This plugin adds support for multimedia keys or global key combinations Deze module voegt ondersteuning toe voor multimedia toetsen of globale toetscombinaties - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_pl_PL.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_pl_PL.ts index daa25cf53..e53d9f27a 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_pl_PL.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_pl_PL.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Wtyczka klawiszów skrótowych - + About Global Hotkey Plugin O wtyczce Klawisze Skrótowe - + Qmmp Global Hotkey Plugin Wtyczka Skróŧy Klawiszowe dla Qmmp - + This plugin adds support for multimedia keys or global key combinations Ta wtyczka obsługuje klawisze multimedialne oraz globalne kombinacje klawiszów skrótowych - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_pt.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_pt.ts index 2adc4fde7..c26e27d32 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_pt.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_pt.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Suplemento Global Hotkey - + About Global Hotkey Plugin Sobre o suplemento Global Hotkey - + Qmmp Global Hotkey Plugin Suplemento Qmmp Global Hotkey - + This plugin adds support for multimedia keys or global key combinations Este suplemento adiciona suporte às teclas multimédia ou a combinações de teclas - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_pt_BR.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_pt_BR.ts index a89444930..585cc440b 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_pt_BR.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_pt_BR.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Plugin Global Hotkey - + About Global Hotkey Plugin Sobre o plugin Global Hotkey - + Qmmp Global Hotkey Plugin Plugin Qmmp Global Hotkey - + This plugin adds support for multimedia keys or global key combinations Este plugin adiciona suporte às teclas multimídia ou a combinações de teclas - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_ru.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_ru.ts index b8bb9e1e7..d84aaf4c4 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_ru.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_ru.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Модуль глоб. клавиш - + About Global Hotkey Plugin О модуле глобальных клавиш - + Qmmp Global Hotkey Plugin Модуль глобальных клавиш для Qmmp - + This plugin adds support for multimedia keys or global key combinations Этот модуль добавляет поддержку медиа- или глобальных клавиш - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_sk.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_sk.ts index 36bd98162..1743d2e1b 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_sk.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_sk.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin - + About Global Hotkey Plugin - + Qmmp Global Hotkey Plugin - + This plugin adds support for multimedia keys or global key combinations - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_sr_BA.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_sr_BA.ts index ce2bf7062..67c64b838 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_sr_BA.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_sr_BA.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Глобалне пречице - + About Global Hotkey Plugin О прикључку за глобалне пречице - + Qmmp Global Hotkey Plugin Кумп прикључак за глобалне пречице - + This plugin adds support for multimedia keys or global key combinations Подршка за мултимедијалне тастере или глобалне комбинације тастера - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_sr_RS.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_sr_RS.ts index 80b173f2a..0941e8ba5 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_sr_RS.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_sr_RS.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Глобалне пречице - + About Global Hotkey Plugin О прикључку за глобалне пречице - + Qmmp Global Hotkey Plugin Кумп прикључак за глобалне пречице - + This plugin adds support for multimedia keys or global key combinations Подршка за мултимедијалне тастере или глобалне комбинације тастера - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_tr.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_tr.ts index 3161c133e..f225c967a 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_tr.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_tr.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Genel Kısayol Eklentisi - + About Global Hotkey Plugin Genel Kısayol Eklentisi Hakkında - + Qmmp Global Hotkey Plugin Qmmp Genel Kısayol Eklentisi - + This plugin adds support for multimedia keys or global key combinations Bu eklenti çokluortam tuşları veya genel tuş kombinasyonu desteği ekler - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_uk_UA.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_uk_UA.ts index 29c63d8af..3142f5288 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_uk_UA.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_uk_UA.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Модуль глобальних клавіш - + About Global Hotkey Plugin Про модуль глобальних клавіш - + Qmmp Global Hotkey Plugin Модуль глобальних клавіш для Qmmp - + This plugin adds support for multimedia keys or global key combinations Цей модуль додає підтримку мультимедійних чи глобальних клавіш - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_zh_CN.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_zh_CN.ts index 05cf83a54..29f5eaf20 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_zh_CN.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_zh_CN.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin 全局快捷键插件 - + About Global Hotkey Plugin 关于全局快捷键插件 - + Qmmp Global Hotkey Plugin Qmmp 全局快捷键插件 - + This plugin adds support for multimedia keys or global key combinations 此插件支持增加多媒体快捷键和全局快捷键 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_zh_TW.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_zh_TW.ts index 8f068a3d0..6bfa96cbd 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_zh_TW.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_zh_TW.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin 全局熱鍵插件 - + About Global Hotkey Plugin 關於全局熱鍵插件 - + Qmmp Global Hotkey Plugin Qmmp 全局熱鍵插件 - + This plugin adds support for multimedia keys or global key combinations 此插件支援添加多媒體熱鍵與全局熱鍵 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/kdenotify/CMakeLists.txt b/src/plugins/General/kdenotify/CMakeLists.txt index e24ae1711..abfab62d0 100644 --- a/src/plugins/General/kdenotify/CMakeLists.txt +++ b/src/plugins/General/kdenotify/CMakeLists.txt @@ -1,22 +1,5 @@ project(libkdenotify) - -SET (QT_USE_QTDBUS TRUE) - -INCLUDE(FindQt4) - -include(${QT_USE_FILE}) - -# 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 @@ -32,25 +15,23 @@ SET(libkdenotify_SRCS SET(libkdenotify_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libkdenotify_RCC_SRCS ${libkdenotify_RCCS}) +QT5_ADD_RESOURCES(libkdenotify_RCC_SRCS ${libkdenotify_RCCS}) # user interface SET(libkdenotify_UIS settingsdialog.ui ) -QT4_WRAP_UI(libkdenotify_UIS_H ${libkdenotify_UIS}) +QT5_WRAP_UI(libkdenotify_UIS_H ${libkdenotify_UIS}) -# QT4_WRAP_UI(libkdenotify_UIS_H ${libkdenotify_UIS}) +# QT5_WRAP_UI(libkdenotify_UIS_H ${libkdenotify_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(kdenotify MODULE ${libkdenotify_SRCS} ${libkdenotify_RCC_SRCS} ${libkdenotify_UIS_H}) add_dependencies(kdenotify qmmpui) -target_link_libraries(kdenotify ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(kdenotify Qt5::Widgets Qt5::DBus -lqmmpui -lqmmp) install(TARGETS kdenotify DESTINATION ${LIB_DIR}/qmmp/General) -IF(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - install(FILES images/empty_cover.png DESTINATION share/qmmp/images) - install(FILES images/app_icon.png DESTINATION share/qmmp/images) -ENDIF() +install(FILES images/empty_cover.png DESTINATION share/qmmp/images) +install(FILES images/app_icon.png DESTINATION share/qmmp/images) diff --git a/src/plugins/General/kdenotify/kdenotifyfactory.cpp b/src/plugins/General/kdenotify/kdenotifyfactory.cpp index 557c9f024..2de043e0f 100644 --- a/src/plugins/General/kdenotify/kdenotifyfactory.cpp +++ b/src/plugins/General/kdenotify/kdenotifyfactory.cpp @@ -19,13 +19,12 @@ ***************************************************************************/ #include -#include -#include #include "kdenotifyfactory.h" #include "kdenotify.h" #include "settingsdialog.h" + const GeneralProperties KdeNotifyFactory::properties() const { GeneralProperties properties; @@ -61,5 +60,3 @@ QTranslator *KdeNotifyFactory::createTranslator(QObject *parent) translator->load(QString(":/kdenotify_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(kdenotify, KdeNotifyFactory) diff --git a/src/plugins/General/kdenotify/kdenotifyfactory.h b/src/plugins/General/kdenotify/kdenotifyfactory.h index 9eb0b49fa..1c6f7543a 100644 --- a/src/plugins/General/kdenotify/kdenotifyfactory.h +++ b/src/plugins/General/kdenotify/kdenotifyfactory.h @@ -30,8 +30,9 @@ class KdeNotifyFactory : public QObject, public GeneralFactory { - Q_OBJECT - Q_INTERFACES(GeneralFactory) +Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") +Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; QObject *create(QObject *parent); diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_bg.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_bg.ts index beb9b7037..40c963dc8 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_bg.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_bg.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin - + About KDE Notification Plugin - + KDE 4 notification plugin for Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_cs.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_cs.ts index 5df07c248..f30102e24 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_cs.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_cs.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin Notifikační modul pro KDE4 - + About KDE Notification Plugin O notifikačním modulu pro KDE - + KDE 4 notification plugin for Qmmp Notifikační modul Qmmp pro KDE4 diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_de.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_de.ts index ce3a0fafc..633cb9d2a 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_de.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_de.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin KDE-4-Benachrichtigungsmodul - + About KDE Notification Plugin Über KDE-4-Benachrichtigungsmodul - + KDE 4 notification plugin for Qmmp KDE-4-Benachrichtigungsmodul für Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_el.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_el.ts index e890c5199..0c88946a2 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_el.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_el.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin Πρόσθετο ειδοποιήσεων του KDE4 - + About KDE Notification Plugin Σχετικά με το πρόσθετο ειδοποιήσεων KDE - + KDE 4 notification plugin for Qmmp Qmmp πρόσθετο ειδοποιήσεων του KDE4 diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_en.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_en.ts index d3ee0067e..c35ba83bc 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_en.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_en.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin - + About KDE Notification Plugin - + KDE 4 notification plugin for Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_es.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_es.ts index deb49854a..cb46d77ec 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_es.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_es.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin Módulo de notificación KDE 4 - + About KDE Notification Plugin Acerca del módulo de notificación KDE - + KDE 4 notification plugin for Qmmp Módulo de notificación KDE 4 para Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_fi.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_fi.ts index 36d4aef3c..767e5d3bb 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_fi.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_fi.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin - + About KDE Notification Plugin - + KDE 4 notification plugin for Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_fr.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_fr.ts index f6d93a975..1e97d7e03 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_fr.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_fr.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin Greffon de notification KDE 4 - + About KDE Notification Plugin À propos du greffon de notification KDE 4 - + KDE 4 notification plugin for Qmmp Greffon de notification KDE 4 pour Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_gl_ES.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_gl_ES.ts index f753367d0..1923fa0e4 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_gl_ES.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_gl_ES.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin Engadido para as notificacións de KDE 4 - + About KDE Notification Plugin Sobre o engadido para as notificacións de KDE - + KDE 4 notification plugin for Qmmp Engadido de Qmmp para as notificacións de KDE 4 diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_he.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_he.ts index 2910c2c7e..99b5569c2 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_he.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_he.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin תוסף התראת KDE 4 - + About KDE Notification Plugin אודות תוסף התראת KDE 4 - + KDE 4 notification plugin for Qmmp תוסף התראת KDE 4 עבור Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_hu.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_hu.ts index d889fee31..21ca28642 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_hu.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_hu.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin - + About KDE Notification Plugin - + KDE 4 notification plugin for Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_id.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_id.ts index 369eb583e..683bab14c 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_id.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_id.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin Plugin pemberitahuan KDE 4 - + About KDE Notification Plugin Tentang Plugin Pemberitahuan KDE - + KDE 4 notification plugin for Qmmp Plugin pemberitahuan KDE 4 bagi Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_it.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_it.ts index 91a28c2db..29964f409 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_it.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_it.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin Plugin notificazione per KDE 4 - + About KDE Notification Plugin Info sul Plugin di notificazione per KDE - + KDE 4 notification plugin for Qmmp Plugin di notificazione epr KDE 4 diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_ja.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_ja.ts index 235e4046e..84205be58 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_ja.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_ja.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin KDE 4 通知プラグイン - + About KDE Notification Plugin KDE 通知プラグインについて - + KDE 4 notification plugin for Qmmp QMMP 用 KDE 4 通知プラグイン diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_kk.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_kk.ts index 909e5551b..fa863946d 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_kk.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_kk.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin - + About KDE Notification Plugin - + KDE 4 notification plugin for Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_lt.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_lt.ts index 5da6bca99..3b849fc41 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_lt.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_lt.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin KDE 4 pranešimų įskiepis - + About KDE Notification Plugin Apie qmmp KDE 4 pranešimų įskiepį - + KDE 4 notification plugin for Qmmp Qmmp KDE 4 pranešimų įskiepis diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_nl.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_nl.ts index edc0ba3be..a4b110575 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_nl.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_nl.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin Notificatie Module voor KDE 4 - + About KDE Notification Plugin Over de KDE 4 Notificatie Module - + KDE 4 notification plugin for Qmmp KDE 4 Notificatie Module voor Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_pl_PL.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_pl_PL.ts index 7e661c9cc..a3ec0c8ef 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_pl_PL.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_pl_PL.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin Wtyczka powiadamiania KDE 4 - + About KDE Notification Plugin O wtyczce Powiadomienia KDE - + KDE 4 notification plugin for Qmmp Wtyczka Powiadomienia KDE 4 dla Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_pt.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_pt.ts index e2df55434..ff22b93b5 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_pt.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_pt.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin Suplemento KDE4 Notification - + About KDE Notification Plugin Sobre o suplemento KDE4 Notification - + KDE 4 notification plugin for Qmmp Suplemento Qmmp KDE4 Notification diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_pt_BR.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_pt_BR.ts index 6c9903166..d877c726e 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_pt_BR.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_pt_BR.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin Plugin KDE 4 Notification - + About KDE Notification Plugin Sobre o plugin KDE Notification - + KDE 4 notification plugin for Qmmp Plugin KDE 4 Notification para o Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_ru.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_ru.ts index b194e558c..af1b7bdfa 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_ru.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_ru.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin Модуль уведомлений KDE4 - + About KDE Notification Plugin О модуле уведомлений KDE4 - + KDE 4 notification plugin for Qmmp Модуль уведомлений KDE4 для Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_sk.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_sk.ts index 70f5a5625..d6cdc473d 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_sk.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_sk.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin - + About KDE Notification Plugin - + KDE 4 notification plugin for Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_sr_BA.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_sr_BA.ts index 60f7826c9..9bec3e346 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_sr_BA.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_sr_BA.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin КДЕ4 обавјештавач - + About KDE Notification Plugin О КДЕ4 обавјештавачу - + KDE 4 notification plugin for Qmmp Кумп прикључак за обавјештавање у КДЕ4 diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_sr_RS.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_sr_RS.ts index ad990896b..97ef9586f 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_sr_RS.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_sr_RS.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin КДЕ4 обавештавач - + About KDE Notification Plugin О КДЕ4 обавештавачу - + KDE 4 notification plugin for Qmmp Кумп прикључак за обавештавање у КДЕ4 diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_tr.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_tr.ts index 6d06f14b3..c038ccb28 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_tr.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_tr.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin - + About KDE Notification Plugin - + KDE 4 notification plugin for Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_uk_UA.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_uk_UA.ts index 3f89537d1..851e727f8 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_uk_UA.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_uk_UA.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin Модуль повідомлень KDE4 - + About KDE Notification Plugin Про модуль повідомлень KDE4 - + KDE 4 notification plugin for Qmmp Модуль повідомлень KDE4 для Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_CN.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_CN.ts index 9cf44ac53..1171d7421 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_CN.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_CN.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin KDE 4 通知插件 - + About KDE Notification Plugin 关于 KDE 4 通知插件 - + KDE 4 notification plugin for Qmmp Qmmp KDE 4 通知插件 diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_TW.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_TW.ts index 3874720e7..8f7e5c2b1 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_TW.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_TW.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin KDE 4 通知插件 - + About KDE Notification Plugin 關於 KDE 通知插件 - + KDE 4 notification plugin for Qmmp Qmmp 的 KDE 4通知插件 diff --git a/src/plugins/General/lyrics/CMakeLists.txt b/src/plugins/General/lyrics/CMakeLists.txt index 64a1da810..c2703ff48 100644 --- a/src/plugins/General/lyrics/CMakeLists.txt +++ b/src/plugins/General/lyrics/CMakeLists.txt @@ -1,26 +1,7 @@ project(liblyrics) - -SET(QT_USE_QTNETWORK TRUE) -INCLUDE(FindQt4) - -include(${QT_USE_FILE}) - -# 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}) -SET(QT_INCLUDES - ${QT_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ -) - # libqmmpui & libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -35,7 +16,7 @@ SET(liblyrics_SRCS SET(liblyrics_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(liblyrics_RCC_SRCS ${liblyrics_RCCS}) +QT5_ADD_RESOURCES(liblyrics_RCC_SRCS ${liblyrics_RCCS}) # user interface @@ -43,12 +24,12 @@ SET(liblyrics_UIS lyricswindow.ui ) -QT4_WRAP_UI(liblyrics_UIS_H ${liblyrics_UIS}) +QT5_WRAP_UI(liblyrics_UIS_H ${liblyrics_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(lyrics MODULE ${liblyrics_SRCS} ${liblyrics_UIS_H} ${liblyrics_RCC_SRCS}) add_dependencies(lyrics qmmpui) -target_link_libraries(lyrics ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(lyrics Qt5::Widgets Qt5::Network -lqmmpui -lqmmp) install(TARGETS lyrics DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/lyrics/lyricsfactory.cpp b/src/plugins/General/lyrics/lyricsfactory.cpp index 0ddfd6224..60cb001f1 100644 --- a/src/plugins/General/lyrics/lyricsfactory.cpp +++ b/src/plugins/General/lyrics/lyricsfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2016 by Ilya Kotov * + * Copyright (C) 2009 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -18,9 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ + #include -#include -#include #include "lyrics.h" #include "lyricsfactory.h" @@ -61,5 +60,3 @@ QTranslator *LyricsFactory::createTranslator(QObject *parent) translator->load(QString(":/lyrics_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(lyrcis, LyricsFactory) diff --git a/src/plugins/General/lyrics/lyricsfactory.h b/src/plugins/General/lyrics/lyricsfactory.h index a35af440b..6d61e864c 100644 --- a/src/plugins/General/lyrics/lyricsfactory.h +++ b/src/plugins/General/lyrics/lyricsfactory.h @@ -33,6 +33,7 @@ class LyricsFactory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; diff --git a/src/plugins/General/lyrics/lyricswindow.cpp b/src/plugins/General/lyrics/lyricswindow.cpp index c899e71bc..d914e1630 100644 --- a/src/plugins/General/lyrics/lyricswindow.cpp +++ b/src/plugins/General/lyrics/lyricswindow.cpp @@ -189,7 +189,7 @@ QString LyricsWindow::cacheFilePath() const { QString name = m_ui.artistLineEdit->text() + "_" + m_ui.titleLineEdit->text(); QByteArray hash = QCryptographicHash::hash(name.toUtf8(), QCryptographicHash::Md5); - return m_cachePath + QString::fromLatin1(hash.toHex().constData()) + ".html"; + return m_cachePath + QString::fromLatin1(hash.toHex()) + ".html"; } bool LyricsWindow::loadFromCache() @@ -205,7 +205,7 @@ bool LyricsWindow::loadFromCache() return false; } - m_ui.textBrowser->setHtml(QString::fromUtf8(file.readAll().constData())); + m_ui.textBrowser->setHtml(QString::fromUtf8(file.readAll())); m_ui.stateLabel->setText(tr("Done")); return true; } diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_bg.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_bg.ts index 3c3d04b06..183a6a45c 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_bg.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_bg.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin - + About Lyrics Plugin - + Qmmp Lyrics Plugin - + This plugin retrieves lyrics from LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts index 1ca4aa101..54e91fd64 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Modul pro texty písní - + About Lyrics Plugin O modulu pro texty písní - + Qmmp Lyrics Plugin Modul Qmmp pro texty písní - + This plugin retrieves lyrics from LyricWiki Tento modul získává texty písní z LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts index 4c51d3fbd..daca2344f 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Liedtext-Modul - + About Lyrics Plugin Über Liedtext-Modul - + Qmmp Lyrics Plugin Qmmp Liedtext-Modul - + This plugin retrieves lyrics from LyricWiki Dieses Modul empfängt Liedtexte von LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_el.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_el.ts index 968ea2adb..348a51748 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_el.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_el.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Πρόσθετο στίχων - + About Lyrics Plugin Σχετικά με το πρόσθετο στίχων - + Qmmp Lyrics Plugin Qmmp πρόσθετο στίχων - + This plugin retrieves lyrics from LyricWiki Αυτό το πρόσθετο κάνει λήψη στίχων από το LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_en.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_en.ts index b412af515..4c6372133 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_en.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_en.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin - + About Lyrics Plugin - + Qmmp Lyrics Plugin - + This plugin retrieves lyrics from LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_es.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_es.ts index 9add9e221..33e58ff1f 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_es.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_es.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Módulo de letras - + About Lyrics Plugin Acerca del módulo de letras - + Qmmp Lyrics Plugin Módulo de letras para Qmmp - + This plugin retrieves lyrics from LyricWiki Este módulo descarga letras de LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_fi.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_fi.ts index 71a941c2d..3f1b62b0a 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_fi.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_fi.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Sanoitusliitännäinen - + About Lyrics Plugin Tietoja - Sanoitusliitännäinen - + Qmmp Lyrics Plugin Qmmp-sanoitusliitännäinen - + This plugin retrieves lyrics from LyricWiki Tämä liitännäinen noutaa sanoituksia LyricWikistä - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_fr.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_fr.ts index 8ba2e6297..db7624a31 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_fr.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_fr.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Greffon de paroles - + About Lyrics Plugin À propos du greffon de paroles - + Qmmp Lyrics Plugin Greffon de paroles pour Qmmp - + This plugin retrieves lyrics from LyricWiki Ce greffon récupère les paroles depuis LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_gl_ES.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_gl_ES.ts index 7f1f07e4d..935c5161f 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_gl_ES.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_gl_ES.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Engadido de letras - + About Lyrics Plugin Sobre o engadido de letras - + Qmmp Lyrics Plugin Engadido de letras de Qmmp - + This plugin retrieves lyrics from LyricWiki Este engadido recupera letras dende LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_he.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_he.ts index ea487c866..60ad7087c 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_he.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_he.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin תוסף מילות שיר - + About Lyrics Plugin אודות תוסף מילות שיר - + Qmmp Lyrics Plugin תוסף מילות שיר של Qmmp - + This plugin retrieves lyrics from LyricWiki תוסף zv מאחזר מילות שיר מתוך LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_hu.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_hu.ts index 32a73f846..53b302bd7 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_hu.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_hu.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin - + About Lyrics Plugin - + Qmmp Lyrics Plugin - + This plugin retrieves lyrics from LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_id.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_id.ts index 18e441cdc..b1e3c86ba 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_id.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_id.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Plugin Lyrics - + About Lyrics Plugin Tentang Plugin Lyrics - + Qmmp Lyrics Plugin Plugin Lyrics Qmmp - + This plugin retrieves lyrics from LyricWiki Plugin ini menarik lirik dari LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts index d1648aad9..d5c3a9dfe 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Modulo Lirica - + About Lyrics Plugin Info sul modulo Lirica - + Qmmp Lyrics Plugin Modulo Lirica per Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> - + This plugin retrieves lyrics from LyricWiki Modulo che permette di trovare testi di canzoni da LyricWiki diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_ja.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_ja.ts index 1ae083ea9..69f206b62 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_ja.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_ja.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin 歌詞プラグイン - + About Lyrics Plugin 歌詞プラグインについて - + Qmmp Lyrics Plugin QMMP 歌詞プラグイン - + This plugin retrieves lyrics from LyricWiki このプラグインは LyricWiki より歌詞を取得します - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_kk.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_kk.ts index fb65f759b..fb2d2d440 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_kk.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_kk.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin - + About Lyrics Plugin - + Qmmp Lyrics Plugin - + This plugin retrieves lyrics from LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts index 9e7a9f371..51d855138 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Lyrics įskiepis - + About Lyrics Plugin Apie Lyrics įskiepį - + Qmmp Lyrics Plugin Qmmp Lyrics įskiepis - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> - + This plugin retrieves lyrics from LyricWiki Šis įskiepis atsiunčia dainų žodžius iš LyricWiki diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_nl.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_nl.ts index b0050779f..ba07b208c 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_nl.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_nl.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Liedtekst Module - + About Lyrics Plugin Over de Liedtekst Module - + Qmmp Lyrics Plugin Liedtekst Module voor Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> - + This plugin retrieves lyrics from LyricWiki Deze module haalt liedteksten van LyricWiki diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_pl_PL.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_pl_PL.ts index 58087a58c..ab7b7b747 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_pl_PL.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_pl_PL.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Wtyczka tekstów piosenek - + About Lyrics Plugin O wtyczce Teksty piosenek - + Qmmp Lyrics Plugin Wtyczka Teksty Piosenek dla Qmmp - + This plugin retrieves lyrics from LyricWiki Ta wtyczka ściąga teksty piosenek z LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_pt.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_pt.ts index 97810ea47..ee087d112 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_pt.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_pt.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Suplemento Lyrics - + About Lyrics Plugin Sobre o suplemento Lyrics - + Qmmp Lyrics Plugin Suplemento Qmmp Lyrics - + This plugin retrieves lyrics from LyricWiki Este suplemento obtém as letras através do sítio web LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_pt_BR.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_pt_BR.ts index 48a78d554..7abe4c106 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_pt_BR.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_pt_BR.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Plugin Lyrics - + About Lyrics Plugin Sobre o plugin Lyrics - + Qmmp Lyrics Plugin Plugin Qmmp Lyrics - + This plugin retrieves lyrics from LyricWiki Este plugin obtém as letras através do LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts index a7ad26918..268d1a604 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Модуль показа текстов - + About Lyrics Plugin О модуле показа текстов песен - + Qmmp Lyrics Plugin Модуль показа текстов песен для Qmmp - + This plugin retrieves lyrics from LyricWiki Этот модуль предназначен для получания текстов песен из LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_sk.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_sk.ts index 22d4f1c6d..6ff871a84 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_sk.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_sk.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin - + About Lyrics Plugin - + Qmmp Lyrics Plugin - + This plugin retrieves lyrics from LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_sr_BA.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_sr_BA.ts index 3f65cf492..9ee5429c0 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_sr_BA.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_sr_BA.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Стихови - + About Lyrics Plugin О прикључку за стихове - + Qmmp Lyrics Plugin Кумп прикључак за стихове - + This plugin retrieves lyrics from LyricWiki Добавља стихове са LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_sr_RS.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_sr_RS.ts index 649c2284b..ebe6af459 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_sr_RS.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_sr_RS.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Стихови - + About Lyrics Plugin О прикључку за стихове - + Qmmp Lyrics Plugin Кумп прикључак за стихове - + This plugin retrieves lyrics from LyricWiki Добавља стихове са LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts index 528c4937b..91671892d 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Şarkı Sözü Eklentisi - + About Lyrics Plugin Şarkı Sözü Eklentisi Hakkında - + Qmmp Lyrics Plugin Qmmp Şarkı Sözü Eklentisi - + This plugin retrieves lyrics from LyricWiki Bu eklenti şarkı sözlerini LyricWiki adresinden alır - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts index 1e2f034d7..862ff4af4 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Модуль текстів - + About Lyrics Plugin Про модуль текстів - + Qmmp Lyrics Plugin Модуль текстів для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> - + This plugin retrieves lyrics from LyricWiki Цей модуль отримує тексти з LyricWiki diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts index 72d066523..989d4515c 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin 歌词插件 - + About Lyrics Plugin 关于歌词插件 - + Qmmp Lyrics Plugin Qmmp 歌词插件 - + This plugin retrieves lyrics from LyricWiki 此插件使用的歌词来源于 LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts index 17188b091..8ec6a2f2d 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin 歌詞插件 - + About Lyrics Plugin 關於歌詞插件 - + Qmmp Lyrics Plugin Qmmp 歌詞插件 - + This plugin retrieves lyrics from LyricWiki 此插件歌詞來自於 LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/CMakeLists.txt b/src/plugins/General/mpris/CMakeLists.txt index 6126c4040..75c98dc88 100644 --- a/src/plugins/General/mpris/CMakeLists.txt +++ b/src/plugins/General/mpris/CMakeLists.txt @@ -1,22 +1,5 @@ project(libmpris) - -SET (QT_USE_QTDBUS TRUE) - -INCLUDE(FindQt4) - -include(${QT_USE_FILE}) - -# 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 @@ -36,17 +19,17 @@ SET(libmpris_SRCS SET(libmpris_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libmpris_RCC_SRCS ${libmpris_RCCS}) +QT5_ADD_RESOURCES(libmpris_RCC_SRCS ${libmpris_RCCS}) # user interface -# QT4_WRAP_UI(libmpris_UIS_H ${libmpris_UIS}) +# QT5_WRAP_UI(libmpris_UIS_H ${libmpris_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(mpris MODULE ${libmpris_SRCS} ${libmpris_RCC_SRCS}) add_dependencies(mpris qmmpui) -target_link_libraries(mpris ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(mpris Qt5::Widgets Qt5::DBus -lqmmpui -lqmmp) install(TARGETS mpris DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/mpris/mprisfactory.cpp b/src/plugins/General/mpris/mprisfactory.cpp index 5f48a3540..30c013713 100644 --- a/src/plugins/General/mpris/mprisfactory.cpp +++ b/src/plugins/General/mpris/mprisfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2016 by Ilya Kotov * + * Copyright (C) 2008-2012 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -18,9 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ + #include -#include -#include #include #include "mpris.h" #include "mprisfactory.h" @@ -60,5 +59,3 @@ QTranslator *MPRISFactory::createTranslator(QObject *parent) translator->load(QString(":/mpris_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(mpris, MPRISFactory) diff --git a/src/plugins/General/mpris/mprisfactory.h b/src/plugins/General/mpris/mprisfactory.h index 7f5b9a1c3..7d1fd85e3 100644 --- a/src/plugins/General/mpris/mprisfactory.h +++ b/src/plugins/General/mpris/mprisfactory.h @@ -32,6 +32,7 @@ class MPRISFactory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; diff --git a/src/plugins/General/mpris/translations/mpris_plugin_bg.ts b/src/plugins/General/mpris/translations/mpris_plugin_bg.ts index fb85f0df4..9c66e343f 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_bg.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_bg.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin - + About MPRIS Plugin - + Qmmp MPRIS Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_cs.ts b/src/plugins/General/mpris/translations/mpris_plugin_cs.ts index 885041a08..9cf323a9f 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_cs.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_cs.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin Modul MPRIS - + About MPRIS Plugin O modulu MPRIS - + Qmmp MPRIS Plugin Modul Qmmp MPRIS - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_de.ts b/src/plugins/General/mpris/translations/mpris_plugin_de.ts index 125223494..a691a54af 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_de.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_de.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin MPRIS-Modul - + About MPRIS Plugin Über MPRIS-Modul - + Qmmp MPRIS Plugin Qmmp MPRIS-Modul - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_el.ts b/src/plugins/General/mpris/translations/mpris_plugin_el.ts index 6580b0fb7..84645abc9 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_el.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_el.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin Πρόσθετο MPRIS - + About MPRIS Plugin Σχετικά με το πρόσθετο MPRIS - + Qmmp MPRIS Plugin Qmmp πρόσθετο MPRIS - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_en.ts b/src/plugins/General/mpris/translations/mpris_plugin_en.ts index bc0fdea35..9eee38910 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_en.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_en.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin - + About MPRIS Plugin - + Qmmp MPRIS Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_es.ts b/src/plugins/General/mpris/translations/mpris_plugin_es.ts index e30621262..784a4ede1 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_es.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_es.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin Módulo MPRIS - + About MPRIS Plugin Acerca del módulo MPRIS - + Qmmp MPRIS Plugin Módulo MPRIS para Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_fi.ts b/src/plugins/General/mpris/translations/mpris_plugin_fi.ts index 71b0cd7bc..90f167c0a 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_fi.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_fi.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin MPRIS-liitännäinen - + About MPRIS Plugin Tietoja - MPRIS-liitännäinen - + Qmmp MPRIS Plugin Qmmp:n MPRIS-liitännäinen - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_fr.ts b/src/plugins/General/mpris/translations/mpris_plugin_fr.ts index f09a35e75..0c58a4dda 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_fr.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_fr.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin Greffon MPRIS - + About MPRIS Plugin À propos du greffon MPRIS - + Qmmp MPRIS Plugin Greffon MPRIS pour Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_gl_ES.ts b/src/plugins/General/mpris/translations/mpris_plugin_gl_ES.ts index cac689b1b..807d926f6 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_gl_ES.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_gl_ES.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin Engadido MPRIS - + About MPRIS Plugin Sobre o engadido MPRIS - + Qmmp MPRIS Plugin Engadido MPRIS de Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_he.ts b/src/plugins/General/mpris/translations/mpris_plugin_he.ts index 81dc7ff3b..804b08523 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_he.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_he.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin תוסף MPRIS - + About MPRIS Plugin אודות תוסף MPRIS - + Qmmp MPRIS Plugin תוסף MPRIS של Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_hu.ts b/src/plugins/General/mpris/translations/mpris_plugin_hu.ts index ea8227776..12d5505ad 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_hu.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_hu.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin - + About MPRIS Plugin - + Qmmp MPRIS Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_id.ts b/src/plugins/General/mpris/translations/mpris_plugin_id.ts index 642dfc52e..5d3b0c4ee 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_id.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_id.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin Plugin MPRIS - + About MPRIS Plugin Tentang Plugin MPRIS - + Qmmp MPRIS Plugin Plugin MPRIS Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_it.ts b/src/plugins/General/mpris/translations/mpris_plugin_it.ts index ee644aa25..d2ad842ab 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_it.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_it.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin Modulo MPRIS - + About MPRIS Plugin Info sul modulo MPRIS - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> - + Qmmp MPRIS Plugin Modulo MPRIS per Qmmp diff --git a/src/plugins/General/mpris/translations/mpris_plugin_ja.ts b/src/plugins/General/mpris/translations/mpris_plugin_ja.ts index daef2d672..eed97338f 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_ja.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_ja.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin MPRIS プラグイン - + About MPRIS Plugin MPRIS プラグインについて - + Qmmp MPRIS Plugin QMMP MPRIS プラグイン - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_kk.ts b/src/plugins/General/mpris/translations/mpris_plugin_kk.ts index 123ad2f5e..3feab0a1a 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_kk.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_kk.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin - + About MPRIS Plugin - + Qmmp MPRIS Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_lt.ts b/src/plugins/General/mpris/translations/mpris_plugin_lt.ts index a8e268bd6..741930a51 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_lt.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_lt.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin MPRIS įskiepis - + About MPRIS Plugin Apie MPRIS įskiepį - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> - + Qmmp MPRIS Plugin Qmmp MPRIS įskiepis diff --git a/src/plugins/General/mpris/translations/mpris_plugin_nl.ts b/src/plugins/General/mpris/translations/mpris_plugin_nl.ts index 88d59078a..419b667f4 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_nl.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_nl.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin MPRIS Module - + About MPRIS Plugin Over de MPRIS Module - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> - + Qmmp MPRIS Plugin Qmmp MPRIS Module diff --git a/src/plugins/General/mpris/translations/mpris_plugin_pl_PL.ts b/src/plugins/General/mpris/translations/mpris_plugin_pl_PL.ts index a175b7905..330dfc2ce 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_pl_PL.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_pl_PL.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin Wtyczka MPRIS - + About MPRIS Plugin O wtyczce MPRIS - + Qmmp MPRIS Plugin Wtyczka MPRIS dla Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_pt.ts b/src/plugins/General/mpris/translations/mpris_plugin_pt.ts index 606bb3892..e71e13ba6 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_pt.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_pt.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin Suplemento MPRIS - + About MPRIS Plugin Sobre o suplemento MPRIS - + Qmmp MPRIS Plugin Suplemento Qmmp MPRIS - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_pt_BR.ts b/src/plugins/General/mpris/translations/mpris_plugin_pt_BR.ts index 537d2d76f..c14386703 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_pt_BR.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_pt_BR.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin Plugin MPRIS - + About MPRIS Plugin Sobre o plugin MPRIS - + Qmmp MPRIS Plugin Plugin Qmmp MPRIS - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_ru.ts b/src/plugins/General/mpris/translations/mpris_plugin_ru.ts index 7f19d9590..360e63e85 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_ru.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_ru.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin Модуль MPRIS - + About MPRIS Plugin О модуле MPRIS - + Qmmp MPRIS Plugin Модуль MPRIS для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_sk.ts b/src/plugins/General/mpris/translations/mpris_plugin_sk.ts index 95e729fd1..758107fcf 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_sk.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_sk.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin - + About MPRIS Plugin - + Qmmp MPRIS Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_sr_BA.ts b/src/plugins/General/mpris/translations/mpris_plugin_sr_BA.ts index 0299c1036..46ae1273d 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_sr_BA.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_sr_BA.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin МПРИС - + About MPRIS Plugin О прикључку за МПРИС - + Qmmp MPRIS Plugin Кумп МПРИС прикључак - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_sr_RS.ts b/src/plugins/General/mpris/translations/mpris_plugin_sr_RS.ts index d3d9badb2..fc0749e40 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_sr_RS.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_sr_RS.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin МПРИС - + About MPRIS Plugin О прикључку за МПРИС - + Qmmp MPRIS Plugin Кумп МПРИС прикључак - + Written by: Ilya Kotov <forkotov02@ya.ru> Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_tr.ts b/src/plugins/General/mpris/translations/mpris_plugin_tr.ts index 455210030..aa3fb2fa8 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_tr.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_tr.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin MPRIS Eklentisi - + About MPRIS Plugin MPRIS Eklentisi Hakkında - + Qmmp MPRIS Plugin Qmmp MPRIS Eklentisi - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_uk_UA.ts b/src/plugins/General/mpris/translations/mpris_plugin_uk_UA.ts index b1e28aa53..02b61a295 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_uk_UA.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_uk_UA.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin Модуль MPRIS - + About MPRIS Plugin Про модуль MPRIS - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> - + Qmmp MPRIS Plugin Модуль MPRIS для Qmmp diff --git a/src/plugins/General/mpris/translations/mpris_plugin_zh_CN.ts b/src/plugins/General/mpris/translations/mpris_plugin_zh_CN.ts index 61effea64..170737967 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_zh_CN.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_zh_CN.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin MPRIS 插件 - + About MPRIS Plugin 关于 MPRIS 插件 - + Qmmp MPRIS Plugin Qmmp MPRIS 插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_zh_TW.ts b/src/plugins/General/mpris/translations/mpris_plugin_zh_TW.ts index b40a05bfb..14080aaea 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_zh_TW.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_zh_TW.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin MPRIS 外掛 - + About MPRIS Plugin 關於 MPRIS 外掛 - + Qmmp MPRIS Plugin Qmmp MPRIS 外掛 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/CMakeLists.txt b/src/plugins/General/notifier/CMakeLists.txt index ae11cd7c0..0b2df2839 100644 --- a/src/plugins/General/notifier/CMakeLists.txt +++ b/src/plugins/General/notifier/CMakeLists.txt @@ -1,20 +1,7 @@ project(libnotifier) -# 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}) -SET(QT_INCLUDES - ${QT_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ -) - # libqmmpui & libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -27,11 +14,11 @@ SET(libnotifier_SRCS popupwidget.cpp ) -SET(libnotifier_RCCS +SET(libnotifier_RCCS translations/translations.qrc notifier_images.qrc) -QT4_ADD_RESOURCES(libnotifier_RCC_SRCS ${libnotifier_RCCS}) +QT5_ADD_RESOURCES(libnotifier_RCC_SRCS ${libnotifier_RCCS}) # user interface @@ -40,20 +27,20 @@ SET(libnotifier_UIS settingsdialog.ui ) -QT4_WRAP_UI(libnotifier_UIS_H ${libnotifier_UIS}) +QT5_WRAP_UI(libnotifier_UIS_H ${libnotifier_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(notifier MODULE ${libnotifier_SRCS} ${libnotifier_UIS_H} ${libnotifier_RCC_SRCS}) add_dependencies(notifier qmmpui) -IF(X11_FOUND) +IF(X11_FOUND AND Qt5X11Extras_FOUND) include_directories(${X11_INCLUDE_DIRS}) link_directories(${X11_LIBRARY_DIRS}) ADD_DEFINITIONS(${X11_CFLAGS}) ADD_DEFINITIONS(-DX11_FOUND) - target_link_libraries(notifier ${QT_LIBRARIES} qmmpui libqmmp ${X11_LDFLAGS}) -ELSE(X11_FOUND) - target_link_libraries(notifier ${QT_LIBRARIES} qmmpui libqmmp) -ENDIF(X11_FOUND) + target_link_libraries(notifier Qt5::X11Extras Qt5::Widgets ${X11_LDFLAGS} -lqmmpui -lqmmp) +ELSE(X11_FOUND AND Qt5X11Extras_FOUND) + target_link_libraries(notifier Qt5::Widgets -lqmmpui -lqmmp) +ENDIF(X11_FOUND AND Qt5X11Extras_FOUND) install(TARGETS notifier DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/notifier/notifier.cpp b/src/plugins/General/notifier/notifier.cpp index 1edaeaf36..c55008406 100644 --- a/src/plugins/General/notifier/notifier.cpp +++ b/src/plugins/General/notifier/notifier.cpp @@ -32,7 +32,7 @@ #include #include #include -#elif defined (Q_OS_WIN) +#elif defined(Q_OS_WIN) #include #endif diff --git a/src/plugins/General/notifier/notifier.pro b/src/plugins/General/notifier/notifier.pro index eea864b6c..d3e38c6fc 100644 --- a/src/plugins/General/notifier/notifier.pro +++ b/src/plugins/General/notifier/notifier.pro @@ -20,8 +20,9 @@ RESOURCES = notifier_images.qrc \ LIBS += $$QMMPUI_LIB unix { - PKGCONFIG += x11 - DEFINES += X11_FOUND target.path = $$LIB_DIR/qmmp/General INSTALLS += target + PKGCONFIG += x11 + QT += x11extras + DEFINES += X11_FOUND } diff --git a/src/plugins/General/notifier/notifierfactory.cpp b/src/plugins/General/notifier/notifierfactory.cpp index d7bc37b07..1e6f47d36 100644 --- a/src/plugins/General/notifier/notifierfactory.cpp +++ b/src/plugins/General/notifier/notifierfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2016 by Ilya Kotov * + * Copyright (C) 2008-2012 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -18,9 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ + #include -#include -#include #include "notifier.h" #include "settingsdialog.h" #include "notifierfactory.h" @@ -60,5 +59,3 @@ QTranslator *NotifierFactory::createTranslator(QObject *parent) translator->load(QString(":/notifier_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(notifier,NotifierFactory) diff --git a/src/plugins/General/notifier/notifierfactory.h b/src/plugins/General/notifier/notifierfactory.h index e11a8662e..a968c9c67 100644 --- a/src/plugins/General/notifier/notifierfactory.h +++ b/src/plugins/General/notifier/notifierfactory.h @@ -33,6 +33,7 @@ class NotifierFactory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; diff --git a/src/plugins/General/notifier/translations/notifier_plugin_bg.ts b/src/plugins/General/notifier/translations/notifier_plugin_bg.ts index b2461d263..5b8ea6288 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_bg.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_bg.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin - + About Notifier Plugin - + Qmmp Notifier Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_cs.ts b/src/plugins/General/notifier/translations/notifier_plugin_cs.ts index 274d3e2ce..ec7727e7d 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_cs.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_cs.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Notifikační modul - + About Notifier Plugin O notifikačním modulu - + Qmmp Notifier Plugin Notifikační modul Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_de.ts b/src/plugins/General/notifier/translations/notifier_plugin_de.ts index 23252a6de..c3016380c 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_de.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_de.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Benachrichtigungsmodul - + About Notifier Plugin Über Benachrichtigungsmodul - + Qmmp Notifier Plugin Qmmp Benachrichtigungsmodul - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_el.ts b/src/plugins/General/notifier/translations/notifier_plugin_el.ts index 41fc9e8cb..e193eae43 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_el.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_el.ts @@ -4,25 +4,25 @@ NotifierFactory - + Notifier Plugin Πρόσθετο ειδοποιήσεων - + About Notifier Plugin Σχετικά με το πρόσθετο ειδοποιήσεων - + Qmmp Notifier Plugin Qmmp πρόσθετο ειδοποιήσεων - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_en.ts b/src/plugins/General/notifier/translations/notifier_plugin_en.ts index fd09d7bc9..1561310da 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_en.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_en.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin - + About Notifier Plugin - + Qmmp Notifier Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_es.ts b/src/plugins/General/notifier/translations/notifier_plugin_es.ts index 6734b1c01..357552032 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_es.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_es.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Módulo de avisos - + About Notifier Plugin Acerca del módulo de avisos - + Qmmp Notifier Plugin Módulo de avisos para Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_fi.ts b/src/plugins/General/notifier/translations/notifier_plugin_fi.ts index 8fd2ad648..677cdc067 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_fi.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_fi.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin - + About Notifier Plugin - + Qmmp Notifier Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_fr.ts b/src/plugins/General/notifier/translations/notifier_plugin_fr.ts index 0e24bce50..b4aae94ea 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_fr.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_fr.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Greffon de notification - + About Notifier Plugin À propos du greffon de notification - + Qmmp Notifier Plugin Greffon de notification pour Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_gl_ES.ts b/src/plugins/General/notifier/translations/notifier_plugin_gl_ES.ts index b3e3914d0..7d771c4bb 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_gl_ES.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_gl_ES.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Engadido notificador - + About Notifier Plugin Sobre o engadido notificador - + Qmmp Notifier Plugin Engadido notificador de Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_he.ts b/src/plugins/General/notifier/translations/notifier_plugin_he.ts index 41579206c..2981a909d 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_he.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_he.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin תוסף התראה - + About Notifier Plugin אודות תוסף התראה - + Qmmp Notifier Plugin תוסף התראה של Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_hu.ts b/src/plugins/General/notifier/translations/notifier_plugin_hu.ts index 33b0ddc5f..49e6d36d6 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_hu.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_hu.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin - + About Notifier Plugin - + Qmmp Notifier Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_id.ts b/src/plugins/General/notifier/translations/notifier_plugin_id.ts index ed1ce1747..6b8a72f4f 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_id.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_id.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Plugin Notifier - + About Notifier Plugin Tentang Plugin Notifier - + Qmmp Notifier Plugin Plugin Notifier Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_it.ts b/src/plugins/General/notifier/translations/notifier_plugin_it.ts index bd0bf3a10..27ee940cf 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_it.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_it.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Modulo notifica - + About Notifier Plugin Info sul modulo notifica - + Qmmp Notifier Plugin Modulo notifica per Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_ja.ts b/src/plugins/General/notifier/translations/notifier_plugin_ja.ts index 064b25cfd..cef35786c 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_ja.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_ja.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin 通知プラグイン - + About Notifier Plugin 通知プラグインについて - + Qmmp Notifier Plugin QMMP 通知プラグイン - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_kk.ts b/src/plugins/General/notifier/translations/notifier_plugin_kk.ts index 9995ce780..2ad30aa85 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_kk.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_kk.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin - + About Notifier Plugin - + Qmmp Notifier Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_lt.ts b/src/plugins/General/notifier/translations/notifier_plugin_lt.ts index 758e6ac00..f29d26057 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_lt.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_lt.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Notifier įskiepis - + About Notifier Plugin Apie Notifier įskiepį - + Qmmp Notifier Plugin Qmmp Notifier Įskiepis - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_nl.ts b/src/plugins/General/notifier/translations/notifier_plugin_nl.ts index cac6be165..9cec0058a 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_nl.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_nl.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Notificatie Module - + About Notifier Plugin Over de Notificatie Module - + Qmmp Notifier Plugin Notificatie Module voor Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_pl_PL.ts b/src/plugins/General/notifier/translations/notifier_plugin_pl_PL.ts index 8b63f9b2a..8106ad27a 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_pl_PL.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_pl_PL.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Wtyczka Notifier - + About Notifier Plugin O wtyczce Notifier - + Qmmp Notifier Plugin Wtyczka Notifier dla Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_pt.ts b/src/plugins/General/notifier/translations/notifier_plugin_pt.ts index 9fbb2adae..f5a30f9fe 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_pt.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_pt.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Suplemento Notifier - + About Notifier Plugin Sobre o suplemento Notifier - + Qmmp Notifier Plugin Suplemento Qmmp Notifier - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_pt_BR.ts b/src/plugins/General/notifier/translations/notifier_plugin_pt_BR.ts index a27043739..aa96c0478 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_pt_BR.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_pt_BR.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Plugin Notifier - + About Notifier Plugin Sobre o plugin Notifier - + Qmmp Notifier Plugin Plugin Qmmp Notifier - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_ru.ts b/src/plugins/General/notifier/translations/notifier_plugin_ru.ts index 17d184156..793f0c791 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_ru.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_ru.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Модуль уведомлений - + About Notifier Plugin О модуле уведомлений - + Qmmp Notifier Plugin Модуль уведомлений для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_sk.ts b/src/plugins/General/notifier/translations/notifier_plugin_sk.ts index 12c7fb01c..17c888933 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_sk.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_sk.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin - + About Notifier Plugin - + Qmmp Notifier Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_sr_BA.ts b/src/plugins/General/notifier/translations/notifier_plugin_sr_BA.ts index e525b6b39..6ca5dada4 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_sr_BA.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_sr_BA.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Обавјештавач - + About Notifier Plugin О обавјештавачу - + Qmmp Notifier Plugin Кумп прикључак за обавјештавање - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_sr_RS.ts b/src/plugins/General/notifier/translations/notifier_plugin_sr_RS.ts index 8ad6dd98d..758cf9880 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_sr_RS.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_sr_RS.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Обавештавач - + About Notifier Plugin О обавештавачу - + Qmmp Notifier Plugin Кумп прикључак за обавештавање - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_tr.ts b/src/plugins/General/notifier/translations/notifier_plugin_tr.ts index 5ea682c19..d7785b990 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_tr.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_tr.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Bildirim Eklentisi - + About Notifier Plugin Bildirim Eklentisi Hakkında - + Qmmp Notifier Plugin Qmmp Bildirim Eklentisi - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_uk_UA.ts b/src/plugins/General/notifier/translations/notifier_plugin_uk_UA.ts index 8eb5fdba4..ddb855f88 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_uk_UA.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_uk_UA.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Модуль повідомлень - + About Notifier Plugin Про модуль повідомлень - + Qmmp Notifier Plugin Модуль повідомлень для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_zh_CN.ts b/src/plugins/General/notifier/translations/notifier_plugin_zh_CN.ts index 789e3c144..7c7a95519 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_zh_CN.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_zh_CN.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin 通知插件 - + About Notifier Plugin 关于通知插件 - + Qmmp Notifier Plugin Qmmp 通知插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_zh_TW.ts b/src/plugins/General/notifier/translations/notifier_plugin_zh_TW.ts index 30f5c2c8a..204232177 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_zh_TW.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_zh_TW.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin 通知插件 - + About Notifier Plugin 關於通知插件 - + Qmmp Notifier Plugin Qmmp 通知插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/rgscan/CMakeLists.txt b/src/plugins/General/rgscan/CMakeLists.txt index 62cd415e9..4e420afe5 100644 --- a/src/plugins/General/rgscan/CMakeLists.txt +++ b/src/plugins/General/rgscan/CMakeLists.txt @@ -1,22 +1,7 @@ project(librgscan) -include(${QT_USE_FILE}) - -# 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}) -SET(QT_INCLUDES - ${QT_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ -) - # libqmmpui & libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -44,7 +29,7 @@ SET(librgscan_RCCS translations/translations.qrc ) -QT4_ADD_RESOURCES(librgscan_RCC_SRCS ${librgscan_RCCS}) +QT5_ADD_RESOURCES(librgscan_RCC_SRCS ${librgscan_RCCS}) # user interface @@ -52,12 +37,12 @@ SET(librgscan_UIS rgscandialog.ui ) -QT4_WRAP_UI(librgscan_UIS_H ${librgscan_UIS}) +QT5_WRAP_UI(librgscan_UIS_H ${librgscan_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(rgscan MODULE ${librgscan_SRCS} ${librgscan_UIS_H} ${librgscan_HDRS} ${librgscan_RCC_SRCS}) add_dependencies(rgscan qmmpui) -target_link_libraries(rgscan ${QT_LIBRARIES} qmmpui libqmmp ${TAGLIB_LDFLAGS}) +target_link_libraries(rgscan Qt5::Widgets -lqmmpui -lqmmp ${TAGLIB_LDFLAGS}) install(TARGETS rgscan DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/rgscan/rgscandialog.cpp b/src/plugins/General/rgscan/rgscandialog.cpp index 183cd2218..2784a1a42 100644 --- a/src/plugins/General/rgscan/rgscandialog.cpp +++ b/src/plugins/General/rgscan/rgscandialog.cpp @@ -35,15 +35,11 @@ #include #include #include -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 10)) #include -#endif -#include #include "rgscanner.h" #include "gain_analysis.h" #include "rgscandialog.h" -#define QStringToTString_qt4(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8) #define FILE_SKIPPED (Qt::UserRole + 1) struct ReplayGainInfoItem @@ -57,7 +53,7 @@ RGScanDialog::RGScanDialog(QList tracks, QWidget *parent) : Q { m_ui.setupUi(this); m_ui.tableWidget->verticalHeader()->setDefaultSectionSize(fontMetrics().height() + 3); - m_ui.tableWidget->verticalHeader()->setResizeMode(QHeaderView::Fixed); + m_ui.tableWidget->verticalHeader()->setSectionResizeMode(QHeaderView::Fixed); QStringList paths; MetaDataFormatter formatter("%if(%p&%t,%p - %t,%f) - %l"); @@ -79,12 +75,8 @@ RGScanDialog::RGScanDialog(QList tracks, QWidget *parent) : Q ext == "flac" || //native flac ext == "oga" || //ogg flac ext == "ogg" || //ogg vorbis - ext == "wv" //wavpack -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 10)) - || ext == "m4a") //aac (mp4 container) -#else - ) -#endif + ext == "wv" || //wavpack + ext == "m4a") //aac (mp4 container) { paths.append(track->url()); QString name = formatter.format(track); @@ -293,12 +285,12 @@ QString RGScanDialog::getAlbumName(const QString &url) TagLib::String RGScanDialog::gainToString(double value) { - return QStringToTString_qt4(QString("%1 dB").arg(value, 0, 'f', 2)); + return QStringToTString(QString("%1 dB").arg(value, 0, 'f', 2)); } TagLib::String RGScanDialog::peakToString(double value) { - return QStringToTString_qt4(QString("%1").arg(value, 0, 'f', 6)); + return QStringToTString(QString("%1").arg(value, 0, 'f', 6)); } TagLib::StringList RGScanDialog::gainToStringList(double value) @@ -376,10 +368,8 @@ void RGScanDialog::writeVorbisComment(TagLib::Ogg::XiphComment *tag, ReplayGainI } } -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 10)) void RGScanDialog::writeMP4Tag(TagLib::MP4::Tag *tag, ReplayGainInfoItem *item) { - if(m_ui.trackCheckBox->isChecked()) { tag->setItem("----:com.apple.iTunes:replaygain_track_gain", @@ -395,7 +385,6 @@ void RGScanDialog::writeMP4Tag(TagLib::MP4::Tag *tag, ReplayGainInfoItem *item) gainToStringList(item->info[Qmmp::REPLAYGAIN_ALBUM_PEAK])); } } -#endif void RGScanDialog::on_writeButton_clicked() { @@ -439,13 +428,11 @@ void RGScanDialog::on_writeButton_clicked() writeAPETag(file.APETag(true), item); file.save(); } -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 10)) else if(ext == "m4a") //MPEG-4 Part 14 { TagLib::MP4::File file(qPrintable(item->url)); writeMP4Tag(file.tag(), item); file.save(); } -#endif } } diff --git a/src/plugins/General/rgscan/rgscandialog.h b/src/plugins/General/rgscan/rgscandialog.h index 761b594c2..18dcda9ad 100644 --- a/src/plugins/General/rgscan/rgscandialog.h +++ b/src/plugins/General/rgscan/rgscandialog.h @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include "ui_rgscandialog.h" @@ -49,12 +48,10 @@ namespace TagLib { class XiphComment; } -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 10)) namespace MP4 { class Tag; } -#endif } /** @@ -84,9 +81,7 @@ private: void writeAPETag(TagLib::APE::Tag *tag, ReplayGainInfoItem *item); void writeID3v2Tag(TagLib::ID3v2::Tag *tag, ReplayGainInfoItem *item); void writeVorbisComment(TagLib::Ogg::XiphComment *tag, ReplayGainInfoItem *item); -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 10)) void writeMP4Tag(TagLib::MP4::Tag *tag, ReplayGainInfoItem *item); -#endif Ui::RGScanDialog m_ui; QList m_scanners; QList m_replayGainItemList; diff --git a/src/plugins/General/rgscan/rgscanfactory.cpp b/src/plugins/General/rgscan/rgscanfactory.cpp index e3f3992d8..1bc3545fe 100644 --- a/src/plugins/General/rgscan/rgscanfactory.cpp +++ b/src/plugins/General/rgscan/rgscanfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2016 by Ilya Kotov * + * Copyright (C) 2013 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -18,9 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ + #include -#include -#include #include "rgscanhelper.h" #include "rgscanfactory.h" @@ -66,5 +65,3 @@ QTranslator *RGScanFactory::createTranslator(QObject *parent) translator->load(QString(":/rgscan_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(rgscan, RGScanFactory) diff --git a/src/plugins/General/rgscan/rgscanfactory.h b/src/plugins/General/rgscan/rgscanfactory.h index 13e66d474..ecd75a49a 100644 --- a/src/plugins/General/rgscan/rgscanfactory.h +++ b/src/plugins/General/rgscan/rgscanfactory.h @@ -32,6 +32,7 @@ class RGScanFactory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_bg.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_bg.ts index a7ee1b520..d35a060db 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_bg.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_bg.ts @@ -64,16 +64,16 @@ - - + + Error - - - - + + + + %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin - + About ReplayGain Scanner Plugin - + ReplayGain Scanner Plugin for Qmmp - + This plugin scans audio files and gives information for volume normalization - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: - + David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_cs.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_cs.ts index 953d0777b..eb6806f41 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_cs.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_cs.ts @@ -64,16 +64,16 @@ - - + + Error Chyba - - - - + + + + %1 dB %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin - + About ReplayGain Scanner Plugin - + ReplayGain Scanner Plugin for Qmmp - + This plugin scans audio files and gives information for volume normalization - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: - + David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_de.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_de.ts index 68c106424..9f4b01b96 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_de.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_de.ts @@ -64,16 +64,16 @@ Albumverstärkung/-spitzenwert schreiben - - + + Error Fehler - - - - + + + + %1 dB %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin Wiedergabeverstärkungsscanner-Modul - + About ReplayGain Scanner Plugin Über Wiedergabeverstärkungsscanner-Modul - + ReplayGain Scanner Plugin for Qmmp Wiedergabeverstärkungsscanner-Modul für Qmmp - + This plugin scans audio files and gives information for volume normalization Dieses Modul scannt Audiodateien und gibt Informationen zur Lautstärkenormalisierung - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: Basiert auf Quellcode von: - + David Robinson <David@Robinson.org> David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_el.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_el.ts index f1723996b..840f8074c 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_el.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_el.ts @@ -64,16 +64,16 @@ Εγγραφή ενίσχυσης/κορυφής άλμπουμ - - + + Error Σφάλμα - - - - + + + + %1 dB %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin Πρόσθετο σάρωσης ενίσχυσης αναπαραγωγής - + About ReplayGain Scanner Plugin Σχετικά με το πρόσθετο σάρωσης ενίσχυσης αναπαραγωγής - + ReplayGain Scanner Plugin for Qmmp Qmmp πρόσθετο σάρωσης ενίσχυσης αναπαραγωγής - + This plugin scans audio files and gives information for volume normalization Αυτό το πρόσθετο σαρώνει τα αρχεία ήχου και δίνει πληροφορίες για την κανονικοποίηση της έντασης - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> - + Based on source code by: Βασισμένο στον πηγαίο κώδικα των: - + David Robinson <David@Robinson.org> David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_en.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_en.ts index 564ea0eed..a00d3e0cc 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_en.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_en.ts @@ -64,16 +64,16 @@ - - + + Error - - - - + + + + %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin - + About ReplayGain Scanner Plugin - + ReplayGain Scanner Plugin for Qmmp - + This plugin scans audio files and gives information for volume normalization - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: - + David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_es.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_es.ts index ac725232a..1de1ab68a 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_es.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_es.ts @@ -64,16 +64,16 @@ Escribir ganancia/pico de álbum - - + + Error Error - - - - + + + + %1 dB %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin Módulo de Escáner de Ganancia de Repetición - + About ReplayGain Scanner Plugin Acerca del Módulo de Escáner de Ganancia de Repetición - + ReplayGain Scanner Plugin for Qmmp Módulo de Escáner de Ganancia de Repetición de Qmmp - + This plugin scans audio files and gives information for volume normalization Este módulo escanea archivos de audio y proporciona información para la normalización del volumen - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: Basado sobre código fuente por: - + David Robinson <David@Robinson.org> David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_fi.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_fi.ts index c1f0a7d2b..57b1198f2 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_fi.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_fi.ts @@ -64,16 +64,16 @@ - - + + Error Virhe - - - - + + + + %1 dB %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin - + About ReplayGain Scanner Plugin - + ReplayGain Scanner Plugin for Qmmp - + This plugin scans audio files and gives information for volume normalization - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: - + David Robinson <David@Robinson.org> David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_fr.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_fr.ts index f4af4feeb..45f5ba615 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_fr.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_fr.ts @@ -64,16 +64,16 @@ Écrire gain et pic et l'album - - + + Error Erreur - - - - + + + + %1 dB %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin Greffon analyseur ReplayGain - + About ReplayGain Scanner Plugin À propos du greffon analyseur ReplayGain - + ReplayGain Scanner Plugin for Qmmp Greffon analyseur ReplayGain pour Qmmp - + This plugin scans audio files and gives information for volume normalization Ce greffon analyse les fichiers audio pour obtenir des information de normalisation du volume - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: Basé sur le code source par : - + David Robinson <David@Robinson.org> David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_gl_ES.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_gl_ES.ts index 0b35591a0..8798187a5 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_gl_ES.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_gl_ES.ts @@ -64,16 +64,16 @@ Escribir ganancia/pico do álbum - - + + Error Erro - - - - + + + + %1 dB %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin Plugin ReplayGain Scanner - + About ReplayGain Scanner Plugin Acerca do plugin ReplayGain Scanner - + ReplayGain Scanner Plugin for Qmmp Plugin ReplayGain Scanner para Qmmp - + This plugin scans audio files and gives information for volume normalization Este plugin escanea os arquivos de audio e proporciona información sobre a normalización do volume - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: Basado no código fonte por: - + David Robinson <David@Robinson.org> David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_he.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_he.ts index e03ce5f79..62c7988d6 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_he.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_he.ts @@ -64,16 +64,16 @@ רשום הישג/שיא אלבום - - + + Error שגיאה - - - - + + + + %1 dB %1 דציבלים @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin תוסף סורק ReplayGain - + About ReplayGain Scanner Plugin אודות תוסף סורק ReplayGain - + ReplayGain Scanner Plugin for Qmmp תוסף סורק ReplayGain עבור Qmmp - + This plugin scans audio files and gives information for volume normalization תוסף זה סורק קבצי שמע ונותן מידע עבור נורמליזציה של עוצמת שמע - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: מבוסס על קוד מקור מאת: - + David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_hu.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_hu.ts index 1d37f61ae..f623bedd2 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_hu.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_hu.ts @@ -64,16 +64,16 @@ - - + + Error - - - - + + + + %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin - + About ReplayGain Scanner Plugin - + ReplayGain Scanner Plugin for Qmmp - + This plugin scans audio files and gives information for volume normalization - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: - + David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_id.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_id.ts index ddf72a1d5..f9ea6d21c 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_id.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_id.ts @@ -64,16 +64,16 @@ Tulis gain/puncak album - - + + Error Galat - - - - + + + + %1 dB %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin Plugin Scanner ReplayGain - + About ReplayGain Scanner Plugin Tentang Plugin Scanner ReplayGain - + ReplayGain Scanner Plugin for Qmmp Plugin Scanner ReplayGain untuk Qmmp - + This plugin scans audio files and gives information for volume normalization Plugin ini men-scan file audio dan memberikan informasi untuk normalisasi volume - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: Berdasarkan pada kode sumber oleh: - + David Robinson <David@Robinson.org> David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_it.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_it.ts index ca6f94bbc..4f713c15a 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_it.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_it.ts @@ -64,16 +64,16 @@ - - + + Error - - - - + + + + %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin - + About ReplayGain Scanner Plugin - + ReplayGain Scanner Plugin for Qmmp - + This plugin scans audio files and gives information for volume normalization - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: - + David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_ja.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_ja.ts index 942ac3b3e..84bb85df4 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_ja.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_ja.ts @@ -64,16 +64,16 @@ アルバム全体利得とアルバムピーク値を書き込む - - + + Error エラー - - - - + + + + %1 dB %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin リプレイゲイン スキャナー プラグイン - + About ReplayGain Scanner Plugin リプレイゲイン スキャナー プラグインについて - + ReplayGain Scanner Plugin for Qmmp QMMP リプレイゲイン スキャナー プラグイン - + This plugin scans audio files and gives information for volume normalization このプラグインは音声ファイルの音量を計測し適正音量レベルに直すための情報を提供します - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> - + Based on source code by: 元になったコードの作者: - + David Robinson <David@Robinson.org> David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_kk.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_kk.ts index 3faf55c12..0c7795799 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_kk.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_kk.ts @@ -64,16 +64,16 @@ - - + + Error - - - - + + + + %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin - + About ReplayGain Scanner Plugin - + ReplayGain Scanner Plugin for Qmmp - + This plugin scans audio files and gives information for volume normalization - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: - + David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_lt.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_lt.ts index 95fc7673f..da05d05fd 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_lt.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_lt.ts @@ -64,16 +64,16 @@ Įrašyti albumo didėjimą/piką - - + + Error Klaida - - - - + + + + %1 dB %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin ReplayGain Skanerio Įskiepis - + About ReplayGain Scanner Plugin Apie ReplayGain Skanerio Įskiepį - + ReplayGain Scanner Plugin for Qmmp ReplayGain Skanerio Įskiepis Qmmp - + This plugin scans audio files and gives information for volume normalization Šis įskiepis skenuja audio bylas ir parodo informaciją apie garso normalizavimą - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: Sukurta iš šaltinio pagal: - + David Robinson <David@Robinson.org> David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_nl.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_nl.ts index d3bddca6d..935573751 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_nl.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_nl.ts @@ -64,16 +64,16 @@ - - + + Error - - - - + + + + %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin - + About ReplayGain Scanner Plugin - + ReplayGain Scanner Plugin for Qmmp - + This plugin scans audio files and gives information for volume normalization - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: - + David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_pl_PL.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_pl_PL.ts index f70fd30a0..32ad26023 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_pl_PL.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_pl_PL.ts @@ -64,16 +64,16 @@ - - + + Error Błąd - - - - + + + + %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin Wtyczka Skaner ReplayGain - + About ReplayGain Scanner Plugin O wtyczce Skaner ReplayGain - + ReplayGain Scanner Plugin for Qmmp Wtyczka ReplayGain dla Qmmp - + This plugin scans audio files and gives information for volume normalization Wtyczka skanuje pliki dźwiękowe i podaje informacje na temat normalizacji dźwięku - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: Oparte na kodzie stworzonym przez: - + David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_pt.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_pt.ts index 57da952cd..f3d94cab2 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_pt.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_pt.ts @@ -64,16 +64,16 @@ Gravar ganho/picos do álbum - - + + Error Erro - - - - + + + + %1 dB %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin Suplemento ReplayGain - + About ReplayGain Scanner Plugin Sobre o suplemento ReplayGain - + ReplayGain Scanner Plugin for Qmmp Suplemento Qmmp ReplayGain - + This plugin scans audio files and gives information for volume normalization Este suplemento analisa os ficheiros áudio e as informações para normalização de volume - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: Baseado no código fonte de: - + David Robinson <David@Robinson.org> David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_pt_BR.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_pt_BR.ts index 67cc19e8b..2757cb280 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_pt_BR.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_pt_BR.ts @@ -64,16 +64,16 @@ Salvar ganho/picos do álbum - - + + Error Erro - - - - + + + + %1 dB %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin Plugin ReplayGain - + About ReplayGain Scanner Plugin Sobre o plugin ReplayGain - + ReplayGain Scanner Plugin for Qmmp Plugin Qmmp ReplayGain - + This plugin scans audio files and gives information for volume normalization Este plugin analisa os arquivos de áudio e as informações para normalização de volume - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: Baseado no código fonte de: - + David Robinson <David@Robinson.org> David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_ru.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_ru.ts index 7e3dded4f..9ad6ecad5 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_ru.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_ru.ts @@ -64,16 +64,16 @@ Записывать пик/усиление для альбома - - + + Error Ошибка - - - - + + + + %1 dB %1 дБ @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin Модуль сканир. ReplayGain - + About ReplayGain Scanner Plugin О модуле сканирования ReplayGain - + ReplayGain Scanner Plugin for Qmmp Модуль сканирования ReplayGain для Qmmp - + This plugin scans audio files and gives information for volume normalization Данный модуль сканирует аудио-файлы и выдаёт информацию для нормализации громкости - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> - + Based on source code by: Основан на исходном коде следующих разработчиков: - + David Robinson <David@Robinson.org> David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_sk.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_sk.ts index c5cbca2ac..2b38719c0 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_sk.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_sk.ts @@ -64,16 +64,16 @@ - - + + Error - - - - + + + + %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin - + About ReplayGain Scanner Plugin - + ReplayGain Scanner Plugin for Qmmp - + This plugin scans audio files and gives information for volume normalization - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: - + David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_sr_BA.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_sr_BA.ts index 1a487bac8..8a3f20d19 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_sr_BA.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_sr_BA.ts @@ -64,16 +64,16 @@ Упиши ниво/врх албума - - + + Error Грешка - - - - + + + + %1 dB %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin Скенер нивелације - + About ReplayGain Scanner Plugin О прикључку за скенирање нивелације - + ReplayGain Scanner Plugin for Qmmp Кумп прикључак за скенирање нивелације - + This plugin scans audio files and gives information for volume normalization Скенира фајлове звука и даје податке за нормализацију звука - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: Заснован на кôду од: - + David Robinson <David@Robinson.org> David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_sr_RS.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_sr_RS.ts index 6671bf0f0..a2e2e5b40 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_sr_RS.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_sr_RS.ts @@ -64,16 +64,16 @@ Упиши ниво/врх албума - - + + Error Грешка - - - - + + + + %1 dB %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin Скенер нивелације - + About ReplayGain Scanner Plugin О прикључку за скенирање нивелације - + ReplayGain Scanner Plugin for Qmmp Кумп прикључак за скенирање нивелације - + This plugin scans audio files and gives information for volume normalization Скенира фајлове звука и даје податке за нормализацију звука - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: Заснован на кôду од: - + David Robinson <David@Robinson.org> David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_tr.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_tr.ts index 77c489489..9014d22d0 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_tr.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_tr.ts @@ -64,16 +64,16 @@ - - + + Error - - - - + + + + %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin - + About ReplayGain Scanner Plugin - + ReplayGain Scanner Plugin for Qmmp - + This plugin scans audio files and gives information for volume normalization - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: - + David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_uk_UA.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_uk_UA.ts index a242eaf4f..96573ad94 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_uk_UA.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_uk_UA.ts @@ -64,16 +64,16 @@ Записувати пік/підсилення для альбому - - + + Error Помилка - - - - + + + + %1 dB %1 дБ @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin Модуль сканування ReplayGain - + About ReplayGain Scanner Plugin Про модуль сканування ReplayGain - + ReplayGain Scanner Plugin for Qmmp Модуль сканування ReplayGain для Qmmp - + This plugin scans audio files and gives information for volume normalization Цей модуль сканує аудіо файли і видає інформацію для нормалізації гучності - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> - + Based on source code by: Заснований на вихідному коді наступних розробників: - + David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_zh_CN.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_zh_CN.ts index 00218a37c..ecc2e14ef 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_zh_CN.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_zh_CN.ts @@ -64,16 +64,16 @@ 写专辑的增益/峰值 - - + + Error 错误 - - - - + + + + %1 dB %1分贝 @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin 回放增益扫描器插件 - + About ReplayGain Scanner Plugin 关于回放增益扫描器插件 - + ReplayGain Scanner Plugin for Qmmp 用于Qmmp播放器的回放增益扫描器插件 - + This plugin scans audio files and gives information for volume normalization 本插件扫描音频文件并提供音量正常化的相关信息 - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: 基于以下作者的源代码： - + David Robinson <David@Robinson.org> 戴维.罗宾逊 <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> 格林.索耶尔 <mp3gain@hotmail.com> - + Frank Klemm 弗兰克.克莱姆 diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_zh_TW.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_zh_TW.ts index b5e042bae..c4c3138e4 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_zh_TW.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_zh_TW.ts @@ -64,16 +64,16 @@ - - + + Error 錯誤 - - - - + + + + %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin - + About ReplayGain Scanner Plugin - + ReplayGain Scanner Plugin for Qmmp - + This plugin scans audio files and gives information for volume normalization - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: - + David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm diff --git a/src/plugins/General/scrobbler/CMakeLists.txt b/src/plugins/General/scrobbler/CMakeLists.txt index 6a0b53bb9..d4fbdb2a2 100644 --- a/src/plugins/General/scrobbler/CMakeLists.txt +++ b/src/plugins/General/scrobbler/CMakeLists.txt @@ -1,20 +1,5 @@ project(libscrobbler) - - -SET(QT_USE_QTNETWORK TRUE) -INCLUDE(FindQt4) - -include(${QT_USE_FILE}) - -# 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 @@ -38,7 +23,7 @@ SET(libscrobbler_HDRS SET(libscrobbler_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libscrobbler_RCC_SRCS ${libscrobbler_RCCS}) +QT5_ADD_RESOURCES(libscrobbler_RCC_SRCS ${libscrobbler_RCCS}) # user interface @@ -47,7 +32,7 @@ SET(libscrobbler_UIS settingsdialog.ui ) -QT4_WRAP_UI(libscrobbler_UIS_H ${libscrobbler_UIS}) +QT5_WRAP_UI(libscrobbler_UIS_H ${libscrobbler_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -55,5 +40,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(scrobbler MODULE ${libscrobbler_SRCS} ${libscrobbler_UIS_H} ${libscrobbler_RCC_SRCS} ${libscrobbler_HDRS}) add_dependencies(scrobbler qmmpui) -target_link_libraries(scrobbler ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(scrobbler Qt5::Widgets Qt5::Network -lqmmpui -lqmmp) install(TARGETS scrobbler DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/scrobbler/scrobbler.cpp b/src/plugins/General/scrobbler/scrobbler.cpp index c84cba99d..b4f10e634 100644 --- a/src/plugins/General/scrobbler/scrobbler.cpp +++ b/src/plugins/General/scrobbler/scrobbler.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -312,7 +313,7 @@ void Scrobbler::submit() QUrl url(m_scrobblerUrl); url.setPort(m_scrobblerUrl.startsWith("https") ? 443 : 80); - QUrl body(""); + QUrlQuery body(""); QByteArray data; foreach (QString key, params.keys()) { @@ -321,7 +322,7 @@ void Scrobbler::submit() } data.append(SECRET); body.addQueryItem("api_sig", QCryptographicHash::hash(data, QCryptographicHash::Md5).toHex()); - QByteArray bodyData = body.toEncoded().remove(0,1); + QByteArray bodyData = body.query(QUrl::FullyEncoded).toUtf8(); bodyData.replace("+", QUrl::toPercentEncoding("+")); QNetworkRequest request(url); @@ -361,7 +362,7 @@ void Scrobbler::sendNotification(const SongInfo &info) QUrl url(m_scrobblerUrl); url.setPort(m_scrobblerUrl.startsWith("https") ? 443 : 80); - QUrl body(""); + QUrlQuery body(""); QByteArray data; foreach (QString key, params.keys()) { @@ -370,7 +371,7 @@ void Scrobbler::sendNotification(const SongInfo &info) } data.append(SECRET); body.addQueryItem("api_sig", QCryptographicHash::hash(data, QCryptographicHash::Md5).toHex()); - QByteArray bodyData = body.toEncoded().remove(0,1); + QByteArray bodyData = body.query(QUrl::FullyEncoded).toUtf8(); bodyData.replace("+", QUrl::toPercentEncoding("+")); QNetworkRequest request(url); @@ -415,14 +416,16 @@ void ScrobblerAuth::getToken() m_session.clear(); QUrl url(m_scrobblerUrl + "?"); url.setPort(m_scrobblerUrl.startsWith("https") ? 443 : 80); - url.addQueryItem("method", "auth.getToken"); - url.addQueryItem("api_key", API_KEY); + QUrlQuery q; + q.addQueryItem("method", "auth.getToken"); + q.addQueryItem("api_key", API_KEY); QByteArray data; data.append("api_key" API_KEY); data.append("methodauth.getToken"); data.append(SECRET); - url.addQueryItem("api_sig", QCryptographicHash::hash(data,QCryptographicHash::Md5).toHex()); + q.addQueryItem("api_sig", QCryptographicHash::hash(data,QCryptographicHash::Md5).toHex()); + url.setQuery(q); QNetworkRequest request(url); request.setRawHeader("User-Agent", m_ua); @@ -436,16 +439,18 @@ void ScrobblerAuth::getSession() qDebug("ScrobblerAuth[%s]: new session request", qPrintable(m_name)); QUrl url(m_scrobblerUrl + "?"); url.setPort(m_scrobblerUrl.startsWith("https") ? 443 : 80); - url.addQueryItem("api_key", API_KEY); - url.addQueryItem("method", "auth.getSession"); - url.addQueryItem("token", m_token); + QUrlQuery q; + q.addQueryItem("api_key", API_KEY); + q.addQueryItem("method", "auth.getSession"); + q.addQueryItem("token", m_token); QByteArray data; data.append("api_key" API_KEY); data.append("methodauth.getSession"); data.append("token" + m_token.toUtf8()); data.append(SECRET); - url.addQueryItem("api_sig", QCryptographicHash::hash(data, QCryptographicHash::Md5).toHex()); + q.addQueryItem("api_sig", QCryptographicHash::hash(data, QCryptographicHash::Md5).toHex()); + url.setQuery(q); QNetworkRequest request(url); request.setRawHeader("User-Agent", m_ua); @@ -466,7 +471,7 @@ void ScrobblerAuth::checkSession(const QString &session) QUrl url(m_scrobblerUrl); url.setPort(m_scrobblerUrl.startsWith("https") ? 443 : 80); - QUrl body(""); + QUrlQuery body(""); QByteArray data; foreach (QString key, params.keys()) { @@ -475,7 +480,7 @@ void ScrobblerAuth::checkSession(const QString &session) } data.append(SECRET); body.addQueryItem("api_sig", QCryptographicHash::hash(data, QCryptographicHash::Md5).toHex()); - QByteArray bodyData = body.toEncoded().remove(0,1); + QByteArray bodyData = body.query(QUrl::FullyEncoded).toUtf8(); bodyData.replace("+", QUrl::toPercentEncoding("+")); QNetworkRequest request(url); diff --git a/src/plugins/General/scrobbler/scrobblercache.cpp b/src/plugins/General/scrobbler/scrobblercache.cpp index b6b1eec78..667079fdd 100644 --- a/src/plugins/General/scrobbler/scrobblercache.cpp +++ b/src/plugins/General/scrobbler/scrobblercache.cpp @@ -125,7 +125,7 @@ QList ScrobblerCache::load() while (!file.atEnd()) { - line = QString::fromUtf8(file.readLine().constData()).trimmed(); + line = QString::fromUtf8(file.readLine()).trimmed(); if ((s = line.indexOf("=")) < 0) continue; diff --git a/src/plugins/General/scrobbler/scrobblerfactory.cpp b/src/plugins/General/scrobbler/scrobblerfactory.cpp index 331e258bb..4cfced38c 100644 --- a/src/plugins/General/scrobbler/scrobblerfactory.cpp +++ b/src/plugins/General/scrobbler/scrobblerfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2016 by Ilya Kotov * + * Copyright (C) 2008-2012 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -18,9 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ + #include -#include -#include #include #include "scrobblerhandler.h" #include "settingsdialog.h" @@ -61,5 +60,3 @@ QTranslator *ScrobblerFactory::createTranslator(QObject *parent) translator->load(QString(":/scrobbler_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(scrobbler, ScrobblerFactory) diff --git a/src/plugins/General/scrobbler/scrobblerfactory.h b/src/plugins/General/scrobbler/scrobblerfactory.h index 0d1ea8035..d41d674ca 100644 --- a/src/plugins/General/scrobbler/scrobblerfactory.h +++ b/src/plugins/General/scrobbler/scrobblerfactory.h @@ -32,6 +32,7 @@ class ScrobblerFactory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_bg.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_bg.ts index 643b43b04..4085244a2 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_bg.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_bg.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin - + About Scrobbler Plugin - + Qmmp AudioScrobbler Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_cs.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_cs.ts index 301209963..07b039864 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_cs.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_cs.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Modul Scrobbler - + About Scrobbler Plugin O modulu Scrobbler - + Qmmp AudioScrobbler Plugin Modul Qmmp Scrobbler - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_de.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_de.ts index 18af65d2b..812558220 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_de.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_de.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Scrobbler-Modul - + About Scrobbler Plugin Über Scrobbler-Modul - + Qmmp AudioScrobbler Plugin Qmmp AudioScrobbler-Modul - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_el.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_el.ts index 5a3d57ef4..96bf5fa42 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_el.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_el.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Πρόσθετο Scrobbler - + About Scrobbler Plugin Σχετικά με το πρόσθετο Scrobbler - + Qmmp AudioScrobbler Plugin Qmmp πρόσθετο AudioScrobbler - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_en.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_en.ts index 8e2abb88c..974476db3 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_en.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_en.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin - + About Scrobbler Plugin - + Qmmp AudioScrobbler Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_es.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_es.ts index 921b7d6b2..b601cf556 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_es.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_es.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Módulo Scrobbler - + About Scrobbler Plugin Acerca del módulo Scrobbler - + Qmmp AudioScrobbler Plugin Módulo AudioScrobbler para Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_fi.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_fi.ts index 01c112fee..24ff62c5b 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_fi.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_fi.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Scrobbler-liitännäinen - + About Scrobbler Plugin Tietoja - Scrobbler-liitännäinen - + Qmmp AudioScrobbler Plugin Qmmp:n AudioScrobbler-liitännäinen - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_fr.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_fr.ts index a82a3444b..17c8e0350 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_fr.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_fr.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Greffon AudioScrobbler - + About Scrobbler Plugin À propos du greffon AudioScrobbler - + Qmmp AudioScrobbler Plugin Greffon AudioScrobbler pour Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_gl_ES.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_gl_ES.ts index eb659460b..b9e66912f 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_gl_ES.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_gl_ES.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Engadido Scrobbler - + About Scrobbler Plugin Sobre o engadido Scrobbler - + Qmmp AudioScrobbler Plugin Engadio AudioScrobbler de Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_he.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_he.ts index 071125077..e73194500 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_he.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_he.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin תוסף Scrobbler - + About Scrobbler Plugin אודות תוסף Scrobbler - + Qmmp AudioScrobbler Plugin תוסף AudioScrobbler של Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_hu.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_hu.ts index 68a7080d9..8e2d89e64 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_hu.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_hu.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin - + About Scrobbler Plugin - + Qmmp AudioScrobbler Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_id.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_id.ts index c1f25fdfb..a90c3d57f 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_id.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_id.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Plugin Scrobbler - + About Scrobbler Plugin Tentang Plugin Scrobbler - + Qmmp AudioScrobbler Plugin Plugin AudioScrobbler Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_it.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_it.ts index 43ae94dec..115db2846 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_it.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_it.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Modulo Scrobbler - + About Scrobbler Plugin Info sul modulo Scrobbler - + Qmmp AudioScrobbler Plugin Modulo AudioScrobbler per Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_ja.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_ja.ts index 86037b088..aab9cd90c 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_ja.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_ja.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Scrobbler プラグイン - + About Scrobbler Plugin Scrobbler プラグインについて - + Qmmp AudioScrobbler Plugin QMMP Scrobbler プラグイン - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_kk.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_kk.ts index 665e5907d..a4785023d 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_kk.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_kk.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin - + About Scrobbler Plugin - + Qmmp AudioScrobbler Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_lt.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_lt.ts index 68765f521..e858e2302 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_lt.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_lt.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Scrobbler įskiepis - + About Scrobbler Plugin Apie Scrobbler įskiepį - + Qmmp AudioScrobbler Plugin Qmmp AudioScrobbler įskiepis - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_nl.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_nl.ts index f220b9b11..00b2cd118 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_nl.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_nl.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Scrobbler Module - + About Scrobbler Plugin Over de Scrobbler Module - + Qmmp AudioScrobbler Plugin AudioScrobbler Module voor Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_pl_PL.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_pl_PL.ts index 2a71657d4..40800818a 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_pl_PL.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_pl_PL.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Wtyczka Scrobbler - + About Scrobbler Plugin O wtyczce Scrobbler - + Qmmp AudioScrobbler Plugin Wtyczka AudioScrobbler dla Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_pt.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_pt.ts index b144a330d..ed8a4543a 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_pt.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_pt.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Suplemento Scrobbler - + About Scrobbler Plugin Sobre o suplemento Scrobbler - + Qmmp AudioScrobbler Plugin Suplemento Qmmp AudioScrobbler - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_pt_BR.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_pt_BR.ts index 6d884a52b..806bee3a8 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_pt_BR.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_pt_BR.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Plugin Scrobbler - + About Scrobbler Plugin Sobre o plugin Scrobbler - + Qmmp AudioScrobbler Plugin Plugin Qmmp AudioScrobbler - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_ru.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_ru.ts index 65743f423..e861f91b0 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_ru.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_ru.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Модуль scrobbler - + About Scrobbler Plugin О модуле Scrobbler - + Qmmp AudioScrobbler Plugin Модуль AudioScrobbler для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_sk.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_sk.ts index e8303e43a..300d6f8f6 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_sk.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_sk.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin - + About Scrobbler Plugin - + Qmmp AudioScrobbler Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_sr_BA.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_sr_BA.ts index 2ea3892f0..3e5159efe 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_sr_BA.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_sr_BA.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Скроблер - + About Scrobbler Plugin О прикључку за скробловање - + Qmmp AudioScrobbler Plugin Кумп прикључак за скробловање - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_sr_RS.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_sr_RS.ts index 5cc6c7239..1ac6f95cb 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_sr_RS.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_sr_RS.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Скроблер - + About Scrobbler Plugin О прикључку за скробловање - + Qmmp AudioScrobbler Plugin Кумп прикључак за скробловање - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_tr.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_tr.ts index 1c1328aa7..ed25f4ebd 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_tr.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_tr.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Scrobbler Eklentisi - + About Scrobbler Plugin Scrobbler Eklentisi Hakkında - + Qmmp AudioScrobbler Plugin Qmmp Scrobbler Eklentisi - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_uk_UA.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_uk_UA.ts index 4e7cbad2b..7df95b11a 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_uk_UA.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_uk_UA.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Модуль scrobbler - + About Scrobbler Plugin Про модуль Scrobbler - + Qmmp AudioScrobbler Plugin Модуль AudioScrobbler для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_CN.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_CN.ts index 7771f7f9c..a9c9d4495 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_CN.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_CN.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Scrobbler 插件 - + About Scrobbler Plugin 关于 Scrobbler 插件 - + Qmmp AudioScrobbler Plugin Qmmp Scrobbler 插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_TW.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_TW.ts index 9097809b6..b42dff169 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_TW.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_TW.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Scrobbler 外掛 - + About Scrobbler Plugin 關於 Scrobbler 外掛 - + Qmmp AudioScrobbler Plugin Qmmp Scrobbler 外掛 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/statusicon/CMakeLists.txt b/src/plugins/General/statusicon/CMakeLists.txt index 64942b72a..70ac8981f 100644 --- a/src/plugins/General/statusicon/CMakeLists.txt +++ b/src/plugins/General/statusicon/CMakeLists.txt @@ -1,20 +1,7 @@ project(libstatusicon) -# 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}) -SET(QT_INCLUDES - ${QT_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ -) - # libqmmpui & libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -33,7 +20,7 @@ SET(libstatusicon_RCCS translations/translations.qrc images/tray_images.qrc) -QT4_ADD_RESOURCES(libstatusicon_RCC_SRCS ${libstatusicon_RCCS}) +QT5_ADD_RESOURCES(libstatusicon_RCC_SRCS ${libstatusicon_RCCS}) # user interface @@ -42,12 +29,12 @@ SET(libstatusicon_UIS settingsdialog.ui ) -QT4_WRAP_UI(libstatusicon_UIS_H ${libstatusicon_UIS}) +QT5_WRAP_UI(libstatusicon_UIS_H ${libstatusicon_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(statusicon MODULE ${libstatusicon_SRCS} ${libstatusicon_UIS_H} ${libstatusicon_RCC_SRCS}) add_dependencies(statusicon qmmpui libqmmp) -target_link_libraries(statusicon ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(statusicon Qt5::Widgets -lqmmpui -lqmmp) install(TARGETS statusicon DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/statusicon/qmmptrayicon.cpp b/src/plugins/General/statusicon/qmmptrayicon.cpp index 4113b53a4..5667d8637 100644 --- a/src/plugins/General/statusicon/qmmptrayicon.cpp +++ b/src/plugins/General/statusicon/qmmptrayicon.cpp @@ -21,11 +21,12 @@ #include #include #include -#include +#include +#include #include #include "qmmptrayicon.h" -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 #include "statusiconpopupwidget.h" #endif @@ -41,19 +42,24 @@ QmmpTrayIcon::~QmmpTrayIcon() void QmmpTrayIcon::setToolTip(const QString &tip) { -#ifdef Q_WS_X11 - m_message = tip; - if(m_popupWidget) - showToolTip(); +#ifdef QMMP_WS_X11 + if(hasToolTipEvent()) + { + m_message = tip; + if(m_popupWidget) + showToolTip(); + } + else + QSystemTrayIcon::setToolTip(tip); #else QSystemTrayIcon::setToolTip(tip); #endif } -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 bool QmmpTrayIcon::event(QEvent *e) { - if (e->type() == QEvent::Wheel) + if (e->type() == QEvent::Wheel ) { wheelEvent((QWheelEvent *) e); e->accept(); @@ -68,6 +74,18 @@ bool QmmpTrayIcon::event(QEvent *e) return QSystemTrayIcon::event(e); } +bool QmmpTrayIcon::hasToolTipEvent() +{ + //checking for XEmbed system tray implementation + //only this implementation is able to send QHelpEvent + foreach (QWindow *w, qApp->allWindows()) + { + if(w->objectName() == "QSystemTrayIconSysWindow") + return true; + } + return false; +} + void QmmpTrayIcon::wheelEvent(QWheelEvent *e) { SoundCore::instance()->changeVolume(e->delta()/20); diff --git a/src/plugins/General/statusicon/qmmptrayicon.h b/src/plugins/General/statusicon/qmmptrayicon.h index 1aac4736d..220b59929 100644 --- a/src/plugins/General/statusicon/qmmptrayicon.h +++ b/src/plugins/General/statusicon/qmmptrayicon.h @@ -25,7 +25,7 @@ class QEvent; class QWheelEvent; -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 class StatusIconPopupWidget; #endif @@ -41,11 +41,13 @@ public: void setToolTip(const QString &tip); -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 private: bool event(QEvent *e); void wheelEvent(QWheelEvent *e); void showToolTip(); + + bool hasToolTipEvent(); QPointer m_popupWidget; QString m_message; #endif diff --git a/src/plugins/General/statusicon/settingsdialog.cpp b/src/plugins/General/statusicon/settingsdialog.cpp index ceab6b0dc..7754abc83 100644 --- a/src/plugins/General/statusicon/settingsdialog.cpp +++ b/src/plugins/General/statusicon/settingsdialog.cpp @@ -34,7 +34,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) m_ui.messageGroupBox->setChecked(settings.value("show_message",false).toBool()); m_ui.messageDelaySpinBox->setValue(settings.value("message_delay", 2000).toInt()); m_ui.niceTooltipGroupBox->setChecked(settings.value("show_tooltip", true).toBool()); -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 m_ui.niceTooltipDelaySpinBox->setValue(settings.value("tooltip_delay",2000).toInt()); m_ui.transparencySlider->setValue(settings.value("tooltip_transparency",0).toInt()); m_ui.coverSizeSlider->setValue(settings.value("tooltip_cover_size", 100).toInt()); @@ -64,7 +64,7 @@ void SettingsDialog::accept() settings.setValue("use_standard_icons", m_ui.standardIconsCheckBox->isChecked()); settings.setValue("show_tooltip", m_ui.niceTooltipGroupBox->isChecked()); settings.setValue("split_file_name", m_ui.niceTooltipSplitCheckBox->isChecked()); -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 settings.setValue("tooltip_delay", m_ui.niceTooltipDelaySpinBox->value()); settings.setValue("tooltip_transparency", m_ui.transparencySlider->value()); settings.setValue("tooltip_cover_size", m_ui.coverSizeSlider->value()); diff --git a/src/plugins/General/statusicon/statusicon.cpp b/src/plugins/General/statusicon/statusicon.cpp index a34fa133c..f33e395e8 100644 --- a/src/plugins/General/statusicon/statusicon.cpp +++ b/src/plugins/General/statusicon/statusicon.cpp @@ -48,7 +48,7 @@ StatusIcon::StatusIcon(QObject *parent) : QObject(parent) m_useStandardIcons = settings.value("use_standard_icons",false).toBool(); m_showToolTip = settings.value("show_tooltip",true).toBool(); m_splitFileName = settings.value("split_file_name",true).toBool(); -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 m_toolTipTemplate = settings.value("tooltip_template", DEFAULT_TEMPLATE).toString(); #else m_toolTipTemplate = "%p%if(%p&%t, - ,)%t"; diff --git a/src/plugins/General/statusicon/statusiconfactory.cpp b/src/plugins/General/statusicon/statusiconfactory.cpp index 5c1f094fe..bdc5acb84 100644 --- a/src/plugins/General/statusicon/statusiconfactory.cpp +++ b/src/plugins/General/statusicon/statusiconfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2016 by Ilya Kotov * + * Copyright (C) 2008-2015 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -18,9 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ + #include -#include -#include #include "statusicon.h" #include "settingsdialog.h" #include "statusiconfactory.h" @@ -62,5 +61,3 @@ QTranslator *StatusIconFactory::createTranslator(QObject *parent) translator->load(QString(":/statusicon_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(statusicon, StatusIconFactory) diff --git a/src/plugins/General/statusicon/statusiconfactory.h b/src/plugins/General/statusicon/statusiconfactory.h index a310cfafe..af6f2ae92 100644 --- a/src/plugins/General/statusicon/statusiconfactory.h +++ b/src/plugins/General/statusicon/statusiconfactory.h @@ -33,6 +33,7 @@ class StatusIconFactory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; diff --git a/src/plugins/General/statusicon/statusiconpopupwidget.cpp b/src/plugins/General/statusicon/statusiconpopupwidget.cpp index e4442d742..11439ecd6 100644 --- a/src/plugins/General/statusicon/statusiconpopupwidget.cpp +++ b/src/plugins/General/statusicon/statusiconpopupwidget.cpp @@ -21,8 +21,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 #include #include diff --git a/src/plugins/General/statusicon/statusiconpopupwidget.h b/src/plugins/General/statusicon/statusiconpopupwidget.h index a239ce162..7a9aaa7a4 100644 --- a/src/plugins/General/statusicon/statusiconpopupwidget.h +++ b/src/plugins/General/statusicon/statusiconpopupwidget.h @@ -24,8 +24,8 @@ #ifndef STATUSICONPOPUPWIDGET_H #define STATUSICONPOPUPWIDGET_H -#include -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 + #include #include #include diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_bg.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_bg.ts index 9ee5bfcb6..e576209c8 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_bg.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_bg.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin - + About Status Icon Plugin - + Qmmp Status Icon Plugin - + Written by: - + Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_cs.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_cs.ts index c9fe8efd5..afc2c683e 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_cs.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_cs.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Modul stavové ikony - + About Status Icon Plugin O modulu stavové ikony - + Qmmp Status Icon Plugin Modul stavové ikony Qmmp - + Written by: Autoři: - + Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_de.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_de.ts index a01e35267..0fe8f8e85 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_de.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_de.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Statussymbolmodul - + About Status Icon Plugin Über Statussymbolmodul - + Qmmp Status Icon Plugin Qmmp Statussymbolmodul - + Written by: Autor: - + Ilya Kotov <forkotov02@ya.ru> Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_el.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_el.ts index 27a29808d..61e546063 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_el.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_el.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Πρόσθετου εικονιδίου κατάστασης - + About Status Icon Plugin Σχετικά με το πρόσθετο εικονιδίου κατάστασης - + Qmmp Status Icon Plugin Qmmp πρόσθετο εικονιδίου κατάστασης - + Written by: Γράφτηκε από: - + Ilya Kotov <forkotov02@ya.ru> Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_en.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_en.ts index c22bf1afb..5065f2bf4 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_en.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_en.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin - + About Status Icon Plugin - + Qmmp Status Icon Plugin - + Written by: - + Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_es.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_es.ts index 3f728ed63..140207868 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_es.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_es.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Módulo de icono de estado - + About Status Icon Plugin Acerca del módulo de icono de estado - + Qmmp Status Icon Plugin Módulo de icono de estado para Qmmp - + Written by: Escrito por: - + Ilya Kotov <forkotov02@ya.ru> Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_fi.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_fi.ts index 4fd5c17bb..24809a3de 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_fi.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_fi.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin - + About Status Icon Plugin - + Qmmp Status Icon Plugin - + Written by: Toteutus: - + Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_fr.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_fr.ts index b03304fbb..f72a4caac 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_fr.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_fr.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Greffon d'icône de statut - + About Status Icon Plugin À propos du greffon d'icône de statut - + Qmmp Status Icon Plugin Greffon d'icône de statut pour Qmmp - + Written by: Écrit par : - + Ilya Kotov <forkotov02@ya.ru> Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_gl_ES.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_gl_ES.ts index 517f4cfc5..dc2de44d8 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_gl_ES.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_gl_ES.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Engadido icona de estado - + About Status Icon Plugin Sobre o engadido icona de estado - + Qmmp Status Icon Plugin Engadido icona de estado de Qmmp - + Written by: Escrito por: - + Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_he.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_he.ts index 732a5e3a9..34d7ecbb1 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_he.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_he.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin תוסף סמל מצב - + About Status Icon Plugin אודות תוסף סמל מצב - + Qmmp Status Icon Plugin תוסף סמל מצב של Qmmp - + Written by: חובר על ידי: - + Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_hu.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_hu.ts index 7e84580b5..373d5ae25 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_hu.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_hu.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin - + About Status Icon Plugin - + Qmmp Status Icon Plugin - + Written by: - + Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_id.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_id.ts index 976a861c0..b01db32b7 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_id.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_id.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Plugin Icon Status - + About Status Icon Plugin Tentang Plugin Icon Status - + Qmmp Status Icon Plugin Plugin Icon Status Qmmp - + Written by: Ditulis oleh: - + Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_it.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_it.ts index 19ed588c5..dc7359602 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_it.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_it.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Modulo icona di stato - + Qmmp Status Icon Plugin Modulo icona di stato per Qmmp - + Written by: Autori: - + Ilya Kotov <forkotov02@ya.ru> Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> - + About Status Icon Plugin Info sul modulo icona di stato diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_ja.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_ja.ts index 0f326fb12..c9858a9d5 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_ja.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_ja.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin 状況アイコンプラグイン - + About Status Icon Plugin 状況アイコンプラグインについて - + Qmmp Status Icon Plugin QMMP 状況アイコンプラグイン - + Written by: 制作: - + Ilya Kotov <forkotov02@ya.ru> Илья Котов (Ilya Kotov) <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_kk.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_kk.ts index b3e63ad8a..69039ab74 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_kk.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_kk.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin - + About Status Icon Plugin - + Qmmp Status Icon Plugin - + Written by: - + Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_lt.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_lt.ts index d152eb395..5977067a7 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_lt.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_lt.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Status Icon įskiepis - + About Status Icon Plugin Apie Status Icon įskiepį - + Qmmp Status Icon Plugin Qmmp Status Icon įskiepis - + Written by: Sukūrė: - + Ilya Kotov <forkotov02@ya.ru> Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_nl.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_nl.ts index 416d3e74d..1dbf43229 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_nl.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_nl.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Status Icoon Module - + Qmmp Status Icon Plugin Status Icoon Module voor Qmmp - + Written by: Auteur: - + Ilya Kotov <forkotov02@ya.ru> Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> - + About Status Icon Plugin Over de Status Icoon Module diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_pl_PL.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_pl_PL.ts index 6350a8f0c..6b247993b 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_pl_PL.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_pl_PL.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Wtyczka Ikona Statusu - + About Status Icon Plugin O Wtyczce Ikona Statusu - + Qmmp Status Icon Plugin Wtyczka Ikona Statusu dla Qmmp - + Written by: Napisana przez: - + Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_pt.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_pt.ts index 7e00dafbb..b51f16523 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_pt.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_pt.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Suplemento Status Icon - + About Status Icon Plugin Sobre o suplemento Status Icon - + Qmmp Status Icon Plugin Suplemento QMMP Status Icon - + Written by: Desenvolvido por: - + Ilya Kotov <forkotov02@ya.ru> Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_pt_BR.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_pt_BR.ts index d172f9b70..0b3cd43c6 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_pt_BR.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_pt_BR.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Plugin Status Icon - + About Status Icon Plugin Sobre o plugin Status Icon - + Qmmp Status Icon Plugin Plugin QMMP Status Icon - + Written by: Desenvolvido por: - + Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_ru.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_ru.ts index f1d7d015d..3733bf591 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_ru.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_ru.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Модуль Status Icon - + About Status Icon Plugin О модуле Status Icon - + Qmmp Status Icon Plugin Модуль Status Icon для Qmmp - + Written by: Разработчики: - + Ilya Kotov <forkotov02@ya.ru> Илья Котов <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_sk.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_sk.ts index b76b875f5..83df8a0f6 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_sk.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_sk.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin - + About Status Icon Plugin - + Qmmp Status Icon Plugin - + Written by: - + Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_sr_BA.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_sr_BA.ts index 25cedc9cb..9060d98cf 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_sr_BA.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_sr_BA.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Икона системске палете - + About Status Icon Plugin О прикључку за икону системске палете - + Qmmp Status Icon Plugin Кумп икона системске палете - + Written by: Аутори: - + Ilya Kotov <forkotov02@ya.ru> Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_sr_RS.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_sr_RS.ts index 8b40d5c7c..0b98dd48c 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_sr_RS.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_sr_RS.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Икона системске палете - + About Status Icon Plugin О прикључку за икону системске палете - + Qmmp Status Icon Plugin Кумп икона системске палете - + Written by: Аутори: - + Ilya Kotov <forkotov02@ya.ru> Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_tr.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_tr.ts index 359071d93..02069ec5d 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_tr.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_tr.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Durum Simgesi Eklentisi - + About Status Icon Plugin Durum Simgesi Eklentisi Hakkında - + Qmmp Status Icon Plugin Qmmp Durum Simgesi Eklentisi - + Written by: - + Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_uk_UA.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_uk_UA.ts index 06e63510d..2ad22b898 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_uk_UA.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_uk_UA.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Модуль Status Icon - + About Status Icon Plugin Про модуль Status Icon - + Qmmp Status Icon Plugin Модуль Status Icon для Qmmp - + Written by: Розробники: - + Ilya Kotov <forkotov02@ya.ru> Ілля Котов <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_zh_CN.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_zh_CN.ts index 31fe6f16e..a70c2d9d3 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_zh_CN.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_zh_CN.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin 状态图标插件 - + About Status Icon Plugin 关于状态图标插件 - + Qmmp Status Icon Plugin Qmmp 状态图标插件 - + Written by: 作者： - + Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_zh_TW.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_zh_TW.ts index 1e8245d58..644404cac 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_zh_TW.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_zh_TW.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin 狀態圖像插件 - + About Status Icon Plugin 關於狀態圖像插件 - + Qmmp Status Icon Plugin Qmmp 狀態圖像插件 - + Written by: 作者： - + Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/streambrowser/CMakeLists.txt b/src/plugins/General/streambrowser/CMakeLists.txt index a63b00e60..064525673 100644 --- a/src/plugins/General/streambrowser/CMakeLists.txt +++ b/src/plugins/General/streambrowser/CMakeLists.txt @@ -1,26 +1,7 @@ project(libstreambrowser) - -SET(QT_USE_QTNETWORK TRUE) -INCLUDE(FindQt4) - -include(${QT_USE_FILE}) - -# 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}) -SET(QT_INCLUDES - ${QT_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ -) - # libqmmpui & libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -35,7 +16,7 @@ SET(libstreambrowser_SRCS SET(libstreambrowser_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libstreambrowser_RCC_SRCS ${libstreambrowser_RCCS}) +QT5_ADD_RESOURCES(libstreambrowser_RCC_SRCS ${libstreambrowser_RCCS}) # user interface @@ -43,12 +24,12 @@ SET(libstreambrowser_UIS streamwindow.ui ) -QT4_WRAP_UI(libstreambrowser_UIS_H ${libstreambrowser_UIS}) +QT5_WRAP_UI(libstreambrowser_UIS_H ${libstreambrowser_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(streambrowser MODULE ${libstreambrowser_SRCS} ${libstreambrowser_UIS_H} ${libstreambrowser_RCC_SRCS}) add_dependencies(streambrowser qmmpui) -target_link_libraries(streambrowser ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(streambrowser Qt5::Widgets Qt5::Network -lqmmpui -lqmmp) install(TARGETS streambrowser DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/streambrowser/streambrowserfactory.cpp b/src/plugins/General/streambrowser/streambrowserfactory.cpp index 182e3d414..8c4b53fbe 100644 --- a/src/plugins/General/streambrowser/streambrowserfactory.cpp +++ b/src/plugins/General/streambrowser/streambrowserfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2012-2016 by Ilya Kotov * + * Copyright (C) 2012 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -18,9 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ + #include -#include -#include #include "streambrowser.h" #include "streambrowserfactory.h" @@ -61,5 +60,3 @@ QTranslator *StreamBrowserFactory::createTranslator(QObject *parent) translator->load(QString(":/streambrowser_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(streambrowser, StreamBrowserFactory) diff --git a/src/plugins/General/streambrowser/streambrowserfactory.h b/src/plugins/General/streambrowser/streambrowserfactory.h index aac26dd09..fcaba574c 100644 --- a/src/plugins/General/streambrowser/streambrowserfactory.h +++ b/src/plugins/General/streambrowser/streambrowserfactory.h @@ -33,6 +33,7 @@ class StreamBrowserFactory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; diff --git a/src/plugins/General/streambrowser/streamwindow.cpp b/src/plugins/General/streambrowser/streamwindow.cpp index 7153abe48..c3132ed30 100644 --- a/src/plugins/General/streambrowser/streamwindow.cpp +++ b/src/plugins/General/streambrowser/streamwindow.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -59,7 +60,7 @@ StreamWindow::StreamWindow(QWidget *parent) : QWidget(parent) //icecast table ui.icecastTableView->setModel(m_iceCastFilterModel); ui.icecastTableView->verticalHeader()->setDefaultSectionSize(fontMetrics().height() + 3); - ui.icecastTableView->verticalHeader()->setResizeMode(QHeaderView::Fixed); + ui.icecastTableView->verticalHeader()->setSectionResizeMode(QHeaderView::Fixed); ui.icecastTableView->setEditTriggers(QAbstractItemView::NoEditTriggers); ui.icecastTableView->setContextMenuPolicy(Qt::CustomContextMenu); connect(ui.icecastTableView, SIGNAL(customContextMenuRequested(QPoint)), @@ -77,7 +78,7 @@ StreamWindow::StreamWindow(QWidget *parent) : QWidget(parent) //favorites table ui.favoritesTableView->setModel(m_favoritesFilterModel); ui.favoritesTableView->verticalHeader()->setDefaultSectionSize(fontMetrics().height() + 3); - ui.favoritesTableView->verticalHeader()->setResizeMode(QHeaderView::Fixed); + ui.favoritesTableView->verticalHeader()->setSectionResizeMode(QHeaderView::Fixed); ui.favoritesTableView->setEditTriggers(QAbstractItemView::NoEditTriggers); ui.favoritesTableView->setContextMenuPolicy(Qt::CustomContextMenu); connect(ui.favoritesTableView, SIGNAL(customContextMenuRequested(QPoint)), @@ -231,7 +232,7 @@ void StreamWindow::removeFromFavorites() { rows_to_remove.append(m_favoritesFilterModel->mapToSource(index).row()); } - qStableSort(rows_to_remove); + std::stable_sort(rows_to_remove.begin(), rows_to_remove.end()); int prev_row = -1; for(int i = rows_to_remove.count() - 1; i >= 0; i -= 1 ) { diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_bg.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_bg.ts index e5c53d93b..4cc86218e 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_bg.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_bg.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin - + About Stream Browser Plugin - + Qmmp Stream Browser Plugin - + This plugin allows one to add stream from IceCast stream directory - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -74,58 +74,58 @@ Update - - - - Name - - - Genre + Name - Bitrate + Genre + Bitrate + + + + + Format - + &Add to favorites - + &Add to playlist - + &Remove - + Done - + Error - + Receiving diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_cs.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_cs.ts index 7f0910d7f..e03567c12 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_cs.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_cs.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Modul prohlížeče proudů - + About Stream Browser Plugin O modulu prohlížeče proudů - + Qmmp Stream Browser Plugin Modul Qmmp na prohlížení proudů - + This plugin allows one to add stream from IceCast stream directory Tento modul umožňuje přidat proud z adresáře proudů IceCast - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Aktualizovat - - + + Name Název - - + + Genre Žánr - - + + Bitrate Datový tok - - + + Format Formát - + &Add to favorites Přidat k &oblíbeným - + &Add to playlist Přidat do &seznamu - + &Remove Odst&ranit - + Done Hotovo - + Error Chyba - + Receiving Příjímám diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_de.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_de.ts index 846526a62..d5d3f4019 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_de.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_de.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Stream-Browser-Modul - + About Stream Browser Plugin Über Stream-Browser-Modul - + Qmmp Stream Browser Plugin Qmmp Stream-Browser-Modul - + This plugin allows one to add stream from IceCast stream directory Dieses Modul ermöglicht das Hinzufügen von Streams aus dem IceCast-Streamverzeichnis - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Aktualisieren - - + + Name Name - - + + Genre Genre - - + + Bitrate Bitrate - - + + Format Format - + &Add to favorites Zu &den Favoriten hinzufügen - + &Add to playlist Zu&r Wiedergabeliste hinzufügen - + &Remove &Entfernen - + Done Fertig - + Error Fehler - + Receiving Daten werden empfangen diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_el.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_el.ts index 564286b6f..d4bb33bba 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_el.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_el.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Πρόσθετο περιηγητή ροών - + About Stream Browser Plugin Σχετικά με το πρόσθετο περιηγητή ροών - + Qmmp Stream Browser Plugin Qmmp πρόσθετο περιηγητή ροών - + This plugin allows one to add stream from IceCast stream directory Αυτό το πρόσθετο επιτρέπει την προσθήκη μιας ροής από τον κατάλογο ροών του IceCast - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> @@ -75,57 +75,57 @@ Ενημέρωση - - + + Name Όνομα - - + + Genre Είδος - - + + Bitrate Ρυθμός bit - - + + Format Μορφή - + &Add to favorites &Προσθήκη στα προτιμώμενα - + &Add to playlist Προσθήκη στη &λίστα αναπαραγωγής - + &Remove &Αφαίρεση - + Done Έγινε - + Error Σφάλμα - + Receiving Γίνεται λήψη diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_en.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_en.ts index 63aaea510..597d77e9a 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_en.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_en.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin - + About Stream Browser Plugin - + Qmmp Stream Browser Plugin - + This plugin allows one to add stream from IceCast stream directory - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -74,58 +74,58 @@ Update - - - - Name - - - Genre + Name - Bitrate + Genre + Bitrate + + + + + Format - + &Add to favorites - + &Add to playlist - + &Remove - + Done - + Error - + Receiving diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_es.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_es.ts index eb8b3d229..fe64c5521 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_es.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_es.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Módulo Navegador de Flujos - + About Stream Browser Plugin Acerca de el Módulo Navegador de Flujos de Qmmp - + Qmmp Stream Browser Plugin Módulo Navegador de Flujos de Qmmp - + This plugin allows one to add stream from IceCast stream directory Este módulo permite a uno añadir flujos desde directorio de flujos de IceCast - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Actualizar - - + + Name Nombre - - + + Genre Género - - + + Bitrate Tasa de bits - - + + Format Formato - + &Add to favorites &Añadir a favoritos - + &Add to playlist &Añadir a lista de reproducción - + &Remove Quita&r - + Done Hecho - + Error Error - + Receiving Recibiendo diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_fi.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_fi.ts index d0450093c..cbda1558d 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_fi.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_fi.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin - + About Stream Browser Plugin - + Qmmp Stream Browser Plugin - + This plugin allows one to add stream from IceCast stream directory - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Päivitä - - + + Name Nimi - - + + Genre Tyylilaji - - + + Bitrate Bittinopeus - - + + Format - + &Add to favorites &Lisää suosikkeihin - + &Add to playlist &Lisää soittolistaan - + &Remove Poi&sta - + Done Valmis - + Error Virhe - + Receiving Vastaanotetaan diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_fr.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_fr.ts index ae6ec52ca..5292fec47 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_fr.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_fr.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Greffon de navigation de flux - + About Stream Browser Plugin À propos du greffon de navigation de flux - + Qmmp Stream Browser Plugin Greffon de navigation de flux pour Qmmp - + This plugin allows one to add stream from IceCast stream directory Ce greffon permet d'ajouter un flux depuis un annuaire de flux IceCast - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Mettre à jour - - + + Name Nom - - + + Genre Genre - - + + Bitrate Débit binaire - - + + Format Format - + &Add to favorites &Ajouter aux favoris - + &Add to playlist Ajouter à la liste - + &Remove &Enlever - + Done Fait - + Error Erreur - + Receiving Réception diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_gl_ES.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_gl_ES.ts index 4146f450c..033d6732b 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_gl_ES.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_gl_ES.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Engadido de buscador de fluxos - + About Stream Browser Plugin Sobre o engadido buscador de fluxos - + Qmmp Stream Browser Plugin Engadido buscador de fluxos de Qmmp - + This plugin allows one to add stream from IceCast stream directory Este engadido permite engadir fluxos dende o directorio de fluxos de IceCast - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Actualizar - - + + Name Nome - - + + Genre Xénero - - + + Bitrate Taxa de bits - - + + Format Formato - + &Add to favorites &Engadir a favoritos - + &Add to playlist &Engadir á lista de reprodución - + &Remove &Eliminar - + Done Feito - + Error Erro - + Receiving Recibindo diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_he.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_he.ts index b10cc7858..61bff4b74 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_he.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_he.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin תוסף Stream Browser - + About Stream Browser Plugin אודות תוסף Stream Browser - + Qmmp Stream Browser Plugin תוסף Stream Browser של Qmmp - + This plugin allows one to add stream from IceCast stream directory תוסף זה מתיר לך להוסיף זרם מתוך ספריית זרם IceCast - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ עדכן - - + + Name שם - - + + Genre ז׳אנר - - + + Bitrate שיעור סיביות - - + + Format פורמט - + &Add to favorites הוסף אל &מועדפים - + &Add to playlist הוסף אל &רשימת נגינה - + &Remove הס&ר - + Done סיום - + Error שגיאה - + Receiving קבלה diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_hu.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_hu.ts index 8ab7dcc29..0d80b659f 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_hu.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_hu.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin - + About Stream Browser Plugin - + Qmmp Stream Browser Plugin - + This plugin allows one to add stream from IceCast stream directory - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -74,58 +74,58 @@ Update - - - - Name - - - Genre + Name - Bitrate + Genre + Bitrate + + + + + Format - + &Add to favorites - + &Add to playlist - + &Remove - + Done - + Error - + Receiving diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_id.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_id.ts index 25295cbf7..1b71aa323 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_id.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_id.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Plugin Browser Stream - + About Stream Browser Plugin Tentang Browser Stream - + Qmmp Stream Browser Plugin Plugin Browser Stream Qmmp - + This plugin allows one to add stream from IceCast stream directory Plugin ini membolehkan untuk menambahkan stream dari direktori stream IceCast - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Perbarui - - + + Name Nama - - + + Genre Genre - - + + Bitrate Bitrate - - + + Format Format - + &Add to favorites &Tambah ke favorit - + &Add to playlist &Tambah ke daftarmain - + &Remove &Buang - + Done Kelar - + Error Galat - + Receiving Menerima diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_it.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_it.ts index f0fa53004..61f7533f8 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_it.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_it.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin - + About Stream Browser Plugin - + Qmmp Stream Browser Plugin - + This plugin allows one to add stream from IceCast stream directory - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> @@ -74,58 +74,58 @@ Update - - - - Name - - - Genre + Name - Bitrate + Genre + Bitrate + + + + + Format - + &Add to favorites - + &Add to playlist - + &Remove - + Done - + Error - + Receiving Ricezione diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_ja.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_ja.ts index a543bcab9..5ef9726b1 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_ja.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_ja.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin ストリームブラウザープラグイン - + About Stream Browser Plugin ストリームブラウザープラグインについて - + Qmmp Stream Browser Plugin QMMP ストリームブラウザープラグイン - + This plugin allows one to add stream from IceCast stream directory このプラグインで IceCast ストリームディレクトリーからストリームの取り込みが可能になります - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> @@ -75,57 +75,57 @@ 更新 - - + + Name 局名 - - + + Genre ジャンル - - + + Bitrate ビットレート - - + + Format 形式 - + &Add to favorites お気にいりに追加(&A) - + &Add to playlist プレイリストに追加(&P) - + &Remove 削除(&R) - + Done 完了 - + Error 事故 - + Receiving 取得中 diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_kk.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_kk.ts index 7fd931b9f..1a3f72c0a 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_kk.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_kk.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin - + About Stream Browser Plugin - + Qmmp Stream Browser Plugin - + This plugin allows one to add stream from IceCast stream directory - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -74,58 +74,58 @@ Update - - - - Name - - - Genre + Name - Bitrate + Genre + Bitrate + + + + + Format - + &Add to favorites - + &Add to playlist - + &Remove - + Done - + Error - + Receiving diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_lt.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_lt.ts index 200a88d5d..eb1062f5e 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_lt.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_lt.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Srautų naršyklės įskiepis - + About Stream Browser Plugin Apie srautų naršyklės įskiepį - + Qmmp Stream Browser Plugin Qmmp srautų naršyklės įskiepis - + This plugin allows one to add stream from IceCast stream directory Šis įskiepis leidžia įdėti IceCast srautus į grojaraštį - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Atnaujinti - - + + Name Pavadinimas - - + + Genre Žanras - - + + Bitrate Kokybė - - + + Format Formatas - + &Add to favorites &Įkelti į mėgstamus - + &Add to playlist &Įkelti į grojaraštį - + &Remove &Pašalinti - + Done Atlikta - + Error Klaida - + Receiving Gaunu diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_nl.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_nl.ts index 4310ffd34..62ad67421 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_nl.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_nl.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Radio Navigator Module - + About Stream Browser Plugin Over de Radio Navigator Module - + Qmmp Stream Browser Plugin Radio Navigator Module voor Qmmp - + This plugin allows one to add stream from IceCast stream directory Deze module faciliteert in het toevoegen van radiostations uit de IceCast verzameling - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Bijwerken - - + + Name Naam - - + + Genre - - + + Bitrate Bitsnelheid - - + + Format Formaat - + &Add to favorites &Voeg toe aan favorieten - + &Add to playlist &Voeg toe aan afspeellijst - + &Remove &Verwijder - + Done Klaar - + Error Fout - + Receiving Bezig met ontvangen diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_pl_PL.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_pl_PL.ts index 28b580aec..8b7f74c82 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_pl_PL.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_pl_PL.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Wtyczka Przeglądarka strumieni - + About Stream Browser Plugin O wtyczce Przeglądarka strumieni - + Qmmp Stream Browser Plugin Wtyczka Qmmp Przeglądarka strumieni - + This plugin allows one to add stream from IceCast stream directory Ta wtyczka pozwala dodawać strumienie z katalogu strumieni IceCast - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Aktualizuj - - + + Name Nazwa - - + + Genre Gatunek - - + + Bitrate Przepływność - - + + Format Format - + &Add to favorites &Dodaj do ulubionych - + &Add to playlist &Dodaj do listy odtwarzania - + &Remove &Usuń - + Done Gotowe - + Error Błąd - + Receiving Pobieranie diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_pt.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_pt.ts index 29a2fe263..04a186d2b 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_pt.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_pt.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Suplemento Stream Browser - + About Stream Browser Plugin Sobre o suplemento Stream Browser - + Qmmp Stream Browser Plugin Suplemento Qmmp Stream Browser - + This plugin allows one to add stream from IceCast stream directory Este suplemento permite a adição de emissões do diretório Icecast - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Atualizar - - + + Name Nome - - + + Genre Género - - + + Bitrate Taxa de dados - - + + Format Formato - + &Add to favorites &Adicionar às favoritas - + &Add to playlist A&dicionar à lista de reprodução - + &Remove &Remover - + Done Terminado - + Error Erro - + Receiving Receção diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_pt_BR.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_pt_BR.ts index c7ff4bd4c..26b53599c 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_pt_BR.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_pt_BR.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Plugin Stream Browser - + About Stream Browser Plugin Sobre o plugin Stream Browser - + Qmmp Stream Browser Plugin Plugin Qmmp Stream Browser - + This plugin allows one to add stream from IceCast stream directory Este plugin permite a adição de transmissões do diretório Icecast - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Atualizar - - + + Name Nome - - + + Genre Gênero - - + + Bitrate Taxa de dados - - + + Format Formato - + &Add to favorites &Adicionar às favoritas - + &Add to playlist A&dicionar à lista de reprodução - + &Remove &Remover - + Done Terminado - + Error Erro - + Receiving Recebendo diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_ru.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_ru.ts index f2810c7d2..3ee46de9f 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_ru.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_ru.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Модуль обзора потоков - + About Stream Browser Plugin О модуле обзора потоков - + Qmmp Stream Browser Plugin Модуль обзора потоков для Qmmp - + This plugin allows one to add stream from IceCast stream directory Этот модуль предназначен для добавления потоков из директории IceCast - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Обновить - - + + Name Имя - - + + Genre Жанр - - + + Bitrate Битовая частота - - + + Format Формат - + &Add to favorites &Добавить в избранное - + &Add to playlist &Добавить в список воспроизведения - + &Remove &Удалить - + Done Готово - + Error Ошибка - + Receiving Получение diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_sk.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_sk.ts index 154eaa945..36cbdcbbd 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_sk.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_sk.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin - + About Stream Browser Plugin - + Qmmp Stream Browser Plugin - + This plugin allows one to add stream from IceCast stream directory - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -74,58 +74,58 @@ Update - - - - Name - - - Genre + Name - Bitrate + Genre + Bitrate + + + + + Format - + &Add to favorites - + &Add to playlist - + &Remove - + Done - + Error - + Receiving diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_sr_BA.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_sr_BA.ts index a92e27eac..924cb4ea8 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_sr_BA.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_sr_BA.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Прегледач токова - + About Stream Browser Plugin О прегледачу токова - + Qmmp Stream Browser Plugin Кумп прегледач токова - + This plugin allows one to add stream from IceCast stream directory Функција додавања токова са АјсКаст директоријума токова - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Ажурирај - - + + Name име - - + + Genre жанр - - + + Bitrate битски проток - - + + Format формат - + &Add to favorites Додај у &омиљене - + &Add to playlist Додај у &листу нумера - + &Remove &Уклони - + Done Завршено - + Error Грешка - + Receiving Примање diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_sr_RS.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_sr_RS.ts index 2ca3fee7f..cf25e7ee2 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_sr_RS.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_sr_RS.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Прегледач токова - + About Stream Browser Plugin О прегледачу токова - + Qmmp Stream Browser Plugin Кумп прегледач токова - + This plugin allows one to add stream from IceCast stream directory Функција додавања токова са АјсКаст директоријума токова - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Ажурирај - - + + Name име - - + + Genre жанр - - + + Bitrate битски проток - - + + Format формат - + &Add to favorites Додај у &омиљене - + &Add to playlist Додај у &листу нумера - + &Remove &Уклони - + Done Завршено - + Error Грешка - + Receiving Примање diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_tr.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_tr.ts index 4a403e653..1d27f5354 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_tr.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_tr.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin - + About Stream Browser Plugin - + Qmmp Stream Browser Plugin - + This plugin allows one to add stream from IceCast stream directory - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> @@ -74,58 +74,58 @@ Update - - - - Name - - - Genre + Name - Bitrate + Genre + Bitrate + + + + + Format - + &Add to favorites - + &Add to playlist - + &Remove - + Done - + Error - + Receiving Alınıyor diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_uk_UA.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_uk_UA.ts index c768227dc..77e36a667 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_uk_UA.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_uk_UA.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Модуль огляду потоків - + About Stream Browser Plugin Про модуль огляду потоків - + Qmmp Stream Browser Plugin Модуль огляду потоків для Qmmp - + This plugin allows one to add stream from IceCast stream directory Цей модуль дозволяє додавати потоки з каталогу IceCast - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Оновити - - + + Name Ім'я - - + + Genre Жанр - - + + Bitrate Бітрейт - - + + Format Формат - + &Add to favorites &Додати до вибраного - + &Add to playlist &Додати до списку - + &Remove &Видалити - + Done Готово - + Error Помилка - + Receiving Отримання diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_zh_CN.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_zh_CN.ts index b8509bbf7..93cde669d 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_zh_CN.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_zh_CN.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin 媒体流浏览器插件 - + About Stream Browser Plugin 关于媒体流浏览器插件 - + Qmmp Stream Browser Plugin Qmmp媒体流浏览器插件 - + This plugin allows one to add stream from IceCast stream directory 此插件允许从IceCast媒体流文件夹向Qmmp中添加媒体流 - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ 更新 - - + + Name 名称 - - + + Genre 风格 - - + + Bitrate 比特率 - - + + Format 格式 - + &Add to favorites 添加到最爱清单(&A) - + &Add to playlist 添加到播放列表中(&A) - + &Remove 移除(&R) - + Done 完成 - + Error 错误 - + Receiving 接收中 diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_zh_TW.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_zh_TW.ts index fa942d7c8..15ca48b85 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_zh_TW.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_zh_TW.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin - + About Stream Browser Plugin - + Qmmp Stream Browser Plugin - + This plugin allows one to add stream from IceCast stream directory - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ - - + + Name 名稱 - - + + Genre 流派 - - + + Bitrate 比特率 - - + + Format 格式 - + &Add to favorites - + &Add to playlist - + &Remove - + Done 完成 - + Error 錯誤 - + Receiving 接受 diff --git a/src/plugins/General/trackchange/CMakeLists.txt b/src/plugins/General/trackchange/CMakeLists.txt index bf52689a7..d47034de3 100644 --- a/src/plugins/General/trackchange/CMakeLists.txt +++ b/src/plugins/General/trackchange/CMakeLists.txt @@ -1,22 +1,7 @@ project(libtrackchange) -include(${QT_USE_FILE}) - -# 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}) -SET(QT_INCLUDES - ${QT_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ -) - # libqmmpui & libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -31,19 +16,19 @@ SET(libtrackchange_SRCS SET(libtrackchange_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libtrackchange_RCC_SRCS ${libtrackchange_RCCS}) +QT5_ADD_RESOURCES(libtrackchange_RCC_SRCS ${libtrackchange_RCCS}) # user interface SET(libtrackchange_UIS settingsdialog.ui ) -QT4_WRAP_UI(libtrackchange_UIS_H ${libtrackchange_UIS}) +QT5_WRAP_UI(libtrackchange_UIS_H ${libtrackchange_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(trackchange MODULE ${libtrackchange_SRCS} ${libtrackchange_UIS_H} ${libtrackchange_RCC_SRCS}) add_dependencies(trackchange qmmpui) -target_link_libraries(trackchange ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(trackchange Qt5::Widgets -lqmmpui -lqmmp) install(TARGETS trackchange DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/trackchange/trackchange.pro b/src/plugins/General/trackchange/trackchange.pro index 9dba6c5b9..f5b0264e1 100644 --- a/src/plugins/General/trackchange/trackchange.pro +++ b/src/plugins/General/trackchange/trackchange.pro @@ -1,22 +1,29 @@ include(../../plugins.pri) -TARGET = $$PLUGINS_PREFIX/General/trackchange +CONFIG += warn_on \ +plugin +TARGET =$$PLUGINS_PREFIX/General/trackchange +unix : QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libtrackchange.so + + +TEMPLATE = lib +unix : LIBS += -lqmmpui -lqmmp + +win32 : LIBS += -lqmmpui0 -lqmmp0 + +RESOURCES = translations/translations.qrc +unix { + target.path = $$LIB_DIR/qmmp/General + INSTALLS += target +} HEADERS += trackchangefactory.h \ trackchange.h \ settingsdialog.h +win32 : HEADERS += ../../../../src/qmmpui/general.h SOURCES += trackchangefactory.cpp \ trackchange.cpp \ settingsdialog.cpp FORMS += settingsdialog.ui - -RESOURCES = translations/translations.qrc - -LIBS += $$QMMPUI_LIB - -unix { - target.path = $$LIB_DIR/qmmp/General - INSTALLS += target -} diff --git a/src/plugins/General/trackchange/trackchangefactory.cpp b/src/plugins/General/trackchange/trackchangefactory.cpp index af8f125b7..dcbf6000b 100644 --- a/src/plugins/General/trackchange/trackchangefactory.cpp +++ b/src/plugins/General/trackchange/trackchangefactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2016 by Ilya Kotov * + * Copyright (C) 2013 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -18,9 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ + #include -#include -#include #include "trackchange.h" #include "settingsdialog.h" #include "trackchangefactory.h" @@ -61,5 +60,3 @@ QTranslator *TrackChangeFactory::createTranslator(QObject *parent) translator->load(QString(":/trackchange_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(trackchange, TrackChangeFactory) diff --git a/src/plugins/General/trackchange/trackchangefactory.h b/src/plugins/General/trackchange/trackchangefactory.h index d42371431..482d973b6 100644 --- a/src/plugins/General/trackchange/trackchangefactory.h +++ b/src/plugins/General/trackchange/trackchangefactory.h @@ -32,6 +32,7 @@ class TrackChangeFactory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_bg.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_bg.ts index 03ffd67ef..aa475db3d 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_bg.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_bg.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin - + About Track Change Plugin - + Qmmp Track Change Plugin - + This plugin executes external command when current track is changed - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_cs.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_cs.ts index 64ac247e8..8ae1de127 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_cs.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_cs.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin Modul změny stopy - + About Track Change Plugin O modulu změny stopy - + Qmmp Track Change Plugin Modul změny stopy Qmmp - + This plugin executes external command when current track is changed Tento modul při změně stopy spustí externí příkaz - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_de.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_de.ts index a878776f5..af2573465 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_de.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_de.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin Titeländerungsmodul - + About Track Change Plugin Über Titeländerungsmodul - + Qmmp Track Change Plugin Qmmp Titeländerungsmodul - + This plugin executes external command when current track is changed Dieses Modul führt einen externen Befehl aus, wenn der aktuelle Titel geändert wird - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_el.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_el.ts index 50cc6ce03..3d45bd384 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_el.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_el.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin Πρόσθετο αλλαγής κομματιού - + About Track Change Plugin Σχετικά με το πρόσθετο αλλαγής κομματιού - + Qmmp Track Change Plugin Qmmp πρόσθετο αλλαγής κομματιού - + This plugin executes external command when current track is changed Αυτό το πρόσθετο εκτελεί μια εξωτερική εντολή κατά την αλλαγή του τρέχοντος κομματιού - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_en.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_en.ts index 726b86ba6..d47c395b4 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_en.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_en.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin - + About Track Change Plugin - + Qmmp Track Change Plugin - + This plugin executes external command when current track is changed - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_es.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_es.ts index cb8e1c517..360cbe778 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_es.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_es.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin Módulo de Cambio de Pista - + About Track Change Plugin Acerca del Módulo de Cambio de Pista - + Qmmp Track Change Plugin Módulo de Cambio de Pista de Qmmp - + This plugin executes external command when current track is changed Este módulo ejecuta programas externos de consola cuando la pista actual cambia - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_fi.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_fi.ts index 209e65c35..3a86905a8 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_fi.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_fi.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin - + About Track Change Plugin - + Qmmp Track Change Plugin - + This plugin executes external command when current track is changed - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_fr.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_fr.ts index 64a1d9171..eb9bae4b4 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_fr.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_fr.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin Greffon de suivi de changements - + About Track Change Plugin À propos du greffon de suivi de changements - + Qmmp Track Change Plugin Greffon de suivi de changements pour Qmmp - + This plugin executes external command when current track is changed Ce greffon exécute des commandes externes quand le morceau courant change - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_gl_ES.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_gl_ES.ts index c23941169..0400b2750 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_gl_ES.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_gl_ES.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin Engadido de Cambio de Pista - + About Track Change Plugin Sobre o engadido Cambio de Pista - + Qmmp Track Change Plugin Engadido Cambio de Pista de Qmmp - + This plugin executes external command when current track is changed Este engadido executa comandos externos cando se cambia de pista - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_he.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_he.ts index 3314fbe4f..d7d491eb2 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_he.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_he.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin תוסף שינוי רצועה - + About Track Change Plugin אודות תוסף שינוי רצועה - + Qmmp Track Change Plugin תוסף שינוי רצועה של Qmmp - + This plugin executes external command when current track is changed תוסף זה מבצע פקודה חיצונית כאשר רצועה נוכחית משתנה - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_hu.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_hu.ts index a3fef3dac..08a0e2d42 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_hu.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_hu.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin - + About Track Change Plugin - + Qmmp Track Change Plugin - + This plugin executes external command when current track is changed - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_id.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_id.ts index 7b3b3bed9..06910706f 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_id.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_id.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin Plugin Perubahan Track - + About Track Change Plugin Tentang Plugin Perubahan Track - + Qmmp Track Change Plugin Plugin Perubahan Track Qmmp - + This plugin executes external command when current track is changed Plugin ini mengeksekusi perintah eksternal ketika track saat ini telah diubah - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_it.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_it.ts index e2f50ec20..e423eaf7f 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_it.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_it.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin - + About Track Change Plugin - + Qmmp Track Change Plugin - + This plugin executes external command when current track is changed - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_ja.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_ja.ts index 0e4d5cdf3..bab952c29 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_ja.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_ja.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin トラック変化プラグイン - + About Track Change Plugin トラック変化プラグインについて - + Qmmp Track Change Plugin QMMP トラック変化プラグイン - + This plugin executes external command when current track is changed このプラグインはトラック (演目) が切り換わる際に外部コマンドを実行します。 - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_kk.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_kk.ts index 1a86299e0..771a13910 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_kk.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_kk.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin - + About Track Change Plugin - + Qmmp Track Change Plugin - + This plugin executes external command when current track is changed - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_lt.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_lt.ts index 748f8614d..22f763aa9 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_lt.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_lt.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin Takelio Pasikeitimo Įskiepis - + About Track Change Plugin Apie Takelio Pasikeitimo Įskiepį - + Qmmp Track Change Plugin Qmmp Takelio Pasikeitimo Įskiepis - + This plugin executes external command when current track is changed Šis įskiepis įvykdo išorinę komandą kai pasikeičia dabartinis takelis - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė:Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_nl.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_nl.ts index 7f643440d..94c0cb3f0 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_nl.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_nl.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin - + About Track Change Plugin - + Qmmp Track Change Plugin - + This plugin executes external command when current track is changed - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_pl_PL.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_pl_PL.ts index 0c92824eb..7f540a135 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_pl_PL.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_pl_PL.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin Wtyczka Zmiany Utworu - + About Track Change Plugin O wtyczce Zmiany Utworu - + Qmmp Track Change Plugin Wtyczka Zmiany Utworu dla Qmmp - + This plugin executes external command when current track is changed Uruchamia zewnętrzne polecenia przy zmianie utworu - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_pt.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_pt.ts index 2193ad270..fe91b1c95 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_pt.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_pt.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin Suplemento Track Change - + About Track Change Plugin Sobre o suplemento Track Change - + Qmmp Track Change Plugin Suplemento Qmmp Track Change - + This plugin executes external command when current track is changed Este suplemento executa comandos externos se a faixa em reprodução for alterada - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_pt_BR.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_pt_BR.ts index 12419d42b..115707c42 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_pt_BR.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_pt_BR.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin Plugin Track Change - + About Track Change Plugin Sobre o plugin Track Change - + Qmmp Track Change Plugin Plugin Qmmp Track Change - + This plugin executes external command when current track is changed Este plugin executa comandos externos se a faixa em reprodução for alterada - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_ru.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_ru.ts index 4e7411de2..f81fde9da 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_ru.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_ru.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin Модуль смены трека - + About Track Change Plugin О модуле смены трека - + Qmmp Track Change Plugin Модуль смены трека для Qmmp - + This plugin executes external command when current track is changed Данный модуль предназначен для запуска внешней команды при смене текущего трека - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_sk.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_sk.ts index ae72d4185..107ab15a4 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_sk.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_sk.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin - + About Track Change Plugin - + Qmmp Track Change Plugin - + This plugin executes external command when current track is changed - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_sr_BA.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_sr_BA.ts index 9f0948fae..629d7260c 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_sr_BA.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_sr_BA.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin Измјена нумере - + About Track Change Plugin О прикључку измјене нумере - + Qmmp Track Change Plugin Кумп прикључак измјене нумере - + This plugin executes external command when current track is changed Извршава спољашњу наредбу при измјени нумере - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_sr_RS.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_sr_RS.ts index 6c0341e2e..4a1ecb1b5 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_sr_RS.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_sr_RS.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin Измена нумере - + About Track Change Plugin О прикључку измене нумере - + Qmmp Track Change Plugin Кумп прикључак измене нумере - + This plugin executes external command when current track is changed Извршава спољашњу наредбу при измени нумере - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_tr.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_tr.ts index e4e65e754..40c45febb 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_tr.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_tr.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin - + About Track Change Plugin - + Qmmp Track Change Plugin - + This plugin executes external command when current track is changed - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_uk_UA.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_uk_UA.ts index 6a8864031..b094a22bf 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_uk_UA.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_uk_UA.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin Модуль зміни треку - + About Track Change Plugin Про модуль зміни треку - + Qmmp Track Change Plugin Модуль зміни треку для Qmmp - + This plugin executes external command when current track is changed Цей модуль призначено для запуску зовнішньої команди при зміні поточного треку - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_zh_CN.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_zh_CN.ts index 34851a9f0..8732eb16e 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_zh_CN.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_zh_CN.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin 曲目变更插件 - + About Track Change Plugin 关于曲目变更插件 - + Qmmp Track Change Plugin Qmmp曲目变更插件 - + This plugin executes external command when current track is changed 该插件允许在当前曲目发生变化时执行外部命令 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_zh_TW.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_zh_TW.ts index c6dec1c38..3f0b9e8ac 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_zh_TW.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_zh_TW.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin - + About Track Change Plugin - + Qmmp Track Change Plugin - + This plugin executes external command when current track is changed - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks/CMakeLists.txt b/src/plugins/General/udisks/CMakeLists.txt deleted file mode 100644 index d1538c184..000000000 --- a/src/plugins/General/udisks/CMakeLists.txt +++ /dev/null @@ -1,51 +0,0 @@ -project(libudisks) - - -SET (QT_USE_QTDBUS TRUE) - -INCLUDE(FindQt4) - -include(${QT_USE_FILE}) - -# 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(libudisks_SRCS - udisksfactory.cpp - udisksmanager.cpp - udisksplugin.cpp - udisksdevice.cpp - settingsdialog.cpp -) - -SET(libudisks_RCCS translations/translations.qrc) - -QT4_ADD_RESOURCES(libudisks_RCC_SRCS ${libudisks_RCCS}) - -# user interface - -SET(libudisks_UIS - settingsdialog.ui -) - -QT4_WRAP_UI(libudisks_UIS_H ${libudisks_UIS}) -# Don't forget to include output directory, otherwise -# the UI file won't be wrapped! -include_directories(${CMAKE_CURRENT_BINARY_DIR}) - -ADD_LIBRARY(udisks MODULE ${libudisks_SRCS} ${libudisks_UIS_H} ${libudisks_RCC_SRCS}) -add_dependencies(udisks qmmpui) -target_link_libraries(udisks ${QT_LIBRARIES} qmmpui libqmmp) -install(TARGETS udisks DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/udisks/settingsdialog.cpp b/src/plugins/General/udisks/settingsdialog.cpp deleted file mode 100644 index 1d9b792a8..000000000 --- a/src/plugins/General/udisks/settingsdialog.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2010 by Ilya Kotov * - * forkotov02@ya.ru * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ -#include -#include - -#include - -#include "settingsdialog.h" - -SettingsDialog::SettingsDialog(QWidget *parent) - : QDialog(parent) -{ - ui.setupUi(this); - QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - settings.beginGroup("UDisks"); - ui.cdGroupBox->setChecked(settings.value("cda", true).toBool()); - ui.addTracksCheckBox->setChecked(settings.value("add_tracks", false).toBool()); - ui.removeTracksCheckBox->setChecked(settings.value("remove_tracks", false).toBool()); - ui.removableGroupBox->setChecked(settings.value("removable", true).toBool()); - ui.addFilesCheckBox->setChecked(settings.value("add_files", false).toBool()); - ui.removeFilesCheckBox->setChecked(settings.value("remove_files", false).toBool()); - settings.endGroup(); -} - - -SettingsDialog::~SettingsDialog() -{} - -void SettingsDialog::accept() -{ - QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - settings.beginGroup("UDisks"); - settings.setValue("cda", ui.cdGroupBox->isChecked()); - settings.setValue("add_tracks", ui.addTracksCheckBox->isChecked()); - settings.setValue("remove_tracks", ui.removeTracksCheckBox->isChecked()); - settings.setValue("removable", ui.removableGroupBox->isChecked()); - settings.setValue("add_files", ui.addFilesCheckBox->isChecked()); - settings.setValue("remove_files", ui.removeFilesCheckBox->isChecked()); - settings.endGroup(); - QDialog::accept(); -} diff --git a/src/plugins/General/udisks/settingsdialog.h b/src/plugins/General/udisks/settingsdialog.h deleted file mode 100644 index 5e7aa64c2..000000000 --- a/src/plugins/General/udisks/settingsdialog.h +++ /dev/null @@ -1,46 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2010 by Ilya Kotov * - * forkotov02@ya.ru * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ -#ifndef SETTINGSDIALOG_H -#define SETTINGSDIALOG_H - -#include - -#include "ui_settingsdialog.h" - -/** - @author Ilya Kotov -*/ -class SettingsDialog : public QDialog -{ -Q_OBJECT -public: - SettingsDialog(QWidget *parent = 0); - - ~SettingsDialog(); - - -public slots: - virtual void accept(); - -private: - Ui::SettingsDialog ui; -}; - -#endif diff --git a/src/plugins/General/udisks/settingsdialog.ui b/src/plugins/General/udisks/settingsdialog.ui deleted file mode 100644 index 5b039a88c..000000000 --- a/src/plugins/General/udisks/settingsdialog.ui +++ /dev/null @@ -1,122 +0,0 @@ - - - SettingsDialog - - - - 0 - 0 - 348 - 247 - - - - UDisks Plugin Settings - - - - 6 - - - 6 - - - 6 - - - - - CD Audio Detection - - - true - - - - - - Add tracks to playlist automatically - - - - - - - Remove tracks from playlist automatically - - - - - - - - - - Removable Device Detection - - - true - - - - - - Add files to playlist automatically - - - - - - - Remove files from playlist automatically - - - - - - - - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - - buttonBox - accepted() - SettingsDialog - accept() - - - 199 - 221 - - - 22 - 242 - - - - - buttonBox - rejected() - SettingsDialog - reject() - - - 247 - 225 - - - 273 - 229 - - - - - diff --git a/src/plugins/General/udisks/translations/translations.qrc b/src/plugins/General/udisks/translations/translations.qrc deleted file mode 100644 index 46e648a9a..000000000 --- a/src/plugins/General/udisks/translations/translations.qrc +++ /dev/null @@ -1,32 +0,0 @@ - - - - udisks_plugin_ru.qm - udisks_plugin_uk_UA.qm - udisks_plugin_zh_CN.qm - udisks_plugin_zh_TW.qm - udisks_plugin_tr.qm - udisks_plugin_cs.qm - udisks_plugin_pt_BR.qm - udisks_plugin_pt.qm - udisks_plugin_de.qm - udisks_plugin_pl_PL.qm - udisks_plugin_fr.qm - udisks_plugin_it.qm - udisks_plugin_kk.qm - udisks_plugin_lt.qm - udisks_plugin_hu.qm - udisks_plugin_nl.qm - udisks_plugin_ja.qm - udisks_plugin_sk.qm - udisks_plugin_es.qm - udisks_plugin_he.qm - udisks_plugin_gl_ES.qm - udisks_plugin_sr_BA.qm - udisks_plugin_sr_RS.qm - udisks_plugin_bg.qm - udisks_plugin_el.qm - udisks_plugin_id.qm - udisks_plugin_fi.qm - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_bg.ts b/src/plugins/General/udisks/translations/udisks_plugin_bg.ts deleted file mode 100644 index 8b2eea312..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_bg.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - - - - - CD Audio Detection - - - - - Add tracks to playlist automatically - - - - - Remove tracks from playlist automatically - - - - - Removable Device Detection - - - - - Add files to playlist automatically - - - - - Remove files from playlist automatically - - - - - UDisksFactory - - - UDisks Plugin - - - - - About UDisks Plugin - - - - - Qmmp UDisks Plugin - - - - - This plugin provides removable devices detection using UDisks - - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - UDisksPlugin - - - Add CD "%1" - - - - - Add Volume "%1" - - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_cs.ts b/src/plugins/General/udisks/translations/udisks_plugin_cs.ts deleted file mode 100644 index 1f96a2cb4..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_cs.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - Nastavení modulu UDisks - - - - CD Audio Detection - Detekce zvukových CD - - - - Add tracks to playlist automatically - Automaticky přidat stopy do seznamu skladeb - - - - Remove tracks from playlist automatically - Automaticky odebrat stopy ze seznamu skladeb - - - - Removable Device Detection - Detekce odpojitelných zařízení - - - - Add files to playlist automatically - Automaticky přidat soubory do seznamu skladeb - - - - Remove files from playlist automatically - Automaticky odebrat stopy ze seznamu skladeb - - - - UDisksFactory - - - UDisks Plugin - Modul UDisks - - - - About UDisks Plugin - O modulu UDisks - - - - Qmmp UDisks Plugin - Modul Qmmp UDisks - - - - This plugin provides removable devices detection using UDisks - Tento modul poskytuje detekci výměnných médií pomocí UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - UDisksPlugin - - - Add CD "%1" - Přidat CD „%1“ - - - - Add Volume "%1" - Přidat svazek „%1“ - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_de.ts b/src/plugins/General/udisks/translations/udisks_plugin_de.ts deleted file mode 100644 index eb44b7a38..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_de.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - Einstellungen UDisks-Modul - - - - CD Audio Detection - CD-Audio-Erkennung - - - - Add tracks to playlist automatically - Titel automatisch zur Wiedergabeliste hinzufügen - - - - Remove tracks from playlist automatically - Titel automatisch von der Wiedergabeliste entfernen - - - - Removable Device Detection - Wechsellaufwerkerkennung - - - - Add files to playlist automatically - Dateien automatisch zur Wiedergabeliste hinzufügen - - - - Remove files from playlist automatically - Dateien automatisch von der Wiedergabeliste entfernen - - - - UDisksFactory - - - UDisks Plugin - UDisks-Modul - - - - About UDisks Plugin - Über UDisks-Modul - - - - Qmmp UDisks Plugin - Qmmp UDisks-Modul - - - - This plugin provides removable devices detection using UDisks - Dieses Modul bietet Wechsellaufwerkerkennung unter Verwendung von UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Geschrieben von: Ilya Kotov <forkotov02@ya.ru> - - - - UDisksPlugin - - - Add CD "%1" - CD „%1“ hinzufügen - - - - Add Volume "%1" - Datenträger „%1“ hinzufügen - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_el.ts b/src/plugins/General/udisks/translations/udisks_plugin_el.ts deleted file mode 100644 index 1572ba5b2..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_el.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - Ρυθμίσεις πρόσθετου UDisks - - - - CD Audio Detection - Ανίχνευση CD ήχου - - - - Add tracks to playlist automatically - Προσθήκη των κομματιών αυτόματα στη λίστα αναπαραγωγής - - - - Remove tracks from playlist automatically - Αφαίρεση των κομματιών αυτόματα από τη λίστα αναπαραγωγής - - - - Removable Device Detection - Ανίχνευση αφαιρούμενης συσκευής - - - - Add files to playlist automatically - Προσθήκη αρχείων αυτόματα στη λίστα αναπαραγωγής - - - - Remove files from playlist automatically - Αφαίρεση των αρχείων από τη λίστα αναπαραγωγής αυτόματα - - - - UDisksFactory - - - UDisks Plugin - Πρόσθετο UDisks - - - - About UDisks Plugin - Σχετικά με το πρόσθετο UDisks - - - - Qmmp UDisks Plugin - Qmmp πρόσθετο UDisks - - - - This plugin provides removable devices detection using UDisks - Αυτό το πρόσθετο παρέχει την ανίχνευση αφαιρούμενων συσκευών μέσω UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> - - - - UDisksPlugin - - - Add CD "%1" - Προσθήκη CD «%1» - - - - Add Volume "%1" - Προσθήκη Έντασης «%1» - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_en.ts b/src/plugins/General/udisks/translations/udisks_plugin_en.ts deleted file mode 100644 index 49a76540e..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_en.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - - - - - CD Audio Detection - - - - - Add tracks to playlist automatically - - - - - Remove tracks from playlist automatically - - - - - Removable Device Detection - - - - - Add files to playlist automatically - - - - - Remove files from playlist automatically - - - - - UDisksFactory - - - UDisks Plugin - - - - - About UDisks Plugin - - - - - Qmmp UDisks Plugin - - - - - This plugin provides removable devices detection using UDisks - - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - UDisksPlugin - - - Add CD "%1" - - - - - Add Volume "%1" - - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_es.ts b/src/plugins/General/udisks/translations/udisks_plugin_es.ts deleted file mode 100644 index f77c942b4..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_es.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - Configuración del módulo UDisks - - - - CD Audio Detection - Detección de audio CD - - - - Add tracks to playlist automatically - Añadir pistas a la lista de reproducción automáticamente - - - - Remove tracks from playlist automatically - Eliminar pistas de la lista de reproducción automáticamente - - - - Removable Device Detection - Detectar dispositivos extraibles - - - - Add files to playlist automatically - Añadir archivos a la lista de reproducción automáticamente - - - - Remove files from playlist automatically - Eliminar archivos de la lista de reproducción automáticamente - - - - UDisksFactory - - - UDisks Plugin - Módulo UDisks - - - - About UDisks Plugin - Acerca del módulo UDisks - - - - Qmmp UDisks Plugin - Módulo UDisks para Qmmp - - - - This plugin provides removable devices detection using UDisks - Este módulo detecta los dispositivos extraibles utilizando UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Escrito por: Ilya Kotov <forkotov02@ya.ru> - - - - UDisksPlugin - - - Add CD "%1" - Añadir CD "%1" - - - - Add Volume "%1" - Añadir volumen "%1" - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_fi.ts b/src/plugins/General/udisks/translations/udisks_plugin_fi.ts deleted file mode 100644 index 2ccace62b..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_fi.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - UDisks-liitännäisen asetukset - - - - CD Audio Detection - - - - - Add tracks to playlist automatically - - - - - Remove tracks from playlist automatically - - - - - Removable Device Detection - - - - - Add files to playlist automatically - - - - - Remove files from playlist automatically - - - - - UDisksFactory - - - UDisks Plugin - - - - - About UDisks Plugin - - - - - Qmmp UDisks Plugin - - - - - This plugin provides removable devices detection using UDisks - - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Toteuttanut: Ilya Kotov <forkotov02@ya.ru> - - - - UDisksPlugin - - - Add CD "%1" - Lisää CD "%1" - - - - Add Volume "%1" - - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_fr.ts b/src/plugins/General/udisks/translations/udisks_plugin_fr.ts deleted file mode 100644 index ac958df24..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_fr.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - Configuration du greffon UDisks - - - - CD Audio Detection - Détection de CD audio - - - - Add tracks to playlist automatically - Ajouter automatiquement les pistes à la liste - - - - Remove tracks from playlist automatically - Enlever automatiquement les pistes de la liste - - - - Removable Device Detection - Détection de périphérique amovible - - - - Add files to playlist automatically - Ajouter automatiquement les fichiers à la liste - - - - Remove files from playlist automatically - Enlever automatiquement les fichiers à la liste - - - - UDisksFactory - - - UDisks Plugin - Greffon UDisks - - - - About UDisks Plugin - À propos du greffon UDisks - - - - Qmmp UDisks Plugin - Greffon UDisks pour Qmmp - - - - This plugin provides removable devices detection using UDisks - Ce greffon fournit une détection de périphériques amovibles en utilisant UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Écrit par : Ilya Kotov <forkotov02@ya.ru> - - - - UDisksPlugin - - - Add CD "%1" - Ajouter CD « %1 » - - - - Add Volume "%1" - Ajouter volume « %1 » - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_gl_ES.ts b/src/plugins/General/udisks/translations/udisks_plugin_gl_ES.ts deleted file mode 100644 index 1803d53cf..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_gl_ES.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - Preferencias do engadido UDisks - - - - CD Audio Detection - Detección de CD de audio - - - - Add tracks to playlist automatically - Engadir pistas á lista de reprodución automaticamente - - - - Remove tracks from playlist automatically - Eliminar pistas da lista de reprodución automaticamente - - - - Removable Device Detection - Detección de dispositivos extraíbles - - - - Add files to playlist automatically - Engadir ficheiros á lista de reprodución automaticamente - - - - Remove files from playlist automatically - Eliminar ficheiros da lista de reprodución automaticamente - - - - UDisksFactory - - - UDisks Plugin - Engadido UDisks - - - - About UDisks Plugin - Sobre o engadido UDisks - - - - Qmmp UDisks Plugin - Engadido UDisks de Qmmp - - - - This plugin provides removable devices detection using UDisks - Este engadido provén detección de dispositivos extraíbles usando UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - UDisksPlugin - - - Add CD "%1" - Engadir CD "%1" - - - - Add Volume "%1" - Engadir volume "%1" - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_he.ts b/src/plugins/General/udisks/translations/udisks_plugin_he.ts deleted file mode 100644 index b5b597e45..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_he.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - הגדרות תוסף UDisks - - - - CD Audio Detection - איתור אוטומטי של תקליטור שמע - - - - Add tracks to playlist automatically - הוסף רצועות אוטומטית לתוך רשימת נגינה - - - - Remove tracks from playlist automatically - הסר רצועות אוטומטית מתוך רשימת נגינה - - - - Removable Device Detection - איתור התקנים נשלפים - - - - Add files to playlist automatically - הוסף קבצים אוטומטית לתוך רשימת נגינה - - - - Remove files from playlist automatically - הסר קבצים אוטומטית מתוך רשימת נגינה - - - - UDisksFactory - - - UDisks Plugin - תוסף UDisks - - - - About UDisks Plugin - אודות תוסף UDisks - - - - Qmmp UDisks Plugin - תוסף UDisks של Qmmp - - - - This plugin provides removable devices detection using UDisks - תוסף זה מספק איתור של התקנים נשלפים באמצעות UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - UDisksPlugin - - - Add CD "%1" - הוסף תקליטור "%1" - - - - Add Volume "%1" - הוסף כרך "%1" - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_hu.ts b/src/plugins/General/udisks/translations/udisks_plugin_hu.ts deleted file mode 100644 index 58d107042..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_hu.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - - - - - CD Audio Detection - - - - - Add tracks to playlist automatically - - - - - Remove tracks from playlist automatically - - - - - Removable Device Detection - - - - - Add files to playlist automatically - - - - - Remove files from playlist automatically - - - - - UDisksFactory - - - UDisks Plugin - - - - - About UDisks Plugin - - - - - Qmmp UDisks Plugin - - - - - This plugin provides removable devices detection using UDisks - - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - UDisksPlugin - - - Add CD "%1" - - - - - Add Volume "%1" - - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_id.ts b/src/plugins/General/udisks/translations/udisks_plugin_id.ts deleted file mode 100644 index 097294b2f..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_id.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - Setelan Plugin UDisks - - - - CD Audio Detection - Deteksi Audio CD - - - - Add tracks to playlist automatically - Tambah track ke daftarmain secara otomatis - - - - Remove tracks from playlist automatically - Buang track dari daftarmain secara otomatis - - - - Removable Device Detection - Deteksi Perangkat Dapat-dilepas - - - - Add files to playlist automatically - Tambah file ke daftarmain secara otomatis - - - - Remove files from playlist automatically - Buang file dari daftarmain secara otomatis - - - - UDisksFactory - - - UDisks Plugin - Plugin UDisks - - - - About UDisks Plugin - Tentang Plugin UDisks - - - - Qmmp UDisks Plugin - Plugin UDisks Qmmp - - - - This plugin provides removable devices detection using UDisks - Plugin ini menyediakan deteksi perangkat dapat-dilepas menggunakan UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - UDisksPlugin - - - Add CD "%1" - Tambah CD "%1" - - - - Add Volume "%1" - Tambah Volume %1" - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_it.ts b/src/plugins/General/udisks/translations/udisks_plugin_it.ts deleted file mode 100644 index 529fa0a93..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_it.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - - - - - CD Audio Detection - Rilevamento CD Audio - - - - Add tracks to playlist automatically - Aggiungi automaticamente i titoli alla lista dei brani - - - - Remove tracks from playlist automatically - Rimuovi automaticamente i titoli dalla lista dei brani - - - - Removable Device Detection - Rilevamento dispositivi rimovibili - - - - Add files to playlist automatically - Aggiungi brani automaticamente alla lista - - - - Remove files from playlist automatically - Rimuovi automaticamente i brani dalla lista - - - - UDisksFactory - - - UDisks Plugin - - - - - About UDisks Plugin - - - - - Qmmp UDisks Plugin - - - - - This plugin provides removable devices detection using UDisks - - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Autore: Ilya Kotov <forkotov02@ya.ru> - - - - UDisksPlugin - - - Add CD "%1" - Aggiungi CD "%1" - - - - Add Volume "%1" - Aggiungi libreria "%1" - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_ja.ts b/src/plugins/General/udisks/translations/udisks_plugin_ja.ts deleted file mode 100644 index 7f39f6d7c..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_ja.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - UDisks プラグイン設定 - - - - CD Audio Detection - 音楽 CD 検知 - - - - Add tracks to playlist automatically - プレイリストにトラックを自動追加 - - - - Remove tracks from playlist automatically - プレイリストからトラックを自動除去 - - - - Removable Device Detection - 着脱可能なデバイスの検知 - - - - Add files to playlist automatically - プレイリストにファイルを自動追加 - - - - Remove files from playlist automatically - プレイリストからファイルを自動除去 - - - - UDisksFactory - - - UDisks Plugin - UDisks プラグイン - - - - About UDisks Plugin - UDisks プラグインについて - - - - Qmmp UDisks Plugin - QMMP UDisks プラグイン - - - - This plugin provides removable devices detection using UDisks - このプラグインは着脱可能なデバイスの検知を UDisks により行ないます - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> - - - - UDisksPlugin - - - Add CD "%1" - CD "%1" を追加 - - - - Add Volume "%1" - 量目 "%1" を追加 - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_kk.ts b/src/plugins/General/udisks/translations/udisks_plugin_kk.ts deleted file mode 100644 index 406d1a997..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_kk.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - - - - - CD Audio Detection - - - - - Add tracks to playlist automatically - - - - - Remove tracks from playlist automatically - - - - - Removable Device Detection - - - - - Add files to playlist automatically - - - - - Remove files from playlist automatically - - - - - UDisksFactory - - - UDisks Plugin - - - - - About UDisks Plugin - - - - - Qmmp UDisks Plugin - - - - - This plugin provides removable devices detection using UDisks - - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - UDisksPlugin - - - Add CD "%1" - - - - - Add Volume "%1" - - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_lt.ts b/src/plugins/General/udisks/translations/udisks_plugin_lt.ts deleted file mode 100644 index 76611afeb..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_lt.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - Udisks įskiepio nustatymai - - - - CD Audio Detection - Audio CD aptikimas - - - - Add tracks to playlist automatically - Įdėti takelius į grojaraštį automatiškai - - - - Remove tracks from playlist automatically - Pašalinti takelius iš grojaraščio automatiškai - - - - Removable Device Detection - Išorinių įrenginių aptikimas - - - - Add files to playlist automatically - Įdėti takelius į grojaratį automatiškai - - - - Remove files from playlist automatically - Pašalinti takelius iš grojaraščio automatiškai - - - - UDisksFactory - - - UDisks Plugin - UDisks įskiepis - - - - About UDisks Plugin - Apie UDisks įskiepį - - - - Qmmp UDisks Plugin - Qmmp UDisks įskiepis - - - - This plugin provides removable devices detection using UDisks - Šis įskiepis suranda išorinius įrenginius - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Sukūrė: Ilya Kotov - - - - UDisksPlugin - - - Add CD "%1" - Pridėti CD "%1" - - - - Add Volume "%1" - Pridėti tomą "%1" - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_nl.ts b/src/plugins/General/udisks/translations/udisks_plugin_nl.ts deleted file mode 100644 index 98f393eec..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_nl.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - UDisks Module Instellingen - - - - CD Audio Detection - CD Audio Detectie - - - - Add tracks to playlist automatically - Voeg nummers automatisch toe aan speellijst - - - - Remove tracks from playlist automatically - Verwijder nummers automatisch uit afspeellijst - - - - Removable Device Detection - Detectie van Verwisselbare Stations - - - - Add files to playlist automatically - Voeg bestanden automatisch toe aan afspeellijst - - - - Remove files from playlist automatically - Verwijder bestanden automatisch uit afspeellijst - - - - UDisksFactory - - - UDisks Plugin - UDisks Module - - - - About UDisks Plugin - Over de Udisks Module - - - - Qmmp UDisks Plugin - UDisks Module voor Qmmp - - - - This plugin provides removable devices detection using UDisks - Deze module faciliteert de automatische detectie van verwisselbare media gebruikmakend van UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Auteur: Ilya Kotov <forkotov02@ya.ru> - - - - UDisksPlugin - - - Add CD "%1" - Voeg CD "%1" toe - - - - Add Volume "%1" - Voeg Station "%1" toe - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_pl_PL.ts b/src/plugins/General/udisks/translations/udisks_plugin_pl_PL.ts deleted file mode 100644 index c0488228c..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_pl_PL.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - Ustawienia wtyczki UDisks - - - - CD Audio Detection - Detekcja płyt CD Audio - - - - Add tracks to playlist automatically - Automatycznie dodaj utwory do listy - - - - Remove tracks from playlist automatically - Automatycznie usuń utwory z listy - - - - Removable Device Detection - Detekcja urządzeń przenośnych - - - - Add files to playlist automatically - Automatycznie dodaj pliki do listy - - - - Remove files from playlist automatically - Automatycznie usuń pliki z listy - - - - UDisksFactory - - - UDisks Plugin - Wtyczka UDisks - - - - About UDisks Plugin - O wtyczce UDisks - - - - Qmmp UDisks Plugin - Wtyczka UDisks dla Qmmp - - - - This plugin provides removable devices detection using UDisks - Ta wtyczka umożliwia wykrywanie urządzeń przenośnych przy użyciu UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - UDisksPlugin - - - Add CD "%1" - Dodaj CD "%1" - - - - Add Volume "%1" - Dodaj urządzenie "%1" - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_pt.ts b/src/plugins/General/udisks/translations/udisks_plugin_pt.ts deleted file mode 100644 index fc4569f79..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_pt.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - Definições - - - - CD Audio Detection - Deteção de CD áudio - - - - Add tracks to playlist automatically - Adicionar faixas à lista de reprodução - - - - Remove tracks from playlist automatically - Remover faixas da lista de reprodução - - - - Removable Device Detection - Deteção de discos amovíveis - - - - Add files to playlist automatically - Adicionar ficheiros à lista de reprodução - - - - Remove files from playlist automatically - Remover ficheiros da lista de reprodução - - - - UDisksFactory - - - UDisks Plugin - Suplemento UDisks - - - - About UDisks Plugin - Sobre o suplemento UDisks - - - - Qmmp UDisks Plugin - Suplemento Qmmp UDisks - - - - This plugin provides removable devices detection using UDisks - Este suplemento permite a deteção de discos amovíveis através do serviço UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> - - - - UDisksPlugin - - - Add CD "%1" - Adicionar CD %1 - - - - Add Volume "%1" - Adicionar volume %1 - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_pt_BR.ts b/src/plugins/General/udisks/translations/udisks_plugin_pt_BR.ts deleted file mode 100644 index a2dc15d7f..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_pt_BR.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - Preferências do plugin UDisks - - - - CD Audio Detection - Detecção de áudio de CD - - - - Add tracks to playlist automatically - Adicionar faixas à lista de reprodução - - - - Remove tracks from playlist automatically - Remover faixas da lista de reprodução - - - - Removable Device Detection - Detecção de dispositivos removíveis - - - - Add files to playlist automatically - Adicionar arquivos à lista de reprodução - - - - Remove files from playlist automatically - Remover arquivos da lista de reprodução - - - - UDisksFactory - - - UDisks Plugin - Plugin UDisks - - - - About UDisks Plugin - Sobre o plugin UDisks - - - - Qmmp UDisks Plugin - Plugin Qmmp UDisks - - - - This plugin provides removable devices detection using UDisks - Este plugin permite a detecção de dispositivos removíveis através do serviço UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - UDisksPlugin - - - Add CD "%1" - Adicionar CD %1 - - - - Add Volume "%1" - Adicionar volume %1 - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_ru.ts b/src/plugins/General/udisks/translations/udisks_plugin_ru.ts deleted file mode 100644 index 4dd0816e2..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_ru.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - Настройки модуля UDisks - - - - CD Audio Detection - Автоопределение аудио-CD - - - - Add tracks to playlist automatically - Автоматически добавлять треки в список - - - - Remove tracks from playlist automatically - Автоматически удалять треки из списка - - - - Removable Device Detection - Автоопределение съёмных устройств - - - - Add files to playlist automatically - Автоматически добавлять треки в список - - - - Remove files from playlist automatically - Автоматически удалять треки из списка - - - - UDisksFactory - - - UDisks Plugin - Модуль UDisks - - - - About UDisks Plugin - О модуле UDisks - - - - Qmmp UDisks Plugin - Модуль UDisks для Qmmp - - - - This plugin provides removable devices detection using UDisks - Этот модуль отслеживает съёмные устройства с помощью UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Разработчик: Илья Котов <forkotov02@ya.ru> - - - - UDisksPlugin - - - Add CD "%1" - Добавить CD "%1" - - - - Add Volume "%1" - Добавить том "%1" - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_sk.ts b/src/plugins/General/udisks/translations/udisks_plugin_sk.ts deleted file mode 100644 index 2060957bd..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_sk.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - - - - - CD Audio Detection - - - - - Add tracks to playlist automatically - - - - - Remove tracks from playlist automatically - - - - - Removable Device Detection - - - - - Add files to playlist automatically - - - - - Remove files from playlist automatically - - - - - UDisksFactory - - - UDisks Plugin - - - - - About UDisks Plugin - - - - - Qmmp UDisks Plugin - - - - - This plugin provides removable devices detection using UDisks - - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - UDisksPlugin - - - Add CD "%1" - - - - - Add Volume "%1" - - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_sr_BA.ts b/src/plugins/General/udisks/translations/udisks_plugin_sr_BA.ts deleted file mode 100644 index eda86012b..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_sr_BA.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - Поставке за Удискс - - - - CD Audio Detection - Откривање музичког диска - - - - Add tracks to playlist automatically - Аутоматски додај нумере на листу - - - - Remove tracks from playlist automatically - Аутоматски уклони нумере са листе - - - - Removable Device Detection - Откривање уклоњивих уређаја - - - - Add files to playlist automatically - Аутоматски додај фајлове на листу - - - - Remove files from playlist automatically - Аутоматски уклони фајлове са листе - - - - UDisksFactory - - - UDisks Plugin - Удискс - - - - About UDisks Plugin - О прикључку за UDisks - - - - Qmmp UDisks Plugin - Кумп прикључак за UDisks - - - - This plugin provides removable devices detection using UDisks - Омогућује откривање уклоњивих уређаја користећи UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Аутор: Ilya Kotov <forkotov02@ya.ru> - - - - UDisksPlugin - - - Add CD "%1" - Додај диск „%1“ - - - - Add Volume "%1" - Додај складишни простор „%1“ - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_sr_RS.ts b/src/plugins/General/udisks/translations/udisks_plugin_sr_RS.ts deleted file mode 100644 index 2470efdc6..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_sr_RS.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - Поставке за Удискс - - - - CD Audio Detection - Откривање музичког диска - - - - Add tracks to playlist automatically - Аутоматски додај нумере на листу - - - - Remove tracks from playlist automatically - Аутоматски уклони нумере са листе - - - - Removable Device Detection - Откривање уклоњивих уређаја - - - - Add files to playlist automatically - Аутоматски додај фајлове на листу - - - - Remove files from playlist automatically - Аутоматски уклони фајлове са листе - - - - UDisksFactory - - - UDisks Plugin - Удискс - - - - About UDisks Plugin - О прикључку за UDisks - - - - Qmmp UDisks Plugin - Кумп прикључак за UDisks - - - - This plugin provides removable devices detection using UDisks - Омогућује откривање уклоњивих уређаја користећи UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Аутор: Ilya Kotov <forkotov02@ya.ru> - - - - UDisksPlugin - - - Add CD "%1" - Додај диск „%1“ - - - - Add Volume "%1" - Додај складишни простор „%1“ - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_tr.ts b/src/plugins/General/udisks/translations/udisks_plugin_tr.ts deleted file mode 100644 index 3ae7e71ce..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_tr.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - - - - - CD Audio Detection - CD Ses Algılama - - - - Add tracks to playlist automatically - Parçaları listeye otomatik olarka ekle - - - - Remove tracks from playlist automatically - Parçaları listeden otomatik olarak kaldır - - - - Removable Device Detection - Çıkarılabilir Aygıt Algılama - - - - Add files to playlist automatically - Dosyaları listeye otomatik olarak ekle - - - - Remove files from playlist automatically - Dosyaları listeden otomatik olarak kaldır - - - - UDisksFactory - - - UDisks Plugin - - - - - About UDisks Plugin - - - - - Qmmp UDisks Plugin - - - - - This plugin provides removable devices detection using UDisks - - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Yazan: Ilya Kotov <forkotov02@ya.ru> - - - - UDisksPlugin - - - Add CD "%1" - CD "%1" Ekle - - - - Add Volume "%1" - "%1" Aygıtını Ekle - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_uk_UA.ts b/src/plugins/General/udisks/translations/udisks_plugin_uk_UA.ts deleted file mode 100644 index 6de558536..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_uk_UA.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - Налаштування модуля UDisks - - - - CD Audio Detection - Автовизначення аудіо-CD - - - - Add tracks to playlist automatically - Автоматично додавати треки до списку - - - - Remove tracks from playlist automatically - Автоматично видаляти треки зі списку - - - - Removable Device Detection - Виявлення змінних пристроїв - - - - Add files to playlist automatically - Автоматично додавати файли до списку - - - - Remove files from playlist automatically - Автоматично видаляти файли зі списку - - - - UDisksFactory - - - UDisks Plugin - Модуль UDisks - - - - About UDisks Plugin - Про модуль UDisks - - - - Qmmp UDisks Plugin - Модуль UDisks для Qmmp - - - - This plugin provides removable devices detection using UDisks - Цей модуль забезпечує виявлення знімних пристроїв за допомогою UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Розробник: Ілля Котов <forkotov02@ya.ru> - - - - UDisksPlugin - - - Add CD "%1" - Додати CD "%1" - - - - Add Volume "%1" - Додати том "%1" - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_zh_CN.ts b/src/plugins/General/udisks/translations/udisks_plugin_zh_CN.ts deleted file mode 100644 index ff3b12673..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_zh_CN.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - UDisks 插件设置 - - - - CD Audio Detection - CD 音频检测 - - - - Add tracks to playlist automatically - 自动添加音轨到播放列表 - - - - Remove tracks from playlist automatically - 自动从播放列表删除音轨 - - - - Removable Device Detection - 可移动设备检测 - - - - Add files to playlist automatically - 自动添加文件到播放列表 - - - - Remove files from playlist automatically - 自动从播放列表删除文件 - - - - UDisksFactory - - - UDisks Plugin - UDisks 插件 - - - - About UDisks Plugin - 关于 UDisks 插件 - - - - Qmmp UDisks Plugin - Qmmp UDisks 插件 - - - - This plugin provides removable devices detection using UDisks - 此插件依据可移动检测使用 UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - UDisksPlugin - - - Add CD "%1" - 添加 CD "%1" - - - - Add Volume "%1" - 添加卷 "%1" - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_zh_TW.ts b/src/plugins/General/udisks/translations/udisks_plugin_zh_TW.ts deleted file mode 100644 index be5a34032..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_zh_TW.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - UDisks 插件設定 - - - - CD Audio Detection - CD 音頻檢測 - - - - Add tracks to playlist automatically - 自動添加音軌到播放清單 - - - - Remove tracks from playlist automatically - 自動從播放清單刪除音軌 - - - - Removable Device Detection - 可移動設備檢測 - - - - Add files to playlist automatically - 自動添加檔案到播放清單 - - - - Remove files from playlist automatically - 自動從播放清單刪除檔案 - - - - UDisksFactory - - - UDisks Plugin - UDisks 外掛 - - - - About UDisks Plugin - 關於 UDisks 外掛 - - - - Qmmp UDisks Plugin - Qmmp UDisks 外掛 - - - - This plugin provides removable devices detection using UDisks - 此插件基於可移動設備檢測來使用 UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - 作者：Ilya Kotov <forkotov02@ya.ru> - - - - UDisksPlugin - - - Add CD "%1" - 添加 CD "%1" - - - - Add Volume "%1" - 添加卷 "%1" - - - diff --git a/src/plugins/General/udisks/udisks.pro b/src/plugins/General/udisks/udisks.pro deleted file mode 100644 index e45c95554..000000000 --- a/src/plugins/General/udisks/udisks.pro +++ /dev/null @@ -1,26 +0,0 @@ -include(../../plugins.pri) - -TARGET = $$PLUGINS_PREFIX/General/udisks - -QT += dbus - -HEADERS += udisksfactory.h \ - udisksplugin.h \ - udisksmanager.h \ - udisksdevice.h \ - settingsdialog.h - -SOURCES += udisksfactory.cpp \ - udisksplugin.cpp \ - udisksmanager.cpp \ - udisksdevice.cpp \ - settingsdialog.cpp - -FORMS += settingsdialog.ui - -RESOURCES = translations/translations.qrc - -LIBS += $$QMMPUI_LIB - -target.path = $$LIB_DIR/qmmp/General -INSTALLS += target diff --git a/src/plugins/General/udisks/udisksdevice.cpp b/src/plugins/General/udisks/udisksdevice.cpp deleted file mode 100644 index d6d824e37..000000000 --- a/src/plugins/General/udisks/udisksdevice.cpp +++ /dev/null @@ -1,50 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2010 by Ilya Kotov * - * forkotov02@ya.ru * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -#include -#include - -#include "udisksdevice.h" - - -UDisksDevice::UDisksDevice(QDBusObjectPath o, QObject *parent) - : QObject(parent) -{ - m_interface = new QDBusInterface("org.freedesktop.UDisks", o.path(), - "org.freedesktop.UDisks.Device", QDBusConnection::systemBus(), this); - m_interface->connection().connect("org.freedesktop.UDisks", o.path(), - "org.freedesktop.UDisks.Device","Changed", - this, SIGNAL(changed())); - m_path = o; -} - -QVariant UDisksDevice::property (const QString &key) -{ - return m_interface->property(key.toLatin1().data()); -} - -UDisksDevice::~UDisksDevice() -{ -} - -QDBusObjectPath UDisksDevice::objectPath() const -{ - return m_path; -} diff --git a/src/plugins/General/udisks/udisksdevice.h b/src/plugins/General/udisks/udisksdevice.h deleted file mode 100644 index f49b3bcc7..000000000 --- a/src/plugins/General/udisks/udisksdevice.h +++ /dev/null @@ -1,54 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2010 by Ilya Kotov * - * forkotov02@ya.ru * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ -#ifndef UDISKSDEVICE_H -#define UDISKSDEVICE_H - -#include -#include -#include -#include -#include - -class QDBusInterface; - -/** - @author Ilya Kotov -*/ -class UDisksDevice : public QObject -{ - Q_OBJECT -public: - UDisksDevice(QDBusObjectPath o, QObject *parent = 0); - - ~UDisksDevice(); - - QVariant property (const QString &key); - QDBusObjectPath objectPath() const; - -signals: - void changed(); - - -private: - QDBusInterface *m_interface; - QDBusObjectPath m_path; -}; - -#endif diff --git a/src/plugins/General/udisks/udisksfactory.cpp b/src/plugins/General/udisks/udisksfactory.cpp deleted file mode 100644 index 17684b8dc..000000000 --- a/src/plugins/General/udisks/udisksfactory.cpp +++ /dev/null @@ -1,66 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2010 by Ilya Kotov * - * forkotov02@ya.ru * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -#include -#include -#include -#include -#include "settingsdialog.h" -#include "udisksplugin.h" -#include "udisksfactory.h" - -const GeneralProperties UDisksFactory::properties() const -{ - GeneralProperties properties; - properties.name = tr("UDisks Plugin"); - properties.shortName = "udisks"; - properties.hasAbout = true; - properties.hasSettings = true; - properties.visibilityControl = false; - return properties; -} - -QObject *UDisksFactory::create(QObject *parent) -{ - return new UDisksPlugin(parent); -} - -QDialog *UDisksFactory::createConfigDialog(QWidget *parent) -{ - return new SettingsDialog(parent); -} - -void UDisksFactory::showAbout(QWidget *parent) -{ - QMessageBox::about (parent, tr("About UDisks Plugin"), - tr("Qmmp UDisks Plugin") + "\n" + - tr("This plugin provides removable devices detection using UDisks") + "\n" + - tr("Written by: Ilya Kotov ")); -} - -QTranslator *UDisksFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/udisks_plugin_") + locale); - return translator; -} - -Q_EXPORT_PLUGIN2(udisks, UDisksFactory) diff --git a/src/plugins/General/udisks/udisksfactory.h b/src/plugins/General/udisks/udisksfactory.h deleted file mode 100644 index 9a096f794..000000000 --- a/src/plugins/General/udisks/udisksfactory.h +++ /dev/null @@ -1,45 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2010 by Ilya Kotov * - * forkotov02@ya.ru * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ -#ifndef DEVDETECTFACTORY_H -#define DEVDETECTFACTORY_H - -/** - @author Ilya Kotov -*/ -#include -#include - -#include -#include - -class UDisksFactory : public QObject, public GeneralFactory -{ -Q_OBJECT -Q_INTERFACES(GeneralFactory) -public: - const GeneralProperties properties() const; - QObject *create(QObject *parent); - QDialog *createConfigDialog(QWidget *parent); - void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); - -}; - -#endif diff --git a/src/plugins/General/udisks/udisksmanager.cpp b/src/plugins/General/udisks/udisksmanager.cpp deleted file mode 100644 index 53025ed50..000000000 --- a/src/plugins/General/udisks/udisksmanager.cpp +++ /dev/null @@ -1,61 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2010 by Ilya Kotov * - * forkotov02@ya.ru * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -#include -#include -#include - -#include "udisksmanager.h" - -UDisksManager::UDisksManager(QObject *parent) - : QObject(parent) -{ - m_interface = new QDBusInterface("org.freedesktop.UDisks", "/org/freedesktop/UDisks", - "org.freedesktop.UDisks", QDBusConnection::systemBus(), this); - - m_interface->connection().connect("org.freedesktop.UDisks", "/org/freedesktop/UDisks", - "org.freedesktop.UDisks", "DeviceAdded", - this, SIGNAL(deviceAdded(QDBusObjectPath))); - - m_interface->connection().connect("org.freedesktop.UDisks", "/org/freedesktop/UDisks", - "org.freedesktop.UDisks", "DeviceRemoved", - this, SIGNAL(deviceRemoved(QDBusObjectPath))); - - m_interface->connection().connect("org.freedesktop.UDisks", "/org/freedesktop/UDisks", - "org.freedesktop.UDisks", "DeviceChanged", - this, SIGNAL(deviceChanged(QDBusObjectPath))); - -} - - -UDisksManager::~UDisksManager() -{ -} - -QList UDisksManager::findAllDevices() -{ - QDBusReply > reply = m_interface->call("EnumerateDevices"); - if (!reply.isValid()) - { - qWarning("UDisksManager: error: %s", qPrintable(reply.error().name())); - return QList(); - } - return reply.value(); -} diff --git a/src/plugins/General/udisks/udisksmanager.h b/src/plugins/General/udisks/udisksmanager.h deleted file mode 100644 index c109947a6..000000000 --- a/src/plugins/General/udisks/udisksmanager.h +++ /dev/null @@ -1,52 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2010 by Ilya Kotov * - * forkotov02@ya.ru * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ -#ifndef UDISKSMANAGER_H -#define UDISKSMANAGER_H - -#include -#include -#include - -class QDBusInterface; - -/** - @author Ilya Kotov -*/ -class UDisksManager : public QObject -{ -Q_OBJECT -public: - UDisksManager(QObject *parent = 0); - - ~UDisksManager(); - - QList findAllDevices(); - -signals: - void deviceAdded(QDBusObjectPath); - void deviceRemoved(QDBusObjectPath); - void deviceChanged(QDBusObjectPath); - -private: - QDBusInterface *m_interface; - -}; - -#endif diff --git a/src/plugins/General/udisks/udisksplugin.cpp b/src/plugins/General/udisks/udisksplugin.cpp deleted file mode 100644 index 22f5b1420..000000000 --- a/src/plugins/General/udisks/udisksplugin.cpp +++ /dev/null @@ -1,269 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2010-2014 by Ilya Kotov * - * forkotov02@ya.ru * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "udisksdevice.h" -#include "udisksmanager.h" -#include "udisksplugin.h" - -UDisksPlugin::UDisksPlugin(QObject *parent) : QObject(parent) -{ - m_manager = new UDisksManager(this); - m_actions = new QActionGroup(this); - connect(m_manager,SIGNAL(deviceAdded(QDBusObjectPath)), SLOT(addDevice(QDBusObjectPath))); - connect(m_manager,SIGNAL(deviceChanged(QDBusObjectPath)), SLOT(addDevice(QDBusObjectPath))); - connect(m_manager,SIGNAL(deviceRemoved(QDBusObjectPath)), SLOT(removeDevice(QDBusObjectPath))); - connect(m_actions,SIGNAL(triggered (QAction *)), SLOT(processAction(QAction *))); - //load settings - QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - settings.beginGroup("UDisks"); - m_detectCDA = settings.value("cda", true).toBool(); - m_detectRemovable = settings.value("removable", true).toBool(); - m_addTracks = false; //do not load tracks on startup - m_addFiles = false; - //find existing devices - QList devs = m_manager->findAllDevices(); - foreach(QDBusObjectPath o, devs) - addDevice(o); - //load remaining settings - m_addTracks = settings.value("add_tracks", false).toBool(); - m_removeTracks = settings.value("remove_tracks", false).toBool(); - m_addFiles = settings.value("add_files", false).toBool(); - m_removeFiles = settings.value("remove_files", false).toBool(); - settings.endGroup(); -} - - -UDisksPlugin::~UDisksPlugin() -{ -} - -void UDisksPlugin::removeDevice(QDBusObjectPath o) -{ - foreach(UDisksDevice *device, m_devices) - { - if (device->objectPath() == o) - { - m_devices.removeAll(device); - delete device; - qDebug("UDisksPlugin: device \"%s\" removed", qPrintable(o.path())); - updateActions(); - break; - } - } -} - -void UDisksPlugin::addDevice(QDBusObjectPath o) -{ - foreach(UDisksDevice *device, m_devices) //is it already exists? - { - if (device->objectPath() == o) - return; - } - UDisksDevice *device = new UDisksDevice(o, this); - - //audio cd - if (device->property("DeviceIsOpticalDisc").toBool() && - device->property("OpticalDiscNumAudioTracks").toInt()) - { - if (m_detectCDA) - { - qDebug("UDisksPlugin: device \"%s\" added (cd audio)", qPrintable(o.path())); - m_devices << device; - connect(device, SIGNAL(changed()), SLOT(updateActions())); - updateActions(); - } - else - delete device; - return; - } - - // filter mounted partitions - if ((!device->property("DeviceIsPartition").toBool() || - device->property("DeviceIsSystemInternal").toBool()) && - !device->property("DeviceIsOpticalDisc").toBool()) - { - delete device; - return; - } - if (device->property("PartitionSize").toLongLong() < 40000000000LL && - (device->property("IdType").toString() == "vfat" || - device->property("IdType").toString() == "iso9660" || - device->property("IdType").toString() == "udf" || - device->property("IdType").toString() == "ext2")) - { - if (m_detectRemovable) - { - qDebug("UDisksPlugin: device \"%s\" added (removable)", qPrintable(o.path())); - m_devices << device; - updateActions(); - connect(device, SIGNAL(changed()), SLOT(updateActions())); - } - else - delete device; - return; - } - delete device; -} - -void UDisksPlugin::updateActions() -{ - // add action for cd audio or mounted volume - foreach(UDisksDevice *device, m_devices) - { - QString dev_path; - if (device->property("DeviceIsOpticalDisc").toBool() && - device->property("OpticalDiscNumAudioTracks").toInt()) //cd audio - dev_path = "cdda://" + device->property("DeviceFile").toString(); - else if (device->property("DeviceIsMounted").toBool()) //mounted volume - dev_path = device->property("DeviceMountPaths").toStringList()[0]; - else - continue; - - if (!findAction(dev_path)) - { - QAction *action = new QAction(this); - QString actionText; - if (device->property("DeviceIsOpticalDisc").toBool() - && device->property("OpticalDiscNumAudioTracks").toInt()) - actionText = QString(tr("Add CD \"%1\"")).arg(device->property("DeviceFile").toString()); - else - { - QString name = device->property("IdLabel").toString(); - if (name.isEmpty()) - name = dev_path; - actionText = QString(tr("Add Volume \"%1\"")).arg(name); - } - - if (device->property("DeviceIsOpticalDisc").toBool()) - { - if(device->property("IdType").toString() == "iso9660") - action->setIcon(qApp->style()->standardIcon(QStyle::SP_DriveDVDIcon)); - else - action->setIcon(qApp->style()->standardIcon(QStyle::SP_DriveCDIcon)); - } - else - action->setIcon(qApp->style()->standardIcon(QStyle::SP_DriveHDIcon)); - - action->setText(actionText); - action->setData(dev_path); - m_actions->addAction(action); - UiHelper::instance()->addAction(action, UiHelper::TOOLS_MENU); - addPath(dev_path); - } - } - // remove action if device is unmounted/removed - foreach(QAction *action, m_actions->actions ()) - { - if (!findDevice(action)) - { - m_actions->removeAction(action); - UiHelper::instance()->removeAction(action); - removePath(action->data().toString()); - action->deleteLater(); - } - } -} - -void UDisksPlugin::processAction(QAction *action) -{ - qDebug("UDisksPlugin: action triggered: %s", qPrintable(action->data().toString())); - QString path = action->data().toString(); - MediaPlayer::instance()->playListManager()->selectedPlayList()->add(path); -} - -QAction *UDisksPlugin::findAction(const QString &dev_path) -{ - foreach(QAction *action, m_actions->actions ()) - { - if (action->data().toString() == dev_path) - return action; - } - return 0; -} - -UDisksDevice *UDisksPlugin::findDevice(QAction *action) -{ - foreach(UDisksDevice *device, m_devices) - { - QString dev_path; - if (device->property("DeviceIsOpticalDisc").toBool() && - device->property("OpticalDiscNumAudioTracks").toInt()) - { - dev_path = "cdda://" + device->property("DeviceFile").toString(); - if (dev_path == action->data().toString()) - return device; - } - if (device->property("DeviceIsMounted").toBool()) - { - dev_path = device->property("DeviceMountPaths").toStringList()[0]; - if (dev_path == action->data().toString()) - return device; - } - } - return 0; -} - -void UDisksPlugin::addPath(const QString &path) -{ - PlayListModel *model = PlayListManager::instance()->selectedPlayList(); - - foreach(PlayListItem *item, model->items()) // Is it already exist? - { - if(item->isGroup()) - continue; - if (dynamic_cast(item)->url().startsWith(path)) - return; - } - - if (path.startsWith("cdda://") && m_addTracks) - { - PlayListManager::instance()->selectedPlayList()->add(path); - return; - } - else if (!path.startsWith("cdda://") && m_addFiles) - PlayListManager::instance()->selectedPlayList()->add(path); -} - -void UDisksPlugin::removePath(const QString &path) -{ - if ((path.startsWith("cdda://") && !m_removeTracks) || - (!path.startsWith("cdda://") && !m_removeFiles)) //process settings - return; - - PlayListModel *model = PlayListManager::instance()->selectedPlayList(); - - int i = 0; - while (model->count() > 0 && i < model->count()) - { - if (model->isTrack(i) && model->track(i)->url().startsWith(path)) - model->removeTrack(i); - else - ++i; - } -} diff --git a/src/plugins/General/udisks/udisksplugin.h b/src/plugins/General/udisks/udisksplugin.h deleted file mode 100644 index c463b33fe..000000000 --- a/src/plugins/General/udisks/udisksplugin.h +++ /dev/null @@ -1,65 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2010 by Ilya Kotov * - * forkotov02@ya.ru * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ -#ifndef UDISKSPLUGIN_H -#define UDISKSPLUGIN_H - -#include -#include - -class UDisksManager; -class UDisksDevice; -class QActionGroup; -class QAction; - -/** - @author Ilya Kotov -*/ - -class UDisksPlugin : public QObject -{ -Q_OBJECT -public: - UDisksPlugin(QObject *parent = 0); - - ~UDisksPlugin(); - -private slots: - void removeDevice(QDBusObjectPath); - void addDevice(QDBusObjectPath); - void processAction(QAction *action); - void updateActions(); - -private: - QAction *findAction(const QString &dev_path); - UDisksDevice *findDevice(QAction *action); - void addPath(const QString &path); - void removePath(const QString &path); - UDisksManager *m_manager; - QList m_devices; - QActionGroup *m_actions; - bool m_detectCDA; - bool m_addTracks; - bool m_removeTracks; - bool m_detectRemovable; - bool m_addFiles; - bool m_removeFiles; -}; - -#endif diff --git a/src/plugins/General/udisks2/CMakeLists.txt b/src/plugins/General/udisks2/CMakeLists.txt index bb12e48b2..a24c94e5f 100644 --- a/src/plugins/General/udisks2/CMakeLists.txt +++ b/src/plugins/General/udisks2/CMakeLists.txt @@ -1,19 +1,5 @@ project(libudisks2) -SET (QT_USE_QTDBUS TRUE) - -INCLUDE(FindQt4) - -include(${QT_USE_FILE}) - -# 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 @@ -31,7 +17,7 @@ SET(libudisks2_SRCS SET(libudisks2_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libudisks2_RCC_SRCS ${libudisks2_RCCS}) +QT5_ADD_RESOURCES(libudisks2_RCC_SRCS ${libudisks2_RCCS}) # user interface @@ -39,12 +25,12 @@ SET(libudisks2_UIS settingsdialog.ui ) -QT4_WRAP_UI(libudisks2_UIS_H ${libudisks2_UIS}) +QT5_WRAP_UI(libudisks2_UIS_H ${libudisks2_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(udisks2 MODULE ${libudisks2_SRCS} ${libudisks2_UIS_H} ${libudisks2_RCC_SRCS}) add_dependencies(udisks2 qmmpui) -target_link_libraries(udisks2 ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(udisks2 Qt5::Widgets Qt5::DBus -lqmmpui -lqmmp) install(TARGETS udisks2 DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_bg.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_bg.ts index a8c9d09c3..765d15a72 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_bg.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_bg.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin - + About UDisks2 Plugin - + Qmmp UDisks2 Plugin - + This plugin provides removable devices detection using UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_cs.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_cs.ts index 44536607b..5654b8831 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_cs.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_cs.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin Modul UDisks2 - + About UDisks2 Plugin O modulu UDisks2 - + Qmmp UDisks2 Plugin Modul Qmmp UDisks2 - + This plugin provides removable devices detection using UDisks2 Tento modul poskytuje detekci výměnných médií pomocí UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_de.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_de.ts index cd32c9d11..5e81135a4 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_de.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_de.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin UDisks2-Modul - + About UDisks2 Plugin Über UDisks2-Modul - + Qmmp UDisks2 Plugin Qmmp UDisks2-Modul - + This plugin provides removable devices detection using UDisks2 Dieses Modul bietet Wechsellaufwerkerkennung unter Verwendung von UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_el.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_el.ts index 0d51aee7b..1ae0e648c 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_el.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_el.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin Πρόσθετο UDisks2 - + About UDisks2 Plugin Σχετικά με το πρόσθετο UDisks2 - + Qmmp UDisks2 Plugin Qmmp πρόσθετο UDisks2 - + This plugin provides removable devices detection using UDisks2 Αυτό το πρόσθετο παρέχει την ανίχνευση αφαιρούμενων συσκευών μέσω UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_en.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_en.ts index 9561978a9..4a74ace97 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_en.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_en.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin - + About UDisks2 Plugin - + Qmmp UDisks2 Plugin - + This plugin provides removable devices detection using UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_es.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_es.ts index c815dbe06..de68e2ff3 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_es.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_es.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin Módulo UDisks2 - + About UDisks2 Plugin Acerca del Módulo UDisks2 - + Qmmp UDisks2 Plugin Módulo UDisks2 de Qmmp - + This plugin provides removable devices detection using UDisks2 Este módulo proporciona detección de dispositivos extraíbles mediante UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_fi.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_fi.ts index c74ffd367..c26a2075b 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_fi.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_fi.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin UDisks2-liitännäinen - + About UDisks2 Plugin - + Qmmp UDisks2 Plugin Qmmp:n UDisks2-liitännäinen - + This plugin provides removable devices detection using UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_fr.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_fr.ts index 77477d25f..67da21e68 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_fr.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_fr.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin Greffon UDisks2 - + About UDisks2 Plugin À propos du greffon UDisks2 - + Qmmp UDisks2 Plugin Greffon UDisks2 pour Qmmp - + This plugin provides removable devices detection using UDisks2 Ce greffon fournit une détection de périphériques amovibles en utilisant UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_gl_ES.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_gl_ES.ts index cd506c367..2f1043041 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_gl_ES.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_gl_ES.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin Engadido UDisks2 - + About UDisks2 Plugin Sobre o engadido UDisks2 - + Qmmp UDisks2 Plugin Engadido UDisks2 de Qmmp - + This plugin provides removable devices detection using UDisks2 Este engadido provén detección de dispositivos extraíbles usando UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_he.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_he.ts index df0d33f43..177175889 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_he.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_he.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin תוסף UDisks2 - + About UDisks2 Plugin אודות תוסף UDisks2 - + Qmmp UDisks2 Plugin תוסף UDisks2 של Qmmp - + This plugin provides removable devices detection using UDisks2 תוסף זה מספק איתור התקנים ברי הזזה באמצעות UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_hu.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_hu.ts index 6d30fbe49..e705d5801 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_hu.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_hu.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin - + About UDisks2 Plugin - + Qmmp UDisks2 Plugin - + This plugin provides removable devices detection using UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_id.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_id.ts index 988e79fec..d0b6ea52d 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_id.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_id.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin Plugin UDisks - + About UDisks2 Plugin Tentang Plugin UDisks - + Qmmp UDisks2 Plugin Plugin UDisks Qmmp - + This plugin provides removable devices detection using UDisks2 Plugin ini menyediakan deteksi perangkat dapat-dilepas menggunakan UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_it.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_it.ts index 7b5b2e7a0..36193fb68 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_it.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_it.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin - + About UDisks2 Plugin - + Qmmp UDisks2 Plugin - + This plugin provides removable devices detection using UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_ja.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_ja.ts index 73598b9ad..46dc98772 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_ja.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_ja.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin UDisks2 プラグイン - + About UDisks2 Plugin UDisks2 プラグインについて - + Qmmp UDisks2 Plugin QMMP UDisks2 プラグイン - + This plugin provides removable devices detection using UDisks2 このプラグインは着脱可能なデバイスの検知を UDisks2 により行ないます - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_kk.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_kk.ts index ec49c5bb4..e4a2d48cc 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_kk.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_kk.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin - + About UDisks2 Plugin - + Qmmp UDisks2 Plugin - + This plugin provides removable devices detection using UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_lt.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_lt.ts index a5e2415a3..8faf69ee3 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_lt.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_lt.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin UDisks2 Įskiepis - + About UDisks2 Plugin Apie UDisks2 Įskiepį - + Qmmp UDisks2 Plugin Qmmp UDisks2 Įskiepis - + This plugin provides removable devices detection using UDisks2 Šis įskiepis aptinka prijungiamus įrenginius naudodamas UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_nl.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_nl.ts index f0bbc2e10..65727b53c 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_nl.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_nl.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin - + About UDisks2 Plugin - + Qmmp UDisks2 Plugin - + This plugin provides removable devices detection using UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_pl_PL.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_pl_PL.ts index 443fa10ee..b70384545 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_pl_PL.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_pl_PL.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin Wtyczka UDisks2 - + About UDisks2 Plugin O wtyczce UDisks2 - + Qmmp UDisks2 Plugin Wtyczka UDisks2 dla Qmmp - + This plugin provides removable devices detection using UDisks2 Ta wtyczka pozwala na wykrywanie urządzeń przy użyciu UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_pt.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_pt.ts index 86a790e8a..8b621b9b9 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_pt.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_pt.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin Suplemento UDisks2 - + About UDisks2 Plugin Sobre o suplemento UDisks2 - + Qmmp UDisks2 Plugin Suplemento Qmmp UDisks2 - + This plugin provides removable devices detection using UDisks2 Este suplemento permite a deteção de discos amovíveis através do serviço UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_pt_BR.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_pt_BR.ts index a6e07070b..59b82be01 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_pt_BR.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_pt_BR.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin Plugin UDisks2 - + About UDisks2 Plugin Sobre o plugin UDisks2 - + Qmmp UDisks2 Plugin Plugin Qmmp UDisks2 - + This plugin provides removable devices detection using UDisks2 Este plugin permite a detecção de dispositivos removíveis através do serviço UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_ru.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_ru.ts index 101935a00..fb63634ac 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_ru.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_ru.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin Модуль UDisks2 - + About UDisks2 Plugin О модуле UDisks2 - + Qmmp UDisks2 Plugin Модуль UDisks2 для Qmmp - + This plugin provides removable devices detection using UDisks2 Это модуль отслеживает съёмные устройства с помощью UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_sk.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_sk.ts index 735bd1324..7bb01457c 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_sk.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_sk.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin - + About UDisks2 Plugin - + Qmmp UDisks2 Plugin - + This plugin provides removable devices detection using UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_sr_BA.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_sr_BA.ts index b191e85e6..469b250ec 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_sr_BA.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_sr_BA.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin Удискс2 - + About UDisks2 Plugin О прикључку за UDisks2 - + Qmmp UDisks2 Plugin Кумп прикључак за UDisks2 - + This plugin provides removable devices detection using UDisks2 Омогућује откривање уклоњивих уређаја користећи UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_sr_RS.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_sr_RS.ts index 9db721bca..d27eb3dcf 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_sr_RS.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_sr_RS.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin Удискс2 - + About UDisks2 Plugin О прикључку за UDisks2 - + Qmmp UDisks2 Plugin Кумп прикључак за UDisks2 - + This plugin provides removable devices detection using UDisks2 Омогућује откривање уклоњивих уређаја користећи UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_tr.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_tr.ts index b6b699647..b484068b6 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_tr.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_tr.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin - + About UDisks2 Plugin - + Qmmp UDisks2 Plugin - + This plugin provides removable devices detection using UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_uk_UA.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_uk_UA.ts index 017c0c0c6..e31253340 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_uk_UA.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_uk_UA.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin Модуль UDisks2 - + About UDisks2 Plugin Про модуль UDisks2 - + Qmmp UDisks2 Plugin Модуль UDisks2 для Qmmp - + This plugin provides removable devices detection using UDisks2 Цей модуль відстежує з'ємні пристрої за допомогою UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_zh_CN.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_zh_CN.ts index 4770b4df4..39651091c 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_zh_CN.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_zh_CN.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin UDisk2插件 - + About UDisks2 Plugin 关于UDisk2插件 - + Qmmp UDisks2 Plugin Qmmp播放器UDisk2插件 - + This plugin provides removable devices detection using UDisks2 本插件使用UDisk2提供对移动设备的探测功能 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_zh_TW.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_zh_TW.ts index 900afb2e2..f434f8fc0 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_zh_TW.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_zh_TW.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin - + About UDisks2 Plugin - + Qmmp UDisks2 Plugin - + This plugin provides removable devices detection using UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/udisks2device.cpp b/src/plugins/General/udisks2/udisks2device.cpp index a6f4499ce..db0e88f85 100644 --- a/src/plugins/General/udisks2/udisks2device.cpp +++ b/src/plugins/General/udisks2/udisks2device.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013 by Ilya Kotov * + * Copyright (C) 2013-2016 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -93,7 +93,10 @@ QStringList UDisks2Device::mountPoints() const foreach (QVariant arg, args) { QByteArrayList list; - arg.value().variant().value() >> list; + QDBusArgument a = arg.value().variant().value(); + if(a.currentType() != QDBusArgument::ArrayType) + continue; + a >> list; foreach (QByteArray p, list) points.append(p); @@ -103,7 +106,7 @@ QStringList UDisks2Device::mountPoints() const QString UDisks2Device::deviceFile() const { - return QString::fromAscii(m_block_interface->property("Device").toByteArray().constData()); + return QString::fromLatin1(m_block_interface->property("Device").toByteArray()); } QDBusObjectPath UDisks2Device::objectPath() const diff --git a/src/plugins/General/udisks2/udisks2factory.cpp b/src/plugins/General/udisks2/udisks2factory.cpp index 3bd3d6d6d..0548b8932 100644 --- a/src/plugins/General/udisks2/udisks2factory.cpp +++ b/src/plugins/General/udisks2/udisks2factory.cpp @@ -18,9 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ + #include -#include -#include #include #include "settingsdialog.h" #include "udisks2plugin.h" @@ -62,5 +61,3 @@ QTranslator *UDisks2Factory::createTranslator(QObject *parent) translator->load(QString(":/udisks2_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(udisks2, UDisks2Factory) diff --git a/src/plugins/General/udisks2/udisks2factory.h b/src/plugins/General/udisks2/udisks2factory.h index b12e4722c..e4d1f94ff 100644 --- a/src/plugins/General/udisks2/udisks2factory.h +++ b/src/plugins/General/udisks2/udisks2factory.h @@ -32,6 +32,7 @@ class UDisks2Factory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; -- cgit v1.2.3-13-gbd6f