bump version number, first try of updating docs

4 years ago · 280256589b
14 changed files with 5560 additions and 5559 deletions
--- a/README.md
+++ b/README.md
@ -1,8 +1,8 @@

-[//]: # (Generated 2020-12-18T19:35:22.895502. Changes belong into template/documentation/readme.template)
+[//]: # (Generated 2020-12-18T21:27:20.851104. Changes belong into template/documentation/readme.template)

 #Laborejo
-Program version 2.0
+Program version 2.0.0


 Laborejo (Esperanto: Workshop) is a MIDI sequencer based on classical music notation.
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 #!/bin/bash
 program=laborejo
 cboxconfigure="--without-fluidsynth --without-libsmf"
-version=Unreleased, Stuck in Development Limbo 
+version=2.0.0

 . template/configure.template  #. is the posix compatible version of source
--- a/documentation/english.adoc
+++ b/documentation/english.adoc
@ -1,5 +1,5 @@
 :Author: Laborejo Software Suite
-:Version: 2.0
+:Version: 2.0.0
 :iconfont-remote!:
 :!webfonts:

@ -25,7 +25,7 @@ https://asciidoctor.org/docs/user-manual/
 = Laborejo

 // Don't write in the empty line above line. It will be interpreted as author html tag
-For program version 2.0
+For program version 2.0.0

 == Introduction

--- a/documentation/german.adoc
+++ b/documentation/german.adoc
@ -1,5 +1,5 @@
 :Author: Laborejo Software Suite
-:Version: 2.0
+:Version: 2.0.0
 :iconfont-remote!:
 :!webfonts:

@ -25,7 +25,7 @@ https://asciidoctor.org/docs/user-manual/
 = Laborejo

 // Don't write in the empty line above line. It will be interpreted as author html tag
-Für Programmversion 2.0
+Für Programmversion 2.0.0

 == Einleitung

--- a/documentation/index.adoc
+++ b/documentation/index.adoc
@ -1,5 +1,5 @@
 :Author: Laborejo Software Suite
-:Version: 2.0
+:Version: 2.0.0
 :iconfont-remote!:
 :!webfonts:

@ -21,7 +21,7 @@ https://asciidoctor.org/docs/user-manual/
 == Laborejo Multi-Language Documentation
 image::logo.png["logo", 320, 180]

-For program version 2.0
+For program version 2.0.0

 This site is part of the https://www.laborejo.org[Laborejo Software Suite]

--- a/documentation/laborejo.1
+++ b/documentation/laborejo.1
@ -1,11 +1,11 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.16.
-.TH LABOREJO "1" "December 2020" "Laborejo 2.0" "User Commands"
+.TH LABOREJO "1" "December 2020" "Laborejo 2.0.0" "User Commands"
 .SH NAME
 Laborejo - MIDI sequencer based on classical music notation
 .SH DESCRIPTION
 usage: laborejo [\-h] [\-v] [\-s DIRECTORY] [\-p] [\-m] [\-V]
 .PP
-Laborejo \- Version 2.0 \- Copyright 2020 by Laborejo Software Suite \-
+Laborejo \- Version 2.0.0 \- Copyright 2020 by Laborejo Software Suite \-
 https://www.laborejo.org/laborejo
 .SS "optional arguments:"
 .TP
@ -59,7 +59,7 @@ Run without audio and midi. Skips all JACK checks. Used to just look at the GUI,
 .SH "REPORTING BUGS"
 https://www.laborejo.org/bugs
 .SH COPYRIGHT
-Laborejo 2.0 - Copyright 2020
+Laborejo 2.0.0 - Copyright 2020
 Laborejo Software Suite
 https://www.laborejo.org/
 .SH "SEE ALSO"
--- a/documentation/manpageinclude.h2m
+++ b/documentation/manpageinclude.h2m
@ -20,7 +20,7 @@ Working in Laborejo is very fast and efficient by using a combination of midi in
 https://www.laborejo.org/bugs

 [copyright]
-Laborejo 2.0 - Copyright 2020
+Laborejo 2.0.0 - Copyright 2020
 Laborejo Software Suite
 https://www.laborejo.org/

--- a/documentation/out/english.html
+++ b/documentation/out/english.html
@ -464,7 +464,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
-<p>For program version 2.0</p>
+<p>For program version 2.0.0</p>
 </div>
 </div>
 </div>
@ -722,7 +722,7 @@ The program is split in two parts. A shared "template" between the Laborejo Soft
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-12-18 19:35:22 +0100
+Last updated 2020-12-18 21:27:20 +0100
 </div>
 </div>
 </body>
--- a/documentation/out/german.html
+++ b/documentation/out/german.html
@ -552,7 +552,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
-<p>Für Programmversion 2.0</p>
+<p>Für Programmversion 2.0.0</p>
 </div>
 </div>
 </div>
@ -2220,7 +2220,7 @@ Ansonsten starten Sie laborejo mit diesem Befehl, Sprachcode ändern, vom Termin
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-12-18 19:35:22 +0100
+Last updated 2020-12-18 21:27:20 +0100
 </div>
 </div>
 </body>
--- a/documentation/out/index.html
+++ b/documentation/out/index.html
@ -450,7 +450,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="paragraph">
-<p>For program version 2.0</p>
+<p>For program version 2.0.0</p>
 </div>
 <div class="paragraph">
 <p>This site is part of the <a href="https://www.laborejo.org">Laborejo Software Suite</a></p>
--- a/engine/config.py
+++ b/engine/config.py
@ -21,7 +21,7 @@ METADATA={
    #release announcements, entries in software directories etc.
    "tagline" : 'MIDI sequencer based on classical music notation',

-    "version" : "2.0",
+    "version" : "2.0.0",
    "year" : "2020",
    "author" : "Laborejo Software Suite",
    "url" : "https://www.laborejo.org/laborejo",
--- a/qtgui/conductor.py
+++ b/qtgui/conductor.py
@ -406,7 +406,8 @@ class TempoPoint(QtWidgets.QGraphicsItem):
        self.note = QtWidgets.QGraphicsTextItem("")
        self.note.setParentItem(self)
        self.note.setFont(constantsAndConfigs.musicFont)
-        self.note.setHtml("<font size='6'>{}</font>".format(constantsAndConfigs.realNoteDisplay[staticExportItem["referenceTicks"]]))
+        s = constantsAndConfigs.realNoteDisplay[staticExportItem["referenceTicks"]]
+        self.note.setHtml(f"<font size='6'>{s}</font>")
        self.note.setPos(-6,0) #adjust items font x offsset.

        self.number = QtWidgets.QGraphicsTextItem("")
--- a/qtgui/resources.py
+++ b/qtgui/resources.py
--- a/template/engine/session.py
+++ b/template/engine/session.py
@ -126,7 +126,7 @@ class Session(object):
                logger.error(error)

        if result and "version" in result and "origin" in result and result["origin"] == METADATA["url"]:
-            if METADATA["version"] >= result["version"]:
+            if METADATA["version"] >= result["version"]: #Achtung. This only works because Python can compare Strings this way!
                self.guiWasSavedAsNSMVisible = result["guiWasSavedAsNSMVisible"]
                if "recordingEnabled" in result: #introduced in april 2020
                    self.recordingEnabled = result["recordingEnabled"]
@ -135,10 +135,10 @@ class Session(object):
                logger.info("Loading file complete")
                return Data.instanceFromSerializedData(parentSession=self, serializedData=result)
            else:
-                logger.warning(f"""{absoluteJsonFilePath} was saved with {result["version"]} but we need {METADATA["version"]}""")
+                logger.error(f"""{absoluteJsonFilePath} was saved with {result["version"]} but we need {METADATA["version"]}""")
                sysexit()
        else:
-            logger.warning(f"""Error. {absoluteJsonFilePath} not loaded. Not a sane {METADATA["name"]} file in json format""")
+            logger.error(f"""Error. {absoluteJsonFilePath} not loaded. Not a sane {METADATA["name"]} file in json format""")
            sysexit()