Skip to content

[stable-33.0] Improve integration. #9618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mgallien merged 3 commits into from
Mar 12, 2026
+41 −74
Merged

[stable-33.0] Improve integration. #9618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
65e471a
fix(integration): use icon instead of Image for file actions list.
camilasan Mar 12, 2026
d2f8e3f
feat(integration): close window when user clicks on response text to …
camilasan Mar 12, 2026
cfbd904
refactor(integration): remove MouseArea from ItemDelegate.
camilasan Mar 12, 2026
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
111 changes: 39 additions & 72 deletions src/gui/integration/FileActionsWindow.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,42 @@ ApplicationWindow {
spacing: Style.trayHorizontalMargin
Layout.fillWidth: true
Layout.fillHeight: true
delegate: fileActionsDelegate
delegate: ItemDelegate {
id: fileActionsDelegate

required property string name
required property int index
required property string actionIcon

Layout.fillWidth: true
height: implicitHeight
width: parent.width
implicitHeight: Style.activityListButtonHeight
padding: Style.standardSpacing

text: name
font.pixelSize: Style.defaultFontPtSize
Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
icon {
source: actionIcon
color: palette.windowText
width: Style.minimumActivityItemHeight
height: Style.minimumActivityItemHeight
Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
}

background: Rectangle {
color: "transparent"
radius: root.windowRadius
border.width: fileActionsDelegate.hovered ? Style.trayWindowBorderWidth : 0
border.color: palette.dark
anchors.margins: Style.standardSpacing
height: parent.height
width: parent.width
}

onClicked: fileActionModel.createRequest(index)
}
}

Button {
Expand Down Expand Up @@ -186,79 +221,11 @@ ApplicationWindow {
id: responseArea
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
onClicked: Qt.openUrlExternally(fileActionModel.responseUrl)
}
}
}
}

Component {
id: fileActionsDelegate

RowLayout {
id: fileAction
Layout.fillWidth: true
height: implicitHeight
width: parent.width

required property string name
required property int index
required property string icon

Button {
id: fileActionButton
flat: true
Layout.fillWidth: true
implicitHeight: Style.activityListButtonHeight

padding: Style.standardSpacing

contentItem: Row {
id: fileActionsContent
anchors.fill: parent
anchors.topMargin: Style.standardSpacing
anchors.rightMargin: Style.standardSpacing
anchors.bottomMargin: Style.standardSpacing
anchors.leftMargin: Style.extraSmallSpacing
spacing: Style.standardSpacing
Layout.fillWidth: true

Image {
source: fileAction.icon + palette.windowText
width: Style.minimumActivityItemHeight
height: Style.minimumActivityItemHeight
fillMode: Image.PreserveAspectFit
Layout.preferredWidth: Style.minimumActivityItemHeight
Layout.preferredHeight: Style.minimumActivityItemHeight
anchors.verticalCenter: parent.verticalCenter
}

EnforcedPlainTextLabel {
text: fileAction.name
color: palette.text
font.pixelSize: Style.defaultFontPtSize
verticalAlignment: Text.AlignVCenter
anchors.verticalCenter: parent.verticalCenter
onClicked: {
Qt.openUrlExternally(fileActionModel.responseUrl)
root.close()
}
}

background: Rectangle {
color: "transparent"
radius: root.windowRadius
border.width: fileActionButton.hovered ? Style.trayWindowBorderWidth : 0
border.color: palette.dark
anchors.margins: Style.standardSpacing
height: parent.height
width: parent.width
}

MouseArea {
id: fileActionMouseArea
anchors.fill: parent
anchors.margins: Style.standardSpacing
cursorShape: Qt.PointingHandCursor
onClicked: fileActionModel.createRequest(fileAction.index)
}
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/gui/integration/fileactionsmodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ int FileActionsModel::rowCount(const QModelIndex &parent) const
QHash<int, QByteArray> FileActionsModel::roleNames() const
{
auto roles = QAbstractListModel::roleNames();
roles[FileActionIconRole] = "icon";
roles[FileActionIconRole] = "actionIcon";
roles[FileActionNameRole] = "name";
roles[FileActionUrlRole] = "url";
roles[FileActionMethodRole] = "method";
Expand Down Expand Up @@ -325,7 +325,7 @@ QString FileActionsModel::parseIcon(const QString &icon) const
return QStringLiteral("image://svgimage-custom-color/convert_to_text.svg/");
}

return _accountUrl + icon;
return QStringLiteral("image://tray-image-provider/") + _accountUrl + icon;
}

void FileActionsModel::createRequest(const int row)
Expand Down
Loading