Adding metainfo files + changing cpy in AppMenuBar + fixing flatpak bug.

LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml

@@ -74,7 +74,7 @@ MenuBar {
         }
         MenuSeparator { }
         Action { 
-            text: qsTr("&Copy diagram")
+            text: qsTr("&Copy plot")
             shortcut: StandardKey.Copy
             onTriggered: root.copyDiagramToClipboard()
             icon.name: 'edit-copy'

linux/eu.ad5001.LogarithmPlotter.metainfo.flatpak.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2021 Ad5001 -->
+<application>
+    <id>eu.ad5001.LogarithmPlotter</id>
+    <id type="desktop">eu.ad5001.LogarithmPlotter.desktop</id>
+    <launchable type="desktop-id">eu.ad5001.LogarithmPlotter.desktop</launchable>
+    <metadata_license>CC0-1.0</metadata_license>
+    <project_license>GPL-3.0+</project_license>
+    
+    <name>LogarithmPlotter</name>
+    <name xml:lang="fr">LogarithmPlotter</name>
+    <icon type="remote">http://apps.ad5001.eu/icons/apps/logarithmplotter.svg</icon>
+    <summary>2D plotter software to make BODE plots, sequences and repartition functions</summary>
+    <summary xml:lang="fr">Logiciel de traçage 2D pour les diagrammes de BODE, les suites et les fonctions de répartition</summary>
+    <description>
+        <p>
+            LogarithmPlotter is, as it's name suggests, a plotter made with logarithm scales in mind. With an object system similar to <a href="https://geogebra.org">Geogebra</a>'s, it allows dynamic creation of plots with very few limitations.
+        </p>
+        <p>
+            It's primary use is to quickly create [asymptotic Bode Diagrams/plots](https://en.wikipedia.org/wiki/Bode_plot), but it's extensible nature and ability to switch to non-logarithmic scales allow it to create other things with it, like sequences or statistical repartition functions.
+        </p>
+    </description>
+    <description xml:lang="fr">
+        <p>
+            LogarithmPlotter est, comme son nom l'indique, un créateur de graphes et diagrammes 2D réalisé avec l'échelle logarithmique en tête. Avec un système d'objets similaire à <a href="https://geogebra.org">Geogebra</a>, ce qui lui permet de créer des graphes avec peu de limitations.    
+        </p>
+        <p>
+            Son intérêt principal est de permettre de créer des [diagrammes asymptotiques de Bode](https://fr.wikipedia.org/wiki/Diagramme_de_Bode), mais sa nature extensible et sa capacité à passer à une échelle non-logarithmique lui permet de créer d'autres choses.
+        </p>
+    </description>
+    
+    <categories>
+        <category>Network</category>
+        <category>Feed</category>
+    </categories>
+    <url type="homepage">https://apps.ad5001.eu/logarithmplotter/</url>
+    <url type="bugtracker">https://git.ad5001.eu/Ad5001/LogarithmPlotter/issues/</url>
+    <url type="help">https://git.ad5001.eu/Ad5001/LogarithmPlotter/wiki/</url>
+    <screenshots>
+        <screenshot type="default">http://apps.ad5001.eu/img/full/logarithmplotter.png</screenshot>
+    </screenshots>
+    <releases>
+        <release version="0.0.1" date="2021-07-15"/>
+    </releases>
+      <content_rating type="oars-1.0">
+    </content_rating>
+    <update_contact>mail@ad5001.eu</update_contact>
+</application>
+

linux/eu.ad5001.LogarithmPlotter.metainfo.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2021 Ad5001 -->
+<application>
+    <id>eu.ad5001.LogarithmPlotter</id>
+    <id type="desktop">logarithmplotter.desktop</id>
+    <launchable type="desktop-id">logarithmplotter.desktop</launchable>
+    <metadata_license>CC0-1.0</metadata_license>
+    <project_license>GPL-3.0+</project_license>
+    
+    <name>LogarithmPlotter</name>
+    <name xml:lang="fr">LogarithmPlotter</name>
+    <icon type="remote">http://apps.ad5001.eu/icons/apps/logarithmplotter.svg</icon>
+    <summary>2D plotter software to make BODE plots, sequences and repartition functions</summary>
+    <summary xml:lang="fr">Logiciel de traçage 2D pour les diagrammes de BODE, les suites et les fonctions de répartition</summary>
+    <description>
+        <p>
+            LogarithmPlotter is, as it's name suggests, a plotter made with logarithm scales in mind. With an object system similar to <a href="https://geogebra.org">Geogebra</a>'s, it allows dynamic creation of plots with very few limitations.
+        </p>
+        <p>
+            It's primary use is to quickly create [asymptotic Bode Diagrams/plots](https://en.wikipedia.org/wiki/Bode_plot), but it's extensible nature and ability to switch to non-logarithmic scales allow it to create other things with it, like sequences or statistical repartition functions.
+        </p>
+    </description>
+    <description xml:lang="fr">
+        <p>
+            LogarithmPlotter est, comme son nom l'indique, un créateur de graphes et diagrammes 2D réalisé avec l'échelle logarithmique en tête. Avec un système d'objets similaire à <a href="https://geogebra.org">Geogebra</a>, ce qui lui permet de créer des graphes avec peu de limitations.    
+        </p>
+        <p>
+            Son intérêt principal est de permettre de créer des [diagrammes asymptotiques de Bode](https://fr.wikipedia.org/wiki/Diagramme_de_Bode), mais sa nature extensible et sa capacité à passer à une échelle non-logarithmique lui permet de créer d'autres choses.
+        </p>
+    </description>
+    
+    <categories>
+        <category>Network</category>
+        <category>Feed</category>
+    </categories>
+    <url type="homepage">https://apps.ad5001.eu/logarithmplotter/</url>
+    <url type="bugtracker">https://git.ad5001.eu/Ad5001/LogarithmPlotter/issues/</url>
+    <url type="help">https://git.ad5001.eu/Ad5001/LogarithmPlotter/wiki/</url>
+    <screenshots>
+        <screenshot type="default">http://apps.ad5001.eu/img/full/logarithmplotter.png</screenshot>
+    </screenshots>
+    <releases>
+        <release version="0.0.1" date="2021-07-15"/>
+    </releases>
+      <content_rating type="oars-1.0">
+    </content_rating>
+    <update_contact>mail@ad5001.eu</update_contact>
+</application>
+
+

setup.py

@@ -74,19 +74,33 @@ if sys.platform == 'linux':
     data_files.append((os.environ["PREFIX"] + '/mime/packages/', ['linux/x-logarithm-plot.xml']))
     data_files.append((os.environ["PREFIX"] + '/icons/hicolor/scalable/mimetypes/', ['linux/application-x-logarithm-plot.svg']))
     data_files.append((os.environ["PREFIX"] + '/icons/hicolor/scalable/apps/', ['logplotter.svg']))
-    if len(sys.argv) > 1 and sys.argv[1] == "install":
+    if len(sys.argv) > 1:
-        from shutil import copyfile
+        if sys.argv[1] == "install":
-        os.makedirs(os.environ["PREFIX"] + '/applications/', exist_ok=True)
+            from shutil import copyfile
-        os.makedirs(os.environ["PREFIX"] + '/mime/packages/', exist_ok=True)
+            os.makedirs(os.environ["PREFIX"] + '/applications/', exist_ok=True)
-        os.makedirs(os.environ["PREFIX"] + '/icons/hicolor/scalable/mimetypes/', exist_ok=True)
+            os.makedirs(os.environ["PREFIX"] + '/mime/packages/', exist_ok=True)
-        os.makedirs(os.environ["PREFIX"] + '/icons/hicolor/scalable/apps/', exist_ok=True)
+            os.makedirs(os.environ["PREFIX"] + '/icons/hicolor/scalable/mimetypes/', exist_ok=True)
-        copyfile(current_dir + '/linux/logarithmplotter.desktop', os.environ["PREFIX"] + '/applications/logarithmplotter.desktop')
+            os.makedirs(os.environ["PREFIX"] + '/icons/hicolor/scalable/apps/', exist_ok=True)
-        copyfile(current_dir + '/linux/x-logarithm-plot.xml', os.environ["PREFIX"] + '/mime/packages/x-logarithm-plot.xml')
+            copyfile(current_dir + '/linux/logarithmplotter.desktop', os.environ["PREFIX"] + '/applications/logarithmplotter.desktop')
-        copyfile(current_dir + '/linux/application-x-logarithm-plot.svg', os.environ["PREFIX"] + '/icons/hicolor/scalable/mimetypes/application-x-logarithm-plot.svg')
+            copyfile(current_dir + '/linux/x-logarithm-plot.xml', os.environ["PREFIX"] + '/mime/packages/x-logarithm-plot.xml')
-        copyfile(current_dir + '/logplotter.svg', os.environ["PREFIX"] + '/icons/hicolor/scalable/apps/logplotter.svg')
+            copyfile(current_dir + '/linux/application-x-logarithm-plot.svg', 
+                     os.environ["PREFIX"] + '/icons/hicolor/scalable/mimetypes/application-x-logarithm-plot.svg')
+            copyfile(current_dir + '/logplotter.svg', os.environ["PREFIX"] + '/icons/hicolor/scalable/apps/logplotter.svg')
+            if "FLATPAK_INSTALL" in os.environ:
+                os.makedirs(os.environ["PREFIX"] + '/metainfo/', exist_ok=True)
+                copyfile(current_dir + '/linux/eu.ad5001.LogarithmPlotter.metainfo.flatpak.xml',
+                         os.environ["PREFIX"] + '/metainfo/eu.ad5001.LogarithmPlotter.metainfo.xml')
+        elif sys.argv[1] == "uninstall":
+            os.remove(os.environ["PREFIX"] + '/applications/logarithmplotter.desktop')
+            os.remove(os.environ["PREFIX"] + '/mime/packages/x-logarithm-plot.xml')
+            os.remove(os.environ["PREFIX"] + '/icons/hicolor/scalable/mimetypes/application-x-logarithm-plot.svg')
+            os.remove(os.environ["PREFIX"] + '/icons/hicolor/scalable/apps/logplotter.svg')
+
+print("FLATPAK_INSTALL=", "FLATPAK_INSTALL" in os.environ)
+print("Dependencies:", [] if "FLATPAK_INSTALL" in os.environ else ["PySide2"])
 
 setuptools.setup(
-    install_requires=["PySide2"],
+    install_requires=([] if "FLATPAK_INSTALL" in os.environ else ["PySide2"]),
     python_requires='>=3.8',
 
     name='logarithmplotter',

snapcraft.yaml

@@ -1,4 +1,5 @@
 name: logarithmplotter
+title: LogarithmPlotter
 version: '0.0.1'
 summary: 2D plotter software to make BODE plots, sequences and repartition functions.
 description: |
@@ -8,6 +9,12 @@ confinement: strict
 base: core20
 grade: devel
 icon: LogarithmPlotter/logarithmplotter.svg
+adopt-info: linuxfiles
+license: GPL-3.0+
+
+architectures:
+  - build-on: amd64
+    run-on: amd64
 
 plugs:
   #gnome-3-38-2004:
@@ -19,7 +26,7 @@ plugs:
     interface: content
     target: $SNAP/data-dir/themes
   sound-themes:
-    default-provider: gtk-common-themes:sound-themes
+    defauwebsitelt-provider: gtk-common-themes:sound-themes
     interface: content
     target: $SNAP/data-dir/sounds
   icon-themes:
@@ -65,6 +72,7 @@ parts:
   linuxfiles:
     source: linux/
     plugin: dump
+    parse-info: [eu.ad5001.LogarithmPlotter.metainfo.xml]
     organize:
       logarithmplotter.desktop: usr/share/applications/logarithmplotter.desktop
       x-logarithm-plot.xml: usr/share/mime/packages/x-logarithm-plot.xml