diff --git a/scripts/install.sh b/scripts/install.sh index db258eb0..38bcbe9c 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -16,3 +16,7 @@ echo "📦 Installing the KCM..." KCM_BUILDDIR="build/kcm" sudo cmake --install "$KCM_BUILDDIR" + +echo "🎉 Installation finished." +echo "💡 You can configure Bismuth in the System Settings > Window Management > Window Tiling." +echo "🦾 Enjoy your tiling!" diff --git a/src/kcm/CMakeLists.txt b/src/kcm/CMakeLists.txt index ed645263..05c0e899 100644 --- a/src/kcm/CMakeLists.txt +++ b/src/kcm/CMakeLists.txt @@ -15,6 +15,8 @@ include(KDEInstallDirs) include(KDECMakeSettings) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) +include(ECMInstallIcons) + find_package( Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Quick @@ -56,3 +58,5 @@ install(TARGETS kcm_bismuth DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms) install(FILES package/metadata.desktop RENAME kcm_bismuth.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) kpackage_install_package(package kcm_bismuth kcms) + +add_subdirectory(icons) diff --git a/src/kcm/icons/CMakeLists.txt b/src/kcm/icons/CMakeLists.txt new file mode 100644 index 00000000..97e6768e --- /dev/null +++ b/src/kcm/icons/CMakeLists.txt @@ -0,0 +1,8 @@ +# SPDX-FileCopyrightText: 2021 Mikhail Zolotukhin +# SPDX-License-Identifier: MIT + +ecm_install_icons( + ICONS + sc-apps-bismuth.svg + DESTINATION ${KDE_INSTALL_ICONDIR} +) diff --git a/src/kwinscript/res/icons/bismuth.svg b/src/kcm/icons/sc-apps-bismuth.svg similarity index 100% rename from src/kwinscript/res/icons/bismuth.svg rename to src/kcm/icons/sc-apps-bismuth.svg diff --git a/src/kwinscript/res/install.sh b/src/kwinscript/res/install.sh deleted file mode 100644 index 0bd633de..00000000 --- a/src/kwinscript/res/install.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env sh - -# SPDX-FileCopyrightText: 2021 Mikhail Zolotukhin -# -# SPDX-License-Identifier: MIT - -# Installation script, that comes inside of the tar.gz package - -set -e - -# Install icons -echo "🖼️ Installing icons..." -APP_ICONS_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/icons/hicolor/scalable/apps" -mkdir -p "$APP_ICONS_DIR" -cp icons/bismuth.svg "$APP_ICONS_DIR/bismuth.svg" - -# Upgrade/install script -echo "📦 Installing the script..." -KWINPKG_FILE="bismuth.kwinscript" -plasmapkg2 -u "$KWINPKG_FILE" > /dev/null || plasmapkg2 -i "$KWINPKG_FILE" > /dev/null - -# Enable user configuration dialog -echo "🔧 Enabling user configuration..." -mkdir -p ~/.local/share/kservices5/ -ln -sf ~/.local/share/kwin/scripts/bismuth/metadata.desktop ~/.local/share/kservices5/bismuth.desktop - -echo "🎉 Installation finished." -echo "💡 You can enable and configure Bismuth in the System Settings > Window Management > KWin Scripts." -echo "🦾 Enjoy your tiling!"