add latte layout, fix look and feel

Signed-off-by: Rafael Silva <rafaelsilva@ajtec.pt>

3 files changed, 35 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ba3437537026..40e8051ab91b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = moe-theme-git
 	pkgdesc = Moe is a light theme, with blur transparencies and red tones with gradients.
-	pkgver = r20.4c1f4df
-	pkgrel = 3
+	pkgver = r29.bd9b178
+	pkgrel = 1
 	url = https://gitlab.com/jomada/moe-theme
 	arch = any
 	license = GPL3
@@ -11,6 +11,7 @@ pkgbase = moe-theme-git
 	sha256sums = SKIP
 
 pkgname = plasma-theme-moe-git
+	install = moe-latte.install
 	optdepends = kvantum-theme-moe-git: Moe theme for Kvantum (recommended)
 
 pkgname = kvantum-theme-moe-git
diff --git a/PKGBUILD b/PKGBUILD
index d5f518e8517e..52f74f1b84a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,16 +3,18 @@
 _pkgbase=moe-theme
 pkgbase="${_pkgbase}-git"
 pkgname=(plasma-theme-moe-git kvantum-theme-moe-git)
-pkgver=r20.4c1f4df
-pkgrel=3
-pkgdesc="Moe is a light theme, with blur transparencies and red tones with gradients."
-arch=(any)
+pkgver=r29.bd9b178
+pkgrel=1
+pkgdesc='Moe is a light theme, with blur transparencies and red tones with gradients.'
+arch=('any')
 url="https://gitlab.com/jomada/${_pkgbase}"
-license=(GPL3)
-makedepends=(git)
+license=('GPL3')
+makedepends=('git')
 options=(!strip)
-source=("${_pkgbase}::git+https://gitlab.com/jomada/${_pkgbase}")
-sha256sums=('SKIP')
+source=("${_pkgbase}::git+https://gitlab.com/jomada/${_pkgbase}"
+		'moe-latte.install')
+sha256sums=('SKIP'
+            '89bfd49ddd4be744fa2531b446a5c39ef0b1c9dab324db34988140022ac51226')
 
 pkgver() {
 	cd "${_pkgbase}"
@@ -21,16 +23,23 @@ pkgver() {
 
 package_plasma-theme-moe-git() {
     optdepends=('kvantum-theme-moe-git: Moe theme for Kvantum (recommended)')
+	install=moe-latte.install
 
     cd "${srcdir}/${_pkgbase}"
 
-	install -d "${pkgdir}"/usr/share/plasma/desktoptheme "${pkgdir}"/usr/share/plasma/look-and-feel "${pkgdir}"/usr/share/aurorae/themes "${pkgdir}"/usr/share/color-schemes "${pkgdir}"/usr/share/konsole
+	install -d "${pkgdir}"/usr/share/plasma/desktoptheme \
+			   "${pkgdir}"/usr/share/plasma/look-and-feel \
+			   "${pkgdir}"/usr/share/aurorae/themes \
+			   "${pkgdir}"/usr/share/color-schemes \
+			   "${pkgdir}"/usr/share/konsole \
+			   "${pkgdir}"/usr/share/${_pkgbase}/latte-layout
 
-    cp -dr --no-preserve=ownership Moe{,Dark} "${pkgdir}"/usr/share/plasma/desktoptheme/
-    cp -dr --no-preserve=ownership look-and-feel/Moe "${pkgdir}"/usr/share/plasma/look-and-feel/
+    cp -dr --no-preserve=ownership Moe{,Dark} "${pkgdir}"/usr/share/plasma/desktoptheme
+    cp -dr --no-preserve=ownership Moe-Global/* "${pkgdir}"/usr/share/plasma/look-and-feel
     cp -dr --no-preserve=ownership {,MoeDark-}aurorae/* "${pkgdir}"/usr/share/aurorae/themes
     cp -dr --no-preserve=ownership {,Moe-Dark-}color-schemes/* "${pkgdir}"/usr/share/color-schemes
     cp -dr --no-preserve=ownership {,Moe-Dark-}konsole/* "${pkgdir}"/usr/share/konsole
+    cp -dr --no-preserve=ownership latte-layout/Moe.layout.latte "${pkgdir}"/usr/share/${_pkgbase}/latte-layout
 }
 
 package_kvantum-theme-moe-git() {
diff --git a/moe-latte.install b/moe-latte.install
new file mode 100644
index 000000000000..d018e667ba0d
--- /dev/null
+++ b/moe-latte.install
@@ -0,0 +1,12 @@
+post_install() {
+  echo -e '\033[1mAttention:\033[0m'
+  echo '  Latte Dock layout for Moe theme is installed but NOT imported.'
+  echo '  Find it in /usr/share/moe-theme/latte-layout/Moe.layout.latte'
+  echo '  Import it by right-clicking your latte-dock and navigate to Layouts -> Manage Layouts...'
+}
+
+post_remove() {
+  echo -e '\033[1mAttention:\033[0m'
+  echo '  Manually imported Moe Latte Dock layout is NOT deleted.'
+  echo '  Please delete it by right-clicking your latte-dock and navigate to Layouts -> Manage Layouts...'
+}