From af512dbfca41849d8318bee6c4c643e85ff044fd Mon Sep 17 00:00:00 2001 From: Bart Ribbers Date: Thu, 4 Mar 2021 11:02:08 +0100 Subject: [PATCH] main/postmarketos-ui-plasma-mobile: configure the keyboard to be less huge (MR 2007) --- .../000-gschema.override | 3 ++ main/postmarketos-ui-plasma-mobile/APKBUILD | 34 ++++++++------- .../maliit-plasmamobile.json | 41 +++++++++++++++++++ ...postmarketos-ui-plasma-mobile.post-install | 2 + 4 files changed, 66 insertions(+), 14 deletions(-) create mode 100644 main/postmarketos-ui-plasma-mobile/maliit-plasmamobile.json diff --git a/main/postmarketos-ui-plasma-mobile/000-gschema.override b/main/postmarketos-ui-plasma-mobile/000-gschema.override index aeeacbc9b..d3c3e9e8a 100644 --- a/main/postmarketos-ui-plasma-mobile/000-gschema.override +++ b/main/postmarketos-ui-plasma-mobile/000-gschema.override @@ -1,3 +1,6 @@ [org.gnome.desktop.wm.preferences] button-layout='appmenu:' +[org.maliit.keyboard.maliit] +device='plasmamobile' +theme='Breeze' diff --git a/main/postmarketos-ui-plasma-mobile/APKBUILD b/main/postmarketos-ui-plasma-mobile/APKBUILD index 74abfa5f7..ff79d1b17 100644 --- a/main/postmarketos-ui-plasma-mobile/APKBUILD +++ b/main/postmarketos-ui-plasma-mobile/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-ui-plasma-mobile pkgver=3.3 -pkgrel=2 +pkgrel=3 pkgdesc="(Wayland) Mobile variant of KDE Plasma (does not run without hardware acceleration, allows only numeric passwords!)" url="https://wiki.postmarketos.org/wiki/Plasma_Mobile" arch="noarch !armhf !x86" # armhf: pmaports#75, x86: aports#11807 @@ -59,34 +59,39 @@ _pmb_recommends="breeze-gtk xdg-user-dirs " install="$pkgname.post-install $pkgname.post-upgrade" -source="kwinrc - kdeglobals - qtlogging.ini - unlock-plasma +source=" 000-gschema.override gtk-app-wayland.sh + kdeglobals + kwinrc + maliit-plasmamobile.json + qtlogging.ini + unlock-plasma " subpackages="$pkgname-extras" options="!check" package() { install -Dm644 "$srcdir"/kwinrc \ - "$pkgdir"/etc/xdg/kwinrc + -t "$pkgdir"/etc/xdg/ install -Dm644 "$srcdir"/kdeglobals \ - "$pkgdir"/etc/xdg/kdeglobals + -t "$pkgdir"/etc/xdg/ install -Dm644 "$srcdir"/qtlogging.ini \ - "$pkgdir"/etc/xdg/QtProject/qtlogging.ini + -t "$pkgdir"/etc/xdg/QtProject/ install -Dm755 "$srcdir"/unlock-plasma \ - "$pkgdir"/usr/bin/unlock-plasma + -t "$pkgdir"/usr/bin/ install -Dm755 "$srcdir"/gtk-app-wayland.sh \ - "$pkgdir"/etc/profile.d/gtk-app-wayland.sh + -t "$pkgdir"/etc/profile.d/ install -Dm644 "$srcdir"/000-gschema.override \ "$pkgdir"/usr/share/glib-2.0/schemas/000-postmarketos.gschema.override + + install -Dm644 "$srcdir"/maliit-plasmamobile.json \ + "$pkgdir"/usr/share/maliit/keyboard2/devices/plasmamobile.json } extras() { @@ -110,9 +115,10 @@ extras() { mkdir -p "$subpkgdir" } -sha512sums="4ae28ff92e2ae2f78cc4841249941ad02b1ed0447a5be2e7c6d9080fa47e22471ade584a328deb3a1cb22e1a5d7a81f961b9d92fbc9103a092dfeabf2c1ba45c kwinrc +sha512sums="591529f147f161f5e97c979a9ad4b9f3a65e6d3b87a7bdbd020ec928155cfe5fd561cae6582c4b2831b452fe9b0a03168731771b77020fb66e09f81552ba421e 000-gschema.override +57793bb079c76ba3bdcfca7880aa887de11fe80e7a05557b78435e57feabab70fbaeedc42da3aec6f914c35bba8e8ee9918367516eb45ee247f63f694624f179 gtk-app-wayland.sh 93d6c3e76b6e8d3c8c5424fcb921595ad3569e1aba1b03255b977230b33146dc73a97327e455e8a539018cb02c3bf1a700dd951622f798b50f36c5d381a1b342 kdeglobals +4ae28ff92e2ae2f78cc4841249941ad02b1ed0447a5be2e7c6d9080fa47e22471ade584a328deb3a1cb22e1a5d7a81f961b9d92fbc9103a092dfeabf2c1ba45c kwinrc +70ee87860842057b557a433a9ae7d54653f076a612b3d9de2d413d598806d23ec19390262eaa398cddf39437f1213d14922402a8d978878e5e98f3767ce0b9eb maliit-plasmamobile.json 341f0b866c315f37868ef3e7137cce8b53a0e8e6164e5af71b3e8e2fa68321afbf0652d76124ef84bade1393f701748852ac939aef9daff7e272a0df827780eb qtlogging.ini -e5dcc82c0e58288fd7a8f805e60fa777fab71c68355f085a0e4f25b05526491476fdb6decbc7c0495626d6736a53bfc8e8f34a3231210858998e19cd6fbc89a0 unlock-plasma -2c0ac3cc66e9af71fb89c4f790b6f71598b5c0ecd9b684bd7cbd95d25ce27c256154b8e3a66e1f2648e4d4410d7a5cedc9663b31c1c87b33dcc3179c98d04252 000-gschema.override -57793bb079c76ba3bdcfca7880aa887de11fe80e7a05557b78435e57feabab70fbaeedc42da3aec6f914c35bba8e8ee9918367516eb45ee247f63f694624f179 gtk-app-wayland.sh" +e5dcc82c0e58288fd7a8f805e60fa777fab71c68355f085a0e4f25b05526491476fdb6decbc7c0495626d6736a53bfc8e8f34a3231210858998e19cd6fbc89a0 unlock-plasma" diff --git a/main/postmarketos-ui-plasma-mobile/maliit-plasmamobile.json b/main/postmarketos-ui-plasma-mobile/maliit-plasmamobile.json new file mode 100644 index 000000000..47b07b667 --- /dev/null +++ b/main/postmarketos-ui-plasma-mobile/maliit-plasmamobile.json @@ -0,0 +1,41 @@ +{ + "defaultGridUnitPx": 8, + + "keyMargins": 0.25, + + "fontSize": 2.5, + "fontBold": false, + + "annotationFontSize": 10, + "annotationTopMargin": 0.35, + "annotationRightMargin": 0.65, + + "magnifierHorizontalPadding": 1.8, + "magnifierVerticalPadding": 1, + + "actionKeyPadding": 2, + "symbolShiftKeyFontSize": 2, + "smallFontSize": 1.5, + + "popoverCellPadding": 2.2, + "popoverTopMargin": 10, + "popoverEdgeMargin": 2.2, + "popoverSquat": 3, + + "top_margin": 1, + "bottom_margin": 0, + "row_margin": 0, + "rowMarginLandscape": 4, + "rowMarginPortrait": 7, + + "emailLayoutUrlKeyPadding": 1.5, + + "wordRibbonHeight": 4, + "wordRibbonFontSize": 14, + + "keyboardHeightPortrait": 0.30, + "keyboardHeightLandscape": 0.39, + + "flickMargin": 1.5, + "flickBorderWidth": 0.1 +} diff --git a/main/postmarketos-ui-plasma-mobile/postmarketos-ui-plasma-mobile.post-install b/main/postmarketos-ui-plasma-mobile/postmarketos-ui-plasma-mobile.post-install index c87af4236..2cf3bee14 100644 --- a/main/postmarketos-ui-plasma-mobile/postmarketos-ui-plasma-mobile.post-install +++ b/main/postmarketos-ui-plasma-mobile/postmarketos-ui-plasma-mobile.post-install @@ -8,3 +8,5 @@ rc-update add iio-sensor-proxy default rc-update add bluetooth default rc-update add hfd-service default tinydm-set-session -s /usr/share/wayland-sessions/plasma-mobile.desktop + +glib-compile-schemas /usr/share/glib-2.0/schemas