Merge branch 'main' into feature/build_class

This commit is contained in:
Veronica Berglyd Olsen
2023-01-10 17:59:04 +01:00
125 changed files with 3202 additions and 3659 deletions
+1 -1
View File
@@ -9,7 +9,7 @@ Created: 2022-10-11 [2.0rc1] DocSplitter
Created: 2022-11-03 [2.0rc2] ProjectBuilder
This file is a part of novelWriter
Copyright 20182022, Veronica Berglyd Olsen
Copyright 20182023, Veronica Berglyd Olsen
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
+1 -1
View File
@@ -7,7 +7,7 @@ File History:
Created: 2018-09-29 [0.0.1]
This file is a part of novelWriter
Copyright 20182022, Veronica Berglyd Olsen
Copyright 20182023, Veronica Berglyd Olsen
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
+1 -1
View File
@@ -12,7 +12,7 @@ Created: 2022-05-29 [2.0rc1] TagsIndex
Created: 2022-05-29 [2.0rc1] ItemIndex
This file is a part of novelWriter
Copyright 20182022, Veronica Berglyd Olsen
Copyright 20182023, Veronica Berglyd Olsen
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
+1 -1
View File
@@ -7,7 +7,7 @@ File History:
Created: 2018-10-27 [0.0.1]
This file is a part of novelWriter
Copyright 20182022, Veronica Berglyd Olsen
Copyright 20182023, Veronica Berglyd Olsen
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
+1 -1
View File
@@ -8,7 +8,7 @@ Created: 2019-10-21 [0.3.1]
Rewritten: 2020-02-19 [0.4.5]
This file is a part of novelWriter
Copyright 20182022, Veronica Berglyd Olsen
Copyright 20182023, Veronica Berglyd Olsen
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
+4 -1
View File
@@ -7,7 +7,7 @@ File History:
Created: 2018-09-29 [0.0.1]
This file is a part of novelWriter
Copyright 20182022, Veronica Berglyd Olsen
Copyright 20182023, Veronica Berglyd Olsen
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -251,6 +251,9 @@ class NWProject(QObject):
"""
self.clearProject()
if not self._storage.openProjectInPlace(projPath):
self.mainGui.makeAlert(self.tr(
"Could not open project with path: {0}"
).format(projPath), nwAlert.ERROR)
return False
logger.info("Opening project: %s", projPath)
+1 -1
View File
@@ -7,7 +7,7 @@ File History:
Created: 2022-10-30 [2.0rc2]
This file is a part of novelWriter
Copyright 20182022, Veronica Berglyd Olsen
Copyright 20182023, Veronica Berglyd Olsen
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
+1 -1
View File
@@ -9,7 +9,7 @@ Created: 2022-09-28 [2.0rc2] ProjectXMLReader
Created: 2022-10-31 [2.0rc2] ProjectXMLWriter
This file is a part of novelWriter
Copyright 20182022, Veronica Berglyd Olsen
Copyright 20182023, Veronica Berglyd Olsen
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
+1 -1
View File
@@ -7,7 +7,7 @@ File History:
Created: 2019-06-11 [0.1.5]
This file is a part of novelWriter
Copyright 20182022, Veronica Berglyd Olsen
Copyright 20182023, Veronica Berglyd Olsen
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
+1 -1
View File
@@ -8,7 +8,7 @@ Created: 2019-05-19 [0.1.3]
Rewritten: 2022-04-05 [2.0b1]
This file is a part of novelWriter
Copyright 20182022, Veronica Berglyd Olsen
Copyright 20182023, Veronica Berglyd Olsen
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
+8 -2
View File
@@ -7,7 +7,7 @@ File History:
Created: 2022-11-01 [2.0rc2] NWStorage
This file is a part of novelWriter
Copyright 20182022, Veronica Berglyd Olsen
Copyright 20182023, Veronica Berglyd Olsen
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -102,6 +102,10 @@ class NWStorage:
# but it can point to a folder containing files
inPath = inPath.parent
if not (inPath.is_dir() or newProject):
# If the project is not new, the folder must already exist.
return False
self._storagePath = inPath
self._runtimePath = inPath
self._lockFilePath = inPath / nwFiles.PROJ_LOCK
@@ -114,7 +118,9 @@ class NWStorage:
return True
def openProjectArchive(self, path): # pragma: no cover
pass
"""Placeholder for later implementation. See #977.
"""
return False
def runPostSaveTasks(self, autoSave=False): # pragma: no cover
"""Run tasks after the project has been saved.
+1 -1
View File
@@ -7,7 +7,7 @@ File History:
Created: 2019-05-07 [0.0.1]
This file is a part of novelWriter
Copyright 20182022, Veronica Berglyd Olsen
Copyright 20182023, Veronica Berglyd Olsen
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
+1 -1
View File
@@ -7,7 +7,7 @@ File History:
Created: 2019-05-05 [0.0.1]
This file is a part of novelWriter
Copyright 20182022, Veronica Berglyd Olsen
Copyright 20182023, Veronica Berglyd Olsen
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
+1 -1
View File
@@ -7,7 +7,7 @@ File History:
Created: 2021-02-06 [1.2b1]
This file is a part of novelWriter
Copyright 20182022, Veronica Berglyd Olsen
Copyright 20182023, Veronica Berglyd Olsen
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
+1 -1
View File
@@ -7,7 +7,7 @@ File History:
Created: 2021-01-26 [1.2b1]
This file is a part of novelWriter
Copyright 20182022, Veronica Berglyd Olsen
Copyright 20182023, Veronica Berglyd Olsen
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
+1 -1
View File
@@ -7,7 +7,7 @@ File History:
Created: 2020-05-07 [0.4.5]
This file is a part of novelWriter
Copyright 20182022, Veronica Berglyd Olsen
Copyright 20182023, Veronica Berglyd Olsen
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by