From b3da1c6d7811df0669e587d9ba0c2e554998f6d3 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Sat, 17 Nov 2018 17:36:35 +0000
Subject: changed kwin.sh path

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8454 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/Ui/skinned/CMakeLists.txt  |  3 +--
 src/plugins/Ui/skinned/kwin.sh         | 40 ----------------------------------
 src/plugins/Ui/skinned/scripts/kwin.sh | 40 ++++++++++++++++++++++++++++++++++
 src/plugins/Ui/skinned/skinned.pro     |  2 +-
 4 files changed, 42 insertions(+), 43 deletions(-)
 delete mode 100644 src/plugins/Ui/skinned/kwin.sh
 create mode 100644 src/plugins/Ui/skinned/scripts/kwin.sh

(limited to 'src')

diff --git a/src/plugins/Ui/skinned/CMakeLists.txt b/src/plugins/Ui/skinned/CMakeLists.txt
index 6fde5934f..176d8c198 100644
--- a/src/plugins/Ui/skinned/CMakeLists.txt
+++ b/src/plugins/Ui/skinned/CMakeLists.txt
@@ -103,6 +103,5 @@ SET_TARGET_PROPERTIES(skinned PROPERTIES COMPILE_DEFINITIONS "${libskinned_DEFIN
 add_dependencies(skinned libqmmpui libqmmp)
 target_link_libraries(skinned Qt5::Widgets Qt5::X11Extras libqmmpui libqmmp ${X11_LDFLAGS})
 install(TARGETS skinned DESTINATION ${PLUGIN_DIR}/Ui)
-install(FILES DESTINATION share/qmmp${APP_NAME_SUFFIX}/images)
-install(FILES kwin.sh DESTINATION share/qmmp${APP_NAME_SUFFIX}/scripts)
+install(FILES scripts/kwin.sh DESTINATION share/qmmp${APP_NAME_SUFFIX}/scripts)
 ENDIF(X11_FOUND)
diff --git a/src/plugins/Ui/skinned/kwin.sh b/src/plugins/Ui/skinned/kwin.sh
deleted file mode 100644
index 211f335f4..000000000
--- a/src/plugins/Ui/skinned/kwin.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-#This script adds kwin rules for qmmp windows
-
-if ! type kreadconfig5 &> /dev/null; then
-  exit 1
-fi
-
-if ! type kwriteconfig5 &> /dev/null; then
-  exit 1
-fi
-
-count=`kreadconfig5 --file kwinrulesrc --group General --key count`
-i=1
-found=0;
-
-while [ $i -le $count ];
-do
-    desc=`kreadconfig5 --file kwinrulesrc --group $i --key Description`
-    if [ $desc = "qmmp" ]; then
-        found=1
-        break
-    fi
-    i=$((i+1))
-done
-
-if [ $found = "0" ]; then
-    group=$((count+1))
-    kwriteconfig5 --file kwinrulesrc --group General --key count $((count+1))
-    kwriteconfig5 --file kwinrulesrc --group $group --key Description qmmp
-    kwriteconfig5 --file kwinrulesrc --group $group --key skipswitcher true
-    kwriteconfig5 --file kwinrulesrc --group $group --key skipswitcherrule 2
-    kwriteconfig5 --file kwinrulesrc --group $group --key type 5
-    kwriteconfig5 --file kwinrulesrc --group $group --key typerule 2
-    kwriteconfig5 --file kwinrulesrc --group $group --key types 256
-    kwriteconfig5 --file kwinrulesrc --group $group --key wmclass qmmp
-    kwriteconfig5 --file kwinrulesrc --group $group --key wmclasscomplete false
-    kwriteconfig5 --file kwinrulesrc --group $group --key wmclassmatch 1
-    dbus-send --print-reply --dest=org.kde.KWin /KWin org.kde.KWin.reconfigure
-fi
diff --git a/src/plugins/Ui/skinned/scripts/kwin.sh b/src/plugins/Ui/skinned/scripts/kwin.sh
new file mode 100644
index 000000000..211f335f4
--- /dev/null
+++ b/src/plugins/Ui/skinned/scripts/kwin.sh
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+#This script adds kwin rules for qmmp windows
+
+if ! type kreadconfig5 &> /dev/null; then
+  exit 1
+fi
+
+if ! type kwriteconfig5 &> /dev/null; then
+  exit 1
+fi
+
+count=`kreadconfig5 --file kwinrulesrc --group General --key count`
+i=1
+found=0;
+
+while [ $i -le $count ];
+do
+    desc=`kreadconfig5 --file kwinrulesrc --group $i --key Description`
+    if [ $desc = "qmmp" ]; then
+        found=1
+        break
+    fi
+    i=$((i+1))
+done
+
+if [ $found = "0" ]; then
+    group=$((count+1))
+    kwriteconfig5 --file kwinrulesrc --group General --key count $((count+1))
+    kwriteconfig5 --file kwinrulesrc --group $group --key Description qmmp
+    kwriteconfig5 --file kwinrulesrc --group $group --key skipswitcher true
+    kwriteconfig5 --file kwinrulesrc --group $group --key skipswitcherrule 2
+    kwriteconfig5 --file kwinrulesrc --group $group --key type 5
+    kwriteconfig5 --file kwinrulesrc --group $group --key typerule 2
+    kwriteconfig5 --file kwinrulesrc --group $group --key types 256
+    kwriteconfig5 --file kwinrulesrc --group $group --key wmclass qmmp
+    kwriteconfig5 --file kwinrulesrc --group $group --key wmclasscomplete false
+    kwriteconfig5 --file kwinrulesrc --group $group --key wmclassmatch 1
+    dbus-send --print-reply --dest=org.kde.KWin /KWin org.kde.KWin.reconfigure
+fi
diff --git a/src/plugins/Ui/skinned/skinned.pro b/src/plugins/Ui/skinned/skinned.pro
index c6ebfb3a0..ce56009aa 100644
--- a/src/plugins/Ui/skinned/skinned.pro
+++ b/src/plugins/Ui/skinned/skinned.pro
@@ -124,7 +124,7 @@ LIBS += $$QMMPUI_LIB
 unix {
     DEFINES += APP_NAME_SUFFIX=\\\"$$APP_NAME_SUFFIX\\\"
     target.path = $$PLUGIN_DIR/Ui
-    scripts.files = kwin.sh
+    scripts.files = scripts/kwin.sh
     scripts.path = $$DATA_DIR/qmmp$${APP_NAME_SUFFIX}/scripts
     INSTALLS += target
     PKGCONFIG += x11
-- 
cgit v1.2.3-13-gbd6f