diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2012-10-23 16:33:42 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2012-12-10 02:48:05 +0100 |
| commit | c56af1dd8df101f4c25416f1c714c4345bdb3908 (patch) | |
| tree | a1d7dcbf6472bb861a977303fb4b4ab896285f39 | |
| parent | Fix tabs restore when some of them were pinned (diff) | |
| download | rekonq-c56af1dd8df101f4c25416f1c714c4345bdb3908.tar.xz | |
Add 1.x compatibility kwebapp script and moved webapp logic to 2.0
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/application.cpp | 4 | ||||
| -rwxr-xr-x | src/data/kwebapp | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5ab64859..4cbe4d98 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -253,5 +253,9 @@ ENDIF(HAVE_QCA2 AND HAVE_QTOAUTH) INSTALL( TARGETS rekonq ${INSTALL_TARGETS_DEFAULT_ARGS} ) INSTALL( TARGETS kdeinit_rekonq ${INSTALL_TARGETS_DEFAULT_ARGS} ) +# kwebapp script install (provided for retro-compatibility...) +FILE( COPY data/kwebapp DESTINATION ${BIN_INSTALL_DIR} + FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE ) + INSTALL( FILES rekonq.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) INSTALL( FILES webwindow/rekonqui.rc DESTINATION ${DATA_INSTALL_DIR}/rekonq ) diff --git a/src/application.cpp b/src/application.cpp index fc12c17d..55cf8d11 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -747,7 +747,7 @@ void Application::createWebAppShortcut() + QL1S("[Desktop Entry]\n") + QL1S("Name=") + (wAppWidget.nameLineEdit->text().isEmpty() - ? QL1S("kwebapp") + ? QL1S("rekonq") : wAppWidget.nameLineEdit->text()) + QL1S("\n") + QL1S("GenericName=") @@ -756,7 +756,7 @@ void Application::createWebAppShortcut() : wAppWidget.descriptionLineEdit->text()) + QL1S("\n") + QL1S("Icon=") + iconPath + QL1S("\n") - + QL1S("Exec=kwebapp ") + u.url() + QL1S("\n") + + QL1S("Exec=rekonq --webapp ") + u.url() + QL1S("\n") + QL1S("Type=Application\n") + QL1S("Categories=Application;Network\n") ; diff --git a/src/data/kwebapp b/src/data/kwebapp new file mode 100755 index 00000000..1deef738 --- /dev/null +++ b/src/data/kwebapp @@ -0,0 +1,2 @@ +#!/bin/sh +rekonq --webapp $1 |