Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion panels/dock/OverflowContainer.qml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Item {
property alias removeDisplaced: listView.removeDisplaced
property alias moveDisplaced: listView.moveDisplaced
ListView {
Accessible.id: "ListView"
Component.onCompleted: { Accessible.id = "ListView" }
id: listView
anchors.fill: parent
orientation: useColumnLayout ? ListView.Vertical : ListView.Horizontal
Expand Down
4 changes: 2 additions & 2 deletions panels/dock/appruntimeitem/package/appruntimeitem.qml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ AppletItem {

PanelToolTip {
Accessible.role: Accessible.ToolTip
Accessible.id: "Appruntime"
Component.onCompleted: { Accessible.id = "Appruntime" }
id: toolTip
text: qsTr("appruntime")
toolTipX: DockPanelPositioner.x
toolTipY: DockPanelPositioner.y
}
AppletItemButton {
Accessible.role: Accessible.Button
Accessible.id: "Button"
Component.onCompleted: { Accessible.id = "Button" }
id: button
anchors.centerIn: parent
icon.name: "qrc:/ddeshell/package/icons/appruntime.svg"
Expand Down
4 changes: 2 additions & 2 deletions panels/dock/appruntimeitem/windowmanager.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -49,7 +49,7 @@ class WindowManager : public QAbstractListModel {
private:
QList<AppRuntimeInfo> m_WindowList;
int m_InactiveId;
int m_ActiveId;
uint m_ActiveId;
};

#endif // WINDOWMANAGER_H
2 changes: 1 addition & 1 deletion panels/dock/multitaskview/package/multitaskview.qml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ AppletDockItem {

PanelToolTip {
Accessible.role: Accessible.ToolTip
Accessible.id: "MultitaskingView"
Component.onCompleted: { Accessible.id = "MultitaskingView" }
id: toolTip
text: qsTr("Multitasking View")
toolTipX: DockPanelPositioner.x
Expand Down
6 changes: 3 additions & 3 deletions panels/dock/package/main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@ Window {
Accessible.name: qsTr("Dock Left Area")
OverflowContainer {
Accessible.role: Accessible.Pane
Accessible.id: "LeftLoader"
Component.onCompleted: { Accessible.id = "LeftLoader" }
id: leftLoader
anchors.fill: parent
useColumnLayout: dock.useColumnLayout
Expand Down Expand Up @@ -672,7 +672,7 @@ Window {

OverflowContainer {
Accessible.role: Accessible.Pane
Accessible.id: "CenterLoader"
Component.onCompleted: { Accessible.id = "CenterLoader" }
id: centerLoader
anchors.fill: parent
useColumnLayout: dock.useColumnLayout
Expand Down Expand Up @@ -702,7 +702,7 @@ Window {
anchors.bottom: parent.bottom
OverflowContainer {
Accessible.role: Accessible.Pane
Accessible.id: "RightLoader"
Component.onCompleted: { Accessible.id = "RightLoader" }
id: rightLoader
anchors.fill: parent
useColumnLayout: dock.useColumnLayout
Expand Down
2 changes: 1 addition & 1 deletion panels/dock/showdesktop/package/showdesktop.qml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ AppletItem {

PanelToolTip {
Accessible.role: Accessible.ToolTip
Accessible.id: "ShowDesktop"
Component.onCompleted: { Accessible.id = "ShowDesktop" }
id: toolTip
text: qsTr("show desktop")
toolTipX: DockPanelPositioner.x
Expand Down
10 changes: 5 additions & 5 deletions panels/dock/taskmanager/package/AppItem.qml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ Item {

AppItemPalette {
Accessible.role: Accessible.Pane
Accessible.id: "ItemPalette"
Component.onCompleted: { Accessible.id = "ItemPalette" }
id: itemPalette
displayMode: root.displayMode
colorTheme: root.colorTheme
Expand Down Expand Up @@ -246,7 +246,6 @@ Item {

WindowIndicator {
Accessible.role: Accessible.Indicator
Accessible.id: "WindowIndicator"
id: windowIndicator
dotWidth: root.useColumnLayout ? Math.max(iconSize / 16, 2) : Math.max(iconSize / 3, 2)
dotHeight: root.useColumnLayout ? Math.max(iconSize / 3, 2) : Math.max(iconSize / 16, 2)
Expand Down Expand Up @@ -300,12 +299,13 @@ Item {

Component.onCompleted: {
windowIndicator.updateIndicatorAnchors()
Accessible.id = "WindowIndicator"
}
}

AppItemTitle {
Accessible.role: Accessible.StaticText
Accessible.id: "TitleLoader"
Component.onCompleted: { Accessible.id = "TitleLoader" }
id: titleLoader
anchors.left: iconContainer.right
anchors.leftMargin: Math.round(root.iconSize / 8)
Expand Down Expand Up @@ -562,15 +562,15 @@ Item {

PanelToolTip {
Accessible.role: Accessible.ToolTip
Accessible.id: "ToolTip"
Component.onCompleted: { Accessible.id = "ToolTip" }
id: toolTip
toolTipX: DockPanelPositioner.x
toolTipY: DockPanelPositioner.y
}

PanelToolTip {
Accessible.role: Accessible.ToolTip
Accessible.id: "MoveToTrash"
Component.onCompleted: { Accessible.id = "MoveToTrash" }
id: dragToolTip
text: qsTr("Move to Trash")
toolTipX: DockPanelPositioner.x
Expand Down
4 changes: 2 additions & 2 deletions panels/dock/taskmanager/package/TaskManager.qml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ ContainmentItem {

OverflowContainer {
Accessible.role: Accessible.Pane
Accessible.id: "AppContainer"
Component.onCompleted: { Accessible.id = "AppContainer" }
id: appContainer
anchors.fill: parent
anchors.leftMargin: useColumnLayout ? 0 : taskmanager.startPadding
Expand Down Expand Up @@ -226,7 +226,6 @@ ContainmentItem {

AppItem {
Accessible.role: Accessible.ListItem
Accessible.id: "AppItem"
id: appItem
anchors.fill: parent // This is mandatory for draggable item center in drop area

Expand All @@ -247,6 +246,7 @@ ContainmentItem {
ListView.delayRemove: Drag.active
Component.onCompleted: {
dropFilesOnItem.connect(taskmanager.Applet.dropFilesOnItem)
Accessible.id = "AppItem"
}
onDragFinished: function() {
launcherDndDropArea.resetDndState()
Expand Down
10 changes: 5 additions & 5 deletions panels/dock/tray/SurfacePopup.qml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Item {

PanelToolTip {
Accessible.role: Accessible.ToolTip
Accessible.id: "ToolTip"
Component.onCompleted: { Accessible.id = "ToolTip" }
id: toolTip
onToolTipVisibleChanged: function (visible) {
if (visible && menuWindow.visible)
Expand All @@ -29,7 +29,7 @@ Item {
property alias shellSurface: surfaceLayer.shellSurface
ShellSurfaceItemProxy {
Accessible.role: Accessible.Pane
Accessible.id: "SurfaceLayer"
Component.onCompleted: { Accessible.id = "SurfaceLayer" }
id: surfaceLayer
anchors.centerIn: parent
autoClose: true
Expand All @@ -53,7 +53,7 @@ Item {
}
PanelMenu {
Accessible.role: Accessible.PopupMenu
Accessible.id: "Menu"
Component.onCompleted: { Accessible.id = "Menu" }
id: menu
width: menuSurfaceLayer.width
height: menuSurfaceLayer.height
Expand All @@ -62,7 +62,7 @@ Item {
property alias shellSurface: menuSurfaceLayer.shellSurface
ShellSurfaceItemProxy {
Accessible.role: Accessible.Pane
Accessible.id: "MenuSurfaceLayer"
Component.onCompleted: { Accessible.id = "MenuSurfaceLayer" }
id: menuSurfaceLayer
anchors.centerIn: parent
autoClose: true
Expand All @@ -85,7 +85,7 @@ Item {
active: false
sourceComponent: SurfaceSubPopup {
Accessible.role: Accessible.Dialog
Accessible.id: "SurfaceSubPopup"
Component.onCompleted: { Accessible.id = "SurfaceSubPopup" }
objectName: "stashed's subPopup"
transientParent: menuWindow
surfaceAcceptor: function (surfaceId) {
Expand Down
4 changes: 2 additions & 2 deletions panels/dock/tray/SurfaceSubPopup.qml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Item {

PanelMenu {
Accessible.role: Accessible.PopupMenu
Accessible.id: "Popup"
Component.onCompleted: { Accessible.id = "Popup" }
id: popup
width: popupSurfaceLayer.width
height: popupSurfaceLayer.height
Expand All @@ -57,7 +57,7 @@ Item {
property alias shellSurface: popupSurfaceLayer.shellSurface
ShellSurfaceItemProxy {
Accessible.role: Accessible.Pane
Accessible.id: "PopupSurfaceLayer"
Component.onCompleted: { Accessible.id = "PopupSurfaceLayer" }
id: popupSurfaceLayer
anchors.centerIn: parent
autoClose: true
Expand Down
14 changes: 7 additions & 7 deletions panels/dock/tray/TrayItemSurfacePopup.qml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Item {

PanelPopup {
Accessible.role: Accessible.Dialog
Accessible.id: "Popup"
Component.onCompleted: { Accessible.id = "Popup" }
id: popup
property alias shellSurface: popupContent.shellSurface
width: popupContent.width
Expand All @@ -42,7 +42,7 @@ Item {
anchors.fill: parent
ShellSurfaceItemProxy {
Accessible.role: Accessible.Pane
Accessible.id: "PopupContent"
Component.onCompleted: { Accessible.id = "PopupContent" }
id: popupContent
anchors.centerIn: parent
autoClose: true
Expand All @@ -55,7 +55,7 @@ Item {

PanelMenu {
Accessible.role: Accessible.PopupMenu
Accessible.id: "PopupMenu"
Component.onCompleted: { Accessible.id = "PopupMenu" }
id: popupMenu
property alias shellSurface: popupMenuContent.shellSurface
width: popupMenuContent.width
Expand All @@ -76,7 +76,7 @@ Item {
anchors.fill: parent
ShellSurfaceItemProxy {
Accessible.role: Accessible.Pane
Accessible.id: "PopupMenuContent"
Component.onCompleted: { Accessible.id = "PopupMenuContent" }
id: popupMenuContent
anchors.centerIn: parent
autoClose: true
Expand All @@ -100,7 +100,7 @@ Item {
active: false
sourceComponent: SurfaceSubPopup {
Accessible.role: Accessible.Dialog
Accessible.id: "SurfaceSubPopup"
Component.onCompleted: { Accessible.id = "SurfaceSubPopup" }
objectName: "tray's subPopup"
transientParent: popupMenu.menuWindow
surfaceAcceptor: function (surfaceId) {
Expand All @@ -126,15 +126,15 @@ Item {

PanelToolTip {
Accessible.role: Accessible.ToolTip
Accessible.id: "ToolTip"
Component.onCompleted: { Accessible.id = "ToolTip" }
id: toolTip
property alias shellSurface: toolTipContent.shellSurface
toolTipX: DockPanelPositioner.x
toolTipY: DockPanelPositioner.y

ShellSurfaceItemProxy {
Accessible.role: Accessible.Pane
Accessible.id: "ToolTipContent"
Component.onCompleted: { Accessible.id = "ToolTipContent" }
id: toolTipContent
anchors.centerIn: parent
autoClose: true
Expand Down
4 changes: 2 additions & 2 deletions panels/dock/tray/package/ActionLegacyTrayPluginDelegate.qml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import org.deepin.ds.dock.tray 1.0 as DDT

AppletItemButton {
Accessible.role: Accessible.Button
Accessible.id: "AppletItemButton"
Component.onCompleted: { Accessible.id = "AppletItemButton" }
id: root
property alias inputEventsEnabled: surfaceItem.inputEventsEnabled

Expand Down Expand Up @@ -86,7 +86,7 @@ AppletItemButton {

ShellSurfaceItemProxy {
Accessible.role: Accessible.Pane
Accessible.id: "SurfaceItem"
Component.onCompleted: { Accessible.id = "SurfaceItem" }
id: surfaceItem
anchors.fill: parent
shellSurface: pluginItem.plugin
Expand Down
2 changes: 1 addition & 1 deletion panels/dock/tray/package/ActionShowStashDelegate.qml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ AppletItemButton {

PanelToolTip {
Accessible.role: Accessible.ToolTip
Accessible.id: "ApplicationTray"
Component.onCompleted: { Accessible.id = "ApplicationTray" }
id: toolTip
text: qsTr("Application tray")
toolTipX: DockPanelPositioner.x
Expand Down
2 changes: 1 addition & 1 deletion panels/dock/tray/package/ActionToggleCollapseDelegate.qml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ AppletItemButton {

PanelToolTip {
Accessible.role: Accessible.ToolTip
Accessible.id: "CollapseTray"
Component.onCompleted: { Accessible.id = "CollapseTray" }
id: toolTip
text: qsTr("Collapse tray")
toolTipX: DockPanelPositioner.x
Expand Down
2 changes: 1 addition & 1 deletion panels/dock/tray/package/DummyDelegate.qml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import org.deepin.ds.dock 1.0
import org.deepin.ds.dock.tray 1.0 as DDT

Button {
Accessible.id: "Button"
Component.onCompleted: { Accessible.id = "Button" }
icon.name: model.surfaceId
icon.width: 16
icon.height: 16
Expand Down
2 changes: 1 addition & 1 deletion panels/dock/tray/package/StashContainer.qml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Item {
// tooltip and menu
DDT.SurfacePopup {
Accessible.role: Accessible.Dialog
Accessible.id: "StashSurfacePopup"
Component.onCompleted: { Accessible.id = "StashSurfacePopup" }
id: stashSurfacePopup
objectName: "stash"
surfaceAcceptor: isStashPopup
Expand Down
16 changes: 8 additions & 8 deletions panels/dock/tray/package/StashedItemDelegateChooser.qml
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,22 @@ LQM.DelegateChooser {
roleValue: "dummy"
StashedItemPositioner {
Accessible.role: Accessible.Pane
Accessible.id: "StashedItemPositioner"
Component.onCompleted: { Accessible.id = "StashedItemPositioner" }
contentItem: DummyDelegate {
Accessible.role: Accessible.Button
Accessible.id: "DummyDelegate"
Component.onCompleted: { Accessible.id = "DummyDelegate" }
}
}
}
LQM.DelegateChoice {
roleValue: "legacy-tray-plugin"
StashedItemPositioner {
Accessible.role: Accessible.Pane
Accessible.id: "StashItemPositioner"
Component.onCompleted: { Accessible.id = "StashItemPositioner" }
id: stashItemPositioner
contentItem: ActionLegacyTrayPluginDelegate {
Accessible.role: Accessible.Button
Accessible.id: "TrayDelegate"
Component.onCompleted: { Accessible.id = "TrayDelegate" }
id: trayDelegate
objectName: "stash"
itemVisible: stashItemPositioner.itemVisible
Expand Down Expand Up @@ -114,21 +114,21 @@ LQM.DelegateChooser {
roleValue: "action-show-stash"
StashedItemPositioner {
Accessible.role: Accessible.Pane
Accessible.id: "StashedItemPositioner"
Component.onCompleted: { Accessible.id = "StashedItemPositioner" }
contentItem: ActionShowStashDelegate {
Accessible.role: Accessible.Button
Accessible.id: "ActionShowStashDelegate"
Component.onCompleted: { Accessible.id = "ActionShowStashDelegate" }
}
}
}
LQM.DelegateChoice {
roleValue: "action-toggle-collapse"
StashedItemPositioner {
Accessible.role: Accessible.Pane
Accessible.id: "StashedItemPositioner"
Component.onCompleted: { Accessible.id = "StashedItemPositioner" }
contentItem: ActionToggleCollapseDelegate {
Accessible.role: Accessible.Button
Accessible.id: "ActionToggleCollapseDelegate"
Component.onCompleted: { Accessible.id = "ActionToggleCollapseDelegate" }
isHorizontal: root.isHorizontal
}
}
Expand Down
Loading
Loading