Skip to content

Commit

Permalink
Fix update dialog with markdown
Browse files Browse the repository at this point in the history
Push version
  • Loading branch information
jfeil committed Dec 31, 2021
1 parent 701908e commit 15faa9b
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 6 deletions.
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ reportlab~=3.6.3
packaging~=21.3
ipython~=7.30.0
traitlets~=5.1.1
requests~=2.26.0
requests~=2.26.0
markdown2~=2.4.2
2 changes: 1 addition & 1 deletion src/basic_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
display_name = "RegeltestCreator"
app_name = "RegeltestCreator"
app_author = "jfeil"
app_version = "0.2.0"
app_version = "0.2.1"

api_url = "https://api.github.com/repos/jfeil/RegeltestCreator/releases"

Expand Down
14 changes: 10 additions & 4 deletions src/main_application.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import webbrowser
from typing import List, Dict

import markdown2
from PySide6.QtCore import QCoreApplication, Qt
from PySide6.QtWidgets import QMainWindow, QWidget, QTreeWidgetItem, QFileDialog, QApplication, QMessageBox
from bs4 import BeautifulSoup
Expand Down Expand Up @@ -55,7 +56,7 @@ def save_dataset(parent: QWidget):
QApplication.restoreOverrideCursor()


def update_check():
def display_update_dialog():
# new_version, description, url, download_url
result = check_for_update()
msg_box = QMessageBox()
Expand All @@ -64,8 +65,8 @@ def update_check():
msg_box.setText("Kein Update verfügbar!<br><br>Die aktuellste Version ist bereits installiert.")
msg_box.setStandardButtons(QMessageBox.Ok)
else:
msg_box.setText(f'Update <a href="{result[2]}">{result[0]}</a> verfügbar!<br><br>\
Änderungen:<br>{result[1]}<br><br><a href="{result[3]}">Download der aktuellen Version</a>')
msg_box.setText(f'<h1>Update <a href="{result[2]}">{result[0]}</a> verfügbar!</h1>'
f'{markdown2.markdown("#" + result[1])}<a href="{result[3]}">Neueste Version jetzt herunterladen</a>')
msg_box.setInformativeText(f'')
msg_box.setTextFormat(Qt.RichText)
msg_box.setTextInteractionFlags(Qt.TextBrowserInteraction)
Expand All @@ -91,7 +92,7 @@ def __init__(self, parent=None):
self.setWindowTitle(QCoreApplication.translate("MainWindow", f"{display_name} - {app_version}"
, None))
self.ui.actionRegeldatensatz_einladen.triggered.connect(self.load_dataset)
self.ui.actionAuf_Updates_pr_fen.triggered.connect(update_check)
self.ui.actionAuf_Updates_pr_fen.triggered.connect(display_update_dialog)
self.ui.action_ber.triggered.connect(about_dialog)

self.ui.menuBearbeiten.setEnabled(False)
Expand All @@ -118,6 +119,11 @@ def __init__(self, parent=None):
self.ruletabs = {} # type: Dict[int, QuestionTree]
self.questions = {} # type: Dict[QTreeWidgetItem, str]

def show(self) -> None:
super(MainWindow, self).show()
if check_for_update():
display_update_dialog()

def clear_questionlist(self):
self.ui.regeltest_list.clear()
self.ui.regeltest_list.questions.clear()
Expand Down

0 comments on commit 15faa9b

Please sign in to comment.