mirror of
https://github.com/noctalia-dev/noctalia-shell.git
synced 2026-05-11 17:08:27 +08:00
More renaming
This commit is contained in:
@@ -28,7 +28,7 @@
|
||||
],
|
||||
"right": [
|
||||
{
|
||||
"id": "ScreenRecorderIndicator"
|
||||
"id": "ScreenRecorder"
|
||||
},
|
||||
{
|
||||
"id": "Tray"
|
||||
@@ -58,7 +58,7 @@
|
||||
"id": "Clock"
|
||||
},
|
||||
{
|
||||
"id": "SidePanelToggle"
|
||||
"id": "ControlCenter"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
+14
-14
@@ -142,7 +142,7 @@ Singleton {
|
||||
"id": "Workspace"
|
||||
}]
|
||||
property list<var> right: [{
|
||||
"id": "ScreenRecorderIndicator"
|
||||
"id": "ScreenRecorder"
|
||||
}, {
|
||||
"id": "Tray"
|
||||
}, {
|
||||
@@ -162,7 +162,7 @@ Singleton {
|
||||
}, {
|
||||
"id": "Clock"
|
||||
}, {
|
||||
"id": "SidePanelToggle"
|
||||
"id": "ControlCenter"
|
||||
}]
|
||||
}
|
||||
}
|
||||
@@ -386,18 +386,18 @@ Singleton {
|
||||
var widget = adapter.bar.widgets[sectionName][i]
|
||||
|
||||
switch (widget.id) {
|
||||
case "DarkModeToggle":
|
||||
widget.id = "DarkMode"
|
||||
break;
|
||||
case "PowerToggle":
|
||||
widget.id = "SessionMenu"
|
||||
break;
|
||||
case "ScreenRecorderIndicator":
|
||||
widget.id = "ScreenRecorder"
|
||||
break;
|
||||
case "SidePanelToggle":
|
||||
widget.id = "ControlCenter"
|
||||
break;
|
||||
case "DarkModeToggle":
|
||||
widget.id = "DarkMode"
|
||||
break
|
||||
case "PowerToggle":
|
||||
widget.id = "SessionMenu"
|
||||
break
|
||||
case "ScreenRecorderIndicator":
|
||||
widget.id = "ScreenRecorder"
|
||||
break
|
||||
case "SidePanelToggle":
|
||||
widget.id = "ControlCenter"
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,10 +14,10 @@ NIconButton {
|
||||
compact: (Settings.data.bar.density === "compact")
|
||||
baseSize: Style.capsuleHeight
|
||||
icon: "power"
|
||||
tooltipText: "Power panel"
|
||||
tooltipText: "Session menu"
|
||||
colorBg: (Settings.data.bar.showCapsule ? Color.mSurfaceVariant : Color.transparent)
|
||||
colorFg: Color.mError
|
||||
colorBorder: Color.transparent
|
||||
colorBorderHover: Color.transparent
|
||||
onClicked: PanelService.getPanel("powerPanel")?.toggle()
|
||||
onClicked: PanelService.getPanel("sessionMenuPanel")?.toggle()
|
||||
}
|
||||
|
||||
@@ -66,9 +66,9 @@ NBox {
|
||||
NIconButton {
|
||||
id: powerButton
|
||||
icon: "power"
|
||||
tooltipText: "Power panel"
|
||||
tooltipText: "Session Menu"
|
||||
onClicked: {
|
||||
powerPanel.open()
|
||||
sessionMenuPanel.open()
|
||||
controlCenterPanel.close()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -263,7 +263,7 @@ NPanel {
|
||||
Layout.preferredHeight: Style.baseWidgetSize * 0.8 * scaling
|
||||
|
||||
NText {
|
||||
text: timerActive ? `${pendingAction.charAt(0).toUpperCase() + pendingAction.slice(1)} in ${Math.ceil(timeRemaining / 1000)} seconds...` : "Power panel"
|
||||
text: timerActive ? `${pendingAction.charAt(0).toUpperCase() + pendingAction.slice(1)} in ${Math.ceil(timeRemaining / 1000)} seconds...` : "Session Menu"
|
||||
font.weight: Style.fontWeightBold
|
||||
font.pointSize: Style.fontSizeL * scaling
|
||||
color: timerActive ? Color.mPrimary : Color.mOnSurface
|
||||
@@ -126,16 +126,16 @@ Popup {
|
||||
"Battery": "WidgetSettings/BatterySettings.qml",
|
||||
"Brightness": "WidgetSettings/BrightnessSettings.qml",
|
||||
"Clock": "WidgetSettings/ClockSettings.qml",
|
||||
"ControlCenter": "WidgetSettings/ControlCenterSettings.qml",
|
||||
"CustomButton": "WidgetSettings/CustomButtonSettings.qml",
|
||||
"KeyboardLayout": "WidgetSettings/KeyboardLayoutSettings.qml",
|
||||
"MediaMini": "WidgetSettings/MediaMiniSettings.qml",
|
||||
"Microphone": "WidgetSettings/MicrophoneSettings.qml",
|
||||
"NotificationHistory": "WidgetSettings/NotificationHistorySettings.qml",
|
||||
"Workspace": "WidgetSettings/WorkspaceSettings.qml",
|
||||
"SidePanelToggle": "WidgetSettings/SidePanelToggleSettings.qml",
|
||||
"Spacer": "WidgetSettings/SpacerSettings.qml",
|
||||
"SystemMonitor": "WidgetSettings/SystemMonitorSettings.qml",
|
||||
"Volume": "WidgetSettings/VolumeSettings.qml"
|
||||
"Volume": "WidgetSettings/VolumeSettings.qml",
|
||||
"Workspace": "WidgetSettings/WorkspaceSettings.qml"
|
||||
}
|
||||
|
||||
const source = widgetSettingsMap[widgetId]
|
||||
|
||||
@@ -136,7 +136,7 @@ Singleton {
|
||||
CustomButton {}
|
||||
}
|
||||
property Component darkMode: Component {
|
||||
DarkMode{}
|
||||
DarkMode {}
|
||||
}
|
||||
property Component keyboardLayoutComponent: Component {
|
||||
KeyboardLayout {}
|
||||
|
||||
+19
-3
@@ -109,19 +109,35 @@ Item {
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: delete in next major release
|
||||
IpcHandler {
|
||||
target: "powerPanel"
|
||||
function toggle() {
|
||||
powerPanel.toggle()
|
||||
sessionMenuPanel.toggle()
|
||||
ToastService.showWarning("IPC", "PowerPanel has been renamed to SessionMenu, this IPC call will be deprecated soon. Please use \"ipc call sessionMenu toggle\" instead.", 8000)
|
||||
}
|
||||
}
|
||||
IpcHandler {
|
||||
target: "sessionMenu"
|
||||
function toggle() {
|
||||
sessionMenuPanel.toggle()
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: delete in next major release
|
||||
IpcHandler {
|
||||
// TODO: upgrade when breaking changes
|
||||
target: "sidePanel"
|
||||
function toggle() {
|
||||
// Will attempt to open the panel next to the bar button if any.
|
||||
controlCenterPanel.toggle(BarService.lookupWidget("SidePanelToggle"))
|
||||
controlCenterPanel.toggle(BarService.lookupWidget("ControlCenter"))
|
||||
ToastService.showWarning("IPC", "SidePanel has been renamed to ControlCenter, this IPC call will be deprecated soon. Please use \"ipc call controlCenter toggle\" instead.", 8000)
|
||||
}
|
||||
}
|
||||
IpcHandler {
|
||||
target: "controlCenter"
|
||||
function toggle() {
|
||||
// Will attempt to open the panel next to the bar button if any.
|
||||
controlCenterPanel.toggle(BarService.lookupWidget("ControlCenter"))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -24,13 +24,14 @@ import qs.Widgets
|
||||
import qs.Modules.Background
|
||||
import qs.Modules.Dock
|
||||
import qs.Modules.LockScreen
|
||||
import qs.Modules.SessionMenu
|
||||
|
||||
// Bar & Bar Components
|
||||
import qs.Modules.Bar
|
||||
import qs.Modules.Bar.Extras
|
||||
import qs.Modules.Bar.Bluetooth
|
||||
import qs.Modules.Bar.Calendar
|
||||
import qs.Modules.Bar.Power
|
||||
|
||||
import qs.Modules.Bar.WiFi
|
||||
|
||||
// Panels & UI Components
|
||||
@@ -60,7 +61,7 @@ ShellRoot {
|
||||
|
||||
ToastOverlay {}
|
||||
|
||||
// IPCService is treated as a service
|
||||
// IPCService is treated as a service
|
||||
// but it's actually an Item that needs to exists in the shell.
|
||||
IPCService {}
|
||||
|
||||
@@ -91,9 +92,9 @@ ShellRoot {
|
||||
objectName: "notificationHistoryPanel"
|
||||
}
|
||||
|
||||
PowerPanel {
|
||||
id: powerPanel
|
||||
objectName: "powerPanel"
|
||||
SessionMenu {
|
||||
id: sessionMenuPanel
|
||||
objectName: "sessionMenuPanel"
|
||||
}
|
||||
|
||||
WiFiPanel {
|
||||
|
||||
Reference in New Issue
Block a user