Fixed merge conflicts

nw/gui/docviewer.py

@@ -48,6 +48,11 @@ class GuiDocViewer(QTextBrowser):
         self.setMinimumWidth(300)
         self.initEditor()
 
+        theOpt = QTextOption()
+        if self.mainConf.doJustify:
+            theOpt.setAlignment(Qt.AlignJustify)
+        self.theQDoc.setDefaultTextOption(theOpt)
+
         logger.debug("DocViewer initialisation complete")
 
         return

nw/gui/mainmenu.py

@@ -108,10 +108,11 @@ class GuiMainMenu(QMenuBar):
         msgBox.about(self.theParent, "About %s" % nw.__package__, (
             "<h3>About {name:s}</h3>"
             "<p>Version: {version:s}<br>Release Date: {date:s}</p>"
-            "<p>{name:s} is a text editor designed for writing novels. "
+            "<p>{name:s} is a markdown-like text editor designed for organising and writing novels. "
             "It is written in Python 3 with a Qt5 GUI. The Python and Qt layers are connected with PyQt5</p>"
             "<p>{name:s} is is licensed under GPL v3.0</p>"
             "<p>{copyright:s}</p>"
+            "<p>Website: <a href='{website:s}'>{website:s}</a></p>"
             "<h4>Credits</h4>"
             "<p>{credits:s}</p>"
         ).format(
@@ -119,7 +120,8 @@ class GuiMainMenu(QMenuBar):
             version   = nw.__version__,
             date      = nw.__date__,
             copyright = nw.__copyright__,
-            credits   = "<br>".join(nw.__credits__),
+            website   = nw.__url__,
+            credits   = "".join(["&nbsp;&nbsp;&bull;&nbsp;&nbsp;%s<br/>" % x for x in nw.__credits__]),
         ))
         return True
 

nw/gui/winmain.py

@@ -314,7 +314,13 @@ class GuiMain(QMainWindow):
         if tHandle is None:
             tHandle = self.treeView.getSelectedHandle()
         if tHandle is None:
-            logger.warning("No document selected")
+            logger.debug("No document selected, trying last viewed")
+            tHandle = self.theProject.lastViewed
+        if tHandle is None:
+            logger.debug("No document selected, trying editor document")
+            tHandle = self.theDocument.docHandle
+        if tHandle is None:
+            logger.debug("No document selected, giving up")
             return False
 
         if self.docViewer.loadText(tHandle):