[arch-commits] Commit in (kcm-touchpad-frameworks)
Date: Sunday, May 3, 2015 @ 20:49:47 Author: arojas Revision: 132665 Merged in plasma-desktop Deleted: kcm-touchpad-frameworks/
[arch-commits] Commit in kcm-touchpad-frameworks/trunk (PKGBUILD)
Date: Saturday, February 14, 2015 @ 22:14:01
Author: arojas
Revision: 127717
Remove wrong group (FS#43819)
Modified:
kcm-touchpad-frameworks/trunk/PKGBUILD
--+
PKGBUILD |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-02-14 21:12:40 UTC (rev 127716)
+++ PKGBUILD2015-02-14 21:14:01 UTC (rev 127717)
@@ -4,7 +4,7 @@
pkgname=kcm-touchpad-frameworks
pkgver=5.1.95
-pkgrel=3
+pkgrel=4
pkgdesc='KCM, daemon and applet for touchpad'
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/kde/workspace/kcm-touchpad'
@@ -11,7 +11,6 @@
license=('GPL')
depends=('xf86-input-synaptics' 'xcb-util-cursor' 'plasma-framework'
'knotifyconfig' 'kded')
makedepends=('extra-cmake-modules' 'xorg-server-devel')
-groups=('plasma-next')
conflicts=('kcm-touchpad')
source=(http://download.kde.org/unstable/plasma/$pkgver/kcm-touchpad-$pkgver.tar.xz;
'fix-plasmoid.patch')
install=$pkgname.install
[arch-commits] Commit in kcm-touchpad-frameworks/repos (12 files)
Date: Saturday, February 14, 2015 @ 22:14:23
Author: arojas
Revision: 127718
archrelease: copy trunk to community-i686, community-x86_64
Added:
kcm-touchpad-frameworks/repos/community-i686/PKGBUILD
(from rev 127717, kcm-touchpad-frameworks/trunk/PKGBUILD)
kcm-touchpad-frameworks/repos/community-i686/fix-plasmoid.patch
(from rev 127717, kcm-touchpad-frameworks/trunk/fix-plasmoid.patch)
kcm-touchpad-frameworks/repos/community-i686/kcm-touchpad-frameworks.install
(from rev 127717,
kcm-touchpad-frameworks/trunk/kcm-touchpad-frameworks.install)
kcm-touchpad-frameworks/repos/community-x86_64/PKGBUILD
(from rev 127717, kcm-touchpad-frameworks/trunk/PKGBUILD)
kcm-touchpad-frameworks/repos/community-x86_64/fix-plasmoid.patch
(from rev 127717, kcm-touchpad-frameworks/trunk/fix-plasmoid.patch)
kcm-touchpad-frameworks/repos/community-x86_64/kcm-touchpad-frameworks.install
(from rev 127717,
kcm-touchpad-frameworks/trunk/kcm-touchpad-frameworks.install)
Deleted:
kcm-touchpad-frameworks/repos/community-i686/PKGBUILD
kcm-touchpad-frameworks/repos/community-i686/fix-plasmoid.patch
kcm-touchpad-frameworks/repos/community-i686/kcm-touchpad-frameworks.install
kcm-touchpad-frameworks/repos/community-x86_64/PKGBUILD
kcm-touchpad-frameworks/repos/community-x86_64/fix-plasmoid.patch
kcm-touchpad-frameworks/repos/community-x86_64/kcm-touchpad-frameworks.install
--+
/PKGBUILD| 80 ++
/fix-plasmoid.patch | 114 +
/kcm-touchpad-frameworks.install | 22
community-i686/PKGBUILD | 41 ---
community-i686/fix-plasmoid.patch| 57 --
community-i686/kcm-touchpad-frameworks.install | 11 --
community-x86_64/PKGBUILD| 41 ---
community-x86_64/fix-plasmoid.patch | 57 --
community-x86_64/kcm-touchpad-frameworks.install | 11 --
9 files changed, 216 insertions(+), 218 deletions(-)
Deleted: community-i686/PKGBUILD
===
--- community-i686/PKGBUILD 2015-02-14 21:14:01 UTC (rev 127717)
+++ community-i686/PKGBUILD 2015-02-14 21:14:23 UTC (rev 127718)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas aro...@archlinux.org
-# Contributor: Alexander Mezin mezin.alexan...@gmail.com
-
-pkgname=kcm-touchpad-frameworks
-pkgver=5.1.95
-pkgrel=3
-pkgdesc='KCM, daemon and applet for touchpad'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/workspace/kcm-touchpad'
-license=('GPL')
-depends=('xf86-input-synaptics' 'xcb-util-cursor' 'plasma-framework'
'knotifyconfig' 'kded')
-makedepends=('extra-cmake-modules' 'xorg-server-devel')
-groups=('plasma-next')
-conflicts=('kcm-touchpad')
-source=(http://download.kde.org/unstable/plasma/$pkgver/kcm-touchpad-$pkgver.tar.xz;
'fix-plasmoid.patch')
-install=$pkgname.install
-md5sums=('25f22612196f820dafe395cdf2fdf0a8'
- '1e47e7680850b14432f880fa27c8237b')
-
-prepare() {
- mkdir -p build
-
- cd kcm-touchpad-$pkgver
-# fix plasmoid loading
- patch -p1 -i $srcdir/fix-plasmoid.patch
-}
-
-build() {
- cd build
- cmake ../kcm-touchpad-$pkgver \
--DCMAKE_INSTALL_PREFIX=/usr \
--DCMAKE_BUILD_TYPE=Release \
--DKDE_INSTALL_USE_QT_SYS_PATHS=ON
- make
-}
-
-package() {
- cd build
- make DESTDIR=$pkgdir install
-}
Copied: kcm-touchpad-frameworks/repos/community-i686/PKGBUILD (from rev 127717,
kcm-touchpad-frameworks/trunk/PKGBUILD)
===
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-02-14 21:14:23 UTC (rev 127718)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Antonio Rojas aro...@archlinux.org
+# Contributor: Alexander Mezin mezin.alexan...@gmail.com
+
+pkgname=kcm-touchpad-frameworks
+pkgver=5.1.95
+pkgrel=4
+pkgdesc='KCM, daemon and applet for touchpad'
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kde/workspace/kcm-touchpad'
+license=('GPL')
+depends=('xf86-input-synaptics' 'xcb-util-cursor' 'plasma-framework'
'knotifyconfig' 'kded')
+makedepends=('extra-cmake-modules' 'xorg-server-devel')
+conflicts=('kcm-touchpad')
+source=(http://download.kde.org/unstable/plasma/$pkgver/kcm-touchpad-$pkgver.tar.xz;
'fix-plasmoid.patch')
+install=$pkgname.install
+md5sums=('25f22612196f820dafe395cdf2fdf0a8'
+ '1e47e7680850b14432f880fa27c8237b')
+
+prepare() {
+ mkdir -p build
+
+ cd kcm-touchpad-$pkgver
+# fix plasmoid loading
+ patch -p1 -i $srcdir/fix-plasmoid.patch
+}
+
+build() {
+ cd build
+ cmake ../kcm-touchpad-$pkgver \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_BUILD_TYPE=Release \
+-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR=$pkgdir install
+}
Deleted:
[arch-commits] Commit in kcm-touchpad-frameworks (9 files)
Date: Friday, February 6, 2015 @ 09:37:01
Author: arojas
Revision: 127180
archrelease: copy trunk to community-i686, community-x86_64
Added:
kcm-touchpad-frameworks/repos/
kcm-touchpad-frameworks/repos/community-i686/
kcm-touchpad-frameworks/repos/community-i686/PKGBUILD
(from rev 127179, kcm-touchpad-frameworks/trunk/PKGBUILD)
kcm-touchpad-frameworks/repos/community-i686/fix-plasmoid.patch
(from rev 127179, kcm-touchpad-frameworks/trunk/fix-plasmoid.patch)
kcm-touchpad-frameworks/repos/community-i686/kcm-touchpad-frameworks.install
(from rev 127179,
kcm-touchpad-frameworks/trunk/kcm-touchpad-frameworks.install)
kcm-touchpad-frameworks/repos/community-x86_64/
kcm-touchpad-frameworks/repos/community-x86_64/PKGBUILD
(from rev 127179, kcm-touchpad-frameworks/trunk/PKGBUILD)
kcm-touchpad-frameworks/repos/community-x86_64/fix-plasmoid.patch
(from rev 127179, kcm-touchpad-frameworks/trunk/fix-plasmoid.patch)
kcm-touchpad-frameworks/repos/community-x86_64/kcm-touchpad-frameworks.install
(from rev 127179,
kcm-touchpad-frameworks/trunk/kcm-touchpad-frameworks.install)
--+
community-i686/PKGBUILD | 36 +
community-i686/fix-plasmoid.patch| 128 +
community-i686/kcm-touchpad-frameworks.install | 11 +
community-x86_64/PKGBUILD| 36 +
community-x86_64/fix-plasmoid.patch | 128 +
community-x86_64/kcm-touchpad-frameworks.install | 11 +
6 files changed, 350 insertions(+)
Copied: kcm-touchpad-frameworks/repos/community-i686/PKGBUILD (from rev 127179,
kcm-touchpad-frameworks/trunk/PKGBUILD)
===
--- repos/community-i686/PKGBUILD (rev 0)
+++ repos/community-i686/PKGBUILD 2015-02-06 08:37:01 UTC (rev 127180)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Antonio Rojas aro...@archlinux.org
+# Contributor: Alexander Mezin mezin.alexan...@gmail.com
+
+pkgname=kcm-touchpad-frameworks
+pkgver=5.1.95
+pkgrel=2
+pkgdesc='KCM, daemon and applet for touchpad'
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kde/workspace/kcm-touchpad'
+license=('GPL')
+depends=('xf86-input-synaptics' 'xcb-util-cursor' 'plasma-framework'
'knotifyconfig' 'kded')
+makedepends=('extra-cmake-modules' 'xorg-server-devel')
+groups=('plasma-next')
+conflicts=('kcm-touchpad')
+source=(http://download.kde.org/unstable/plasma/$pkgver/kcm-touchpad-$pkgver.tar.xz;)
+install=$pkgname.install
+md5sums=('25f22612196f820dafe395cdf2fdf0a8')
+
+prepare() {
+ mkdir -p build
+}
+
+build() {
+ cd build
+ cmake ../kcm-touchpad-$pkgver \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_BUILD_TYPE=Release \
+-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR=$pkgdir install
+}
Copied: kcm-touchpad-frameworks/repos/community-i686/fix-plasmoid.patch (from
rev 127179, kcm-touchpad-frameworks/trunk/fix-plasmoid.patch)
===
--- repos/community-i686/fix-plasmoid.patch (rev 0)
+++ repos/community-i686/fix-plasmoid.patch 2015-02-06 08:37:01 UTC (rev
127180)
@@ -0,0 +1,128 @@
+From: Lukáš Tinkl lu...@kde.org
+Date: Thu, 22 Jan 2015 16:20:38 +
+Subject: load the translation catalog correctly
+X-Git-Url:
http://quickgit.kde.org/?p=kcm-touchpad.gita=commitdiffh=7494875a95ccfacc407eb0278f8c1deb71b2b949
+---
+load the translation catalog correctly
+
+also unbreak the dataengine loading and the applet
+---
+
+
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ project(kcm-touchpad)
+ set(PROJECT_VERSION 5.1.95)
+ cmake_minimum_required(VERSION 2.8.12)
++add_definitions(-DTRANSLATION_DOMAIN=\kcm_touchpad\)
+
+ set(CMAKE_MODULE_PATH
+ ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules
+
+--- a/src/applet/CMakeLists.txt
b/src/applet/CMakeLists.txt
+@@ -1,3 +1,6 @@
++remove_definitions(-DTRANSLATION_DOMAIN=kcm_touchpad)
++add_definitions(-DTRANSLATION_DOMAIN=plasma_applet_touchpad)
++
+ add_subdirectory(qml)
+
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dataengine.desktop
+@@ -23,14 +26,16 @@
+ Qt5::DBus
+ )
+
++kcoreaddons_desktop_to_json(plasma_engine_touchpad
${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-touchpad.desktop)
++
+ install(TARGETS plasma_engine_touchpad
+-DESTINATION ${PLUGIN_INSTALL_DIR}
++DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine
+ )
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-touchpad.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+ )
+ install(FILES touchpad.operations
+-DESTINATION ${DATA_INSTALL_DIR}/plasma/services
++DESTINATION ${PLASMA_DATA_INSTALL_DIR}/services
+ )
+ install(FILES touchpad.svg
+ DESTINATION ${DATA_INSTALL_DIR}/plasma/desktoptheme/default/icons
+
+---
[arch-commits] Commit in kcm-touchpad-frameworks/trunk (1 file)
Date: Friday, February 6, 2015 @ 09:35:43
Author: arojas
Revision: 127179
Add install file
Added:
kcm-touchpad-frameworks/trunk/kcm-touchpad-frameworks.install
-+
kcm-touchpad-frameworks.install | 11 +++
1 file changed, 11 insertions(+)
Added: kcm-touchpad-frameworks.install
===
--- kcm-touchpad-frameworks.install (rev 0)
+++ kcm-touchpad-frameworks.install 2015-02-06 08:35:43 UTC (rev 127179)
@@ -0,0 +1,11 @@
+post_install() {
+xdg-icon-resource forceupdate --theme hicolor /dev/null
+}
+
+post_upgrade() {
+post_install
+}
+
+post_remove() {
+post_install
+}
[arch-commits] Commit in kcm-touchpad-frameworks/repos (12 files)
Date: Friday, February 6, 2015 @ 10:04:04
Author: arojas
Revision: 127182
archrelease: copy trunk to community-i686, community-x86_64
Added:
kcm-touchpad-frameworks/repos/community-i686/PKGBUILD
(from rev 127181, kcm-touchpad-frameworks/trunk/PKGBUILD)
kcm-touchpad-frameworks/repos/community-i686/fix-plasmoid.patch
(from rev 127181, kcm-touchpad-frameworks/trunk/fix-plasmoid.patch)
kcm-touchpad-frameworks/repos/community-i686/kcm-touchpad-frameworks.install
(from rev 127181,
kcm-touchpad-frameworks/trunk/kcm-touchpad-frameworks.install)
kcm-touchpad-frameworks/repos/community-x86_64/PKGBUILD
(from rev 127181, kcm-touchpad-frameworks/trunk/PKGBUILD)
kcm-touchpad-frameworks/repos/community-x86_64/fix-plasmoid.patch
(from rev 127181, kcm-touchpad-frameworks/trunk/fix-plasmoid.patch)
kcm-touchpad-frameworks/repos/community-x86_64/kcm-touchpad-frameworks.install
(from rev 127181,
kcm-touchpad-frameworks/trunk/kcm-touchpad-frameworks.install)
Deleted:
kcm-touchpad-frameworks/repos/community-i686/PKGBUILD
kcm-touchpad-frameworks/repos/community-i686/fix-plasmoid.patch
kcm-touchpad-frameworks/repos/community-i686/kcm-touchpad-frameworks.install
kcm-touchpad-frameworks/repos/community-x86_64/PKGBUILD
kcm-touchpad-frameworks/repos/community-x86_64/fix-plasmoid.patch
kcm-touchpad-frameworks/repos/community-x86_64/kcm-touchpad-frameworks.install
--+
/PKGBUILD| 82 +
/fix-plasmoid.patch | 114 ++
/kcm-touchpad-frameworks.install | 22 +++
community-i686/PKGBUILD | 36 -
community-i686/fix-plasmoid.patch| 128 -
community-i686/kcm-touchpad-frameworks.install | 11 -
community-x86_64/PKGBUILD| 36 -
community-x86_64/fix-plasmoid.patch | 128 -
community-x86_64/kcm-touchpad-frameworks.install | 11 -
9 files changed, 218 insertions(+), 350 deletions(-)
Deleted: community-i686/PKGBUILD
===
--- community-i686/PKGBUILD 2015-02-06 09:01:34 UTC (rev 127181)
+++ community-i686/PKGBUILD 2015-02-06 09:04:04 UTC (rev 127182)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas aro...@archlinux.org
-# Contributor: Alexander Mezin mezin.alexan...@gmail.com
-
-pkgname=kcm-touchpad-frameworks
-pkgver=5.1.95
-pkgrel=2
-pkgdesc='KCM, daemon and applet for touchpad'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/workspace/kcm-touchpad'
-license=('GPL')
-depends=('xf86-input-synaptics' 'xcb-util-cursor' 'plasma-framework'
'knotifyconfig' 'kded')
-makedepends=('extra-cmake-modules' 'xorg-server-devel')
-groups=('plasma-next')
-conflicts=('kcm-touchpad')
-source=(http://download.kde.org/unstable/plasma/$pkgver/kcm-touchpad-$pkgver.tar.xz;)
-install=$pkgname.install
-md5sums=('25f22612196f820dafe395cdf2fdf0a8')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../kcm-touchpad-$pkgver \
--DCMAKE_INSTALL_PREFIX=/usr \
--DCMAKE_BUILD_TYPE=Release \
--DKDE_INSTALL_USE_QT_SYS_PATHS=ON
- make
-}
-
-package() {
- cd build
- make DESTDIR=$pkgdir install
-}
Copied: kcm-touchpad-frameworks/repos/community-i686/PKGBUILD (from rev 127181,
kcm-touchpad-frameworks/trunk/PKGBUILD)
===
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-02-06 09:04:04 UTC (rev 127182)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Antonio Rojas aro...@archlinux.org
+# Contributor: Alexander Mezin mezin.alexan...@gmail.com
+
+pkgname=kcm-touchpad-frameworks
+pkgver=5.1.95
+pkgrel=3
+pkgdesc='KCM, daemon and applet for touchpad'
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kde/workspace/kcm-touchpad'
+license=('GPL')
+depends=('xf86-input-synaptics' 'xcb-util-cursor' 'plasma-framework'
'knotifyconfig' 'kded')
+makedepends=('extra-cmake-modules' 'xorg-server-devel')
+groups=('plasma-next')
+conflicts=('kcm-touchpad')
+source=(http://download.kde.org/unstable/plasma/$pkgver/kcm-touchpad-$pkgver.tar.xz;
'fix-plasmoid.patch')
+install=$pkgname.install
+md5sums=('25f22612196f820dafe395cdf2fdf0a8'
+ '1e47e7680850b14432f880fa27c8237b')
+
+prepare() {
+ mkdir -p build
+
+ cd kcm-touchpad-$pkgver
+# fix plasmoid loading
+ patch -p1 -i $srcdir/fix-plasmoid.patch
+}
+
+build() {
+ cd build
+ cmake ../kcm-touchpad-$pkgver \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_BUILD_TYPE=Release \
+-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR=$pkgdir install
+}
Deleted: community-i686/fix-plasmoid.patch
===
--- community-i686/fix-plasmoid.patch 2015-02-06
[arch-commits] Commit in kcm-touchpad-frameworks/trunk (PKGBUILD fix-plasmoid.patch)
Date: Friday, February 6, 2015 @ 10:01:34
Author: arojas
Revision: 127181
Apply patch
Modified:
kcm-touchpad-frameworks/trunk/PKGBUILD
kcm-touchpad-frameworks/trunk/fix-plasmoid.patch
+
PKGBUILD | 11 -
fix-plasmoid.patch | 97 ++-
2 files changed, 21 insertions(+), 87 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-02-06 08:37:01 UTC (rev 127180)
+++ PKGBUILD2015-02-06 09:01:34 UTC (rev 127181)
@@ -4,7 +4,7 @@
pkgname=kcm-touchpad-frameworks
pkgver=5.1.95
-pkgrel=2
+pkgrel=3
pkgdesc='KCM, daemon and applet for touchpad'
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/kde/workspace/kcm-touchpad'
@@ -13,12 +13,17 @@
makedepends=('extra-cmake-modules' 'xorg-server-devel')
groups=('plasma-next')
conflicts=('kcm-touchpad')
-source=(http://download.kde.org/unstable/plasma/$pkgver/kcm-touchpad-$pkgver.tar.xz;)
+source=(http://download.kde.org/unstable/plasma/$pkgver/kcm-touchpad-$pkgver.tar.xz;
'fix-plasmoid.patch')
install=$pkgname.install
-md5sums=('25f22612196f820dafe395cdf2fdf0a8')
+md5sums=('25f22612196f820dafe395cdf2fdf0a8'
+ '1e47e7680850b14432f880fa27c8237b')
prepare() {
mkdir -p build
+
+ cd kcm-touchpad-$pkgver
+# fix plasmoid loading
+ patch -p1 -i $srcdir/fix-plasmoid.patch
}
build() {
Modified: fix-plasmoid.patch
===
--- fix-plasmoid.patch 2015-02-06 08:37:01 UTC (rev 127180)
+++ fix-plasmoid.patch 2015-02-06 09:01:34 UTC (rev 127181)
@@ -1,63 +1,5 @@
-From: Lukáš Tinkl lu...@kde.org
-Date: Thu, 22 Jan 2015 16:20:38 +
-Subject: load the translation catalog correctly
-X-Git-Url:
http://quickgit.kde.org/?p=kcm-touchpad.gita=commitdiffh=7494875a95ccfacc407eb0278f8c1deb71b2b949
-load the translation catalog correctly
-
-also unbreak the dataengine loading and the applet
-
-
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,6 +1,7 @@
- project(kcm-touchpad)
- set(PROJECT_VERSION 5.1.95)
- cmake_minimum_required(VERSION 2.8.12)
-+add_definitions(-DTRANSLATION_DOMAIN=\kcm_touchpad\)
-
- set(CMAKE_MODULE_PATH
- ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules
-
a/src/applet/CMakeLists.txt
-+++ b/src/applet/CMakeLists.txt
-@@ -1,3 +1,6 @@
-+remove_definitions(-DTRANSLATION_DOMAIN=kcm_touchpad)
-+add_definitions(-DTRANSLATION_DOMAIN=plasma_applet_touchpad)
-+
- add_subdirectory(qml)
-
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dataengine.desktop
-@@ -23,14 +26,16 @@
- Qt5::DBus
- )
-
-+kcoreaddons_desktop_to_json(plasma_engine_touchpad
${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-touchpad.desktop)
-+
- install(TARGETS plasma_engine_touchpad
--DESTINATION ${PLUGIN_INSTALL_DIR}
-+DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine
- )
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-touchpad.desktop
- DESTINATION ${SERVICES_INSTALL_DIR}
- )
- install(FILES touchpad.operations
--DESTINATION ${DATA_INSTALL_DIR}/plasma/services
-+DESTINATION ${PLASMA_DATA_INSTALL_DIR}/services
- )
- install(FILES touchpad.svg
- DESTINATION ${DATA_INSTALL_DIR}/plasma/desktoptheme/default/icons
-
a/src/applet/dataengine.desktop
-+++ b/src/applet/dataengine.desktop
-@@ -44,5 +44,3 @@
- X-KDE-PluginInfo-License=GPL
- X-KDE-PluginInfo-EnabledByDefault=true
-
--X-Plasma-EngineName=touchpad
--
-
+diff --git a/src/applet/qml/contents/ui/touchpad.qml
b/src/applet/qml/contents/ui/touchpad.qml
+index 2dcb808..00f0f5d 100644
--- a/src/applet/qml/contents/ui/touchpad.qml
+++ b/src/applet/qml/contents/ui/touchpad.qml
@@ -21,7 +21,6 @@
@@ -68,7 +10,7 @@
Item {
id: root
-@@ -84,28 +83,28 @@
+@@ -84,28 +83,28 @@ Item {
}
}
@@ -85,7 +27,14 @@
-mainText: {
-if (!hasTouchpad) {
-return i18n(No touchpad was found);
-+
+-}
+
+-return enabled ? i18n(Touchpad is enabled)
+- : i18n(Touchpad is disabled)
+-}
+-image: {
+-if (!hasTouchpad) {
+-return dialog-error
+PlasmaCore.ToolTipArea {
+mainText: {
+if (!hasTouchpad) {
@@ -100,29 +49,9 @@
+return dialog-error
+}
--return enabled ? i18n(Touchpad is enabled)
-- : i18n(Touchpad is disabled)
--}
--image: {
--if (!hasTouchpad) {
--return dialog-error
+-return enabled ? input-touchpad : process-stop
+return enabled ? input-touchpad : process-stop
- }
--
--return enabled ? input-touchpad : process-stop
++}
}
}
-
a/src/applet/touchpadengine.cpp
-+++ b/src/applet/touchpadengine.cpp
-@@ -80,5 +80,7 @@
- {
-
