Ad5001/LogarithmPlotter
Ad5001/LogarithmPlotter
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Wiki Activity

Renaming hisotry icon to timeline, trying to fix button colors in flatpak.
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source
This commit is contained in:
Adsooi 2021-08-21 21:41:56 +02:00
parent 6b70e6df9e
commit 50317a367f
Signed by: Ad5001
GPG key ID: EF45F9C6AFE20160
9 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -1,6 +1,9 @@
build/ build/
dist/ dist/
deb_dist/
linux/flatpak/AppDir linux/flatpak/AppDir
linux/flatpak/repo
linux/flatpak/build-dir
linux/flatpak/.flatpak-builder linux/flatpak/.flatpak-builder
*.snap *.snap
*.spec *.spec

4
LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml
View file

@ -93,7 +93,7 @@ MenuBar {
height: visible ? implicitHeight : 0 height: visible ? implicitHeight : 0
icon.name: modelData icon.name: modelData
icon.source: './icons/' + modelData + '.svg' icon.source: './icons/' + modelData + '.svg'
icon.color: sysPalette.windowText icon.color: sysPalette.buttonText
onTriggered: { onTriggered: {
var newObj = Objects.createNewRegisteredObject(modelData) var newObj = Objects.createNewRegisteredObject(modelData)
history.addToHistory(new HistoryLib.CreateNewObject(newObj.name, modelData, newObj.export())) history.addToHistory(new HistoryLib.CreateNewObject(newObj.name, modelData, newObj.export()))
@ -120,7 +120,7 @@ MenuBar {
checkable: true checkable: true
checked: Helper.getSettingBool("reset_redo_stack") checked: Helper.getSettingBool("reset_redo_stack")
onTriggered: Helper.setSettingBool("reset_redo_stack", checked) onTriggered: Helper.setSettingBool("reset_redo_stack", checked)
icon.name: 'history' icon.name: 'timeline'
} }
} }

2
LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectCreationGrid.qml
View file

@ -50,7 +50,7 @@ Column {
icon.source: '../icons/' + modelData + '.svg' icon.source: '../icons/' + modelData + '.svg'
icon.width: 24 icon.width: 24
icon.height: 24 icon.height: 24
icon.color: sysPalette.windowText icon.color: sysPalette.buttonText
onClicked: { onClicked: {
var newObj = Objects.createNewRegisteredObject(modelData) var newObj = Objects.createNewRegisteredObject(modelData)

2
LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml
View file

@ -129,6 +129,7 @@ ListView {
anchors.topMargin: 5 anchors.topMargin: 5
icon.name: 'position' icon.name: 'position'
icon.source: '../icons/position.svg' icon.source: '../icons/position.svg'
icon.color: sysPalette.buttonText
property bool hasXProp: Objects.types[objType].properties().hasOwnProperty('x') property bool hasXProp: Objects.types[objType].properties().hasOwnProperty('x')
property bool hasYProp: Objects.types[objType].properties().hasOwnProperty('y') property bool hasYProp: Objects.types[objType].properties().hasOwnProperty('y')
visible: hasXProp || hasYProp visible: hasXProp || hasYProp
@ -156,6 +157,7 @@ ListView {
anchors.topMargin: 5 anchors.topMargin: 5
icon.name: 'delete' icon.name: 'delete'
icon.source: '../icons/delete.svg' icon.source: '../icons/delete.svg'
icon.color: sysPalette.buttonText
ToolTip.visible: hovered ToolTip.visible: hovered
ToolTip.text: 'Delete ' + Objects.types[objType].displayType() + '.' ToolTip.text: 'Delete ' + Objects.types[objType].displayType() + '.'

0
LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/history.svg → LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/timeline.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 675 B

After

Width:  |  Height:  |  Size: 675 B

2
linux/debian/changelog
View file

@ -1,4 +1,4 @@
logarithmplotter (0.0.1.dev0) UNRELEASED; urgency=medium logarithmplotter (0.1.dev0) UNRELEASED; urgency=medium
* Initial release. * Initial release.

5
linux/debian/control
View file

@ -1,9 +1,10 @@
Package: logarithmplotter Package: logarithmplotter
Source: logarithmplotter Source: logarithmplotter
Version: 0.0.1.dev0 Version: 0.1
Architecture: all Architecture: all
Maintainer: Ad5001 <mail@ad5001.eu> Maintainer: Ad5001 <mail@ad5001.eu>
Depends: python3, python3-pip, qt5-default (>= 5.14.0), qml-module-qtquick-controls2 (>= 5.14.0), qml-module-qtmultimedia (>= 5.14.0), qml-module-qtgraphicaleffects (>= 5.14.0), qml-module-qtquick2 (>= 5.14.0), qml-module-qtqml-models2 (>= 5.14.0), qml-module-qtquick-controls (>= 5.14.0), python3-pyside2.qtcore (>= 5.14.0), python3-pyside2.qtqml (>= 5.14.0), python3-pyside2.qtgui (>= 5.14.0), python3-pyside2.qtquick (>= 5.14.0), python3-pyside2.qtwidgets (>= 5.14.0), python3-pyside2.qtmultimedia (>= 5.14.0), python3-pyside2.qtnetwork (>= 5.14.0) Depends: python3, python3-pip, qml-module-qtquick-controls2 (>= 5.12.0), qml-module-qtmultimedia (>= 5.12.0), qml-module-qtgraphicaleffects (>= 5.12.0), qml-module-qtquick2 (>= 5.12.0), qml-module-qtqml-models2 (>= 5.12.0), qml-module-qtquick-controls (>= 5.12.0), python3-pyside2.qtcore (>= 5.12.0), python3-pyside2.qtqml (>= 5.12.0), python3-pyside2.qtgui (>= 5.12.0), python3-pyside2.qtquick (>= 5.12.0), python3-pyside2.qtwidgets (>= 5.12.0), python3-pyside2.qtmultimedia (>= 5.12.0), python3-pyside2.qtnetwork (>= 5.12.0)
Build-Depends: debhelper (>=11~), dh-python, dpkg-dev (>= 1.16.1~), python-setuptools, python3-all-dev (>=3.6) Build-Depends: debhelper (>=11~), dh-python, dpkg-dev (>= 1.16.1~), python-setuptools, python3-all-dev (>=3.6)
Section: science Section: science
Priority: optional Priority: optional

2
linux/debian/depends
View file

@ -1 +1 @@
python3-pip, qt5-default (>= 5.12.0), qml-module-qtquick-controls2 (>= 5.12.0), qml-module-qtmultimedia (>= 5.12.0), qml-module-qtgraphicaleffects (>= 5.12.0), qml-module-qtquick2 (>= 5.12.0), qml-module-qtqml-models2 (>= 5.12.0), qml-module-qtquick-controls (>= 5.12.0), python3-pyside2.qtcore (>= 5.12.0), python3-pyside2.qtqml (>= 5.12.0), python3-pyside2.qtgui (>= 5.12.0), python3-pyside2.qtquick (>= 5.12.0), python3-pyside2.qtwidgets (>= 5.12.0), python3-pyside2.qtmultimedia (>= 5.12.0), python3-pyside2.qtnetwork (>= 5.12.0) python3-pip, qml-module-qtquick-controls2 (>= 5.12.0), qml-module-qtmultimedia (>= 5.12.0), qml-module-qtgraphicaleffects (>= 5.12.0), qml-module-qtquick2 (>= 5.12.0), qml-module-qtqml-models2 (>= 5.12.0), qml-module-qtquick-controls (>= 5.12.0), python3-pyside2.qtcore (>= 5.12.0), python3-pyside2.qtqml (>= 5.12.0), python3-pyside2.qtgui (>= 5.12.0), python3-pyside2.qtquick (>= 5.12.0), python3-pyside2.qtwidgets (>= 5.12.0), python3-pyside2.qtmultimedia (>= 5.12.0), python3-pyside2.qtnetwork (>= 5.12.0)

2
package-linux.sh Normal file → Executable file
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
python3 setup.py --command-packages=stdeb.command sdist_dsc --package accountfree --copyright-file linux/debian/copyright --suite hirsute --recommends "$(cat linux/debian/recommends)" --depends "$(cat linux/debian/depends)" --section science bdist_deb python3 setup.py --command-packages=stdeb.command sdist_dsc --package logarithmplotter --copyright-file linux/debian/copyright --suite hirsute --recommends "$(cat linux/debian/recommends)" --depends "$(cat linux/debian/depends)" --section science bdist_deb
# Flatpak building # Flatpak building
FLATPAK_BUILDER=$(which flatpak-builder) FLATPAK_BUILDER=$(which flatpak-builder)