Veronica Berglyd Olsen (@vkbo)
diff --git a/novelwriter/assets/text/gplv3_en.htm b/novelwriter/assets/text/gplv3_en.htm deleted file mode 100644 index 582b13028..000000000 --- a/novelwriter/assets/text/gplv3_en.htm +++ /dev/null @@ -1,641 +0,0 @@ - - - - - -Version 3, 29 June 2007
- -Copyright © 2007 Free Software Foundation, Inc. - <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed.
- -The GNU General Public License is a free, copyleft license for -software and other kinds of works.
- -The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too.
- -When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things.
- -To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others.
- -For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights.
- -Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it.
- -For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions.
- -Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users.
- -Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free.
- -The precise terms and conditions for copying, distribution and -modification follow.
- -“This License” refers to version 3 of the GNU General Public License.
- -“Copyright” also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks.
- -“The Program” refers to any copyrightable work licensed under this -License. Each licensee is addressed as “you”. “Licensees” and -“recipients” may be individuals or organizations.
- -To “modify” a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a “modified version” of the -earlier work or a work “based on” the earlier work.
- -A “covered work” means either the unmodified Program or a work based -on the Program.
- -To “propagate” a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well.
- -To “convey” a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying.
- -An interactive user interface displays “Appropriate Legal Notices” -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion.
- -The “source code” for a work means the preferred form of the work -for making modifications to it. “Object code” means any non-source -form of a work.
- -A “Standard Interface” means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language.
- -The “System Libraries” of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -“Major Component”, in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it.
- -The “Corresponding Source” for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work.
- -The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source.
- -The Corresponding Source for a work in source code form is that -same work.
- -All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law.
- -You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you.
- -Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary.
- -No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures.
- -When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures.
- -You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program.
- -You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee.
- -You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions:
- -A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -“aggregate” if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate.
- -You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways:
- -A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work.
- -A “User Product” is either (1) a “consumer product”, which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, “normally used” refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product.
- -“Installation Information” for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made.
- -If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM).
- -The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network.
- -Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying.
- -“Additional permissions” are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions.
- -When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission.
- -Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms:
- -All other non-permissive additional terms are considered “further -restrictions” within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying.
- -If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms.
- -Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way.
- -You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11).
- -However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation.
- -Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice.
- -Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10.
- -You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so.
- -Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License.
- -An “entity transaction” is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts.
- -You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it.
- -A “contributor” is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's “contributor version”.
- -A contributor's “essential patent claims” are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, “control” includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License.
- -Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version.
- -In the following three paragraphs, a “patent license” is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To “grant” such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party.
- -If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. “Knowingly relying” means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid.
- -If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it.
- -A patent license is “discriminatory” if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007.
- -Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law.
- -If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program.
- -Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such.
- -The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns.
- -Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License “or any later version” applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation.
- -If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program.
- -Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version.
- -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
- -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES.
- -If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee.
- -END OF TERMS AND CONDITIONS
- - diff --git a/novelwriter/assets/text/release_notes.htm b/novelwriter/assets/text/release_notes.htm deleted file mode 100644 index 17fc84cbd..000000000 --- a/novelwriter/assets/text/release_notes.htm +++ /dev/null @@ -1,60 +0,0 @@ - - - - -Released on 17 December 2023
- -Scroll down for Patch Notes
- -This release comes with a number of new features. These are some highlights.
-In addition to the common Markdown style formatting for bold, italic and strike through, a set -of new shortcodes have been added. The shortcodes are far more flexible than the Markdown style -syntax, and can be used for more complex formatting cases. Like when you need to add multiple, -overlapping formats, or add emphasis to just a part of a word. The shortcodes also allow for -underline, subscript and superscript, which the Markdown syntax does not. The new formats are -available in the "Format" menu, and in a new toolbar in the editor that can be enabled by clicking -the three dots in the top–left corner. The shortcode format was chosen because it can later be -extended to include other requested features as well. Please have a look at the documentation for -more details about the new shortcodes.
-The Tags and References system has been improved. The tags themselves are no longer case -sensitive when you use them in references, but they are still displayed as you typed them in the -tag definition when they are displayed in the user interface. Starting to type the '@' symbol in -the text editor, on a new line, will now open an auto-completer menu which will display available -options. It may not display all of your tags if you have a lot of them, but starting to type more -characters will filter the list down further.
-You can now automatically create a note file for a new tag that you have added to a reference -list in a document, but is not yet defined in a project note. So, for instance, if you come up with -a new character while writing, and add a new tag to your '@char' references, you can right-click -the new tag and create a new note for that entry directly. In addition, it is now also possible to -right-click a heading in an open document and set the item label in the project tree to match the -heading.
-In addition to the changes in the editor, the "References" panel below the document viewer has -also been completely redesigned. It now shows all the references to the document you are viewing as -a list, with a lot more details than before. In addition, tabs in the panel will appear to show all -the tags you have defined in your notes, sorted as one tab per category. Like for instance -Characters, Locations, Objects, etc. You can also give each note a short description comment on the -same format as the summary comments for chapters and scenes. The short description comment can be -added from the "Insert" menu under "Special Comments".
-The last major change in this release is the new multi-select feature in the project tree. You -can now select multiple documents and folders using the mouse while pressing 'Ctrl' or 'Shift'. By -right-clicking the selected items, you can perform a limited set of operations on all of them, like -changing active status, and the status or importance labels. You can also drag and drop multiple -items under the condition that all the selected items are in the same folder, at the same level. -This restriction is in place due to limitations in the framework novelWriter is based on. But this -should help in cases where multiple documents need to be moved in and out of folders or between -folders. Note that adding the multi-select feature meant that the undo feature of the project tree -had to be removed. It may be added back later.
- -See also the Releases page.
- -This is a patch release that fixes an issue where the Project View would sometimes switch to the -Novel View when a new item was created. This patch also includes updated translations for German -and Chinese.
- - - diff --git a/novelwriter/dialogs/about.py b/novelwriter/dialogs/about.py index 1329b06eb..4b205441a 100644 --- a/novelwriter/dialogs/about.py +++ b/novelwriter/dialogs/about.py @@ -24,20 +24,20 @@ from __future__ import annotations import logging -import novelwriter from datetime import datetime -from PyQt5.QtGui import QCloseEvent, QCursor +from PyQt5.QtGui import QCloseEvent, QColor from PyQt5.QtCore import Qt from PyQt5.QtWidgets import ( - qApp, QDialog, QDialogButtonBox, QHBoxLayout, QLabel, QTabWidget, - QTextBrowser, QVBoxLayout, QWidget + QDialog, QDialogButtonBox, QHBoxLayout, QLabel, QTextBrowser, QVBoxLayout, + QWidget ) -from novelwriter import CONFIG, SHARED -from novelwriter.common import readTextFile -from novelwriter.constants import nwConst +from novelwriter import CONFIG, SHARED, __version__, __date__ +from novelwriter.common import formatVersion, readTextFile +from novelwriter.constants import nwConst, nwUnicode +from novelwriter.extensions.configlayout import NColourLabel logger = logging.getLogger(__name__) @@ -50,62 +50,72 @@ def __init__(self, parent: QWidget) -> None: logger.debug("Create: GuiAbout") self.setObjectName("GuiAbout") - self.outerBox = QVBoxLayout() - self.innerBox = QHBoxLayout() - self.innerBox.setSpacing(CONFIG.pxInt(16)) - self.setWindowTitle(self.tr("About novelWriter")) - self.setMinimumWidth(CONFIG.pxInt(650)) - self.setMinimumHeight(CONFIG.pxInt(600)) - - nPx = CONFIG.pxInt(96) - self.nwIcon = QLabel() - self.nwIcon.setPixmap(SHARED.theme.getPixmap("novelwriter", (nPx, nPx))) - self.lblName = QLabel("novelWriter") - self.lblVers = QLabel(f"v{novelwriter.__version__}") - self.lblDate = QLabel(datetime.strptime(novelwriter.__date__, "%Y-%m-%d").strftime("%x")) - - self.leftBox = QVBoxLayout() - self.leftBox.setSpacing(CONFIG.pxInt(4)) - self.leftBox.addWidget(self.nwIcon, 0, Qt.AlignCenter) - self.leftBox.addWidget(self.lblName, 0, Qt.AlignCenter) - self.leftBox.addWidget(self.lblVers, 0, Qt.AlignCenter) - self.leftBox.addWidget(self.lblDate, 0, Qt.AlignCenter) - self.leftBox.addStretch(1) - self.innerBox.addLayout(self.leftBox) - - # Pages - self.pageAbout = QTextBrowser() - self.pageAbout.setOpenExternalLinks(True) - self.pageAbout.document().setDocumentMargin(CONFIG.pxInt(16)) - - self.pageNotes = QTextBrowser() - self.pageNotes.setOpenExternalLinks(True) - self.pageNotes.document().setDocumentMargin(CONFIG.pxInt(16)) - - self.pageCredits = QTextBrowser() - self.pageCredits.setOpenExternalLinks(True) - self.pageCredits.document().setDocumentMargin(CONFIG.pxInt(16)) - - self.pageLicense = QTextBrowser() - self.pageLicense.setOpenExternalLinks(True) - self.pageLicense.document().setDocumentMargin(CONFIG.pxInt(16)) - - # Main Tab Area - self.tabBox = QTabWidget() - self.tabBox.addTab(self.pageAbout, self.tr("About")) - self.tabBox.addTab(self.pageNotes, self.tr("Release")) - self.tabBox.addTab(self.pageCredits, self.tr("Credits")) - self.tabBox.addTab(self.pageLicense, self.tr("Licence")) - self.innerBox.addWidget(self.tabBox) - - # OK Button - self.buttonBox = QDialogButtonBox(QDialogButtonBox.Ok) - self.buttonBox.accepted.connect(self.close) - - self.outerBox.addLayout(self.innerBox) - self.outerBox.addWidget(self.buttonBox) + self.resize(CONFIG.pxInt(700), CONFIG.pxInt(500)) + + hA = CONFIG.pxInt(8) + hB = CONFIG.pxInt(16) + nwH = CONFIG.pxInt(36) + nwPx = CONFIG.pxInt(128) + + # Logo and Banner + self.nwImage = SHARED.theme.loadDecoration("nw-text", h=nwH) + self.bgColor = QColor(255, 255, 255) if SHARED.theme.isLightTheme else QColor(54, 54, 54) + + self.nwLogo = QLabel(self) + self.nwLogo.setPixmap(SHARED.theme.getPixmap("novelwriter", (nwPx, nwPx))) + + self.nwLabel = QLabel(self) + self.nwLabel.setPixmap(self.nwImage) + + self.nwInfo = QLabel(self.tr("Version {0} {1} Released on {2} {1} {3}").format( + formatVersion(__version__), nwUnicode.U_ENDASH, + datetime.strptime(__date__, "%Y-%m-%d").strftime("%x"), + "{1}".format(nwConst.URL_RELEASES, self.tr("Release Notes")) + )) + self.nwInfo.setOpenExternalLinks(True) + + self.nwLicence = QLabel(self.tr("This application is licenced under {0}".format( + "GPL v3.0" + ))) + self.nwLicence.setOpenExternalLinks(True) + + # Credits + self.lblCredits = NColourLabel( + self.tr("Credits"), SHARED.theme.helpText, + scale=NColourLabel.HEADER_SCALE, parent=self + ) + + self.txtCredits = QTextBrowser(self) + self.txtCredits.setOpenExternalLinks(True) + self.txtCredits.document().setDocumentMargin(0) + self.txtCredits.setViewportMargins(0, hA, hA, 0) + + # Buttons + self.btnBox = QDialogButtonBox(QDialogButtonBox.Close, self) + self.btnBox.rejected.connect(self.close) + + # Assemble + self.innerBox = QVBoxLayout() + self.innerBox.addSpacing(hB) + self.innerBox.addWidget(self.nwLabel) + self.innerBox.addWidget(self.nwInfo) + self.innerBox.addWidget(self.nwLicence) + self.innerBox.addSpacing(hA) + self.innerBox.addWidget(self.lblCredits) + self.innerBox.addWidget(self.txtCredits) + self.innerBox.addSpacing(hB) + self.innerBox.addWidget(self.btnBox) + + topRight = Qt.AlignmentFlag.AlignTop | Qt.AlignmentFlag.AlignRight + + self.outerBox = QHBoxLayout() + self.outerBox.addWidget(self.nwLogo, 0, topRight) + self.outerBox.addLayout(self.innerBox, 1) + self.setLayout(self.outerBox) + self.setSizeGripEnabled(True) + self._setStyleSheet() logger.debug("Ready: GuiAbout") @@ -117,18 +127,7 @@ def __del__(self) -> None: # pragma: no cover def populateGUI(self) -> None: """Populate tabs with text.""" - qApp.setOverrideCursor(QCursor(Qt.WaitCursor)) - self._setStyleSheet() - self._fillAboutPage() - self._fillNotesPage() self._fillCreditsPage() - self._fillLicensePage() - qApp.restoreOverrideCursor() - return - - def showReleaseNotes(self) -> None: - """Show the release notes.""" - self.tabBox.setCurrentWidget(self.pageNotes) return ## @@ -145,77 +144,14 @@ def closeEvent(self, event: QCloseEvent) -> None: # Internal Functions ## - def _fillAboutPage(self) -> None: - """Generate the content for the About page.""" - aboutMsg = ( - "{copy}
" - "{link}
" - "{intro}
" - "{license1}
" - "{license2}
" - "{license3}
" - ).format( - title1=self.tr("About novelWriter"), - copy=novelwriter.__copyright__, - link=self.tr("Website: {0}").format( - f"{novelwriter.__domain__}" - ), - intro=self.tr( - "novelWriter is a markdown-like text editor designed for organising and " - "writing novels. It is written in Python 3 with a Qt5 GUI, using PyQt5." - ), - license1=self.tr( - "novelWriter is free software: you can redistribute it and/or modify it " - "under the terms of the GNU General Public License as published by the " - "Free Software Foundation, either version 3 of the License, or (at your " - "option) any later version." - ), - license2=self.tr( - "novelWriter is distributed in the hope that it will be useful, but " - "WITHOUT ANY WARRANTY; without even the implied warranty of " - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - ), - license3=self.tr( - "See the Licence tab for the full licence text, or visit the " - "GNU website at {0} for more details." - ).format( - "GPL v3.0" - ), - ) - - self.pageAbout.setHtml(aboutMsg) - - return - - def _fillNotesPage(self) -> None: - """Load the content for the Release Notes page.""" - docPath = CONFIG.assetPath("text") / "release_notes.htm" - docText = readTextFile(docPath) - if docText: - self.pageNotes.setHtml(docText) - else: - self.pageNotes.setHtml("Error loading release notes text ...") - return - def _fillCreditsPage(self) -> None: """Load the content for the Credits page.""" docPath = CONFIG.assetPath("text") / "credits_en.htm" docText = readTextFile(docPath) if docText: - self.pageCredits.setHtml(docText) + self.txtCredits.setHtml(docText) else: - self.pageCredits.setHtml("Error loading credits text ...") - return - - def _fillLicensePage(self) -> None: - """Load the content for the Licence page.""" - docPath = CONFIG.assetPath("text") / "gplv3_en.htm" - docText = readTextFile(docPath) - if docText: - self.pageLicense.setHtml(docText) - else: - self.pageLicense.setHtml("Error loading licence text ...") + self.txtCredits.setHtml("Error loading credits text ...") return def _setStyleSheet(self) -> None: @@ -240,10 +176,12 @@ def _setStyleSheet(self) -> None: kColG=colKey.green(), kColB=colKey.blue(), ) - self.pageAbout.document().setDefaultStyleSheet(styleSheet) - self.pageNotes.document().setDefaultStyleSheet(styleSheet) - self.pageCredits.document().setDefaultStyleSheet(styleSheet) - self.pageLicense.document().setDefaultStyleSheet(styleSheet) + self.txtCredits.document().setDefaultStyleSheet(styleSheet) + + baseCol = self.palette().window().color() + self.txtCredits.setStyleSheet(( + "QTextBrowser {{border: none; background: rgb({r},{g},{b});}} " + ).format(r=baseCol.red(), g=baseCol.green(), b=baseCol.blue())) return diff --git a/novelwriter/tools/welcome.py b/novelwriter/tools/welcome.py index 7353c086a..253867718 100644 --- a/novelwriter/tools/welcome.py +++ b/novelwriter/tools/welcome.py @@ -84,10 +84,10 @@ def __init__(self, parent: QWidget) -> None: self.nwImage = SHARED.theme.loadDecoration("nw-text", h=hD) self.bgColor = QColor(255, 255, 255) if SHARED.theme.isLightTheme else QColor(54, 54, 54) - self.nwLogo = QLabel() + self.nwLogo = QLabel(self) self.nwLogo.setPixmap(SHARED.theme.getPixmap("novelwriter", (hF, hF))) - self.nwLabel = QLabel("novelWriter") + self.nwLabel = QLabel(self) self.nwLabel.setPixmap(self.nwImage) self.nwInfo = QLabel(self.tr("Version {0} {1} Released on {2}").format( From 5e9d96788ed5820441dfb482c431ffa122c2725e Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Tue, 13 Feb 2024 18:10:24 +0100 Subject: [PATCH 3/4] Update tests --- tests/test_dialogs/test_dlg_about.py | 14 +++----------- tests/test_gui/test_gui_guimain.py | 14 +++----------- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/tests/test_dialogs/test_dlg_about.py b/tests/test_dialogs/test_dlg_about.py index ab60cfd70..f3fbf0cbd 100644 --- a/tests/test_dialogs/test_dlg_about.py +++ b/tests/test_dialogs/test_dlg_about.py @@ -34,27 +34,19 @@ def testDlgAbout_NWDialog(qtbot, monkeypatch, nwGUI): """Test the novelWriter about dialogs.""" # NW About - nwGUI.showAboutNWDialog(showNotes=True) + nwGUI.showAboutNWDialog() qtbot.waitUntil(lambda: SHARED.findTopLevelWidget(GuiAbout) is not None, timeout=1000) msgAbout = SHARED.findTopLevelWidget(GuiAbout) assert isinstance(msgAbout, GuiAbout) - assert msgAbout.pageAbout.document().characterCount() > 100 - assert msgAbout.pageNotes.document().characterCount() > 100 - assert msgAbout.pageLicense.document().characterCount() > 100 + assert msgAbout.txtCredits.document().characterCount() > 100 with monkeypatch.context() as mp: mp.setattr("novelwriter.config.Config.assetPath", lambda *a: Path("whatever")) - msgAbout._fillNotesPage() - assert msgAbout.pageNotes.toPlainText() == "Error loading release notes text ..." msgAbout._fillCreditsPage() - assert msgAbout.pageCredits.toPlainText() == "Error loading credits text ..." - msgAbout._fillLicensePage() - assert msgAbout.pageLicense.toPlainText() == "Error loading licence text ..." + assert msgAbout.txtCredits.toPlainText() == "Error loading credits text ..." - msgAbout.showReleaseNotes() - assert msgAbout.tabBox.currentWidget() == msgAbout.pageNotes msgAbout.close() # END Test testDlgAbout_NWDialog diff --git a/tests/test_gui/test_gui_guimain.py b/tests/test_gui/test_gui_guimain.py index 6bfb7f0df..71cdeecb8 100644 --- a/tests/test_gui/test_gui_guimain.py +++ b/tests/test_gui/test_gui_guimain.py @@ -25,9 +25,7 @@ from shutil import copyfile -from tools import ( - C, NWD_IGNORE, cmpFiles, buildTestProject, XML_IGNORE -) +from tools import C, NWD_IGNORE, cmpFiles, buildTestProject, XML_IGNORE from PyQt5.QtGui import QPalette from PyQt5.QtCore import Qt @@ -40,7 +38,6 @@ from novelwriter.gui.doceditor import GuiDocEditor from novelwriter.gui.noveltree import GuiNovelView from novelwriter.tools.welcome import GuiWelcome -from novelwriter.dialogs.about import GuiAbout from novelwriter.dialogs.editlabel import GuiEditLabel KEY_DELAY = 1 @@ -69,7 +66,6 @@ def testGuiMain_ProjectBlocker(nwGUI): def testGuiMain_Launch(qtbot, monkeypatch, nwGUI, projPath): """Test the handling of launch tasks.""" monkeypatch.setattr(GuiWelcome, "exec_", lambda *a: None) - # monkeypatch.setattr(GuiProjectLoad, "result", lambda *a: QDialog.Accepted) CONFIG.lastNotes = "0x0" buildTestProject(nwGUI, projPath) @@ -92,12 +88,8 @@ def testGuiMain_Launch(qtbot, monkeypatch, nwGUI, projPath): assert nwGUI.openProject(projPath) is True nwGUI.closeProject() - # Check that release notes opened - qtbot.waitUntil(lambda: SHARED.findTopLevelWidget(GuiAbout) is not None, timeout=1000) - msgAbout = SHARED.findTopLevelWidget(GuiAbout) - assert isinstance(msgAbout, GuiAbout) - assert msgAbout.tabBox.currentWidget() == msgAbout.pageNotes - msgAbout.accept() + # Check that latest release info updated + CONFIG.lastNotes != "0x0" # Check that project open dialog launches nwGUI.postLaunchTasks(None) From ea14f06245656f869c7b0ffab9a320594aabfad8 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Tue, 13 Feb 2024 18:15:27 +0100 Subject: [PATCH 4/4] Update credits --- CREDITS.md | 4 ++++ novelwriter/assets/text/credits_en.htm | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/CREDITS.md b/CREDITS.md index 68e673e99..c058105e5 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -12,6 +12,10 @@ For other contributions, see the project's [Contributors](https://github.com/vkbo/novelWriter/graphs/contributors) page. +## Artwork + +The artwork on the Welcome dialog was created by [Louis Durrant](https://louisdurrant.art). + ## Translations The default language is English (UK) with English (US) as an option. These are the original diff --git a/novelwriter/assets/text/credits_en.htm b/novelwriter/assets/text/credits_en.htm index 778e59c55..3733090e3 100644 --- a/novelwriter/assets/text/credits_en.htm +++ b/novelwriter/assets/text/credits_en.htm @@ -15,6 +15,10 @@For other contributions, see the project's Contributors page.
+The artwork on the Welcome dialog was created by Louis Durrant.
+The default language is English (UK) with English (US) as an option. These are the original