Browse Source

bump version number, first try of updating docs

master
Nils 3 years ago
parent
commit
280256589b
  1. 4
      README.md
  2. 2
      configure
  3. 4
      documentation/english.adoc
  4. 4
      documentation/german.adoc
  5. 4
      documentation/index.adoc
  6. 6
      documentation/laborejo.1
  7. 2
      documentation/manpageinclude.h2m
  8. 4
      documentation/out/english.html
  9. 4
      documentation/out/german.html
  10. 2
      documentation/out/index.html
  11. 2
      engine/config.py
  12. 3
      qtgui/conductor.py
  13. 11072
      qtgui/resources.py
  14. 6
      template/engine/session.py

4
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.

2
configure

@ -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

4
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

4
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

4
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]

6
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"

2
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/

4
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>

4
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>

2
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>

2
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",

3
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("")

11072
qtgui/resources.py

File diff suppressed because it is too large

6
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()

Loading…
Cancel
Save