Updating tests

.gitignore

@@ -2,10 +2,10 @@
 build/
 dist/
 deb_dist/
-linux/flatpak/AppDir
+assets/linux/flatpak/AppDir
-linux/flatpak/repo
+assets/linux/flatpak/repo
-linux/flatpak/build-dir
+assets/linux/flatpak/build-dir
-linux/flatpak/.flatpak-builder
+assets/linux/flatpak/.flatpak-builder
 *.snap
 *.spec
 *.zip
@@ -38,7 +38,7 @@ docs/html
 *.lgg
 
 # npm
-node_modules
+common/node_modules
-coverage/
+common/coverage/
-.coverage
+common/.coverage
-LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/index.mjs*
+runtime-pyside6/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/index.mjs*

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "LogarithmPlotter/qml/eu/ad5001/MixedMenu"]
+[submodule "runtime-pyside6/LogarithmPlotter/qml/eu/ad5001/MixedMenu"]
-	path = LogarithmPlotter/qml/eu/ad5001/MixedMenu
+	path = runtime-pyside6/LogarithmPlotter/qml/eu/ad5001/MixedMenu
 	url = https://git.ad5001.eu/Ad5001/MixedMenu

README.md

@@ -19,15 +19,15 @@ You can find more screenshots on the [app's website](https://apps.ad5001.eu/loga
 
 First, you'll need to install all the required dependencies:
 
-- [Python 3](https://python.org) with [poetry](https://python-poetry.org/), and setup a virtual environment and call
+- [Python 3](https://python.org) with [poetry](https://python-poetry.org/), setup a virtual environment, go to the `runtime-pyside6` directory, and call
   `poetry install`.
-- [npm](https://npmjs.com) (or [yarn](https://yarnpkg.com/)), and run `npm install` (or `yarn install`).
+- [npm](https://npmjs.com) (or [yarn](https://yarnpkg.com/)), go to the `common` directory, and run `npm install` (or `yarn install`).
 
 You can simply run LogarithmPlotter using `python3 run.py`. It automatically compiles the language files (requires
 `lrelease` to be installed and in path), and the JavaScript modules.
 
-If you do not wish do recompile the files again on every run, you can use
+If you do not wish do recompile the files again on every run, you can use the build script (`scripts/build.sh`) and run
-`python3 LogarithmPlotter/logarithmplotter.py`.
+`python3 build/runtime-pyside6/LogarithmPlotter/logarithmplotter.py`.
 
 In order to test translations, you can use the `--lang=<lang code>` commandline option to force the locale.
 
@@ -39,22 +39,18 @@ All scripts noted here can be found in the `scripts` directory.
 
 You can generate installers for LogarithmPlotter after installing all the dependencies.
 
-- Windows installer:
+- Windows installer (crosscompiling from Linux):
-    - Run the `build-windows.bat` script (or `build-wine.sh` if you're cross-compiling with wine on Linux) to build an
+    - Run  `build-wine.sh` (requires wine) to build an exe for LogarithmPlotter in build/runtime-pyside6/dist.
-      exe for LogarithmPlotter.
+    - You also need [NSIS](https://nsis.sourceforge.io/Main_Page) (the [nsis](https://pkgs.org/download/nsis) package is available on linux).
-    - You also need [NSIS](https://nsis.sourceforge.io/Main_Page) (Linux users can install
+    - Run the `package-wine.sh` script. You will find a logarithmplotter-setup.exe installer in the build/runtime-pyside6/dist/logarithmplotter/ folder.
-      the [nsis](https://pkgs.org/download/nsis) package).
-    - Run the `package-windows.bat` script (or `package-wine.sh`if you're cross-compiling on Linux). You will find a
-      logarithmplotter-setup.exe installer in the dist/logarithmplotter/ folder.
 - MacOS Archive creator installer:
-    - Run the `build-macosx.sh` script to build an .app for LogarithmPlotter which can be found in the dist directory.
+    - Run the `build-macosx.sh` script to build an .app for LogarithmPlotter which can be found in the build/runtime-pyside6/dist directory.
     - Run the `package-macosx.sh` script. You will find a LogarithmPlotter-v&lt;version&gt;-setup.dmg installer in the
-      dist/ folder.
+      build/runtime-pyside6/build/pysdist/ folder.
 - Linux packages:
-    - To build and install the flatpak, you
+    - Run `package-deb.sh`. It will create an DSC and a DEB in build/runtime-pyside6/deb_dist/
-      need [flatpak-builder](https://docs.flatpak.org/en/latest/flatpak-builder.html) installed.
+    - Run `scripts/build.sh` followed by `snapcraft`. It .snap file in the root directory.
-    - To build the snap, you need [snapcraft](https://snapcraft.io) installed.
+    - See [the flatpak repo](https://github.com/Ad5001/eu.ad5001.LogarithmPlotter) for instrutions on how to build the flatpak.
-    - Run `package-linux.sh`.
 
 ## Contribute
 

assets/native/linux/application-x-logarithm-plot.svg

@@ -0,0 +1 @@
+../../logplotterfile.svg

assets/native/linux/debian/control

@@ -3,9 +3,9 @@ Source: logarithmplotter
 Version: 0.6.0
 Architecture: all
 Maintainer: Ad5001 <mail@ad5001.eu>
-Depends: python3, python3-pip, python3-pyside6-essentials (>= 6.7.0), texlive-latex-base, dvipng
+Depends: python3 (>= 3.9), python3-pip, python3-pyside6-essentials (>= 6.7.0), texlive-latex-base, dvipng
 
-Build-Depends: debhelper (>=11~), dh-python, dpkg-dev (>= 1.16.1~), python-setuptools, python3-all-dev (>=3.9)
+Build-Depends: debhelper (>=11~), dh-python, dpkg-dev (>= 1.16.1~), python-setuptools
 Section: science
 Priority: optional
 Homepage: https://apps.ad5001.eu/logarithmplotter/

assets/native/linux/debian/depends

@@ -0,0 +1 @@
+python3 (>= 3.9), python3-pip, python3-pyside6-essentials (>= 6.7.0), texlive-latex-base, dvipng

assets/native/linux/logarithmplotter.desktop

@@ -14,7 +14,7 @@ Comment[hu]=Bode-ábrák, sorozatok és újraosztási függvények létrehozása
 
 TryExec=logarithmplotter
 Exec=logarithmplotter %f
-Icon=logplotter
+Icon=logarithmplotter
 MimeType=application/x-logarithm-plot;
 Terminal=false
 StartupNotify=false