From 50317a367f01e44c3574cea4c95075bc79a2eddc Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Sat, 21 Aug 2021 21:41:56 +0200 Subject: [PATCH] Renaming hisotry icon to timeline, trying to fix button colors in flatpak. --- .gitignore | 3 +++ .../qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml | 4 ++-- .../LogarithmPlotter/ObjectLists/ObjectCreationGrid.qml | 2 +- .../eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml | 2 ++ .../icons/settings/{history.svg => timeline.svg} | 0 linux/debian/changelog | 2 +- linux/debian/control | 5 +++-- linux/debian/depends | 2 +- package-linux.sh | 2 +- 9 files changed, 14 insertions(+), 8 deletions(-) rename LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/{history.svg => timeline.svg} (100%) mode change 100644 => 100755 package-linux.sh diff --git a/.gitignore b/.gitignore index 80504ee..f346ca8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ build/ dist/ +deb_dist/ linux/flatpak/AppDir +linux/flatpak/repo +linux/flatpak/build-dir linux/flatpak/.flatpak-builder *.snap *.spec diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml index 712f23f..b0cf8a6 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml @@ -93,7 +93,7 @@ MenuBar { height: visible ? implicitHeight : 0 icon.name: modelData icon.source: './icons/' + modelData + '.svg' - icon.color: sysPalette.windowText + icon.color: sysPalette.buttonText onTriggered: { var newObj = Objects.createNewRegisteredObject(modelData) history.addToHistory(new HistoryLib.CreateNewObject(newObj.name, modelData, newObj.export())) @@ -120,7 +120,7 @@ MenuBar { checkable: true checked: Helper.getSettingBool("reset_redo_stack") onTriggered: Helper.setSettingBool("reset_redo_stack", checked) - icon.name: 'history' + icon.name: 'timeline' } } diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectCreationGrid.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectCreationGrid.qml index 93f8c1f..508e38f 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectCreationGrid.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectCreationGrid.qml @@ -50,7 +50,7 @@ Column { icon.source: '../icons/' + modelData + '.svg' icon.width: 24 icon.height: 24 - icon.color: sysPalette.windowText + icon.color: sysPalette.buttonText onClicked: { var newObj = Objects.createNewRegisteredObject(modelData) diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml index bf7f073..5bc2d7b 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml @@ -129,6 +129,7 @@ ListView { anchors.topMargin: 5 icon.name: 'position' icon.source: '../icons/position.svg' + icon.color: sysPalette.buttonText property bool hasXProp: Objects.types[objType].properties().hasOwnProperty('x') property bool hasYProp: Objects.types[objType].properties().hasOwnProperty('y') visible: hasXProp || hasYProp @@ -156,6 +157,7 @@ ListView { anchors.topMargin: 5 icon.name: 'delete' icon.source: '../icons/delete.svg' + icon.color: sysPalette.buttonText ToolTip.visible: hovered ToolTip.text: 'Delete ' + Objects.types[objType].displayType() + '.' diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/history.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/timeline.svg similarity index 100% rename from LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/history.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/timeline.svg diff --git a/linux/debian/changelog b/linux/debian/changelog index 8172695..33029f8 100644 --- a/linux/debian/changelog +++ b/linux/debian/changelog @@ -1,4 +1,4 @@ -logarithmplotter (0.0.1.dev0) UNRELEASED; urgency=medium +logarithmplotter (0.1.dev0) UNRELEASED; urgency=medium * Initial release. diff --git a/linux/debian/control b/linux/debian/control index ca07e0b..110bbcd 100644 --- a/linux/debian/control +++ b/linux/debian/control @@ -1,9 +1,10 @@ Package: logarithmplotter Source: logarithmplotter -Version: 0.0.1.dev0 +Version: 0.1 Architecture: all Maintainer: Ad5001 -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) Section: science Priority: optional diff --git a/linux/debian/depends b/linux/debian/depends index 1494f2e..3f307c1 100644 --- a/linux/debian/depends +++ b/linux/debian/depends @@ -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) diff --git a/package-linux.sh b/package-linux.sh old mode 100644 new mode 100755 index b10e672..7760b08 --- a/package-linux.sh +++ b/package-linux.sh @@ -1,6 +1,6 @@ #!/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_BUILDER=$(which flatpak-builder)