From 456b25e8f16f312c73a8f8a824ee2ff94abe1cbb Mon Sep 17 00:00:00 2001 From: Peter Fajdiga Date: Fri, 24 Mar 2023 16:57:19 +0100 Subject: [PATCH] rename project to karousel --- .gitignore | 2 +- Makefile | 6 +- {basalt => karousel}/contents/code/main.qml | 8 +-- {basalt => karousel}/metadata.json | 6 +- run.sh | 4 +- src/shortcuts.ts | 64 ++++++++++----------- 6 files changed, 45 insertions(+), 45 deletions(-) rename {basalt => karousel}/contents/code/main.qml (56%) rename {basalt => karousel}/metadata.json (79%) diff --git a/.gitignore b/.gitignore index c40dd2b..daa8eec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/basalt/contents/code/main.js +/karousel/contents/code/main.js /.idea diff --git a/Makefile b/Makefile index b08bf62..21db86f 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,13 @@ SHELL := /bin/bash -O extglob build: - tsc --outFile ./basalt/contents/code/main.js + tsc --outFile ./karousel/contents/code/main.js install: build - cp -r ./basalt ~/.local/share/kwin/scripts + cp -r ./karousel ~/.local/share/kwin/scripts run: build ./run.sh logs: - journalctl -t kwin_x11 -g '^qml:|^file://.*basalt' -f + journalctl -t kwin_x11 -g '^qml:|^file://.*karousel' -f diff --git a/basalt/contents/code/main.qml b/karousel/contents/code/main.qml similarity index 56% rename from basalt/contents/code/main.qml rename to karousel/contents/code/main.qml index ab476cd..98a7acc 100644 --- a/basalt/contents/code/main.qml +++ b/karousel/contents/code/main.qml @@ -1,19 +1,19 @@ import QtQuick 2.15 import org.kde.kwin 3.0 -import "./main.js" as Basalt +import "./main.js" as Karousel Item { id: qmlBase - property var basaltInstance + property var karouselInstance Component.onCompleted: { - qmlBase.basaltInstance = Basalt.init(); + qmlBase.karouselInstance = Karousel.init(); print("script started"); } Component.onDestruction: { - qmlBase.basaltInstance.destroy(); + qmlBase.karouselInstance.destroy(); print("script stopped"); } } diff --git a/basalt/metadata.json b/karousel/metadata.json similarity index 79% rename from basalt/metadata.json rename to karousel/metadata.json index fb04034..9df131e 100644 --- a/basalt/metadata.json +++ b/karousel/metadata.json @@ -1,17 +1,17 @@ { "KPlugin": { - "Name": "Basalt", + "Name": "Karousel", "Description": "Manual columnar tiling extension for KWin", "Icon": "preferences-system-windows", "Authors": [{ "Email": "peter.fajdiga@gmail.com", "Name": "Peter Fajdiga" }], - "Id": "basalt", + "Id": "karousel", "ServiceTypes": ["KWin/Script"], "Version": "1.0", "License": "GPLv3", - "Website": "https://github.com/peterfajdiga/basalt" + "Website": "https://github.com/peterfajdiga/karousel" }, "X-Plasma-API": "declarativescript", "X-Plasma-MainScript": "code/main.qml" diff --git a/run.sh b/run.sh index d05bc54..02e6e0c 100755 --- a/run.sh +++ b/run.sh @@ -5,8 +5,8 @@ set -e bash_source_absolute="$(pwd)/${BASH_SOURCE[0]}" -basalt_dir="$(dirname "$bash_source_absolute")" -kwin_script_path="$basalt_dir/basalt/contents/code/main.qml" +karousel_dir="$(dirname "$bash_source_absolute")" +kwin_script_path="$karousel_dir/karousel/contents/code/main.qml" num=$(dbus-send --print-reply --dest=org.kde.KWin \ /Scripting org.kde.kwin.Scripting.loadDeclarativeScript \ diff --git a/src/shortcuts.ts b/src/shortcuts.ts index 0f1271a..a0a4c78 100644 --- a/src/shortcuts.ts +++ b/src/shortcuts.ts @@ -23,41 +23,41 @@ function registerNumShortcuts(title: string, text: string, keySequence: string, function registerShortcuts(world: World) { const actions = initActions(world); - registerShortcutDbg("basalt-window-toggle-floating", "Basalt: Toggle floating", "Meta+Space", actions.windowToggleFloating); + registerShortcutDbg("karousel-window-toggle-floating", "Karousel: Toggle floating", "Meta+Space", actions.windowToggleFloating); - registerShortcutDbg("basalt-focus-left", "Basalt: Move focus left", "Meta+A", actions.focusLeft); - registerShortcutDbg("basalt-focus-right", "Basalt: Move focus right", "Meta+D", actions.focusRight); - registerShortcutDbg("basalt-focus-up", "Basalt: Move focus up", "Meta+W", actions.focusUp); - registerShortcutDbg("basalt-focus-down", "Basalt: Move focus down", "Meta+S", actions.focusDown); - registerShortcutDbg("basalt-focus-start", "Basalt: Move focus to start", "Meta+Home", actions.focusStart); - registerShortcutDbg("basalt-focus-end", "Basalt: Move focus to end", "Meta+End", actions.focusEnd); + registerShortcutDbg("karousel-focus-left", "Karousel: Move focus left", "Meta+A", actions.focusLeft); + registerShortcutDbg("karousel-focus-right", "Karousel: Move focus right", "Meta+D", actions.focusRight); + registerShortcutDbg("karousel-focus-up", "Karousel: Move focus up", "Meta+W", actions.focusUp); + registerShortcutDbg("karousel-focus-down", "Karousel: Move focus down", "Meta+S", actions.focusDown); + registerShortcutDbg("karousel-focus-start", "Karousel: Move focus to start", "Meta+Home", actions.focusStart); + registerShortcutDbg("karousel-focus-end", "Karousel: Move focus to end", "Meta+End", actions.focusEnd); - registerShortcutDbg("basalt-window-move-left", "Basalt: Move window left", "Meta+Shift+A", actions.windowMoveLeft); - registerShortcutDbg("basalt-window-move-right", "Basalt: Move window right", "Meta+Shift+D", actions.windowMoveRight); - registerShortcutDbg("basalt-window-move-up", "Basalt: Move window up", "Meta+Shift+W", actions.windowMoveUp); - registerShortcutDbg("basalt-window-move-down", "Basalt: Move window down", "Meta+Shift+S", actions.windowMoveDown); - registerShortcutDbg("basalt-window-move-start", "Basalt: Move window to start", "Meta+Shift+Home", actions.windowMoveStart); - registerShortcutDbg("basalt-window-move-end", "Basalt: Move window to end", "Meta+Shift+End", actions.windowMoveEnd); - registerShortcutDbg("basalt-window-expand", "Basalt: Expand window", "Meta+X", actions.windowExpand); + registerShortcutDbg("karousel-window-move-left", "Karousel: Move window left", "Meta+Shift+A", actions.windowMoveLeft); + registerShortcutDbg("karousel-window-move-right", "Karousel: Move window right", "Meta+Shift+D", actions.windowMoveRight); + registerShortcutDbg("karousel-window-move-up", "Karousel: Move window up", "Meta+Shift+W", actions.windowMoveUp); + registerShortcutDbg("karousel-window-move-down", "Karousel: Move window down", "Meta+Shift+S", actions.windowMoveDown); + registerShortcutDbg("karousel-window-move-start", "Karousel: Move window to start", "Meta+Shift+Home", actions.windowMoveStart); + registerShortcutDbg("karousel-window-move-end", "Karousel: Move window to end", "Meta+Shift+End", actions.windowMoveEnd); + registerShortcutDbg("karousel-window-expand", "Karousel: Expand window", "Meta+X", actions.windowExpand); - registerShortcutDbg("basalt-column-move-left", "Basalt: Move column left", "Meta+Ctrl+Shift+A", actions.columnMoveLeft); - registerShortcutDbg("basalt-column-move-right", "Basalt: Move column right", "Meta+Ctrl+Shift+D", actions.columnMoveRight); - registerShortcutDbg("basalt-column-move-start", "Basalt: Move column to start", "Meta+Ctrl+Shift+Home", actions.columnMoveStart); - registerShortcutDbg("basalt-column-move-end", "Basalt: Move column to end", "Meta+Ctrl+Shift+End", actions.columnMoveEnd); - registerShortcutDbg("basalt-column-expand", "Basalt: Expand column", "Meta+Ctrl+X", actions.columnExpand); + registerShortcutDbg("karousel-column-move-left", "Karousel: Move column left", "Meta+Ctrl+Shift+A", actions.columnMoveLeft); + registerShortcutDbg("karousel-column-move-right", "Karousel: Move column right", "Meta+Ctrl+Shift+D", actions.columnMoveRight); + registerShortcutDbg("karousel-column-move-start", "Karousel: Move column to start", "Meta+Ctrl+Shift+Home", actions.columnMoveStart); + registerShortcutDbg("karousel-column-move-end", "Karousel: Move column to end", "Meta+Ctrl+Shift+End", actions.columnMoveEnd); + registerShortcutDbg("karousel-column-expand", "Karousel: Expand column", "Meta+Ctrl+X", actions.columnExpand); - registerShortcutDbg("basalt-grid-scroll-focused", "Basalt: Scroll to focused window", "Meta+Alt+Return", actions.gridScrollFocused); - registerShortcutDbg("basalt-grid-scroll-left-column", "Basalt: Scroll one column to the left", "Meta+Alt+A", actions.gridScrollLeftColumn); - registerShortcutDbg("basalt-grid-scroll-left-column", "Basalt: Scroll one column to the left", "Meta+Alt+A", actions.gridScrollLeftColumn); - registerShortcutDbg("basalt-grid-scroll-right-column", "Basalt: Scroll one column to the right", "Meta+Alt+D", actions.gridScrollRightColumn); - registerShortcutDbg("basalt-grid-scroll-left", "Basalt: Scroll left", "Meta+Alt+PgUp", actions.gridScrollLeft); - registerShortcutDbg("basalt-grid-scroll-right", "Basalt: Scroll right", "Meta+Alt+PgDown", actions.gridScrollRight); - registerShortcutDbg("basalt-grid-scroll-start", "Basalt: Scroll to start", "Meta+Alt+Home", actions.gridScrollStart); - registerShortcutDbg("basalt-grid-scroll-end", "Basalt: Scroll to end", "Meta+Alt+End", actions.gridScrollEnd); + registerShortcutDbg("karousel-grid-scroll-focused", "Karousel: Scroll to focused window", "Meta+Alt+Return", actions.gridScrollFocused); + registerShortcutDbg("karousel-grid-scroll-left-column", "Karousel: Scroll one column to the left", "Meta+Alt+A", actions.gridScrollLeftColumn); + registerShortcutDbg("karousel-grid-scroll-left-column", "Karousel: Scroll one column to the left", "Meta+Alt+A", actions.gridScrollLeftColumn); + registerShortcutDbg("karousel-grid-scroll-right-column", "Karousel: Scroll one column to the right", "Meta+Alt+D", actions.gridScrollRightColumn); + registerShortcutDbg("karousel-grid-scroll-left", "Karousel: Scroll left", "Meta+Alt+PgUp", actions.gridScrollLeft); + registerShortcutDbg("karousel-grid-scroll-right", "Karousel: Scroll right", "Meta+Alt+PgDown", actions.gridScrollRight); + registerShortcutDbg("karousel-grid-scroll-start", "Karousel: Scroll to start", "Meta+Alt+Home", actions.gridScrollStart); + registerShortcutDbg("karousel-grid-scroll-end", "Karousel: Scroll to end", "Meta+Alt+End", actions.gridScrollEnd); - registerNumShortcuts("basalt-focus-", "Basalt: Move focus to column ", "Meta+", actions.focusColumn, 9); - registerNumShortcuts("basalt-window-move-to-column-", "Basalt: Move window to column ", "Meta+Shift+", actions.windowMoveToColumn, 9); - registerNumShortcuts("basalt-column-move-to-column-", "Basalt: Move column to position ", "Meta+Ctrl+Shift+", actions.columnMoveToColumn, 9); - registerNumShortcuts("basalt-column-move-to-desktop-", "Basalt: Move column to desktop ", "Meta+Ctrl+Shift+F", actions.columnMoveToDesktop, 12); - registerNumShortcuts("basalt-tail-move-to-desktop-", "Basalt: Move this and all following columns to desktop ", "Meta+Ctrl+Shift+Alt+F", actions.tailMoveToDesktop, 12); + registerNumShortcuts("karousel-focus-", "Karousel: Move focus to column ", "Meta+", actions.focusColumn, 9); + registerNumShortcuts("karousel-window-move-to-column-", "Karousel: Move window to column ", "Meta+Shift+", actions.windowMoveToColumn, 9); + registerNumShortcuts("karousel-column-move-to-column-", "Karousel: Move column to position ", "Meta+Ctrl+Shift+", actions.columnMoveToColumn, 9); + registerNumShortcuts("karousel-column-move-to-desktop-", "Karousel: Move column to desktop ", "Meta+Ctrl+Shift+F", actions.columnMoveToDesktop, 12); + registerNumShortcuts("karousel-tail-move-to-desktop-", "Karousel: Move this and all following columns to desktop ", "Meta+Ctrl+Shift+Alt+F", actions.tailMoveToDesktop, 12); }