diff --git a/nw/__init__.py b/nw/__init__.py index 65ab7f59..c9fae2d6 100644 --- a/nw/__init__.py +++ b/nw/__init__.py @@ -58,20 +58,21 @@ from nw.config import Config # __package__ = "nw" -__author__ = "Veronica Berglyd Olsen" __copyright__ = "Copyright 2018–2020, Veronica Berglyd Olsen" __license__ = "GPLv3" +__author__ = "Veronica Berglyd Olsen" +__maintainer__ = "Veronica Berglyd Olsen" +__email__ = "code@vkbo.net" __version__ = "1.0rc1" __hexversion__ = "0x010000c1" __date__ = "2020-11-16" -__maintainer__ = "Veronica Berglyd Olsen" -__email__ = "code@vkbo.net" __status__ = "Beta" +__domain__ = "novelwriter.io" __url__ = "https://novelwriter.io" __sourceurl__ = "https://github.com/vkbo/novelWriter" __issuesurl__ = "https://github.com/vkbo/novelWriter/issues" +__helpurl__ = "https://github.com/vkbo/novelWriter/discussions" __releaseurl__ = "https://github.com/vkbo/novelWriter/releases/latest" -__domain__ = "novelwriter.io" __docurl__ = "https://novelwriter.readthedocs.io" __credits__ = [ "Veronica Berglyd Olsen (developer)", diff --git a/nw/gui/mainmenu.py b/nw/gui/mainmenu.py index 309e99bb..861126c2 100644 --- a/nw/gui/mainmenu.py +++ b/nw/gui/mainmenu.py @@ -896,12 +896,6 @@ class GuiMainMenu(QMenuBar): self.aAboutQt.triggered.connect(lambda: self.theParent.showAboutQtDialog()) self.helpMenu.addAction(self.aAboutQt) - # Document > Main Website - self.aWebsite = QAction("Main Website", self) - self.aWebsite.setStatusTip("Open the main website at %s" % nw.__url__) - self.aWebsite.triggered.connect(lambda: self._openWebsite(nw.__url__)) - self.helpMenu.addAction(self.aWebsite) - # Help > Separator self.helpMenu.addSeparator() @@ -922,17 +916,32 @@ class GuiMainMenu(QMenuBar): self.aHelpWeb.setShortcuts(["F1", "Shift+F1"]) self.helpMenu.addAction(self.aHelpWeb) - # Document > Report Issue + # Help > Separator + self.helpMenu.addSeparator() + + # Document > Report an Issue self.aIssue = QAction("Report an Issue (GitHub)", self) self.aIssue.setStatusTip("Report a bug or issue on GitHub at %s" % nw.__issuesurl__) self.aIssue.triggered.connect(lambda: self._openWebsite(nw.__issuesurl__)) self.helpMenu.addAction(self.aIssue) + # Document > Ask a Question + self.aQuestion = QAction("Ask a Question (GitHub)", self) + self.aQuestion.setStatusTip("Ask a question on GitHub at %s" % nw.__helpurl__) + self.aQuestion.triggered.connect(lambda: self._openWebsite(nw.__helpurl__)) + self.helpMenu.addAction(self.aQuestion) + # Document > Latest Release - self.aIssue = QAction("Latest Release (GitHub)", self) - self.aIssue.setStatusTip("Open the Releases page on GitHub at %s" % nw.__releaseurl__) - self.aIssue.triggered.connect(lambda: self._openWebsite(nw.__releaseurl__)) - self.helpMenu.addAction(self.aIssue) + self.aRelease = QAction("Latest Release (GitHub)", self) + self.aRelease.setStatusTip("Open the Releases page on GitHub at %s" % nw.__releaseurl__) + self.aRelease.triggered.connect(lambda: self._openWebsite(nw.__releaseurl__)) + self.helpMenu.addAction(self.aRelease) + + # Document > Main Website + self.aWebsite = QAction("The novelWriter Website", self) + self.aWebsite.setStatusTip("Open the novelWriter website at %s" % nw.__url__) + self.aWebsite.triggered.connect(lambda: self._openWebsite(nw.__url__)) + self.helpMenu.addAction(self.aWebsite) return