diff --git a/cura/UI/TextManager.py b/cura/UI/TextManager.py index c09fc9b1c2..7d428137f2 100644 --- a/cura/UI/TextManager.py +++ b/cura/UI/TextManager.py @@ -39,6 +39,8 @@ class TextManager(QObject): line = line.replace("[", "") line = line.replace("]", "") open_version = Version(line) + if open_version > Version([14, 99, 99]): # Bit of a hack: We released the 15.x.x versions before 2.x + open_version = Version([0, open_version.getMinor(), open_version.getRevision(), open_version.getPostfixVersion()]) open_header = "" change_logs_dict[open_version] = collections.OrderedDict() elif line.startswith("*"): @@ -51,8 +53,11 @@ class TextManager(QObject): # Format changelog text content = "" - for version in change_logs_dict: - content += "

" + str(version) + "


" + for version in sorted(change_logs_dict.keys(), reverse=True): + text_version = version + if version < Version([1, 0, 0]): # Bit of a hack: We released the 15.x.x versions before 2.x + text_version = Version([15, version.getMinor(), version.getRevision(), version.getPostfixVersion()]) + content += "

" + str(text_version) + "


" content += "" for change in change_logs_dict[version]: if str(change) != "": diff --git a/resources/qml/WelcomePages/WhatsNewContent.qml b/resources/qml/WelcomePages/WhatsNewContent.qml index 298aaa7d4d..754e843621 100644 --- a/resources/qml/WelcomePages/WhatsNewContent.qml +++ b/resources/qml/WelcomePages/WhatsNewContent.qml @@ -57,6 +57,11 @@ Item font: UM.Theme.getFont("default") renderType: Text.NativeRendering } + + Component.onCompleted: + { + Scrollbar.vertical.position = 0; + } } }