mirror of
https://invent.kde.org/plasma/plasma-desktop.git
synced 2026-11-03 14:49:44 -09:00
desktoppackage: Use Kirigami.AboutItem for the widget About page
Instead of keeping a copy of Kirigami's About page adapted to KPluginMetaData, pass the widget's metadata to Kirigami.AboutItem. This also brings Kirigami's reflowed license text, so the license no longer shows the hard line breaks of the license file. BUG: 486305
This commit is contained in:
Niccolò Venerandi
Marco Martin
parent
cd9506325c
commit
0296b746ce
1 changed files with 33 additions and 232 deletions
|
|
@ -7,15 +7,13 @@
|
|||
|
||||
import QtCore
|
||||
import QtQuick
|
||||
import QtQuick.Controls as QQC2
|
||||
import QtQuick.Layouts
|
||||
|
||||
import org.kde.plasma.plasmoid
|
||||
import org.kde.kirigami as Kirigami
|
||||
import org.kde.kcmutils as KCM
|
||||
|
||||
/**
|
||||
* A copy of Kirigami.AboutPage adapted to KPluginMetadata instead of KAboutData
|
||||
* Shows the widget's KPluginMetaData in a Kirigami.AboutItem
|
||||
*/
|
||||
KCM.SimpleKCM {
|
||||
id: page
|
||||
|
|
@ -23,239 +21,42 @@ KCM.SimpleKCM {
|
|||
|
||||
property var metaData: Plasmoid.metaData
|
||||
|
||||
Component {
|
||||
id: personDelegate
|
||||
Kirigami.AboutItem {
|
||||
id: aboutItem
|
||||
|
||||
RowLayout {
|
||||
height: implicitHeight + (Kirigami.Units.smallSpacing * 2)
|
||||
|
||||
spacing: Kirigami.Units.smallSpacing * 2
|
||||
Kirigami.Icon {
|
||||
implicitWidth: Kirigami.Units.iconSizes.smallMedium
|
||||
implicitHeight: implicitWidth
|
||||
source: "user"
|
||||
}
|
||||
QQC2.Label {
|
||||
Layout.fillWidth: true
|
||||
text: modelData.name
|
||||
textFormat: Text.PlainText
|
||||
}
|
||||
Row {
|
||||
// Group action buttons together
|
||||
spacing: 0
|
||||
QQC2.Button {
|
||||
visible: modelData.emailAddress
|
||||
width: height
|
||||
icon.name: "mail-sent"
|
||||
|
||||
display: QQC2.AbstractButton.IconOnly
|
||||
text: i18ndc("@action:button icononly for tooltip & accessible", "plasma_shell_org.kde.plasma.desktop", "Send an email to %1", modelData.emailAddress)
|
||||
|
||||
QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
|
||||
QQC2.ToolTip.visible: hovered
|
||||
QQC2.ToolTip.text: text
|
||||
|
||||
onClicked: Qt.openUrlExternally("mailto:%1".arg(modelData.emailAddress))
|
||||
}
|
||||
QQC2.Button {
|
||||
visible: modelData.webAddress
|
||||
width: height
|
||||
icon.name: "globe"
|
||||
|
||||
display: QQC2.AbstractButton.IconOnly
|
||||
text: i18ndc("plasma_shell_org.kde.plasma.desktop", "@action:button icononly for tooltip & accessible %1 is url", "Open website %1", modelData.webAddress)
|
||||
|
||||
QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
|
||||
QQC2.ToolTip.visible: hovered
|
||||
QQC2.ToolTip.text: modelData.webAddress
|
||||
|
||||
onClicked: Qt.openUrlExternally(modelData.webAddress)
|
||||
}
|
||||
readonly property var programLogo: {
|
||||
const iconName = page.metaData.iconName;
|
||||
if (iconName.charAt(0) == "/") {
|
||||
const fileName = "plasma/plasmoids/" +
|
||||
page.metaData.pluginId + "/contents" +
|
||||
iconName;
|
||||
return StandardPaths.locate(StandardPaths.
|
||||
GenericDataLocation, fileName);
|
||||
}
|
||||
return iconName || "application-x-plasma";
|
||||
}
|
||||
}
|
||||
|
||||
Component {
|
||||
id: licenseComponent
|
||||
|
||||
Kirigami.OverlaySheet {
|
||||
property alias text: licenseLabel.text
|
||||
|
||||
onClosed: destroy()
|
||||
|
||||
Kirigami.SelectableLabel {
|
||||
id: licenseLabel
|
||||
implicitWidth: Math.max(Kirigami.Units.gridUnit * 25, Math.round(page.width / 2), contentWidth)
|
||||
wrapMode: Text.WordWrap
|
||||
}
|
||||
|
||||
Component.onCompleted: open();
|
||||
}
|
||||
}
|
||||
|
||||
Item {
|
||||
height: childrenRect.height
|
||||
|
||||
ColumnLayout {
|
||||
id: column
|
||||
|
||||
readonly property int headingTopSpacing: Kirigami.Units.smallSpacing
|
||||
readonly property int dataLeftSpacing: Kirigami.Units.smallSpacing
|
||||
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
spacing: Kirigami.Units.largeSpacing
|
||||
|
||||
GridLayout {
|
||||
columns: 2
|
||||
Layout.fillWidth: true
|
||||
|
||||
Kirigami.Icon {
|
||||
Layout.rowSpan: 2
|
||||
Layout.preferredHeight: Kirigami.Units.iconSizes.huge
|
||||
Layout.preferredWidth: height
|
||||
Layout.maximumWidth: page.width / 3;
|
||||
Layout.rightMargin: Kirigami.Units.largeSpacing
|
||||
|
||||
source: {
|
||||
const iconName = page.metaData.iconName;
|
||||
if (iconName.charAt(0) == "/") {
|
||||
const fileName = "plasma/plasmoids/" +
|
||||
page.metaData.pluginId + "/contents" +
|
||||
iconName;
|
||||
return StandardPaths.locate(StandardPaths.
|
||||
GenericDataLocation, fileName);
|
||||
}
|
||||
return page.metaData.iconName ||
|
||||
page.metaData.pluginId;
|
||||
}
|
||||
fallback: "application-x-plasma"
|
||||
}
|
||||
|
||||
Kirigami.Heading {
|
||||
Layout.fillWidth: true
|
||||
Layout.alignment: Qt.AlignBottom
|
||||
text: page.metaData.name + " " + page.metaData.version
|
||||
textFormat: Text.PlainText
|
||||
}
|
||||
|
||||
Kirigami.Heading {
|
||||
Layout.fillWidth: true
|
||||
Layout.alignment: Qt.AlignTop
|
||||
Layout.maximumWidth: Kirigami.Units.gridUnit * 15
|
||||
level: 3
|
||||
type: Kirigami.Heading.Type.Secondary
|
||||
wrapMode: Text.WordWrap
|
||||
text: page.metaData.description
|
||||
textFormat: Text.PlainText
|
||||
}
|
||||
}
|
||||
|
||||
Kirigami.Separator {
|
||||
Layout.fillWidth: true
|
||||
}
|
||||
|
||||
Kirigami.Heading {
|
||||
Layout.topMargin: column.headingTopSpacing
|
||||
text: i18ndc("plasma_shell_org.kde.plasma.desktop", "@title:group", "Website")
|
||||
textFormat: Text.PlainText
|
||||
}
|
||||
Kirigami.UrlButton {
|
||||
Layout.leftMargin: column.dataLeftSpacing
|
||||
url: page.metaData.website
|
||||
visible: url.length > 0
|
||||
}
|
||||
|
||||
Kirigami.Heading {
|
||||
Layout.topMargin: column.headingTopSpacing
|
||||
text: i18ndc("plasma_shell_org.kde.plasma.desktop", "@title:group", "Get Help")
|
||||
textFormat: Text.PlainText
|
||||
}
|
||||
Kirigami.UrlButton {
|
||||
Layout.leftMargin: column.dataLeftSpacing
|
||||
textFormat: Text.PlainText
|
||||
|
||||
url: page.metaData.bugReportUrl
|
||||
text: i18ndc("plasma_shell_org.kde.plasma.desktop", "@action:button urlbutton", "Report an issue")
|
||||
|
||||
visible: page.metaData.bugReportUrl.length > 0
|
||||
}
|
||||
|
||||
Kirigami.Heading {
|
||||
Layout.topMargin: column.headingTopSpacing
|
||||
text: i18ndc("plasma_shell_org.kde.plasma.desktop", "@title license information", "Copyright")
|
||||
textFormat: Text.PlainText
|
||||
}
|
||||
|
||||
ColumnLayout {
|
||||
spacing: Kirigami.Units.smallSpacing
|
||||
Layout.leftMargin: column.dataLeftSpacing
|
||||
|
||||
QQC2.Label {
|
||||
text: page.metaData.copyrightText
|
||||
textFormat: Text.PlainText
|
||||
visible: text.length > 0
|
||||
}
|
||||
|
||||
RowLayout {
|
||||
spacing: Kirigami.Units.smallSpacing
|
||||
|
||||
QQC2.Label {
|
||||
Layout.fillWidth: true
|
||||
text: i18ndc("plasma_shell_org.kde.plasma.desktop", "@label %1 is the short SPDX text for the license", "License: %1", page.metaData.license)
|
||||
textFormat: Text.PlainText
|
||||
}
|
||||
|
||||
QQC2.Button {
|
||||
icon.name: "view-readermode"
|
||||
text: i18ndc("plasma_shell_org.kde.plasma.desktop", "@action:button", "Read License")
|
||||
onClicked: {
|
||||
licenseComponent.incubateObject(page.Window.window.contentItem, {
|
||||
"text": page.metaData.licenseText,
|
||||
"title": page.metaData.license,
|
||||
}, Qt.Asynchronous);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Kirigami.Heading {
|
||||
Layout.fillWidth: true
|
||||
Layout.topMargin: column.headingTopSpacing
|
||||
text: i18ndc("plasma_shell_org.kde.plasma.desktop", "@title:group", "Authors")
|
||||
textFormat: Text.PlainText
|
||||
visible: page.metaData.authors.length > 0
|
||||
}
|
||||
Repeater {
|
||||
Layout.leftMargin: column.dataLeftSpacing
|
||||
model: page.metaData.authors
|
||||
delegate: personDelegate
|
||||
}
|
||||
|
||||
Kirigami.Heading {
|
||||
Layout.topMargin: column.headingTopSpacing
|
||||
text: i18ndc("plasma_shell_org.kde.plasma.desktop", "@title:group", "Credits")
|
||||
textFormat: Text.PlainText
|
||||
visible: repCredits.count > 0
|
||||
}
|
||||
Repeater {
|
||||
id: repCredits
|
||||
Layout.leftMargin: column.dataLeftSpacing
|
||||
model: page.metaData.otherContributors
|
||||
delegate: personDelegate
|
||||
}
|
||||
|
||||
Kirigami.Heading {
|
||||
Layout.topMargin: column.headingTopSpacing
|
||||
text: i18ndc("plasma_shell_org.kde.plasma.desktop", "@title:group", "Translators")
|
||||
textFormat: Text.PlainText
|
||||
visible: repTranslators.count > 0
|
||||
}
|
||||
Repeater {
|
||||
id: repTranslators
|
||||
Layout.leftMargin: column.dataLeftSpacing
|
||||
model: page.metaData.translators
|
||||
delegate: personDelegate
|
||||
}
|
||||
showLibraries: false
|
||||
aboutData: {
|
||||
"displayName": page.metaData.name,
|
||||
"productName": "",
|
||||
"componentName": page.metaData.pluginId,
|
||||
"programLogo": aboutItem.programLogo,
|
||||
"shortDescription": page.metaData.description,
|
||||
"homepage": page.metaData.website,
|
||||
"bugAddress": page.metaData.bugReportUrl,
|
||||
"version": page.metaData.version,
|
||||
"otherText": "",
|
||||
"authors": page.metaData.authors,
|
||||
"credits": page.metaData.otherContributors,
|
||||
"translators": page.metaData.translators,
|
||||
"licenses": page.metaData.license.length > 0 ? [{
|
||||
"name": page.metaData.license,
|
||||
"text": page.metaData.licenseText,
|
||||
"spdx": page.metaData.license,
|
||||
}] : [],
|
||||
"copyrightStatement": page.metaData.copyrightText,
|
||||
"desktopFileName": "",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue