3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-20 21:27:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix showing changelog when the first item in the changelog doesn't start with an "*"

Browse source 
CURA-1583
This commit is contained in:
fieldOfView 2016-05-23 11:35:01 +02:00
parent 4de0a208d1
commit f8c8de86bc
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
plugins/ChangeLogPlugin/ChangeLog.py
View file

@ -48,7 +48,8 @@ class ChangeLog(Extension, QObject,):
result += "<h1>" + str(version) + "</h1><br>" result += "<h1>" + str(version) + "</h1><br>"
result += "" result += ""
for change in logs[version]: for change in logs[version]:
result += "<b>" + str(change) + "</b><br>" if str(change) != "":
result += "<b>" + str(change) + "</b><br>"
for line in logs[version][change]: for line in logs[version][change]:
result += str(line) + "<br>" result += str(line) + "<br>"
result += "<br>" result += "<br>"
@ -60,20 +61,21 @@ class ChangeLog(Extension, QObject,):
self._change_logs = collections.OrderedDict() self._change_logs = collections.OrderedDict()
with open(os.path.join(PluginRegistry.getInstance().getPluginPath(self.getPluginId()), "ChangeLog.txt"), "r",-1, "utf-8") as f: with open(os.path.join(PluginRegistry.getInstance().getPluginPath(self.getPluginId()), "ChangeLog.txt"), "r",-1, "utf-8") as f:
open_version = None open_version = None
open_header = None open_header = "" # Initialise to an empty header in case there is no "*" in the first line of the changelog
for line in f: for line in f:
line = line.replace("\n","") line = line.replace("\n","")
if "[" in line and "]" in line: if "[" in line and "]" in line:
line = line.replace("[","") line = line.replace("[","")
line = line.replace("]","") line = line.replace("]","")
open_version = Version(line) open_version = Version(line)
self._change_logs[Version(line)] = collections.OrderedDict() self._change_logs[open_version] = collections.OrderedDict()
elif line.startswith("*"): elif line.startswith("*"):
open_header = line.replace("*","") open_header = line.replace("*","")
self._change_logs[open_version][open_header] = [] self._change_logs[open_version][open_header] = []
else: elif line != "":
if line != "": if open_header not in self._change_logs[open_version]:
self._change_logs[open_version][open_header].append(line) self._change_logs[open_version][open_header] = []
self._change_logs[open_version][open_header].append(line)
def _onEngineCreated(self): def _onEngineCreated(self):
if not self._version: if not self._version:
@ -105,4 +107,3 @@ class ChangeLog(Extension, QObject,):
self._changelog_context = QQmlContext(Application.getInstance()._engine.rootContext()) self._changelog_context = QQmlContext(Application.getInstance()._engine.rootContext())
self._changelog_context.setContextProperty("manager", self) self._changelog_context.setContextProperty("manager", self)
self._changelog_window = component.create(self._changelog_context) self._changelog_window = component.create(self._changelog_context)
#print(self._changelog_window)