summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Martin <notmart@gmail.com>2015-04-03 14:56:00 (GMT)
committerMarco Martin <notmart@gmail.com>2015-04-03 14:56:00 (GMT)
commitaf3b4cba17a25fd866f15886eb52a04ef21bae2f (patch)
tree66d1ab0312779190cc08211744de5b6169ca95ac
parent2708e9ce6d5636cd3ed000bb8fcbfcfa05e79a01 (diff)
use the new kpackage-based runtime for the QML app
remove old dead code, the okular active app is now completely qml and KPackage based
-rw-r--r--active/CMakeLists.txt11
-rw-r--r--active/app/CMakeLists.txt9
-rwxr-xr-xactive/app/active-documentviewer.desktop151
-rw-r--r--active/app/package/contents/ui/main.qml12
-rw-r--r--active/app/package/metadata.desktop3
-rw-r--r--active/app/src/CMakeLists.txt21
-rw-r--r--active/app/src/main.cpp62
-rw-r--r--generators/chm/active-documentviewer_chm.desktop4
-rw-r--r--generators/comicbook/active-documentviewer_comicbook.desktop4
-rw-r--r--generators/djvu/active-documentviewer_djvu.desktop4
-rw-r--r--generators/dvi/active-documentviewer_dvi.desktop4
-rw-r--r--generators/epub/active-documentviewer_epub.desktop4
-rw-r--r--generators/fax/active-documentviewer_fax.desktop4
-rw-r--r--generators/fictionbook/active-documentviewer_fb.desktop4
-rwxr-xr-xgenerators/kimgio/active-documentviewer_kimgio.desktop4
-rw-r--r--generators/ooo/active-documentviewer_ooo.desktop4
-rw-r--r--generators/plucker/active-documentviewer_plucker.desktop4
-rw-r--r--generators/poppler/active-documentviewer_pdf.desktop4
-rw-r--r--generators/spectre/active-documentviewer_ghostview.desktop4
-rw-r--r--generators/tiff/active-documentviewer_tiff.desktop4
-rw-r--r--generators/txt/active-documentviewer_txt.desktop4
-rw-r--r--generators/xps/active-documentviewer_xps.desktop4
22 files changed, 45 insertions, 284 deletions
diff --git a/active/CMakeLists.txt b/active/CMakeLists.txt
index 4a93edc..094160d 100644
--- a/active/CMakeLists.txt
+++ b/active/CMakeLists.txt
@@ -1,13 +1,4 @@
-find_package(ActiveApp "0.1")
-set_package_properties("ActiveApp" PROPERTIES
- DESCRIPTION "Support for developing applications for Plasma Active"
- URL "https://projects.kde.org/projects/extragear/base/plasma-mobile"
- TYPE OPTIONAL)
-
-if (ACTIVEAPP_FOUND)
- add_subdirectory( app )
-endif (ACTIVEAPP_FOUND)
-
+add_subdirectory( app )
add_subdirectory( components )
diff --git a/active/app/CMakeLists.txt b/active/app/CMakeLists.txt
index 662fdc2..cf9fd08 100644
--- a/active/app/CMakeLists.txt
+++ b/active/app/CMakeLists.txt
@@ -1,11 +1,14 @@
include_directories( ${QT_INCLUDES} )
-add_subdirectory(src)
+#add_subdirectory(src)
# QML-only thing
-install(DIRECTORY package/ DESTINATION ${KDE_INSTALL_DATADIR}/plasma/packages/org.kde.active.documentviewer)
+#install(DIRECTORY package/ DESTINATION ${KDE_INSTALL_DATADIR}/plasma/packages/org.kde.active.documentviewer)
+install(DIRECTORY package/ DESTINATION ${KDE_INSTALL_DATADIR}/kpackage/genericqml/org.kde.active.documentviewer)
+install(FILES package/metadata.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} RENAME org.kde.active.documentviewer.desktop)
-install(FILES active-documentviewer.desktop DESTINATION ${KDE_INSTALL_APPDIR})
+
+#install(FILES active-documentviewer.desktop DESTINATION ${KDE_INSTALL_APPDIR})
diff --git a/active/app/active-documentviewer.desktop b/active/app/active-documentviewer.desktop
deleted file mode 100755
index ba3467c..0000000
--- a/active/app/active-documentviewer.desktop
+++ /dev/null
@@ -1,151 +0,0 @@
-[Desktop Entry]
-Name=Reader
-Name[ar]=التصيير
-Name[bg]=Четец
-Name[bs]=Čitač
-Name[ca]=Lector
-Name[ca@valencia]=Lector
-Name[cs]=Čtečka
-Name[da]=Læser
-Name[de]=Lesegerät
-Name[el]=Πρόγραμμα ανάγνωσης
-Name[en_GB]=Reader
-Name[es]=Lector
-Name[et]=Lugeja
-Name[fi]=Lukija
-Name[fr]=Lecteur
-Name[ga]=Léitheoir
-Name[gl]=Lector
-Name[hu]=Olvasó
-Name[ia]=Lector
-Name[is]=Lesari
-Name[it]=Lettore
-Name[kk]=Оқу құралы
-Name[ko]=리더
-Name[lt]=Skaitytuvas
-Name[mr]=वाचक
-Name[nb]=Leser
-Name[nds]=Leser
-Name[nl]=Lezer
-Name[pa]=ਰੀਡਰ
-Name[pl]=Czytnik
-Name[pt]=Leitor
-Name[pt_BR]=Leitor
-Name[ro]=Cititor
-Name[ru]=Просмотрщик
-Name[sk]=Čítačka
-Name[sl]=Bralnik
-Name[sr]=Читач
-Name[sr@ijekavian]=Читач
-Name[sr@ijekavianlatin]=Čitač
-Name[sr@latin]=Čitač
-Name[sv]=Läsprogram
-Name[tr]=Okuyucu
-Name[ug]=ئوقۇغۇ
-Name[uk]=Переглядач
-Name[x-test]=xxReaderxx
-Name[zh_CN]=阅读器
-Name[zh_TW]=閱讀器
-GenericName=Document viewer
-GenericName[ar]=عارض المستندات
-GenericName[bg]=Преглед на документи
-GenericName[bs]=Prikazivač dokumenata
-GenericName[ca]=Visualitzador de documents
-GenericName[ca@valencia]=Visualitzador de documents
-GenericName[cs]=Prohlížeč dokumentů
-GenericName[da]=Dokumentfremviser
-GenericName[de]=Dokumentenbetrachter
-GenericName[el]=Προβολέας εγγράφων
-GenericName[en_GB]=Document Viewer
-GenericName[es]=Visor de documentos
-GenericName[et]=Dokumendinäitaja
-GenericName[fi]=Asiakirjakatselin
-GenericName[fr]=Afficheur de document
-GenericName[ga]=Amharcán cáipéisí
-GenericName[gl]=Visor de documentos
-GenericName[hu]=Dokumentummegjelenítő
-GenericName[ia]=Visor de documento
-GenericName[is]=Skjalaskoðari
-GenericName[it]=Visore di documenti
-GenericName[ja]=文書ビューア
-GenericName[kk]=Құжатты қарау құралы
-GenericName[ko]=문서 뷰어
-GenericName[lt]=Dokumentų žiūryklė
-GenericName[mr]=दस्तऐवज प्रदर्शक
-GenericName[nb]=Dokumentviser
-GenericName[nds]=Dokmentkieker
-GenericName[nl]=Documentenviewer
-GenericName[pa]=ਡੌਕੂਮੈਂਟ ਦਰਸ਼ਕ
-GenericName[pl]=Przeglądarka dokumentów
-GenericName[pt]=Visualizador de documentos
-GenericName[pt_BR]=Visualizador de documentos
-GenericName[ro]=Vizualizor de documente
-GenericName[ru]=Просмотр документов
-GenericName[sk]=Prehliadač dokumentov
-GenericName[sl]=Pregledovalnik dokumentov
-GenericName[sr]=Приказивач докумената
-GenericName[sr@ijekavian]=Приказивач докумената
-GenericName[sr@ijekavianlatin]=Prikazivač dokumenata
-GenericName[sr@latin]=Prikazivač dokumenata
-GenericName[sv]=Dokumentvisare
-GenericName[tr]=Belge görüntüleyici
-GenericName[uk]=Переглядач документів
-GenericName[x-test]=xxDocument viewerxx
-GenericName[zh_CN]=文档查看器
-GenericName[zh_TW]=文件檢視器
-Comment=Viewer for various types of documents
-Comment[ar]=عارض للعديد من أنواع المستندات
-Comment[bg]=Преглед на различни видове документи
-Comment[bs]=Pregledač raznih vrsta dokumenata
-Comment[ca]=Visualitzador de diversos tipus de documents
-Comment[ca@valencia]=Visualitzador de diversos tipus de documents
-Comment[cs]=Prohlížeč různých typů dokumentů
-Comment[da]=Fremviser af diverse dokumenttyper
-Comment[de]=Betrachter für verschiedene Arten von Dokumenten
-Comment[el]=Πρόγραμμα προβολής για διάφορους τύπους εγγράφων
-Comment[en_GB]=Viewer for various types of documents
-Comment[es]=Visor de diversos tipos de documentos
-Comment[et]=Eri tüüpi dokumentide näitaja
-Comment[fi]=Monenlaisten asiakirjojen katseluohjelma
-Comment[fr]=Afficheur pour différents types de documents
-Comment[ga]=Amharcán le haghaidh cáipéisí éagsúla
-Comment[gl]=Visor de varios tipos de documentos.
-Comment[hu]=Megjelenítő különféle típusú dokumentumokhoz
-Comment[ia]=Visor pro varie typos de documento
-Comment[is]=Skoðari fyrir ýmsar gerðir skjala
-Comment[it]=Visore per vari tipi di documenti
-Comment[kk]=Түрлі құжаттар қарау құралы
-Comment[ko]=여러 형식의 문서 뷰어
-Comment[lt]=Žiūryklė įvairiems dokumentų tipams
-Comment[mr]=विविध प्रकारच्या दस्तऐवजांचा प्रदर्शक
-Comment[nb]=Framviser for forskjellige dokumenttyper
-Comment[nds]=Kieker för en Reeg Dokmenttypen
-Comment[nl]=Viewer voor verschillende typen documenten
-Comment[pa]=ਕਈ ਕਿਸਮ ਦੇ ਡੌਕੂਮੈਂਟ ਵੇਖਾਉਣ ਲਈ ਦਰਸ਼ਕ
-Comment[pl]=Przeglądarka dla różnych typów dokumentów
-Comment[pt]=Visualizador de vários tipos de documentos
-Comment[pt_BR]=Visualizador para vários tipos de documentos
-Comment[ro]=Vizualizor pentru diferite tipuri de documente
-Comment[ru]=Программа для просмотра различных типов документов
-Comment[sk]=Prehliadač pre rôzne typy dokumentov
-Comment[sl]=Pregledovalnik raznih vrst dokumentov
-Comment[sr]=Приказивач различитих врста докумената
-Comment[sr@ijekavian]=Приказивач различитих врста докумената
-Comment[sr@ijekavianlatin]=Prikazivač različitih vrsta dokumenata
-Comment[sr@latin]=Prikazivač različitih vrsta dokumenata
-Comment[sv]=Visningsprogram för diverse typer av dokument
-Comment[tr]=Çeşitli belge türü için görüntüleyici
-Comment[ug]=ھەر خىل تىپتىكى پۈتۈكلەرنى كۆرىدىغان پروگرامما
-Comment[uk]=Програма для перегляду документів різних типів
-Comment[x-test]=xxViewer for various types of documentsxx
-Comment[zh_CN]=可以查看多种文档的工具
-Comment[zh_TW]=多種型態文件的檢視器
-
-Exec=active-documentviewer %u
-Terminal=false
-Icon=okular
-Type=Application
-Categories=Qt;KDE;Graphics;Office;Viewer;
-InitialPreference=6
-NoDisplay=true
-MimeType=application/vnd.kde.okular-archive;
diff --git a/active/app/package/contents/ui/main.qml b/active/app/package/contents/ui/main.qml
index 2cf2325..0a776b7 100644
--- a/active/app/package/contents/ui/main.qml
+++ b/active/app/package/contents/ui/main.qml
@@ -19,14 +19,14 @@
import QtQuick 2.1
import org.kde.okular 2.0 as Okular
+import QtQuick.Controls 1.3
import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.plasma.components 2.0 as PlasmaComponents
-Image {
+ApplicationWindow {
id: fileBrowserRoot
objectName: "fileBrowserRoot"
- source: "image://appbackgrounds/contextarea"
- fillMode: Image.Tile
+ visible: true
width: 360
height: 360
@@ -40,7 +40,7 @@ Image {
Okular.DocumentItem {
id: documentItem
onWindowTitleForDocumentChanged: {
- application.caption = windowTitleForDocument
+ fileBrowserRoot.title = windowTitleForDocument
}
}
@@ -55,8 +55,8 @@ Image {
interval: 100
running: true
onTriggered: {
- if (application.startupArguments.length > 0) {
- documentItem.path = application.startupArguments[0]
+ if (commandlineArguments.length > 0) {
+ documentItem.path = commandlineArguments[0]
}
mainStack.push(Qt.createComponent("Browser.qml"))
diff --git a/active/app/package/metadata.desktop b/active/app/package/metadata.desktop
index 060f479..a7e9b48 100644
--- a/active/app/package/metadata.desktop
+++ b/active/app/package/metadata.desktop
@@ -47,7 +47,8 @@ Name[x-test]=xxDocument viewerxx
Name[zh_CN]=文档查看器
Name[zh_TW]=文件檢視器
Encoding=UTF-8
-Type=Service
+Type=Application
+Exec=kpackagelauncherqml -a org.kde.active.documentviewer %u
Icon=okular
X-KDE-ParentApp=
X-KDE-PluginInfo-Author=Marco Martin
diff --git a/active/app/src/CMakeLists.txt b/active/app/src/CMakeLists.txt
deleted file mode 100644
index 4e0ca2d..0000000
--- a/active/app/src/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-
-set(active-documentviewer_SRCS
- main.cpp
-)
-
-add_executable(active-documentviewer ${active-documentviewer_SRCS})
-
-find_package(ActiveApp REQUIRED)
-
-include_directories( ${QT_INCLUDES} ${ACTIVEAPP_INCLUDE_DIR})
-
-target_link_libraries(active-documentviewer
- Qt5::Declarative
- Qt5::OpenGL
-
- ${KDE4_PLASMA_LIBS}
- ${ACTIVEAPP_LIBRARIES}
-)
-
-install(TARGETS active-documentviewer ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
-
diff --git a/active/app/src/main.cpp b/active/app/src/main.cpp
deleted file mode 100644
index 416ab76..0000000
--- a/active/app/src/main.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/***************************************************************************
- * *
- * Copyright 2011 Sebastian Kügler <sebas@kde.org> *
- * Copyright 2012 Marco Martin <mart@kde.org> *
- * *
- * 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 . *
- ***************************************************************************/
-
-// KDE
-#include <KApplication>
-#include <KAboutData>
-#include <KCmdLineArgs>
-#include <KDebug>
-#include <KConfigGroup>
-
-#include "kdeclarativemainwindow.h"
-#include "kdeclarativeview.h"
-
-static const char description[] = I18N_NOOP("Document viewer for Plasma Active using Okular");
-
-static const char version[] = "0.1";
-
-int main(int argc, char **argv)
-{
- KAboutData about("active-documentviewer", 0, ki18n("Reader"), version, ki18n(description),
- KAboutData::License_GPL, ki18n("Copyright 2012 Marco Martin"), KLocalizedString(), 0, "mart@kde.org");
- about.addAuthor( ki18n("Marco Martin"), KLocalizedString(), "mart@kde.org" );
- about.setProgramIconName("okular");
-
- KCmdLineArgs::init(argc, argv, &about);
-
- KCmdLineOptions options;
- options.add("+[url]", ki18n( "URL of the file to open" ));
-
- KCmdLineArgs::addCmdLineOptions(options);
- KApplication app;
-
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
-
- //KF5 port: remove this line and define TRANSLATION_DOMAIN in CMakeLists.txt instead
-//KLocale::global()->insertCatalog("org.kde.okular");
- //kDebug() << "ARGS:" << args << args->count();
-
- KDeclarativeMainWindow *mainWindow = new KDeclarativeMainWindow();
- mainWindow->declarativeView()->setPackageName("org.kde.active.documentviewer");
- mainWindow->show();
- args->clear();
- return app.exec();
-}
diff --git a/generators/chm/active-documentviewer_chm.desktop b/generators/chm/active-documentviewer_chm.desktop
index dd42c9f..22207c5 100644
--- a/generators/chm/active-documentviewer_chm.desktop
+++ b/generators/chm/active-documentviewer_chm.desktop
@@ -141,8 +141,8 @@ Comment[x-test]=xxViewer for various types of documentsxx
Comment[zh_CN]=可以查看多种文档的工具
Comment[zh_TW]=多種型態文件的檢視器
-TryExec=active-documentviewer
-Exec=active-documentviewer %u
+TryExec=kpackagelauncherqml -a org.kde.active.documentviewer
+Exec=kpackagelauncherqml -a org.kde.active.documentviewer %u
Terminal=false
Icon=okular
Type=Application
diff --git a/generators/comicbook/active-documentviewer_comicbook.desktop b/generators/comicbook/active-documentviewer_comicbook.desktop
index 7c380ab..49265df 100644
--- a/generators/comicbook/active-documentviewer_comicbook.desktop
+++ b/generators/comicbook/active-documentviewer_comicbook.desktop
@@ -142,8 +142,8 @@ Comment[x-test]=xxViewer for various types of documentsxx
Comment[zh_CN]=可以查看多种文档的工具
Comment[zh_TW]=多種型態文件的檢視器
-TryExec=active-documentviewer
-Exec=active-documentviewer %u
+TryExec=kpackagelauncherqml -a org.kde.active.documentviewer
+Exec=kpackagelauncherqml -a org.kde.active.documentviewer %u
Terminal=false
Icon=okular
Type=Application
diff --git a/generators/djvu/active-documentviewer_djvu.desktop b/generators/djvu/active-documentviewer_djvu.desktop
index 11796ac..180a17a 100644
--- a/generators/djvu/active-documentviewer_djvu.desktop
+++ b/generators/djvu/active-documentviewer_djvu.desktop
@@ -142,8 +142,8 @@ Comment[x-test]=xxViewer for various types of documentsxx
Comment[zh_CN]=可以查看多种文档的工具
Comment[zh_TW]=多種型態文件的檢視器
-TryExec=active-documentviewer
-Exec=active-documentviewer %u
+TryExec=kpackagelauncherqml -a org.kde.active.documentviewer
+Exec=kpackagelauncherqml -a org.kde.active.documentviewer %u
Terminal=false
Icon=okular
Type=Application
diff --git a/generators/dvi/active-documentviewer_dvi.desktop b/generators/dvi/active-documentviewer_dvi.desktop
index b68238a..a7d8718 100644
--- a/generators/dvi/active-documentviewer_dvi.desktop
+++ b/generators/dvi/active-documentviewer_dvi.desktop
@@ -142,8 +142,8 @@ Comment[x-test]=xxViewer for various types of documentsxx
Comment[zh_CN]=可以查看多种文档的工具
Comment[zh_TW]=多種型態文件的檢視器
-TryExec=active-documentviewer
-Exec=active-documentviewer %u
+TryExec=kpackagelauncherqml -a org.kde.active.documentviewer
+Exec=kpackagelauncherqml -a org.kde.active.documentviewer %u
Terminal=false
Icon=okular
Type=Application
diff --git a/generators/epub/active-documentviewer_epub.desktop b/generators/epub/active-documentviewer_epub.desktop
index ed84010..3eaba29 100644
--- a/generators/epub/active-documentviewer_epub.desktop
+++ b/generators/epub/active-documentviewer_epub.desktop
@@ -142,8 +142,8 @@ Comment[x-test]=xxViewer for various types of documentsxx
Comment[zh_CN]=可以查看多种文档的工具
Comment[zh_TW]=多種型態文件的檢視器
-TryExec=active-documentviewer
-Exec=active-documentviewer %u
+TryExec=kpackagelauncherqml -a org.kde.active.documentviewer
+Exec=kpackagelauncherqml -a org.kde.active.documentviewer %u
Terminal=false
Icon=okular
Type=Application
diff --git a/generators/fax/active-documentviewer_fax.desktop b/generators/fax/active-documentviewer_fax.desktop
index 37f39de..7e50071 100644
--- a/generators/fax/active-documentviewer_fax.desktop
+++ b/generators/fax/active-documentviewer_fax.desktop
@@ -142,8 +142,8 @@ Comment[x-test]=xxViewer for various types of documentsxx
Comment[zh_CN]=可以查看多种文档的工具
Comment[zh_TW]=多種型態文件的檢視器
-TryExec=active-documentviewer
-Exec=active-documentviewer %u
+TryExec=kpackagelauncherqml -a org.kde.active.documentviewer
+Exec=kpackagelauncherqml -a org.kde.active.documentviewer %u
Terminal=false
Icon=okular
Type=Application
diff --git a/generators/fictionbook/active-documentviewer_fb.desktop b/generators/fictionbook/active-documentviewer_fb.desktop
index f3a469c..0c82bb8 100644
--- a/generators/fictionbook/active-documentviewer_fb.desktop
+++ b/generators/fictionbook/active-documentviewer_fb.desktop
@@ -142,8 +142,8 @@ Comment[x-test]=xxViewer for various types of documentsxx
Comment[zh_CN]=可以查看多种文档的工具
Comment[zh_TW]=多種型態文件的檢視器
-TryExec=active-documentviewer
-Exec=active-documentviewer %u
+TryExec=kpackagelauncherqml -a org.kde.active.documentviewer
+Exec=kpackagelauncherqml -a org.kde.active.documentviewer %u
Terminal=false
Icon=okular
Type=Application
diff --git a/generators/kimgio/active-documentviewer_kimgio.desktop b/generators/kimgio/active-documentviewer_kimgio.desktop
index 61f7364..3a3fa35 100755
--- a/generators/kimgio/active-documentviewer_kimgio.desktop
+++ b/generators/kimgio/active-documentviewer_kimgio.desktop
@@ -142,8 +142,8 @@ Comment[x-test]=xxViewer for various types of documentsxx
Comment[zh_CN]=可以查看多种文档的工具
Comment[zh_TW]=多種型態文件的檢視器
-TryExec=active-documentviewer
-Exec=active-documentviewer %u
+TryExec=kpackagelauncherqml -a org.kde.active.documentviewer
+Exec=kpackagelauncherqml -a org.kde.active.documentviewer %u
Terminal=false
Icon=okular
Type=Application
diff --git a/generators/ooo/active-documentviewer_ooo.desktop b/generators/ooo/active-documentviewer_ooo.desktop
index 8a6d8a8..4e52748 100644
--- a/generators/ooo/active-documentviewer_ooo.desktop
+++ b/generators/ooo/active-documentviewer_ooo.desktop
@@ -142,8 +142,8 @@ Comment[x-test]=xxViewer for various types of documentsxx
Comment[zh_CN]=可以查看多种文档的工具
Comment[zh_TW]=多種型態文件的檢視器
-TryExec=active-documentviewer
-Exec=active-documentviewer %u
+TryExec=kpackagelauncherqml -a org.kde.active.documentviewer
+Exec=kpackagelauncherqml -a org.kde.active.documentviewer %u
Terminal=false
Icon=okular
Type=Application
diff --git a/generators/plucker/active-documentviewer_plucker.desktop b/generators/plucker/active-documentviewer_plucker.desktop
index 432a01c..b45f47f 100644
--- a/generators/plucker/active-documentviewer_plucker.desktop
+++ b/generators/plucker/active-documentviewer_plucker.desktop
@@ -142,8 +142,8 @@ Comment[x-test]=xxViewer for various types of documentsxx
Comment[zh_CN]=可以查看多种文档的工具
Comment[zh_TW]=多種型態文件的檢視器
-TryExec=active-documentviewer
-Exec=active-documentviewer %u
+TryExec=kpackagelauncherqml -a org.kde.active.documentviewer
+Exec=kpackagelauncherqml -a org.kde.active.documentviewer %u
Terminal=false
Icon=okular
Type=Application
diff --git a/generators/poppler/active-documentviewer_pdf.desktop b/generators/poppler/active-documentviewer_pdf.desktop
index c0ba419..fd5a584 100644
--- a/generators/poppler/active-documentviewer_pdf.desktop
+++ b/generators/poppler/active-documentviewer_pdf.desktop
@@ -142,8 +142,8 @@ Comment[x-test]=xxViewer for various types of documentsxx
Comment[zh_CN]=可以查看多种文档的工具
Comment[zh_TW]=多種型態文件的檢視器
-TryExec=active-documentviewer
-Exec=active-documentviewer %u
+TryExec=kpackagelauncherqml -a org.kde.active.documentviewer
+Exec=kpackagelauncherqml -a org.kde.active.documentviewer %u
Terminal=false
Icon=okular
Type=Application
diff --git a/generators/spectre/active-documentviewer_ghostview.desktop b/generators/spectre/active-documentviewer_ghostview.desktop
index 6baf5be..b90eb96 100644
--- a/generators/spectre/active-documentviewer_ghostview.desktop
+++ b/generators/spectre/active-documentviewer_ghostview.desktop
@@ -142,8 +142,8 @@ Comment[x-test]=xxViewer for various types of documentsxx
Comment[zh_CN]=可以查看多种文档的工具
Comment[zh_TW]=多種型態文件的檢視器
-TryExec=active-documentviewer
-Exec=active-documentviewer %u
+TryExec=kpackagelauncherqml -a org.kde.active.documentviewer
+Exec=kpackagelauncherqml -a org.kde.active.documentviewer %u
Terminal=false
Icon=okular
Type=Application
diff --git a/generators/tiff/active-documentviewer_tiff.desktop b/generators/tiff/active-documentviewer_tiff.desktop
index 68d82f3..1287fed 100644
--- a/generators/tiff/active-documentviewer_tiff.desktop
+++ b/generators/tiff/active-documentviewer_tiff.desktop
@@ -142,8 +142,8 @@ Comment[x-test]=xxViewer for various types of documentsxx
Comment[zh_CN]=可以查看多种文档的工具
Comment[zh_TW]=多種型態文件的檢視器
-TryExec=active-documentviewer
-Exec=active-documentviewer %u
+TryExec=kpackagelauncherqml -a org.kde.active.documentviewer
+Exec=kpackagelauncherqml -a org.kde.active.documentviewer %u
Terminal=false
Icon=okular
Type=Application
diff --git a/generators/txt/active-documentviewer_txt.desktop b/generators/txt/active-documentviewer_txt.desktop
index 5632740..8d7b782 100644
--- a/generators/txt/active-documentviewer_txt.desktop
+++ b/generators/txt/active-documentviewer_txt.desktop
@@ -142,8 +142,8 @@ Comment[x-test]=xxViewer for various types of documentsxx
Comment[zh_CN]=可以查看多种文档的工具
Comment[zh_TW]=多種型態文件的檢視器
-TryExec=active-documentviewer
-Exec=active-documentviewer %u
+TryExec=kpackagelauncherqml -a org.kde.active.documentviewer
+Exec=kpackagelauncherqml -a org.kde.active.documentviewer %u
Terminal=false
Icon=okular
Type=Application
diff --git a/generators/xps/active-documentviewer_xps.desktop b/generators/xps/active-documentviewer_xps.desktop
index 3ed4506..46d945c 100644
--- a/generators/xps/active-documentviewer_xps.desktop
+++ b/generators/xps/active-documentviewer_xps.desktop
@@ -142,8 +142,8 @@ Comment[x-test]=xxViewer for various types of documentsxx
Comment[zh_CN]=可以查看多种文档的工具
Comment[zh_TW]=多種型態文件的檢視器
-TryExec=active-documentviewer
-Exec=active-documentviewer %u
+TryExec=kpackagelauncherqml -a org.kde.active.documentviewer
+Exec=kpackagelauncherqml -a org.kde.active.documentviewer %u
Terminal=false
Icon=okular
Type=Application