From 90f4691c54e936e33e9690716d04e7c13ae1ee6f Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Sat, 26 Oct 2024 22:44:18 +0200 Subject: [PATCH 1/3] Updating icons to comply with KDE HIG. --- assets/logarithmplotter.svg | 187 ++++++++++++++++++++++++++++-------- 1 file changed, 147 insertions(+), 40 deletions(-) diff --git a/assets/logarithmplotter.svg b/assets/logarithmplotter.svg index 77a2817..1f3a5e0 100644 --- a/assets/logarithmplotter.svg +++ b/assets/logarithmplotter.svg @@ -1,64 +1,171 @@ + + LogarithmPlotter Icon v1.0image/svg+xmlLogarithmPlotter Icon v1.02021Ad5001(c) Ad5001 2021 - All rights reserved + LogarithmPlotter Icon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + d="m 18,3.5 c 0,7 -4,12 -13,12" /> + + + + + LogarithmPlotter Icon + 2024-10-06 + + + Adsooi <mail@ad5001.eu> + + + + + (c) Adsooi 2021-2024 + + + + + + + + + + + + + + + + From 5d0542ffcc4f8ea102b60a68f46ee06633357f0f Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Sat, 26 Oct 2024 22:46:22 +0200 Subject: [PATCH 2/3] Ensuring app icons are white. --- .../eu/ad5001/LogarithmPlotter/AppMenuBar.qml | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/runtime-pyside6/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml b/runtime-pyside6/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml index f4e2f35..87dd625 100644 --- a/runtime-pyside6/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml +++ b/runtime-pyside6/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml @@ -41,6 +41,7 @@ MenuBar { shortcut: StandardKey.Open onTriggered: settings.load() icon.name: 'document-open' + icon.color: sysPalette.windowText } Action { @@ -48,13 +49,14 @@ MenuBar { shortcut: StandardKey.Save onTriggered: settings.save() icon.name: 'document-save' + icon.color: sysPalette.windowText } Action { text: qsTr("Save &As...") shortcut: StandardKey.SaveAs onTriggered: settings.saveAs() - icon.name: 'document-save-as' - + icon.color: sysPalette.windowText + icon.name: 'document-save-as' } MenuSeparator { } Action { @@ -68,6 +70,7 @@ MenuBar { } icon.name: 'application-exit' + icon.color: sysPalette.windowText } } @@ -92,6 +95,7 @@ MenuBar { shortcut: StandardKey.Copy onTriggered: root.copyDiagramToClipboard() icon.name: 'edit-copy' + icon.color: sysPalette.windowText } MenuSeparator { } Action { @@ -99,6 +103,7 @@ MenuBar { shortcut: StandardKey.Copy onTriggered: preferences.open() icon.name: 'settings' + icon.color: sysPalette.windowText } } @@ -129,38 +134,45 @@ MenuBar { Action { text: qsTr("&Source code") icon.name: 'software-sources' + icon.color: sysPalette.windowText onTriggered: Qt.openUrlExternally("https://git.ad5001.eu/Ad5001/LogarithmPlotter") } Action { text: qsTr("&Report a bug") icon.name: 'tools-report-bug' + icon.color: sysPalette.windowText onTriggered: Qt.openUrlExternally("https://git.ad5001.eu/Ad5001/LogarithmPlotter/issues") } Action { text: qsTr("&User manual") icon.name: 'documentation' + icon.color: sysPalette.windowText onTriggered: Qt.openUrlExternally("https://git.ad5001.eu/Ad5001/LogarithmPlotter/wiki/_Sidebar") } Action { text: qsTr("&Changelog") icon.name: 'state-information' + icon.color: sysPalette.windowText onTriggered: changelog.open() } Action { text: qsTr("&Help translating!") - icon.name: 'translator' + icon.name: 'translate' + icon.color: sysPalette.windowText onTriggered: Qt.openUrlExternally("https://hosted.weblate.org/engage/logarithmplotter/") } MenuSeparator { } Action { text: qsTr("&Thanks") - icon.name: 'about' + icon.name: 'help-about' + icon.color: sysPalette.windowText onTriggered: thanksTo.open() } Action { text: qsTr("&About") shortcut: StandardKey.HelpContents - icon.name: 'about' + icon.name: 'help-about' + icon.color: sysPalette.windowText onTriggered: about.open() } } From 8da10497d232c38bcf0805308028c19449530f50 Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Sat, 26 Oct 2024 22:46:41 +0200 Subject: [PATCH 3/3] Adding different revisions for different debian packages depending on their dependencies --- scripts/package-deb.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/package-deb.sh b/scripts/package-deb.sh index eea10ba..e01c370 100755 --- a/scripts/package-deb.sh +++ b/scripts/package-deb.sh @@ -30,7 +30,7 @@ cp ../../README.md . python3 setup.py --remove-git-version --command-packages=stdeb.command sdist_dsc \ --package logarithmplotter --copyright-file assets/native/linux/debian/copyright \ --suite noble --depends3 "$(cat assets/native/linux/debian/depends.wheels)" --section science \ - bdist_deb + --debian-version +wheels-1 bdist_deb mv deb_dist deb_dist.noble @@ -38,6 +38,6 @@ mv deb_dist deb_dist.noble python3 setup.py --remove-git-version --command-packages=stdeb.command sdist_dsc \ --package logarithmplotter --copyright-file assets/native/linux/debian/copyright \ --suite oracular --depends3 "$(cat assets/native/linux/debian/depends.packaged)" --section science \ - bdist_deb + --debian-version +packaged-1 bdist_deb mv deb_dist deb_dist.oracular