Compare commits

..

No commits in common. "a66ccd131935673433433d3475bb417d383925fb" and "999999832a6beaf5b8ee03a61f2bd2b581c857ee" have entirely different histories.

5 changed files with 8 additions and 17 deletions

View file

@ -17,8 +17,8 @@
""" """
from shutil import which from shutil import which
__VERSION__ = "0.4.1" __VERSION__ = "0.4.0"
is_release = False is_release = True
# Check if development version, if so get the date of the latest git patch # Check if development version, if so get the date of the latest git patch

View file

@ -32,7 +32,7 @@ Popup {
id: changelogPopup id: changelogPopup
x: (parent.width-width)/2 x: (parent.width-width)/2
y: Math.max(20, (parent.height-height)/2) y: Math.max(20, (parent.height-height)/2)
width: 800 width: changelog.width+40
height: Math.min(parent.height-40, 500) height: Math.min(parent.height-40, 500)
modal: true modal: true
focus: true focus: true
@ -44,42 +44,33 @@ Popup {
*/ */
property bool changelogNeedsFetching: true property bool changelogNeedsFetching: true
onAboutToShow: if(changelogNeedsFetching) { onAboutToShow: if(changelogNeedsFetching) Helper.fetchChangelog()
Helper.fetchChangelog()
}
Connections { Connections {
target: Helper target: Helper
function onChangelogFetched(chl) { function onChangelogFetched(chl) {
changelogNeedsFetching = false; changelogNeedsFetching = false;
changelog.text = chl changelog.text = chl
changelogView.contentItem.implicitHeight = changelog.height
// console.log(changelog.height, changelogView.contentItem.implicitHeight)
} }
} }
ScrollView { ScrollView {
id: changelogView
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: 10 anchors.topMargin: 10
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 10 anchors.leftMargin: 10
anchors.right: parent.right
anchors.rightMargin: 10
anchors.bottom: doneBtn.top anchors.bottom: doneBtn.top
anchors.bottomMargin: 10 anchors.bottomMargin: 10
clip: true clip: true
Label { Label {
id: changelog id: changelog
color: sysPalette.windowText color: sysPalette.windowText
width: 760
wrapMode: Text.WordWrap
textFormat: TextEdit.MarkdownText textFormat: TextEdit.MarkdownText
text: qsTr("Fetching changelog...") text: qsTr("Fetching changelog...")
onLinkActivated: Qt.openUrlExternally(link) onLinkActivated: Qt.openUrlExternally(link)
} }
} }

View file

@ -17,7 +17,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.4.1</string> <string>0.4.0</string>
<key>NSHighResolutionCapable</key> <key>NSHighResolutionCapable</key>
<true/> <true/>
<key>UTExportedTypeDeclarations</key> <key>UTExportedTypeDeclarations</key>

View file

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
cd "$(dirname "$(readlink -f "$0" || realpath "$0")")/.." cd "$(dirname "$(readlink -f "$0" || realpath "$0")")/.."
VERSION=0.4.1 VERSION=0.4.0
title="LogarithmPlotter v${VERSION} Setup" title="LogarithmPlotter v${VERSION} Setup"
finalDMGName="LogarithmPlotter-v${VERSION}-setup.dmg" finalDMGName="LogarithmPlotter-v${VERSION}-setup.dmg"
applicationName=LogarithmPlotter applicationName=LogarithmPlotter

View file

@ -11,7 +11,7 @@ Unicode True
!define PROG_ID "LogarithmPlotter.File.1" !define PROG_ID "LogarithmPlotter.File.1"
!define DEV_NAME "Ad5001" !define DEV_NAME "Ad5001"
!define WEBSITE "https://apps.ad5001.eu/logarithmplotter" !define WEBSITE "https://apps.ad5001.eu/logarithmplotter"
!define VERSION_SHORT "0.4.1" !define VERSION_SHORT "0.4.0"
!define APP_VERSION "${VERSION_SHORT}.0" !define APP_VERSION "${VERSION_SHORT}.0"
!define COPYRIGHT "Ad5001 (c) 2023" !define COPYRIGHT "Ad5001 (c) 2023"
!define DESCRIPTION "Create graphs with logarithm scales." !define DESCRIPTION "Create graphs with logarithm scales."