Refactor import to be compatible with new version of quickshell (#2263)

This commit is contained in:
end-4
2025-10-21 22:56:44 +02:00
committed by GitHub
25 changed files with 55 additions and 55 deletions
@@ -13,7 +13,7 @@ import Quickshell.Io
import Quickshell.Wayland import Quickshell.Wayland
import Quickshell.Hyprland import Quickshell.Hyprland
import "./cookieClock" import qs.modules.background.cookieClock
Variants { Variants {
id: root id: root
@@ -9,8 +9,8 @@ import QtQuick.Layouts
import Qt5Compat.GraphicalEffects import Qt5Compat.GraphicalEffects
import Quickshell.Io import Quickshell.Io
import "./dateIndicator" import qs.modules.background.cookieClock.dateIndicator
import "./minuteMarks" import qs.modules.background.cookieClock.minuteMarks
Item { Item {
id: root id: root
@@ -1,4 +1,4 @@
import "./weather" import qs.modules.bar.weather
import QtQuick import QtQuick
import QtQuick.Layouts import QtQuick.Layouts
import Quickshell import Quickshell
@@ -4,7 +4,7 @@ import qs.modules.common.widgets
import QtQuick import QtQuick
import QtQuick.Layouts import QtQuick.Layouts
import "../" import qs.modules.bar
StyledPopup { StyledPopup {
id: root id: root
@@ -101,4 +101,4 @@ StyledPopup {
} }
} }
} }
} }
@@ -2,7 +2,7 @@ import qs.services
import QtQuick import QtQuick
import Quickshell import Quickshell
import Quickshell.Hyprland import Quickshell.Hyprland
import "../" import qs.modules.onScreenDisplay
OsdValueIndicator { OsdValueIndicator {
id: root id: root
@@ -1,6 +1,6 @@
import qs.services import qs.services
import QtQuick import QtQuick
import "../" import qs.modules.onScreenDisplay
OsdValueIndicator { OsdValueIndicator {
id: osdValues id: osdValues
@@ -3,7 +3,7 @@ import qs.services
import qs.modules.common import qs.modules.common
import qs.modules.common.widgets import qs.modules.common.widgets
import qs.modules.common.functions import qs.modules.common.functions
import "./aiChat/" import qs.modules.sidebarLeft.aiChat
import QtQuick import QtQuick
import QtQuick.Controls import QtQuick.Controls
import QtQuick.Layouts import QtQuick.Layouts
@@ -3,7 +3,7 @@ import qs.services
import qs.modules.common import qs.modules.common
import qs.modules.common.widgets import qs.modules.common.widgets
import qs.modules.common.functions import qs.modules.common.functions
import "./anime/" import qs.modules.sidebarLeft.anime
import QtQuick import QtQuick
import QtQuick.Controls import QtQuick.Controls
import QtQuick.Layouts import QtQuick.Layouts
@@ -2,7 +2,7 @@ import qs.services
import qs.modules.common import qs.modules.common
import qs.modules.common.widgets import qs.modules.common.widgets
import qs.modules.common.functions import qs.modules.common.functions
import "./translator/" import qs.modules.sidebarLeft.translator
import QtQuick import QtQuick
import QtQuick.Layouts import QtQuick.Layouts
import Quickshell import Quickshell
@@ -3,7 +3,7 @@ import qs.services
import qs.modules.common import qs.modules.common
import qs.modules.common.widgets import qs.modules.common.widgets
import qs.modules.common.functions import qs.modules.common.functions
import "../" import qs.modules.sidebarLeft
import qs.services import qs.services
import QtQuick import QtQuick
import QtQuick.Controls import QtQuick.Controls
@@ -287,4 +287,4 @@ Rectangle {
} }
} }
} }
} }
@@ -1,9 +1,9 @@
import qs.modules.common import qs.modules.common
import qs.modules.common.widgets import qs.modules.common.widgets
import qs.services import qs.services
import "./calendar" import qs.modules.sidebarRight.calendar
import "./todo" import qs.modules.sidebarRight.todo
import "./pomodoro" import qs.modules.sidebarRight.pomodoro
import QtQuick import QtQuick
import QtQuick.Layouts import QtQuick.Layouts
@@ -248,4 +248,4 @@ Rectangle {
anchors.margins: 5 anchors.margins: 5
} }
} }
} }
@@ -1,8 +1,8 @@
import qs.modules.common import qs.modules.common
import qs.modules.common.widgets import qs.modules.common.widgets
import qs.services import qs.services
import "./notifications" import qs.modules.sidebarRight.notifications
import "./volumeMixer" import qs.modules.sidebarRight.volumeMixer
import Qt5Compat.GraphicalEffects import Qt5Compat.GraphicalEffects
import QtQuick import QtQuick
import QtQuick.Controls import QtQuick.Controls
@@ -9,11 +9,11 @@ import Quickshell
import Quickshell.Bluetooth import Quickshell.Bluetooth
import Quickshell.Hyprland import Quickshell.Hyprland
import "./quickToggles/" import qs.modules.sidebarRight.quickToggles
import "./quickToggles/classicStyle/" import qs.modules.sidebarRight.quickToggles.classicStyle
import "./wifiNetworks/" import qs.modules.sidebarRight.wifiNetworks
import "./bluetoothDevices/" import qs.modules.sidebarRight.bluetoothDevices
import "./volumeMixer/" import qs.modules.sidebarRight.volumeMixer
Item { Item {
id: root id: root
@@ -6,7 +6,7 @@ import QtQuick.Layouts
import Quickshell import Quickshell
import Quickshell.Bluetooth import Quickshell.Bluetooth
import "./androidStyle/" import qs.modules.sidebarRight.quickToggles.androidStyle
AbstractQuickPanel { AbstractQuickPanel {
id: root id: root
@@ -5,7 +5,7 @@ import QtQuick
import QtQuick.Layouts import QtQuick.Layouts
import Quickshell.Bluetooth import Quickshell.Bluetooth
import "./classicStyle/" import qs.modules.sidebarRight.quickToggles.classicStyle
AbstractQuickPanel { AbstractQuickPanel {
id: root id: root
@@ -2,7 +2,7 @@ import qs.services
import qs.modules.common import qs.modules.common
import qs.modules.common.widgets import qs.modules.common.widgets
import qs.modules.common.functions import qs.modules.common.functions
import "../" import qs.modules.sidebarRight.quickToggles
import qs import qs
import QtQuick import QtQuick
import Quickshell import Quickshell
@@ -3,7 +3,7 @@ import qs.modules.common.widgets
import qs.services import qs.services
import QtQuick import QtQuick
import QtQuick.Layouts import QtQuick.Layouts
import "./../bar" as Bar import qs.modules.bar as Bar
MouseArea { MouseArea {
id: root id: root
@@ -2,7 +2,7 @@ import qs.services
import qs.modules.common import qs.modules.common
import QtQuick import QtQuick
import QtQuick.Layouts import QtQuick.Layouts
import "../bar" as Bar import qs.modules.bar as Bar
MouseArea { MouseArea {
id: root id: root
@@ -8,7 +8,7 @@ import qs.services
import qs.modules.common import qs.modules.common
import qs.modules.common.widgets import qs.modules.common.widgets
import qs.modules.common.functions import qs.modules.common.functions
import "../bar" as Bar import qs.modules.bar as Bar
Item { // Bar content region Item { // Bar content region
id: root id: root
@@ -3,7 +3,7 @@ import qs.modules.common.widgets
import qs.services import qs.services
import QtQuick import QtQuick
import QtQuick.Layouts import QtQuick.Layouts
import "../bar" as Bar import qs.modules.bar as Bar
Item { Item {
id: root id: root
@@ -4,7 +4,7 @@ import qs.services
import QtQuick import QtQuick
import QtQuick.Shapes import QtQuick.Shapes
import QtQuick.Layouts import QtQuick.Layouts
import "../bar" as Bar import qs.modules.bar as Bar
Item { // Full hitbox Item { // Full hitbox
id: root id: root
@@ -8,7 +8,7 @@ import QtQuick
import QtQuick.Layouts import QtQuick.Layouts
import Quickshell.Services.Mpris import Quickshell.Services.Mpris
import "../bar" as Bar import qs.modules.bar as Bar
MouseArea { MouseArea {
id: root id: root
+1 -1
View File
@@ -7,7 +7,7 @@ import Quickshell
import Quickshell.Io import Quickshell.Io
import Quickshell.Wayland import Quickshell.Wayland
import QtQuick import QtQuick
import "./ai/" import qs.services.ai
/** /**
* Basic service to handle LLM chats. Supports Google's and OpenAI's API formats. * Basic service to handle LLM chats. Supports Google's and OpenAI's API formats.
@@ -6,7 +6,7 @@ pragma ComponentBehavior: Bound
import Quickshell import Quickshell
import Quickshell.Io import Quickshell.Io
import QtQuick import QtQuick
import "./network" import qs.services.network
/** /**
* Network service with nmcli. * Network service with nmcli.
+20 -20
View File
@@ -7,30 +7,30 @@
//@ pragma Env QT_SCALE_FACTOR=1 //@ pragma Env QT_SCALE_FACTOR=1
import "./modules/common/" import qs.modules.common
import "./modules/background/" import qs.modules.background
import "./modules/bar/" import qs.modules.bar
import "./modules/cheatsheet/" import qs.modules.cheatsheet
import "./modules/crosshair/" import qs.modules.crosshair
import "./modules/dock/" import qs.modules.dock
import "./modules/lock/" import qs.modules.lock
import "./modules/mediaControls/" import qs.modules.mediaControls
import "./modules/notificationPopup/" import qs.modules.notificationPopup
import "./modules/onScreenDisplay/" import qs.modules.onScreenDisplay
import "./modules/onScreenKeyboard/" import qs.modules.onScreenKeyboard
import "./modules/overview/" import qs.modules.overview
import "./modules/regionSelector/" import qs.modules.regionSelector
import "./modules/screenCorners/" import qs.modules.screenCorners
import "./modules/sessionScreen/" import qs.modules.sessionScreen
import "./modules/sidebarLeft/" import qs.modules.sidebarLeft
import "./modules/sidebarRight/" import qs.modules.sidebarRight
import "./modules/verticalBar/" import qs.modules.verticalBar
import "./modules/wallpaperSelector/" import qs.modules.wallpaperSelector
import QtQuick import QtQuick
import QtQuick.Window import QtQuick.Window
import Quickshell import Quickshell
import "./services/" import qs.services
ShellRoot { ShellRoot {
// Enable/disable modules here. False = not loaded at all, so rest assured // Enable/disable modules here. False = not loaded at all, so rest assured