Compare commits

..

No commits in common. "494d6a38e037a51ef972d28e0e610549b3e36f23" and "044e9a55b1a2a8418cdd69ad098a2820e33b100a" have entirely different histories.

7 changed files with 518 additions and 61 deletions

View file

@ -2,6 +2,10 @@
Flahub repository for [LogarithmPlotter](https://apps.ad5001.eu/logarithmplotter/). Flahub repository for [LogarithmPlotter](https://apps.ad5001.eu/logarithmplotter/).
## KF6
The files in the `kf6` directory contain the most barebones instalations of the KDE Frameworks 6 to install the QtQuick Controls 2 Desktop Theme or Breeze Styles. They're not used in LogarithmPlotter for now, as the cost vs benefits ratio is minimal (longer load times against slightly higher fidelity to KDE desktop theme, but still no theme awareness, or proper breeze icons integration).
## Build ## Build
You can build the latest version of LogarithmPlotter flatpak using `flatpak-builder`: You can build the latest version of LogarithmPlotter flatpak using `flatpak-builder`:

View file

@ -79,21 +79,21 @@
<url type="help">https://git.ad5001.eu/Ad5001/LogarithmPlotter/wiki/</url> <url type="help">https://git.ad5001.eu/Ad5001/LogarithmPlotter/wiki/</url>
<url type="translate">https://hosted.weblate.org/engage/logarithmplotter/</url> <url type="translate">https://hosted.weblate.org/engage/logarithmplotter/</url>
<screenshots> <screenshots>
<screenshot type="default">https://apps.ad5001.eu/img/en/logarithmplotter/gain.png?v=0.5</screenshot> <screenshot type="default">https://apps.ad5001.eu/img/en/gain.png?v=0.4-light</screenshot>
<screenshot>https://apps.ad5001.eu/img/en/logarithmplotter/phase.png?v=0.5</screenshot> <screenshot>https://apps.ad5001.eu/img/en/logarithmplotter/phase.png?v=0.4-light</screenshot>
<screenshot>https://apps.ad5001.eu/img/en/logarithmplotter/welcome.png?v=0.5</screenshot> <screenshot>https://apps.ad5001.eu/img/en/logarithmplotter/welcome.png?v=0.4-light</screenshot>
<screenshot xml:lang="de" type="default">https://apps.ad5001.eu/img/de/gain.png?v=0.5</screenshot> <screenshot xml:lang="de" type="default">https://apps.ad5001.eu/img/de/gain.png?v=0.4-light</screenshot>
<screenshot xml:lang="de">https://apps.ad5001.eu/img/de/logarithmplotter/phase.png?v=0.5</screenshot> <screenshot xml:lang="de">https://apps.ad5001.eu/img/de/logarithmplotter/phase.png?v=0.4-light</screenshot>
<screenshot xml:lang="de">https://apps.ad5001.eu/img/de/logarithmplotter/welcome.png?v=0.5</screenshot> <screenshot xml:lang="de">https://apps.ad5001.eu/img/de/logarithmplotter/welcome.png?v=0.4-light</screenshot>
<screenshot xml:lang="fr" type="default">https://apps.ad5001.eu/img/fr/gain.png?v=0.5</screenshot> <screenshot xml:lang="fr" type="default">https://apps.ad5001.eu/img/fr/gain.png?v=0.4-light</screenshot>
<screenshot xml:lang="fr">https://apps.ad5001.eu/img/fr/logarithmplotter/phase.png?v=0.5</screenshot> <screenshot xml:lang="fr">https://apps.ad5001.eu/img/fr/logarithmplotter/phase.png?v=0.4-light</screenshot>
<screenshot xml:lang="fr">https://apps.ad5001.eu/img/fr/logarithmplotter/welcome.png?v=0.5</screenshot> <screenshot xml:lang="fr">https://apps.ad5001.eu/img/fr/logarithmplotter/welcome.png?v=0.4-light</screenshot>
<screenshot xml:lang="hu" type="default">https://apps.ad5001.eu/img/hu/gain.png?v=0.5</screenshot> <screenshot xml:lang="hu" type="default">https://apps.ad5001.eu/img/hu/gain.png?v=0.4-light</screenshot>
<screenshot xml:lang="hu">https://apps.ad5001.eu/img/hu/logarithmplotter/phase.png?v=0.5</screenshot> <screenshot xml:lang="hu">https://apps.ad5001.eu/img/hu/logarithmplotter/phase.png?v=0.4-light</screenshot>
<screenshot xml:lang="hu">https://apps.ad5001.eu/img/hu/logarithmplotter/welcome.png?v=0.5</screenshot> <screenshot xml:lang="hu">https://apps.ad5001.eu/img/hu/logarithmplotter/welcome.png?v=0.4-light</screenshot>
<screenshot xml:lang="no" type="default">https://apps.ad5001.eu/img/no/gain.png?v=0.5</screenshot> <screenshot xml:lang="no" type="default">https://apps.ad5001.eu/img/no/gain.png?v=0.4-light</screenshot>
<screenshot xml:lang="no">https://apps.ad5001.eu/img/no/logarithmplotter/phase.png?v=0.5</screenshot> <screenshot xml:lang="no">https://apps.ad5001.eu/img/no/logarithmplotter/phase.png?v=0.4-light</screenshot>
<screenshot xml:lang="no">https://apps.ad5001.eu/img/no/logarithmplotter/welcome.png?v=0.5</screenshot> <screenshot xml:lang="no">https://apps.ad5001.eu/img/no/logarithmplotter/welcome.png?v=0.4-light</screenshot>
</screenshots> </screenshots>
<!-- recommend at least 600 logical pixels of space --> <!-- recommend at least 600 logical pixels of space -->
@ -109,50 +109,6 @@
</requires> </requires>
<releases> <releases>
<release version="0.5.0" date="2023-01-11">
<description>
<p><b>Changes for v0.5.0:</b></p>
<p>New</p>
<ul>
<li>New, reworked application icon.</li>
<li>Graph is now mouse interactive:</li>
<li>You can now drag to move and scroll to zoom!</li>
<li>Builtin functions now provide usage when used in the autocomplete of the expression editor.</li>
</ul>
<p>Changes</p>
<ul>
<li>When creating an object that can be positioned, new default behavior is to pick first instead of opening object settings.</li>
<li>Icons with text now use the SVG's text element, allowing them to integrate better with the system's default font.</li>
<li>Special characters popup is now context aware (e.g. no sub/supscript symbols in expressions).</li>
<li>New symbols in special characters popup.</li>
<li>Integrals and derivatives can now be provided with an executable object (e.g. Functions) instead of strings as function.</li>
<li>New description on Linux.</li>
</ul>
<p>Fixed bugs</p>
<ul>
<li>Fixing ∞ 'variable' in domains and expressions.</li>
<li>Several other bugs related to constants in expresions were fixed as well.</li>
<li>Builtin functions now send an error message when not provided with the proper arguments.</li>
</ul>
<p>Internal changes</p>
<ul>
<li>Updated to PySide6 v6.6.1.</li>
<li>Reworked continuous functions' rendering to make it faster.</li>
<li>Removed old bits from an unfinished new parser that weren't used.</li>
</ul>
</description>
<artifacts>
<artifact type="binary" platform="x86_64-windows-any">
<location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.5.0/logarithmplotter-v0.5.0-setup.exe</location>
</artifact>
<artifact type="binary" platform="x86_64-macos-any">
<location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.5.0/LogarithmPlotter-v0.5.0-setup.dmg</location>
</artifact>
<artifact type="source">
<location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.5.0/logarithmplotter-0.5.0.tar.gz</location>
</artifact>
</artifacts>
</release>
<release version="0.4.0" date="2023-05-27"> <release version="0.4.0" date="2023-05-27">
<description> <description>
<p><b>Changes for v0.4.0:</b></p> <p><b>Changes for v0.4.0:</b></p>

View file

@ -62,6 +62,11 @@ modules:
build-commands: build-commands:
- install -d /app/texlive - install -d /app/texlive
# Built KDE Depenedencies (included for some reason when built by bot)
# - "kf6/qqc2breezestyle.json"
# - "kf6/qqc2desktoptheme.json"
# - "kf6/qqc2desktoptheme-bare.json"
- name: LogarithmPlotter - name: LogarithmPlotter
buildsystem: simple buildsystem: simple
build-options: build-options:
@ -76,6 +81,9 @@ modules:
# Add metainfo file from current repository. # Add metainfo file from current repository.
- mkdir -p /app/share/metainfo/ - mkdir -p /app/share/metainfo/
- mv eu.ad5001.LogarithmPlotter.metainfo.xml /app/share/metainfo/eu.ad5001.LogarithmPlotter.metainfo.xml - mv eu.ad5001.LogarithmPlotter.metainfo.xml /app/share/metainfo/eu.ad5001.LogarithmPlotter.metainfo.xml
# Use new icon (temporary)
- cp icon_flatpak.svg logplotter.svg
- cp icon_flatpak.svg ./LogarithmPlotter/logarithmplotter.svg
# Install # Install
- PREFIX="/app/share" FLATPAK_INSTALL=1 pip3 install --verbose --no-index --prefix=${FLATPAK_DEST} --no-build-isolation --no-deps . - PREFIX="/app/share" FLATPAK_INSTALL=1 pip3 install --verbose --no-index --prefix=${FLATPAK_DEST} --no-build-isolation --no-deps .
# Copy changelog into the directory needed for it to be cached. # Copy changelog into the directory needed for it to be cached.
@ -88,9 +96,11 @@ modules:
sources: sources:
- type: git - type: git
url: https://git.ad5001.eu/Ad5001/LogarithmPlotter url: https://git.ad5001.eu/Ad5001/LogarithmPlotter
tag: v0.5.0 tag: v0.4.0
commit: 33c790b11326cb8ecb0e0c7e909ccc51b0a59ba3 commit: 19e403ce9883e8debd2905e0773b0dba370bffca
- type: file - type: file
path: eu.ad5001.LogarithmPlotter.metainfo.xml path: eu.ad5001.LogarithmPlotter.metainfo.xml
- type: file
path: icon_flatpak.svg
- type: file - type: file
path: logarithmplotter.desktop path: logarithmplotter.desktop

64
icon_flatpak.svg Normal file
View file

@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="24.0px"
height="24.0px"
viewBox="0 0 24.0 24.0"
version="1.1"
id="SVGRoot"
xml:space="preserve"
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"
id="rect1546"
width="18"
height="18"
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"
id="rect1546-7"
width="18"
height="18"
x="3"
y="3"
ry="2.25" /></g><g
id="layer1"
style="stroke-width:2;stroke-dasharray:none"><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"
id="rect1412"
width="2"
height="15"
x="9"
y="3.9768662" /><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>

After

Width:  |  Height:  |  Size: 3.1 KiB

179
kf6/qqc2breezestyle.json Normal file
View file

@ -0,0 +1,179 @@
{
"name": "qqc2breezestyle",
"buildsystem": "cmake",
"builddir": true,
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/plasma/qqc2-breeze-style.git",
"commit": "125713a9216cde83726b7893635480be60da1a8a"
}
],
"cleanup": [
"/lib/debug",
"/share/runtime/locale/sr/"
],
"modules": [
{
"name": "ecm",
"buildsystem": "cmake-ninja",
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/frameworks/extra-cmake-modules.git",
"commit": "41f2e5863b01d86088adf5e2e49ad0871e02117f"
}
]
},
{
"name": "kirigami2",
"buildsystem": "cmake",
"builddir": true,
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/frameworks/kirigami.git",
"commit": "ff5a671e8310f7a97dccbb95cc9de56d620e1e2f"
}
]
},
{
"name": "kconfig",
"buildsystem": "cmake",
"builddir": true,
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/frameworks/kconfig.git",
"commit": "08abea7dbea3b4d44f089a997961314226f21654"
}
]
},
{
"name": "kcolorscheme",
"buildsystem": "cmake",
"builddir": true,
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/frameworks/kcolorscheme.git",
"commit": "5dfc0fa1a53447c56a2ed1941b348b3fad7e0d56"
}
],
"modules": [
{
"name": "ki18n",
"buildsystem": "cmake",
"builddir": true,
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/frameworks/ki18n.git",
"commit": "347d47119bdad89b113a904fa53f4c6ece182219"
}
]
},
{
"name": "plasma-wayland-protocols",
"buildsystem": "cmake",
"builddir": true,
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/libraries/plasma-wayland-protocols.git",
"commit": "6e08d9c981278660791e72fec06d143403a98ba2"
}
]
},
{
"name": "kguiaddons",
"buildsystem": "cmake",
"builddir": true,
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/frameworks/kguiaddons.git",
"commit": "8be8489019fcbfa83539bd1d9e333c2ebc44d008"
}
]
}
]
},
{
"name": "kiconthemes",
"buildsystem": "cmake",
"builddir": true,
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/frameworks/kiconthemes.git",
"commit": "a825523545f3dd84064e7a868cf5d61f363a0d8b"
}
],
"modules": [
{
"name": "karchive",
"buildsystem": "cmake",
"builddir": true,
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/frameworks/karchive.git",
"commit": "74972b29463dc903c3245d3d050f8f50dbf86477"
}
]
},
{
"name": "kcoreaddons",
"buildsystem": "cmake",
"builddir": true,
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/frameworks/kcoreaddons.git",
"commit": "8edca25c6512193b734b4091363f1eb0285ffcfd"
}
]
},
{
"name": "kwidgetsaddons",
"buildsystem": "cmake",
"builddir": true,
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/frameworks/kwidgetsaddons.git",
"commit": "9a6ebfe56032354651f9b501639dae87a298ed42"
}
]
},
{
"name": "kconfigwidgets",
"buildsystem": "cmake",
"builddir": true,
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/frameworks/kconfigwidgets.git",
"commit": "740d09892eb9dbdc191f7768ba9df64e3cb24b9b"
}
],
"modules": [
{
"name": "kcodecs",
"buildsystem": "cmake",
"builddir": true,
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/frameworks/kcodecs.git",
"commit": "c7c7a32bcac3a41a85d7197bafd841f081e8db05"
}
]
}
]
}
]
}
]
}

View file

@ -0,0 +1,53 @@
{
"name": "qqc2desktoptheme",
"buildsystem": "cmake",
"builddir": true,
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/frameworks/qqc2-desktop-style.git",
"commit": "cdd3e195360438c8acad66b067c1843246882894"
}
],
"cleanup": [
"/lib/debug",
"/share/runtime/locale/sr/"
],
"modules": [
{
"name": "ecm",
"buildsystem": "cmake-ninja",
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/frameworks/extra-cmake-modules.git",
"commit": "41f2e5863b01d86088adf5e2e49ad0871e02117f"
}
]
},
{
"name": "kirigami2",
"buildsystem": "cmake",
"builddir": true,
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/frameworks/kirigami.git",
"commit": "ff5a671e8310f7a97dccbb95cc9de56d620e1e2f"
}
]
},
{
"name": "kconfig",
"buildsystem": "cmake",
"builddir": true,
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/frameworks/kconfig.git",
"commit": "08abea7dbea3b4d44f089a997961314226f21654"
}
]
}
]
}

191
kf6/qqc2desktoptheme.json Normal file
View file

@ -0,0 +1,191 @@
{
"name": "qqc2desktoptheme",
"buildsystem": "cmake",
"builddir": true,
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/frameworks/qqc2-desktop-style.git",
"commit": "cdd3e195360438c8acad66b067c1843246882894"
}
],
"cleanup": [
"/lib/debug",
"/share/runtime/locale/sr/"
],
"modules": [
{
"name": "ecm",
"buildsystem": "cmake-ninja",
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/frameworks/extra-cmake-modules.git",
"commit": "41f2e5863b01d86088adf5e2e49ad0871e02117f"
}
]
},
{
"name": "kirigami2",
"buildsystem": "cmake",
"builddir": true,
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/frameworks/kirigami.git",
"commit": "ff5a671e8310f7a97dccbb95cc9de56d620e1e2f"
}
]
},
{
"name": "kconfig",
"buildsystem": "cmake",
"builddir": true,
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/frameworks/kconfig.git",
"commit": "08abea7dbea3b4d44f089a997961314226f21654"
}
]
},
{
"name": "kcolorscheme",
"buildsystem": "cmake",
"builddir": true,
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/frameworks/kcolorscheme.git",
"commit": "5dfc0fa1a53447c56a2ed1941b348b3fad7e0d56"
}
],
"modules": [
{
"name": "ki18n",
"buildsystem": "cmake",
"builddir": true,
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/frameworks/ki18n.git",
"commit": "347d47119bdad89b113a904fa53f4c6ece182219"
}
]
},
{
"name": "plasma-wayland-protocols",
"buildsystem": "cmake",
"builddir": true,
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/libraries/plasma-wayland-protocols.git",
"commit": "6e08d9c981278660791e72fec06d143403a98ba2"
}
]
},
{
"name": "kguiaddons",
"buildsystem": "cmake",
"builddir": true,
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/frameworks/kguiaddons.git",
"commit": "8be8489019fcbfa83539bd1d9e333c2ebc44d008"
}
]
}
]
},
{
"name": "kiconthemes",
"buildsystem": "cmake",
"builddir": true,
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/frameworks/kiconthemes.git",
"commit": "a825523545f3dd84064e7a868cf5d61f363a0d8b"
}
],
"modules": [
{
"name": "breeze-icons",
"buildsystem": "cmake",
"builddir": true,
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/frameworks/breeze-icons.git",
"commit": "41d35bd18b4c4ef5c91553cd9ecabbf5e3c3a898"
}
]
},
{
"name": "karchive",
"buildsystem": "cmake",
"builddir": true,
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/frameworks/karchive.git",
"commit": "74972b29463dc903c3245d3d050f8f50dbf86477"
}
]
},
{
"name": "kcoreaddons",
"buildsystem": "cmake",
"builddir": true,
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/frameworks/kcoreaddons.git",
"commit": "8edca25c6512193b734b4091363f1eb0285ffcfd"
}
]
},
{
"name": "kwidgetsaddons",
"buildsystem": "cmake",
"builddir": true,
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/frameworks/kwidgetsaddons.git",
"commit": "9a6ebfe56032354651f9b501639dae87a298ed42"
}
]
},
{
"name": "kconfigwidgets",
"buildsystem": "cmake",
"builddir": true,
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/frameworks/kconfigwidgets.git",
"commit": "740d09892eb9dbdc191f7768ba9df64e3cb24b9b"
}
],
"modules": [
{
"name": "kcodecs",
"buildsystem": "cmake",
"builddir": true,
"sources": [
{
"type": "git",
"url": "https://invent.kde.org/frameworks/kcodecs.git",
"commit": "c7c7a32bcac3a41a85d7197bafd841f081e8db05"
}
]
}
]
}
]
}
]
}