Formatting
This commit is contained in:
quadbyte
parent
d17fb4c002
commit
934d4cc933
2 changed files with 314 additions and 329 deletions
|
|
@ -8,330 +8,316 @@ import qs.Services
|
||||||
import qs.Widgets
|
import qs.Widgets
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
id: root
|
id: root
|
||||||
|
|
||||||
property string latestVersion: Github.latestVersion
|
property string latestVersion: Github.latestVersion
|
||||||
property string currentVersion: "v1.2.1" // Fallback version
|
property string currentVersion: "v1.2.1" // Fallback version
|
||||||
property var contributors: Github.contributors
|
property var contributors: Github.contributors
|
||||||
|
|
||||||
|
Component.onCompleted: {
|
||||||
|
// Initialize the Github service
|
||||||
|
Github.init()
|
||||||
|
}
|
||||||
|
|
||||||
|
spacing: 0
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.fillHeight: true
|
||||||
|
|
||||||
|
Process {
|
||||||
|
id: currentVersionProcess
|
||||||
|
|
||||||
|
command: ["sh", "-c", "cd " + Quickshell.shellDir + " && git describe --tags --abbrev=0 2>/dev/null || echo 'Unknown'"]
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
// Initialize the Github service
|
running = true
|
||||||
Github.init();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
spacing: 0
|
stdout: StdioCollector {
|
||||||
|
onStreamFinished: {
|
||||||
|
const version = text.trim()
|
||||||
|
if (version && version !== "Unknown") {
|
||||||
|
root.currentVersion = version
|
||||||
|
} else {
|
||||||
|
currentVersionProcess.command = ["sh", "-c", "cd " + Quickshell.shellDir
|
||||||
|
+ " && cat package.json 2>/dev/null | grep '\"version\"' | cut -d'\"' -f4 || echo 'Unknown'"]
|
||||||
|
currentVersionProcess.running = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ScrollView {
|
||||||
|
id: scrollView
|
||||||
|
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
|
padding: 16
|
||||||
|
rightPadding: 12
|
||||||
|
clip: true
|
||||||
|
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
|
||||||
|
ScrollBar.vertical.policy: ScrollBar.AsNeeded
|
||||||
|
|
||||||
Process {
|
ColumnLayout {
|
||||||
id: currentVersionProcess
|
width: scrollView.availableWidth
|
||||||
|
spacing: 0
|
||||||
|
|
||||||
command: ["sh", "-c", "cd " + Quickshell.shellDir + " && git describe --tags --abbrev=0 2>/dev/null || echo 'Unknown'"]
|
NText {
|
||||||
Component.onCompleted: {
|
text: "Noctalia: quiet by design"
|
||||||
running = true;
|
font.pointSize: 24 * Scaling.scale(screen)
|
||||||
|
font.weight: Style.fontWeightBold
|
||||||
|
color: Colors.textPrimary
|
||||||
|
Layout.alignment: Qt.AlignCenter
|
||||||
|
Layout.bottomMargin: 8 * Scaling.scale(screen)
|
||||||
|
}
|
||||||
|
|
||||||
|
NText {
|
||||||
|
text: "It may just be another quickshell setup but it won't get in your way."
|
||||||
|
font.pointSize: 14 * Scaling.scale(screen)
|
||||||
|
color: Colors.textSecondary
|
||||||
|
Layout.alignment: Qt.AlignCenter
|
||||||
|
Layout.bottomMargin: 16 * Scaling.scale(screen)
|
||||||
|
}
|
||||||
|
|
||||||
|
GridLayout {
|
||||||
|
Layout.alignment: Qt.AlignCenter
|
||||||
|
columns: 2
|
||||||
|
rowSpacing: 4
|
||||||
|
columnSpacing: 8
|
||||||
|
|
||||||
|
NText {
|
||||||
|
text: "Latest Version:"
|
||||||
|
font.pointSize: 16 * Scaling.scale(screen)
|
||||||
|
color: Colors.textSecondary
|
||||||
|
Layout.alignment: Qt.AlignRight
|
||||||
}
|
}
|
||||||
|
|
||||||
stdout: StdioCollector {
|
NText {
|
||||||
onStreamFinished: {
|
text: root.latestVersion
|
||||||
const version = text.trim();
|
font.pointSize: 16 * Scaling.scale(screen)
|
||||||
if (version && version !== "Unknown") {
|
color: Colors.textPrimary
|
||||||
root.currentVersion = version;
|
font.weight: Style.fontWeightBold
|
||||||
} else {
|
|
||||||
currentVersionProcess.command = ["sh", "-c", "cd " + Quickshell.shellDir + " && cat package.json 2>/dev/null | grep '\"version\"' | cut -d'\"' -f4 || echo 'Unknown'"];
|
|
||||||
currentVersionProcess.running = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
NText {
|
||||||
|
text: "Installed Version:"
|
||||||
|
font.pointSize: 16 * Scaling.scale(screen)
|
||||||
|
color: Colors.textSecondary
|
||||||
|
Layout.alignment: Qt.AlignRight
|
||||||
|
}
|
||||||
|
|
||||||
ScrollView {
|
NText {
|
||||||
id: scrollView
|
text: root.currentVersion
|
||||||
|
font.pointSize: 16 * Scaling.scale(screen)
|
||||||
|
color: Colors.textPrimary
|
||||||
|
font.weight: Style.fontWeightBold
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
Layout.alignment: Qt.AlignCenter
|
||||||
|
Layout.topMargin: 8
|
||||||
|
Layout.preferredWidth: updateText.implicitWidth + 46
|
||||||
|
Layout.preferredHeight: 32
|
||||||
|
radius: 20
|
||||||
|
color: updateArea.containsMouse ? Colors.accentPrimary : "transparent"
|
||||||
|
border.color: Colors.accentPrimary
|
||||||
|
border.width: 1
|
||||||
|
visible: {
|
||||||
|
if (root.currentVersion === "Unknown" || root.latestVersion === "Unknown")
|
||||||
|
return false
|
||||||
|
|
||||||
|
const latest = root.latestVersion.replace("v", "").split(".")
|
||||||
|
const current = root.currentVersion.replace("v", "").split(".")
|
||||||
|
for (var i = 0; i < Math.max(latest.length, current.length); i++) {
|
||||||
|
const l = parseInt(latest[i] || "0")
|
||||||
|
const c = parseInt(current[i] || "0")
|
||||||
|
if (l > c)
|
||||||
|
return true
|
||||||
|
|
||||||
|
if (l < c)
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
RowLayout {
|
||||||
|
anchors.centerIn: parent
|
||||||
|
spacing: 8
|
||||||
|
|
||||||
|
NText {
|
||||||
|
text: "system_update"
|
||||||
|
font.family: "Material Symbols Outlined"
|
||||||
|
font.pointSize: 18 * Scaling.scale(screen)
|
||||||
|
color: updateArea.containsMouse ? Colors.backgroundPrimary : Colors.accentPrimary
|
||||||
|
}
|
||||||
|
|
||||||
|
NText {
|
||||||
|
id: updateText
|
||||||
|
|
||||||
|
text: "Download latest release"
|
||||||
|
font.pointSize: 14 * Scaling.scale(screen)
|
||||||
|
color: updateArea.containsMouse ? Colors.backgroundPrimary : Colors.accentPrimary
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
MouseArea {
|
||||||
|
id: updateArea
|
||||||
|
|
||||||
|
anchors.fill: parent
|
||||||
|
hoverEnabled: true
|
||||||
|
cursorShape: Qt.PointingHandCursor
|
||||||
|
onClicked: {
|
||||||
|
Quickshell.execDetached(["xdg-open", "https://github.com/Ly-sec/Noctalia/releases/latest"])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Separator
|
||||||
|
Rectangle {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
Layout.topMargin: 26
|
||||||
|
Layout.bottomMargin: 18
|
||||||
|
height: 1
|
||||||
|
color: Colors.outline
|
||||||
|
opacity: 0.3
|
||||||
|
}
|
||||||
|
|
||||||
|
NText {
|
||||||
|
text: "Contributors"
|
||||||
|
font.pointSize: 18 * Scaling.scale(screen)
|
||||||
|
font.weight: Style.fontWeightBold
|
||||||
|
color: Colors.textPrimary
|
||||||
|
Layout.alignment: Qt.AlignCenter
|
||||||
|
Layout.topMargin: 32
|
||||||
|
}
|
||||||
|
|
||||||
|
NText {
|
||||||
|
text: "(" + root.contributors.length + ")"
|
||||||
|
font.pointSize: 14 * Scaling.scale(screen)
|
||||||
|
color: Colors.textSecondary
|
||||||
|
Layout.alignment: Qt.AlignCenter
|
||||||
|
Layout.topMargin: 4
|
||||||
|
}
|
||||||
|
|
||||||
|
ScrollView {
|
||||||
|
Layout.alignment: Qt.AlignCenter
|
||||||
|
Layout.preferredWidth: 200 * 4
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
padding: 16
|
Layout.topMargin: 16
|
||||||
rightPadding: 12
|
|
||||||
clip: true
|
clip: true
|
||||||
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
|
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
|
||||||
ScrollBar.vertical.policy: ScrollBar.AsNeeded
|
ScrollBar.vertical.policy: ScrollBar.AsNeeded
|
||||||
|
|
||||||
ColumnLayout {
|
GridView {
|
||||||
width: scrollView.availableWidth
|
id: contributorsGrid
|
||||||
spacing: 0
|
|
||||||
|
|
||||||
NText {
|
anchors.fill: parent
|
||||||
text: "Noctalia: quiet by design"
|
width: 200 * 4
|
||||||
font.pointSize: 24 * Scaling.scale(screen)
|
height: Math.ceil(root.contributors.length / 4) * 100
|
||||||
font.weight: Style.fontWeightBold
|
cellWidth: 200
|
||||||
color: Colors.textPrimary
|
cellHeight: 100
|
||||||
Layout.alignment: Qt.AlignCenter
|
model: root.contributors
|
||||||
Layout.bottomMargin: 8 * Scaling.scale(screen)
|
|
||||||
}
|
|
||||||
|
|
||||||
NText {
|
delegate: Rectangle {
|
||||||
text: "It may just be another quickshell setup but it won't get in your way."
|
width: contributorsGrid.cellWidth - 16
|
||||||
font.pointSize: 14 * Scaling.scale(screen)
|
height: contributorsGrid.cellHeight - 4
|
||||||
color: Colors.textSecondary
|
radius: 20
|
||||||
Layout.alignment: Qt.AlignCenter
|
color: contributorArea.containsMouse ? Colors.hover : "transparent"
|
||||||
Layout.bottomMargin: 16 * Scaling.scale(screen)
|
|
||||||
}
|
|
||||||
|
|
||||||
GridLayout {
|
RowLayout {
|
||||||
Layout.alignment: Qt.AlignCenter
|
anchors.fill: parent
|
||||||
columns: 2
|
anchors.margins: 8
|
||||||
rowSpacing: 4
|
spacing: 12
|
||||||
columnSpacing: 8
|
|
||||||
|
|
||||||
NText {
|
Item {
|
||||||
text: "Latest Version:"
|
Layout.alignment: Qt.AlignVCenter
|
||||||
font.pointSize: 16 * Scaling.scale(screen)
|
Layout.preferredWidth: 40
|
||||||
color: Colors.textSecondary
|
Layout.preferredHeight: 40
|
||||||
Layout.alignment: Qt.AlignRight
|
|
||||||
}
|
|
||||||
|
|
||||||
NText {
|
Image {
|
||||||
text: root.latestVersion
|
id: avatarImage
|
||||||
font.pointSize: 16 * Scaling.scale(screen)
|
|
||||||
color: Colors.textPrimary
|
|
||||||
font.weight: Style.fontWeightBold
|
|
||||||
}
|
|
||||||
|
|
||||||
NText {
|
anchors.fill: parent
|
||||||
text: "Installed Version:"
|
source: modelData.avatar_url || ""
|
||||||
font.pointSize: 16 * Scaling.scale(screen)
|
sourceSize: Qt.size(80, 80)
|
||||||
color: Colors.textSecondary
|
visible: false
|
||||||
Layout.alignment: Qt.AlignRight
|
mipmap: true
|
||||||
}
|
smooth: true
|
||||||
|
asynchronous: true
|
||||||
NText {
|
fillMode: Image.PreserveAspectCrop
|
||||||
text: root.currentVersion
|
cache: true
|
||||||
font.pointSize: 16 * Scaling.scale(screen)
|
|
||||||
color: Colors.textPrimary
|
|
||||||
font.weight: Style.fontWeightBold
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
Layout.alignment: Qt.AlignCenter
|
|
||||||
Layout.topMargin: 8
|
|
||||||
Layout.preferredWidth: updateText.implicitWidth + 46
|
|
||||||
Layout.preferredHeight: 32
|
|
||||||
radius: 20
|
|
||||||
color: updateArea.containsMouse ? Colors.accentPrimary : "transparent"
|
|
||||||
border.color: Colors.accentPrimary
|
|
||||||
border.width: 1
|
|
||||||
visible: {
|
|
||||||
if (root.currentVersion === "Unknown" || root.latestVersion === "Unknown")
|
|
||||||
return false;
|
|
||||||
|
|
||||||
const latest = root.latestVersion.replace("v", "").split(".");
|
|
||||||
const current = root.currentVersion.replace("v", "").split(".");
|
|
||||||
for (let i = 0; i < Math.max(latest.length, current.length); i++) {
|
|
||||||
const l = parseInt(latest[i] || "0");
|
|
||||||
const c = parseInt(current[i] || "0");
|
|
||||||
if (l > c)
|
|
||||||
return true;
|
|
||||||
|
|
||||||
if (l < c)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
|
onStatusChanged: {
|
||||||
|
if (status === Image.Error) {
|
||||||
|
console.log("[About] Failed to load avatar for", modelData.login, "URL:", modelData.avatar_url)
|
||||||
}
|
}
|
||||||
return false;
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
RowLayout {
|
MultiEffect {
|
||||||
anchors.centerIn: parent
|
anchors.fill: parent
|
||||||
spacing: 8
|
source: avatarImage
|
||||||
|
maskEnabled: true
|
||||||
NText {
|
maskSource: mask
|
||||||
text: "system_update"
|
|
||||||
font.family: "Material Symbols Outlined"
|
|
||||||
font.pointSize: 18 * Scaling.scale(screen)
|
|
||||||
color: updateArea.containsMouse ? Colors.backgroundPrimary : Colors.accentPrimary
|
|
||||||
}
|
|
||||||
|
|
||||||
NText {
|
|
||||||
id: updateText
|
|
||||||
|
|
||||||
text: "Download latest release"
|
|
||||||
font.pointSize: 14 * Scaling.scale(screen)
|
|
||||||
color: updateArea.containsMouse ? Colors.backgroundPrimary : Colors.accentPrimary
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
MouseArea {
|
Item {
|
||||||
id: updateArea
|
id: mask
|
||||||
|
|
||||||
|
anchors.fill: parent
|
||||||
|
layer.enabled: true
|
||||||
|
visible: false
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
hoverEnabled: true
|
radius: parent.width / 2
|
||||||
cursorShape: Qt.PointingHandCursor
|
}
|
||||||
onClicked: {
|
|
||||||
Quickshell.execDetached(["xdg-open", "https://github.com/Ly-sec/Noctalia/releases/latest"]);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
NText {
|
||||||
|
anchors.centerIn: parent
|
||||||
|
text: "person"
|
||||||
|
font.family: "Material Symbols Outlined"
|
||||||
|
font.pointSize: 24 * Scaling.scale(screen)
|
||||||
|
color: contributorArea.containsMouse ? Colors.backgroundPrimary : Colors.textPrimary
|
||||||
|
visible: !avatarImage.source || avatarImage.status !== Image.Ready
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Separator
|
ColumnLayout {
|
||||||
Rectangle {
|
spacing: 4
|
||||||
|
Layout.alignment: Qt.AlignVCenter
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.topMargin: 26
|
|
||||||
Layout.bottomMargin: 18
|
|
||||||
height: 1
|
|
||||||
color: Colors.outline
|
|
||||||
opacity: 0.3
|
|
||||||
}
|
|
||||||
|
|
||||||
NText {
|
|
||||||
text: "Contributors"
|
|
||||||
font.pointSize: 18 * Scaling.scale(screen)
|
|
||||||
font.weight: Style.fontWeightBold
|
|
||||||
color: Colors.textPrimary
|
|
||||||
Layout.alignment: Qt.AlignCenter
|
|
||||||
Layout.topMargin: 32
|
|
||||||
}
|
|
||||||
|
|
||||||
NText {
|
|
||||||
text: "(" + root.contributors.length + ")"
|
|
||||||
font.pointSize: 14 * Scaling.scale(screen)
|
|
||||||
color: Colors.textSecondary
|
|
||||||
Layout.alignment: Qt.AlignCenter
|
|
||||||
Layout.topMargin: 4
|
|
||||||
}
|
|
||||||
|
|
||||||
ScrollView {
|
|
||||||
Layout.alignment: Qt.AlignCenter
|
|
||||||
Layout.preferredWidth: 200 * 4
|
|
||||||
Layout.fillHeight: true
|
|
||||||
Layout.topMargin: 16
|
|
||||||
clip: true
|
|
||||||
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
|
|
||||||
ScrollBar.vertical.policy: ScrollBar.AsNeeded
|
|
||||||
|
|
||||||
GridView {
|
|
||||||
id: contributorsGrid
|
|
||||||
|
|
||||||
anchors.fill: parent
|
|
||||||
width: 200 * 4
|
|
||||||
height: Math.ceil(root.contributors.length / 4) * 100
|
|
||||||
cellWidth: 200
|
|
||||||
cellHeight: 100
|
|
||||||
model: root.contributors
|
|
||||||
|
|
||||||
delegate: Rectangle {
|
|
||||||
width: contributorsGrid.cellWidth - 16
|
|
||||||
height: contributorsGrid.cellHeight - 4
|
|
||||||
radius: 20
|
|
||||||
color: contributorArea.containsMouse ? Colors.hover : "transparent"
|
|
||||||
|
|
||||||
RowLayout {
|
|
||||||
anchors.fill: parent
|
|
||||||
anchors.margins: 8
|
|
||||||
spacing: 12
|
|
||||||
|
|
||||||
Item {
|
|
||||||
Layout.alignment: Qt.AlignVCenter
|
|
||||||
Layout.preferredWidth: 40
|
|
||||||
Layout.preferredHeight: 40
|
|
||||||
|
|
||||||
Image {
|
|
||||||
id: avatarImage
|
|
||||||
|
|
||||||
anchors.fill: parent
|
|
||||||
source: modelData.avatar_url || ""
|
|
||||||
sourceSize: Qt.size(80, 80)
|
|
||||||
visible: false
|
|
||||||
mipmap: true
|
|
||||||
smooth: true
|
|
||||||
asynchronous: true
|
|
||||||
fillMode: Image.PreserveAspectCrop
|
|
||||||
cache: true
|
|
||||||
|
|
||||||
onStatusChanged: {
|
|
||||||
if (status === Image.Error) {
|
|
||||||
console.log("[About] Failed to load avatar for", modelData.login, "URL:", modelData.avatar_url);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
MultiEffect {
|
|
||||||
anchors.fill: parent
|
|
||||||
source: avatarImage
|
|
||||||
maskEnabled: true
|
|
||||||
maskSource: mask
|
|
||||||
}
|
|
||||||
|
|
||||||
Item {
|
|
||||||
id: mask
|
|
||||||
|
|
||||||
anchors.fill: parent
|
|
||||||
layer.enabled: true
|
|
||||||
visible: false
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
anchors.fill: parent
|
|
||||||
radius: parent.width / 2
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
NText {
|
|
||||||
anchors.centerIn: parent
|
|
||||||
text: "person"
|
|
||||||
font.family: "Material Symbols Outlined"
|
|
||||||
font.pointSize: 24 * Scaling.scale(screen)
|
|
||||||
color: contributorArea.containsMouse ? Colors.backgroundPrimary : Colors.textPrimary
|
|
||||||
visible: !avatarImage.source || avatarImage.status !== Image.Ready
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
ColumnLayout {
|
|
||||||
spacing: 4
|
|
||||||
Layout.alignment: Qt.AlignVCenter
|
|
||||||
Layout.fillWidth: true
|
|
||||||
|
|
||||||
NText {
|
|
||||||
text: modelData.login || "Unknown"
|
|
||||||
font.pointSize: 13 * Scaling.scale(screen)
|
|
||||||
color: contributorArea.containsMouse ? Colors.backgroundPrimary : Colors.textPrimary
|
|
||||||
elide: Text.ElideRight
|
|
||||||
Layout.fillWidth: true
|
|
||||||
}
|
|
||||||
|
|
||||||
NText {
|
|
||||||
text: (modelData.contributions || 0) + " commits"
|
|
||||||
font.pointSize: 11 * Scaling.scale(screen)
|
|
||||||
color: contributorArea.containsMouse ? Colors.backgroundPrimary : Colors.textSecondary
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
MouseArea {
|
|
||||||
id: contributorArea
|
|
||||||
|
|
||||||
anchors.fill: parent
|
|
||||||
hoverEnabled: true
|
|
||||||
cursorShape: Qt.PointingHandCursor
|
|
||||||
onClicked: {
|
|
||||||
if (modelData.html_url)
|
|
||||||
Quickshell.execDetached(["xdg-open", modelData.html_url]);
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
NText {
|
||||||
|
text: modelData.login || "Unknown"
|
||||||
|
font.pointSize: 13 * Scaling.scale(screen)
|
||||||
|
color: contributorArea.containsMouse ? Colors.backgroundPrimary : Colors.textPrimary
|
||||||
|
elide: Text.ElideRight
|
||||||
|
Layout.fillWidth: true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
NText {
|
||||||
|
text: (modelData.contributions || 0) + " commits"
|
||||||
|
font.pointSize: 11 * Scaling.scale(screen)
|
||||||
|
color: contributorArea.containsMouse ? Colors.backgroundPrimary : Colors.textSecondary
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
MouseArea {
|
||||||
|
id: contributorArea
|
||||||
|
|
||||||
|
anchors.fill: parent
|
||||||
|
hoverEnabled: true
|
||||||
|
cursorShape: Qt.PointingHandCursor
|
||||||
|
onClicked: {
|
||||||
|
if (modelData.html_url)
|
||||||
|
Quickshell.execDetached(["xdg-open", modelData.html_url])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -32,12 +32,12 @@ Singleton {
|
||||||
onLoadFailed: function (error) {
|
onLoadFailed: function (error) {
|
||||||
if (error.toString().includes("No such file") || error === 2) {
|
if (error.toString().includes("No such file") || error === 2) {
|
||||||
// File doesn't exist, create it with default values
|
// File doesn't exist, create it with default values
|
||||||
console.log("[Github] Creating new cache file...");
|
console.log("[Github] Creating new cache file...")
|
||||||
writeAdapter()
|
writeAdapter()
|
||||||
// Fetch data after a short delay to ensure file is created
|
// Fetch data after a short delay to ensure file is created
|
||||||
Qt.callLater(() => {
|
Qt.callLater(() => {
|
||||||
fetchFromGitHub()
|
fetchFromGitHub()
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -51,26 +51,25 @@ Singleton {
|
||||||
}
|
}
|
||||||
|
|
||||||
// --------------------------------
|
// --------------------------------
|
||||||
function init() {
|
function init() {// does nothing but ensure the singleton is created
|
||||||
// does nothing but ensure the singleton is created
|
|
||||||
// do not remove
|
// do not remove
|
||||||
}
|
}
|
||||||
|
|
||||||
// --------------------------------
|
// --------------------------------
|
||||||
function loadFromCache() {
|
function loadFromCache() {
|
||||||
const now = Date.now();
|
const now = Date.now()
|
||||||
if (!data.timestamp || (now - data.timestamp > githubUpdateFrequency * 1000)) {
|
if (!data.timestamp || (now - data.timestamp > githubUpdateFrequency * 1000)) {
|
||||||
console.log("[Github] Cache expired or missing, fetching new data from GitHub...");
|
console.log("[Github] Cache expired or missing, fetching new data from GitHub...")
|
||||||
fetchFromGitHub();
|
fetchFromGitHub()
|
||||||
return;
|
return
|
||||||
}
|
}
|
||||||
console.log("[Github] Loading cached GitHub data (age: " + Math.round((now - data.timestamp) / 60000) + " minutes)");
|
console.log("[Github] Loading cached GitHub data (age: " + Math.round((now - data.timestamp) / 60000) + " minutes)")
|
||||||
|
|
||||||
if (data.version) {
|
if (data.version) {
|
||||||
root.latestVersion = data.version;
|
root.latestVersion = data.version
|
||||||
}
|
}
|
||||||
if (data.contributors) {
|
if (data.contributors) {
|
||||||
root.contributors = data.contributors;
|
root.contributors = data.contributors
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -82,20 +81,20 @@ Singleton {
|
||||||
}
|
}
|
||||||
|
|
||||||
isFetchingData = true
|
isFetchingData = true
|
||||||
versionProcess.running = true;
|
versionProcess.running = true
|
||||||
contributorsProcess.running = true;
|
contributorsProcess.running = true
|
||||||
}
|
}
|
||||||
|
|
||||||
// --------------------------------
|
// --------------------------------
|
||||||
function saveData() {
|
function saveData() {
|
||||||
data.timestamp = Date.now();
|
data.timestamp = Date.now()
|
||||||
Qt.callLater(() => {
|
Qt.callLater(() => {
|
||||||
// Access the FileView's writeAdapter method
|
// Access the FileView's writeAdapter method
|
||||||
var fileView = root.children.find(child => child.objectName === "githubDataFileView");
|
var fileView = root.children.find(child => child.objectName === "githubDataFileView")
|
||||||
if (fileView) {
|
if (fileView) {
|
||||||
fileView.writeAdapter();
|
fileView.writeAdapter()
|
||||||
}
|
}
|
||||||
});
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// --------------------------------
|
// --------------------------------
|
||||||
|
|
@ -116,26 +115,26 @@ Singleton {
|
||||||
stdout: StdioCollector {
|
stdout: StdioCollector {
|
||||||
onStreamFinished: {
|
onStreamFinished: {
|
||||||
try {
|
try {
|
||||||
const response = text;
|
const response = text
|
||||||
if (response && response.trim()) {
|
if (response && response.trim()) {
|
||||||
const data = JSON.parse(response);
|
const data = JSON.parse(response)
|
||||||
if (data.tag_name) {
|
if (data.tag_name) {
|
||||||
const version = data.tag_name;
|
const version = data.tag_name
|
||||||
root.data.version = version;
|
root.data.version = version
|
||||||
root.latestVersion = version;
|
root.latestVersion = version
|
||||||
console.log("[Github] Latest version fetched from GitHub:", version);
|
console.log("[Github] Latest version fetched from GitHub:", version)
|
||||||
} else {
|
} else {
|
||||||
console.log("[Github] No tag_name in GitHub response");
|
console.log("[Github] No tag_name in GitHub response")
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
console.log("[Github] Empty response from GitHub API");
|
console.log("[Github] Empty response from GitHub API")
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error("[Github] Failed to parse version:", e);
|
console.error("[Github] Failed to parse version:", e)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if both processes are done
|
// Check if both processes are done
|
||||||
checkAndSaveData();
|
checkAndSaveData()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -148,25 +147,25 @@ Singleton {
|
||||||
stdout: StdioCollector {
|
stdout: StdioCollector {
|
||||||
onStreamFinished: {
|
onStreamFinished: {
|
||||||
try {
|
try {
|
||||||
const response = text;
|
const response = text
|
||||||
if (response && response.trim()) {
|
if (response && response.trim()) {
|
||||||
const data = JSON.parse(response);
|
const data = JSON.parse(response)
|
||||||
root.data.contributors = data || [];
|
root.data.contributors = data || []
|
||||||
root.contributors = root.data.contributors;
|
root.contributors = root.data.contributors
|
||||||
console.log("[Github] Contributors fetched from GitHub:", root.contributors.length);
|
console.log("[Github] Contributors fetched from GitHub:", root.contributors.length)
|
||||||
} else {
|
} else {
|
||||||
console.log("[Github] Empty response from GitHub API for contributors");
|
console.log("[Github] Empty response from GitHub API for contributors")
|
||||||
root.data.contributors = [];
|
root.data.contributors = []
|
||||||
root.contributors = [];
|
root.contributors = []
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error("[Github] Failed to parse contributors:", e);
|
console.error("[Github] Failed to parse contributors:", e)
|
||||||
root.data.contributors = [];
|
root.data.contributors = []
|
||||||
root.contributors = [];
|
root.contributors = []
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if both processes are done
|
// Check if both processes are done
|
||||||
checkAndSaveData();
|
checkAndSaveData()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -175,8 +174,8 @@ Singleton {
|
||||||
function checkAndSaveData() {
|
function checkAndSaveData() {
|
||||||
// Only save when both processes are finished
|
// Only save when both processes are finished
|
||||||
if (!versionProcess.running && !contributorsProcess.running) {
|
if (!versionProcess.running && !contributorsProcess.running) {
|
||||||
root.isFetchingData = false;
|
root.isFetchingData = false
|
||||||
root.saveData();
|
root.saveData()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue