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

Using some qt method instead of helper when possible

Browse source
This commit is contained in:
Adsooi 2022-01-31 21:39:51 +01:00
parent 3119c3f9dc
commit 2d12291075
Signed by: Ad5001
GPG key ID: EF45F9C6AFE20160
7 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
LogarithmPlotter/helper.py
View file

@ -24,7 +24,6 @@ from PySide2 import __version__ as PySide2_version
from os import chdir, path from os import chdir, path
from json import loads from json import loads
from webbrowser import open as openWeb
from sys import version as sys_version from sys import version as sys_version
from urllib.request import urlopen from urllib.request import urlopen
from urllib.error import HTTPError, URLError from urllib.error import HTTPError, URLError
@ -142,10 +141,6 @@ class Helper(QObject):
""" """
return QCoreApplication.translate('main',"Built with PySide2 (Qt) v{} and python v{}").format(PySide2_version, sys_version.split("\n")[0]) return QCoreApplication.translate('main',"Built with PySide2 (Qt) v{} and python v{}").format(PySide2_version, sys_version.split("\n")[0])
@Slot(str)
def openUrl(self, url):
openWeb(url)
@Slot() @Slot()
def fetchChangelog(self): def fetchChangelog(self):
changelog_cache_path = path.join(path.dirname(path.realpath(__file__)), "CHANGELOG.md") changelog_cache_path = path.join(path.dirname(path.realpath(__file__)), "CHANGELOG.md")

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

@ -146,12 +146,12 @@ MenuBar {
Action { Action {
text: qsTr("&Source code") text: qsTr("&Source code")
icon.name: 'software-sources' icon.name: 'software-sources'
onTriggered: Helper.openUrl("https://git.ad5001.eu/Ad5001/LogarithmPlotter/issues") onTriggered: Qt.openUrlExternally("https://git.ad5001.eu/Ad5001/LogarithmPlotter/issues")
} }
Action { Action {
text: qsTr("&Report a bug") text: qsTr("&Report a bug")
icon.name: 'tools-report-bug' icon.name: 'tools-report-bug'
onTriggered: Helper.openUrl("https://git.ad5001.eu/Ad5001/LogarithmPlotter/issues") onTriggered: Qt.openUrlExternally("https://git.ad5001.eu/Ad5001/LogarithmPlotter/issues")
} }
Action { Action {
text: qsTr("&Changelog") text: qsTr("&Changelog")
@ -161,7 +161,7 @@ MenuBar {
Action { Action {
text: qsTr("&Help translating!") text: qsTr("&Help translating!")
icon.name: 'translator' icon.name: 'translator'
onTriggered: Helper.openUrl("https://hosted.weblate.org/engage/logarithmplotter/") onTriggered: Qt.openUrlExternally("https://hosted.weblate.org/engage/logarithmplotter/")
} }
MenuSeparator { } MenuSeparator { }
Action { Action {

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

@ -334,7 +334,7 @@ ApplicationWindow {
Action { Action {
text: qsTr("&Update LogarithmPlotter") text: qsTr("&Update LogarithmPlotter")
icon.name: 'update' icon.name: 'update'
onTriggered: Helper.openUrl("https://dev.apps.ad5001.eu/logarithmplotter") onTriggered: Qt.openUrlExternally("https://dev.apps.ad5001.eu/logarithmplotter")
} }
} }

4
LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Popup/About.qml
View file

@ -98,7 +98,7 @@ This program is free software: you can redistribute it and/or modify it under th
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br> This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br>
<br> <br>
You should have received a copy of the GNU General Public License along with this program. If not, see <a href='http://www.gnu.org/licenses/'>http://www.gnu.org/licenses/</a>." You should have received a copy of the GNU General Public License along with this program. If not, see <a href='http://www.gnu.org/licenses/'>http://www.gnu.org/licenses/</a>."
onLinkActivated: Helper.openUrl(link) onLinkActivated: Qt.openUrlExternally(link)
} }
Button { Button {
@ -108,6 +108,6 @@ You should have received a copy of the GNU General Public License along with thi
anchors.topMargin: 10 anchors.topMargin: 10
text: qsTr('Report a bug') text: qsTr('Report a bug')
icon.name: 'bug' icon.name: 'bug'
onClicked: Helper.openUrl('https://git.ad5001.eu/Ad5001/LogarithmPlotter') onClicked: Qt.openUrlExternally('https://git.ad5001.eu/Ad5001/LogarithmPlotter')
} }
} }

2
LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Popup/Changelog.qml
View file

@ -69,7 +69,7 @@ Popup {
textFormat: TextEdit.MarkdownText textFormat: TextEdit.MarkdownText
text: qsTr("Fetching changelog...") text: qsTr("Fetching changelog...")
onLinkActivated: Helper.openUrl(link) onLinkActivated: Qt.openUrlExternally(link)
} }
} }

7
LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Popup/GreetScreen.qml
View file

@ -137,11 +137,8 @@ Popup {
} }
} }
Timer { Component.onCompleted: if(Helper.getSetting("last_install_greet") != Helper.getVersion()) {
running: Helper.getSetting("last_install_greet") != Helper.getVersion() greetingPopup.open()
repeat: false
interval: 50
onTriggered: greetingPopup.open()
} }
onClosed: Helper.setSetting("last_install_greet", Helper.getVersion()) onClosed: Helper.setSetting("last_install_greet", Helper.getVersion())

2
LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/name.js
View file

@ -48,7 +48,7 @@ class NameChanged extends EP.EditedProperty {
} }
getReadableString() { getReadableString() {
return qsTr('Name of %1 %2 changed to %3.') return qsTr('%1 %2 renamed to %3.')
.arg(Objects.types[this.targetType].displayType()) .arg(Objects.types[this.targetType].displayType())
.arg(this.targetName).arg(this.newValue) .arg(this.targetName).arg(this.newValue)
} }