Merge bugfixes (#1009)

* Fix document margin recursion error (#1007)
* Fix project file icon path in Windows installer (#1006)

Author: vkbo

novelwriter/gui/doceditor.py

@@ -1061,8 +1061,8 @@ def resizeEvent(self, theEvent):
         """If the text editor is resized, we must make sure the document
         has its margins adjusted according to user preferences.
         """
-        QTextEdit.resizeEvent(self, theEvent)
         self.updateDocMargins()
+        QTextEdit.resizeEvent(self, theEvent)
         return
 
     ##

novelwriter/gui/docviewer.py

@@ -471,10 +471,11 @@ def _openContextMenu(self, thePos):
     ##
 
     def resizeEvent(self, theEvent):
-        """Make sure the document title is the same width as the window.
+        """If the text editor is resized, we must make sure the document
+        has its margins adjusted according to user preferences.
         """
-        QTextBrowser.resizeEvent(self, theEvent)
         self.updateDocMargins()
+        QTextBrowser.resizeEvent(self, theEvent)
         return
 
     def mouseReleaseEvent(self, theEvent):

setup/win_setup_embed.iss

@@ -51,6 +51,6 @@ Filename:  "{app}\pythonw.exe"; Parameters: "{#nwAppExeName}"; Description: "{cm
 [Registry]
 Root: HKA; Subkey: "Software\Classes\.nwx\OpenWithProgids"; ValueType: string; ValueName: "novelWriterProject.nwx"; ValueData: ""; Flags: uninsdeletevalue
 Root: HKA; Subkey: "Software\Classes\novelWriterProject.nwx"; ValueType: string; ValueName: ""; ValueData: "novelWriter Project File"; Flags: uninsdeletekey
-Root: HKA; Subkey: "Software\Classes\novelWriterProject.nwx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\assets\icons\x-novelwriter-project.ico"
+Root: HKA; Subkey: "Software\Classes\novelWriterProject.nwx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\novelwriter\assets\icons\x-novelwriter-project.ico"
 Root: HKA; Subkey: "Software\Classes\novelWriterProject.nwx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\pythonw.exe"" ""{app}\{#nwAppExeName}"" ""%1"""
 Root: HKA; Subkey: "Software\Classes\Applications\{#nwAppExeName}\SupportedTypes"; ValueType: string; ValueName: ".nwx"; ValueData: ""; Flags: uninsdeletekey