Adding different revisions for different debian packages depending on their dependencies

assets/logarithmplotter.svg

@@ -1,64 +1,171 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
-   width="24.0px"
-   height="24.0px"
-   viewBox="0 0 24.0 24.0"
+   width="48.0px"
+   height="48.0px"
+   viewBox="0 0 48.0 48.0"
    version="1.1"
    id="SVGRoot"
-   xml:space="preserve"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"><title
-     id="title836">LogarithmPlotter Icon v1.0</title><defs
-     id="defs833" /><metadata
-     id="metadata836"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>LogarithmPlotter Icon v1.0</dc:title><cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-nc-sa/4.0/" /><dc:date>2021</dc:date><dc:creator><cc:Agent><dc:title>Ad5001</dc:title></cc:Agent></dc:creator><dc:rights><cc:Agent><dc:title>(c) Ad5001 2021 - All rights reserved</dc:title></cc:Agent></dc:rights></cc:Work><cc:License
-         rdf:about="http://creativecommons.org/licenses/by-nc-sa/4.0/"><cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:requires
-           rdf:resource="http://creativecommons.org/ns#Notice" /><cc:requires
-           rdf:resource="http://creativecommons.org/ns#Attribution" /><cc:prohibits
-           rdf:resource="http://creativecommons.org/ns#CommercialUse" /><cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /><cc:requires
-           rdf:resource="http://creativecommons.org/ns#ShareAlike" /></cc:License></rdf:RDF></metadata><g
-     id="layer2"
-     transform="matrix(1,0,0,0.94444444,0,1.1666667)"
-     style="fill:#666666"><rect
-       style="fill:#666666;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <title
+     id="title38896">LogarithmPlotter Icon</title>
+  <defs
+     id="defs2254">
+    <linearGradient
+       id="linearGradient27593">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.15000001;"
+         offset="0"
+         id="stop27589" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop27591" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient13467">
+      <stop
+         style="stop-color:#808080;stop-opacity:1;"
+         offset="0"
+         id="stop13463" />
+      <stop
+         style="stop-color:#666666;stop-opacity:1;"
+         offset="1"
+         id="stop13465" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8377">
+      <stop
+         style="stop-color:#ebebeb;stop-opacity:1;"
+         offset="0"
+         id="stop8373" />
+      <stop
+         style="stop-color:#bfbfbf;stop-opacity:1;"
+         offset="1"
+         id="stop8375" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient8377"
+       id="linearGradient8379"
+       x1="12"
+       y1="4.8570137"
+       x2="12"
+       y2="21.105883"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#linearGradient13467"
+       id="linearGradient13469"
+       x1="12"
+       y1="9.5647058"
+       x2="12"
+       y2="21"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#linearGradient27593"
+       id="linearGradient27595"
+       x1="28"
+       y1="28"
+       x2="42"
+       y2="42"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     id="layer1">
+    <rect
+       style="fill:url(#linearGradient13469);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect1546"
        width="18"
-       height="18"
+       height="18.105883"
        x="3"
-       y="3"
-       ry="2.25" /></g><g
-     id="layer2-6"
-     transform="matrix(1,0,0,0.94444444,0,0.16666668)"
-     style="fill:#f9f9f9"><rect
-       style="fill:#f9f9f9;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       y="2.8941176"
+       ry="2.3823531"
+       rx="2.2499998"
+       transform="matrix(2.2222222,0,0,2.0987654,-2.6666667,-0.07407404)" />
+    <rect
+       style="fill:url(#linearGradient8379);display:inline;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect1546-7"
        width="18"
-       height="18"
+       height="18.105883"
        x="3"
        y="3"
-       ry="2.25" /></g><g
-     id="layer1"
-     style="stroke-width:2;stroke-dasharray:none"><rect
+       ry="2.3212669"
+       rx="2.2499998"
+       transform="matrix(2.2222222,0,0,2.1539961,-2.6666667,-2.4619883)" />
+  </g>
+  <g
+     id="layer3"
+     style="fill:#0000ff">
+    <path
+       id="path27475"
+       style="fill:url(#linearGradient27595);fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 20,8 V 36 H 10 l 7,7 h 15 7 c 2.769997,0 5,-2.230003 5,-5 v -5 -1 z" />
+  </g>
+  <g
+     id="layer1-6"
+     style="stroke-width:2;stroke-dasharray:none"
+     transform="matrix(2,0,0,2,0,1)">
+    <rect
        style="fill:#000000;fill-rule:evenodd;stroke-width:1.86898;stroke-dasharray:none;stroke-opacity:0"
        id="rect1410"
        width="14"
        height="2"
        x="5"
-       y="15.5" /><rect
-       style="fill:#000000;fill-rule:evenodd;stroke-width:2;stroke-dasharray:none;stroke-opacity:0"
+       y="15.5" />
+    <rect
+       style="fill:#000000;fill-rule:evenodd;stroke-width:2.06559;stroke-dasharray:none;stroke-opacity:0"
        id="rect1412"
        width="2"
-       height="15"
-       x="9"
-       y="3.9768662" /><path
+       height="16"
+       x="8"
+       y="3.5" />
+    <path
        style="fill:none;fill-rule:evenodd;stroke:#ff0000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path1529"
-       d="M 18,4 C 18,10.017307 13.40948,15.5 5,15.5" /></g></svg>
+       d="m 18,3.5 c 0,7 -4,12 -13,12" />
+  </g>
+  <metadata
+     id="metadata38894">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:title>LogarithmPlotter Icon</dc:title>
+        <dc:date>2024-10-06</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Adsooi &lt;mail@ad5001.eu&gt;</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>(c) Adsooi 2021-2024</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-nc-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-nc-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:prohibits
+           rdf:resource="http://creativecommons.org/ns#CommercialUse" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>

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()
         }
     }

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