From ffe09a2b3d47c52f12790b60227690d1b734551e Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Wed, 12 Jan 2022 14:39:23 +0100 Subject: [PATCH] Beginning v0.1.3 Confined packages (snapcraft & flatpak) won't show error messages related to update checks. --- LogarithmPlotter/__init__.py | 4 ++-- LogarithmPlotter/__main__.py | 2 +- LogarithmPlotter/config.py | 2 +- LogarithmPlotter/logarithmplotter.py | 2 +- LogarithmPlotter/native.py | 2 +- .../qml/eu/ad5001/LogarithmPlotter/About.qml | 4 ++-- .../qml/eu/ad5001/LogarithmPlotter/Alert.qml | 2 +- .../qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml | 2 +- .../eu/ad5001/LogarithmPlotter/ComboBoxSetting.qml | 2 +- .../qml/eu/ad5001/LogarithmPlotter/FileDialog.qml | 2 +- .../qml/eu/ad5001/LogarithmPlotter/GreetScreen.qml | 2 +- .../qml/eu/ad5001/LogarithmPlotter/History.qml | 2 +- .../eu/ad5001/LogarithmPlotter/HistoryBrowser.qml | 2 +- .../qml/eu/ad5001/LogarithmPlotter/Icon.qml | 2 +- .../eu/ad5001/LogarithmPlotter/LogGraphCanvas.qml | 2 +- .../ad5001/LogarithmPlotter/LogarithmPlotter.qml | 2 +- .../LogarithmPlotter/ObjectLists/EditorDialog.qml | 2 +- .../ObjectLists/ObjectCreationGrid.qml | 2 +- .../LogarithmPlotter/ObjectLists/ObjectLists.qml | 2 +- .../LogarithmPlotter/PickLocationOverlay.qml | 2 +- .../qml/eu/ad5001/LogarithmPlotter/Settings.qml | 2 +- .../qml/eu/ad5001/LogarithmPlotter/TextSetting.qml | 2 +- LogarithmPlotter/update.py | 6 ++++-- README.md | 4 +++- linux/debian/changelog | 8 +++++++- ...eu.ad5001.LogarithmPlotter.metainfo.flatpak.xml | 6 ++++-- linux/eu.ad5001.LogarithmPlotter.metainfo.xml | 6 ++++-- linux/install_local.sh | 2 +- linux/snapcraft/launcher/launch-logarithmplotter | 2 +- package-linux.sh | 2 +- setup.py | 14 ++++++++++---- snapcraft.yaml | 2 +- 32 files changed, 60 insertions(+), 40 deletions(-) diff --git a/LogarithmPlotter/__init__.py b/LogarithmPlotter/__init__.py index aa63184..1691f80 100644 --- a/LogarithmPlotter/__init__.py +++ b/LogarithmPlotter/__init__.py @@ -1,6 +1,6 @@ """ * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ """ from shutil import which -__VERSION__ = "0.1.2" +__VERSION__ = "0.1.3" is_release = False diff --git a/LogarithmPlotter/__main__.py b/LogarithmPlotter/__main__.py index 983dd6b..0b950d2 100644 --- a/LogarithmPlotter/__main__.py +++ b/LogarithmPlotter/__main__.py @@ -1,6 +1,6 @@ """ * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/config.py b/LogarithmPlotter/config.py index 36ea724..db904b7 100644 --- a/LogarithmPlotter/config.py +++ b/LogarithmPlotter/config.py @@ -1,6 +1,6 @@ """ * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/logarithmplotter.py b/LogarithmPlotter/logarithmplotter.py index 1e534f2..2b105b8 100644 --- a/LogarithmPlotter/logarithmplotter.py +++ b/LogarithmPlotter/logarithmplotter.py @@ -1,6 +1,6 @@ """ * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/native.py b/LogarithmPlotter/native.py index dc7797d..e867c8b 100644 --- a/LogarithmPlotter/native.py +++ b/LogarithmPlotter/native.py @@ -1,6 +1,6 @@ """ * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/About.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/About.qml index c850f63..eb5e32f 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/About.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/About.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -85,7 +85,7 @@ D.Dialog { wrapMode: Text.WordWrap textFormat: Text.RichText font.pixelSize: 13 - text: "Copyright © 2021 Ad5001 <mail@ad5001.eu>
+ text: "Copyright © 2022 Ad5001 <mail@ad5001.eu>

This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.

diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Alert.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Alert.qml index b820f51..5309eec 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Alert.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Alert.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml index b0cf8a6..653f482 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ComboBoxSetting.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ComboBoxSetting.qml index a5086fb..6cda799 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ComboBoxSetting.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ComboBoxSetting.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/FileDialog.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/FileDialog.qml index c958f42..eeaa69b 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/FileDialog.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/FileDialog.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/GreetScreen.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/GreetScreen.qml index 8a78855..2758b24 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/GreetScreen.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/GreetScreen.qml @@ -1,7 +1,7 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/History.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/History.qml index 198af79..8d00ecf 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/History.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/History.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/HistoryBrowser.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/HistoryBrowser.qml index 27f0d7e..27caabb 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/HistoryBrowser.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/HistoryBrowser.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Icon.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Icon.qml index bdeee56..1a24031 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Icon.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Icon.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/LogGraphCanvas.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/LogGraphCanvas.qml index 93c94eb..5488fe0 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/LogGraphCanvas.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/LogGraphCanvas.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/LogarithmPlotter.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/LogarithmPlotter.qml index d0a0356..2311c4d 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/LogarithmPlotter.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/LogarithmPlotter.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/EditorDialog.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/EditorDialog.qml index 803faea..89a39ae 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/EditorDialog.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/EditorDialog.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectCreationGrid.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectCreationGrid.qml index 508e38f..25a256d 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectCreationGrid.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectCreationGrid.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml index 5bc2d7b..c3b5310 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/PickLocationOverlay.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/PickLocationOverlay.qml index 44465e2..c684836 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/PickLocationOverlay.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/PickLocationOverlay.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Settings.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Settings.qml index 3a0207f..38a30c0 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Settings.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Settings.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/TextSetting.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/TextSetting.qml index 77c62ba..5c20f36 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/TextSetting.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/TextSetting.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/update.py b/LogarithmPlotter/update.py index afd9ef7..35df66f 100644 --- a/LogarithmPlotter/update.py +++ b/LogarithmPlotter/update.py @@ -1,6 +1,6 @@ """ * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,6 +19,7 @@ from PySide2.QtCore import Qt, QRunnable, QThreadPool, QThread, QObject, Signal from urllib.request import urlopen from urllib.error import HTTPError, URLError +from sys import argv class UpdateInformation(QObject): got_update_info = Signal(bool, str, bool) @@ -67,7 +68,8 @@ def check_for_updates(current_version, window): """ Checks for updates in the background, and sends an alert with information. """ - + if "--no-check-for-updates" in argv: + return # def cb(show_alert, msg_text, update_available): pass if show_alert: diff --git a/README.md b/README.md index 71e6653..bcf5d1d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ -# ![icon](https://git.ad5001.eu/Ad5001/LogarithmicPlotter/raw/branch/master/logplotter.svg) LogarithmPlotter +# ![icon](https://git.ad5001.eu/Ad5001/LogarithmPlotter/raw/branch/master/logplotter.svg) LogarithmPlotter [![Build Status](https://ci.ad5001.eu/api/badges/Ad5001/LogarithmPlotter/status.svg)](https://ci.ad5001.eu/Ad5001/LogarithmPlotter) +[![On flathub](https://img.shields.io/flathub/v/eu.ad5001.LogarithmPlotter?label=on%20flathub)](https://flathub.org/apps/details/eu.ad5001.LogarithmPlotter) +[![On Snapcraft](https://badgen.net/snapcraft/v/logarithmplotter?label=on%20snapcraft)](https://snapcraft.io/logarithmplotter) Create graphs with logarithm scales, namely BODE diagrams. diff --git a/linux/debian/changelog b/linux/debian/changelog index da00b9a..4d6e2fa 100644 --- a/linux/debian/changelog +++ b/linux/debian/changelog @@ -1,3 +1,9 @@ +logarithmplotter (0.1.3) unstable; urgency=medium + + * Fixed bug: Confined packages (snapcraft & flatpak) won't show error messages related to update checks. + + -- Ad5001 Mon, 30 Sep 2021 20:00:00 +0200 + logarithmplotter (0.1.2) unstable; urgency=medium * Fixed bug: Unable to move Bode diagrams elements when having deleted the sum element. @@ -8,7 +14,7 @@ logarithmplotter (0.1.2) unstable; urgency=medium -- Ad5001 Mon, 30 Sep 2021 20:00:00 +0200 -logarithmplotter (0.1.dev0) UNRELEASED; urgency=medium +logarithmplotter (0.1) UNRELEASED; urgency=medium * Initial release. diff --git a/linux/eu.ad5001.LogarithmPlotter.metainfo.flatpak.xml b/linux/eu.ad5001.LogarithmPlotter.metainfo.flatpak.xml index a2940a0..69298ee 100644 --- a/linux/eu.ad5001.LogarithmPlotter.metainfo.flatpak.xml +++ b/linux/eu.ad5001.LogarithmPlotter.metainfo.flatpak.xml @@ -30,8 +30,8 @@ - Network - Feed + Science + Education https://apps.ad5001.eu/logarithmplotter/ https://git.ad5001.eu/Ad5001/LogarithmPlotter/issues/ @@ -42,9 +42,11 @@ + + Ad5001 mail@ad5001.eu diff --git a/linux/eu.ad5001.LogarithmPlotter.metainfo.xml b/linux/eu.ad5001.LogarithmPlotter.metainfo.xml index df8cf2b..9a3c399 100644 --- a/linux/eu.ad5001.LogarithmPlotter.metainfo.xml +++ b/linux/eu.ad5001.LogarithmPlotter.metainfo.xml @@ -30,8 +30,8 @@ - Network - Feed + Science + Education https://apps.ad5001.eu/logarithmplotter/ https://git.ad5001.eu/Ad5001/LogarithmPlotter/issues/ @@ -42,9 +42,11 @@ + + Ad5001 mail@ad5001.eu diff --git a/linux/install_local.sh b/linux/install_local.sh index 21f7ddc..714cc0b 100644 --- a/linux/install_local.sh +++ b/linux/install_local.sh @@ -1,7 +1,7 @@ #!/bin/bash # # AccountFree - Browse and use online services, free of account. -# Copyright (C) 2021 Ad5001 +# Copyright (C) 2022 Ad5001 # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/linux/snapcraft/launcher/launch-logarithmplotter b/linux/snapcraft/launcher/launch-logarithmplotter index bda53ea..1c28d0d 100755 --- a/linux/snapcraft/launcher/launch-logarithmplotter +++ b/linux/snapcraft/launcher/launch-logarithmplotter @@ -11,4 +11,4 @@ set \ #export QT_QPA_PLATFORMTHEME=kde # Finally run the next part of the command chain -exec "${@}" +exec "${@} --no-check-for-updates" diff --git a/package-linux.sh b/package-linux.sh index 9e46527..361161a 100755 --- a/package-linux.sh +++ b/package-linux.sh @@ -1,7 +1,7 @@ #!/bin/bash python3 setup.py --remove-git-version --command-packages=stdeb.command sdist_dsc \ - --package logarithmplotter --copyright-file linux/debian/copyright --suite impish --depends3 "$(cat linux/debian/depends)" --section science \ + --package logarithmplotter --copyright-file linux/debian/copyright --suite sid --depends3 "$(cat linux/debian/depends)" --section science \ --debian-version "ppa1" bdist_deb # Flatpak building diff --git a/setup.py b/setup.py index 376324c..75b474f 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ """ * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -86,7 +86,7 @@ if sys.platform == 'linux': data_files.append(('share/mime/packages/', ['linux/x-logarithm-plot.xml'])) data_files.append(('share/icons/hicolor/scalable/mimetypes/', ['linux/application-x-logarithm-plot.svg'])) data_files.append(('share/icons/hicolor/scalable/apps/', ['logplotter.svg'])) - """data_files.append((os.environ["PREFIX"] + '/applications/', ['linux/logarithmplotter.desktop'])) + data_files.append((os.environ["PREFIX"] + '/applications/', ['linux/logarithmplotter.desktop'])) 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'])) @@ -98,7 +98,6 @@ if sys.platform == 'linux': os.makedirs(os.environ["PREFIX"] + '/icons/hicolor/scalable/mimetypes/', exist_ok=True) os.makedirs(os.environ["PREFIX"] + '/icons/hicolor/scalable/apps/', exist_ok=True) os.makedirs(os.environ["PREFIX"] + '/metainfo/', exist_ok=True) - copyfile(current_dir + '/linux/logarithmplotter.desktop', os.environ["PREFIX"] + '/applications/logarithmplotter.desktop') copyfile(current_dir + '/linux/x-logarithm-plot.xml', os.environ["PREFIX"] + '/mime/packages/x-logarithm-plot.xml') copyfile(current_dir + '/linux/application-x-logarithm-plot.svg', os.environ["PREFIX"] + '/icons/hicolor/scalable/mimetypes/application-x-logarithm-plot.svg') @@ -106,11 +105,18 @@ if sys.platform == 'linux': if "FLATPAK_INSTALL" in os.environ: copyfile(current_dir + '/linux/eu.ad5001.LogarithmPlotter.metainfo.flatpak.xml', os.environ["PREFIX"] + '/metainfo/eu.ad5001.LogarithmPlotter.metainfo.xml') + copyfile(current_dir + '/linux/flatpak/logarithmplotter.desktop', + os.environ["PREFIX"] + '/applications/logarithmplotter.desktop') + else: + copyfile(current_dir + '/linux/eu.ad5001.LogarithmPlotter.metainfo.xml', + os.environ["PREFIX"] + '/metainfo/eu.ad5001.LogarithmPlotter.metainfo.xml') + copyfile(current_dir + '/linux/logarithmplotter.desktop', + os.environ["PREFIX"] + '/applications/logarithmplotter.desktop') 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')""" + os.remove(os.environ["PREFIX"] + '/icons/hicolor/scalable/apps/logplotter.svg') setuptools.setup( install_requires=([] if "FLATPAK_INSTALL" in os.environ else ["PySide2"]), diff --git a/snapcraft.yaml b/snapcraft.yaml index 99646dd..c049967 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,6 +1,6 @@ name: logarithmplotter title: LogarithmPlotter -version: '0.1.2' +version: '0.1.3' summary: 2D plotter software to make BODE plots, sequences and repartition functions. description: | LogarithmPlotter is, as it's name suggests, a plotter made with logarithm scales in mind. With an object system similar to [Geogebra](https://geogebra.org)'s, it allows dynamic creation of plots with very few limitations.