Fixed allowing spaces inside ODF file name. Fixed removing trailing w…

…hitespace when saving. Updated tooltips, copyright year etc. Prevented writing semicolon (;) in textctrls to avoid unintentionally creating comments in the ODF.
GrandOrgue · Mar 10, 2025 · c5aff98 · c5aff98
1 parent 1353c46
commit c5aff98
Show file tree

Hide file tree

Showing 165 changed files with 595 additions and 186 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,10 +11,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Option to create new panel from selection on existing panel display. (TODO)
 
+## [0.15.1] - 2025-03-10
+
 ### Fixed
 
 - Reading of FourCC values in WAV/WavPack files so that sample file details are correctly shown on all platforms.
 - Reading of all blocks and sub-blocks in a WavPack file and a few related bugs.
+- Unintentional entries of comments in textcontrols by prohibiting usage of semicolon (;).
+- Removed restriction that prevented using spaces in the ODF file name.
+- Trailing whitespaces in textctrls that should be removed when writing an ODF.
 
 ## [0.15.0] - 2024-07-27
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 # GoOdf cmake build file
-# Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+# Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/src/Attack.cpp b/src/Attack.cpp
@@ -1,6 +1,6 @@
 /*
  * Attack.cpp is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/Attack.h b/src/Attack.h
@@ -1,6 +1,6 @@
 /*
  * Attack.h is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/AttackDialog.cpp b/src/AttackDialog.cpp
@@ -1,6 +1,6 @@
 /*
  * AttackDialog.cpp is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/AttackDialog.h b/src/AttackDialog.h
@@ -1,6 +1,6 @@
 /*
  * AttackDialog.h is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/Button.cpp b/src/Button.cpp
@@ -1,6 +1,6 @@
 /*
  * Button.cpp is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/Button.h b/src/Button.h
@@ -1,6 +1,6 @@
 /*
  * Button.h is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/CmbDialog.cpp b/src/CmbDialog.cpp
@@ -1,6 +1,6 @@
 /*
  * CmbDialog.cpp is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/CmbDialog.h b/src/CmbDialog.h
@@ -1,6 +1,6 @@
 /*
  * CmbDialog.h is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/CmbOrgan.h b/src/CmbOrgan.h
@@ -1,6 +1,6 @@
 /*
  * CmbOrgan.h is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/CmbParser.cpp b/src/CmbParser.cpp
@@ -1,6 +1,6 @@
 /*
  * CmbParser.h is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/CmbParser.h b/src/CmbParser.h
@@ -1,6 +1,6 @@
 /*
  * CmbParser.h is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/CopyElementAttributesDialog.cpp b/src/CopyElementAttributesDialog.cpp
@@ -1,6 +1,6 @@
 /*
  * CopyElementAttributesDialog.cpp is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/CopyElementAttributesDialog.h b/src/CopyElementAttributesDialog.h
@@ -1,6 +1,6 @@
 /*
  * CopyElementAttributesDialog.h is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/Coupler.cpp b/src/Coupler.cpp
@@ -1,6 +1,6 @@
 /*
  * Coupler.cpp is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/Coupler.h b/src/Coupler.h
@@ -1,6 +1,6 @@
 /*
  * Coupler.h is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/CouplerPanel.cpp b/src/CouplerPanel.cpp
@@ -1,6 +1,6 @@
 /*
  * CouplerPanel.cpp is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -677,6 +677,7 @@ void CouplerPanel::setIsFirstRemoval(bool value) {
 
 void CouplerPanel::setTooltipsEnabled(bool isEnabled) {
 	if (isEnabled) {
+		m_nameField->SetToolTip(wxT("It's best to make the name unique. NOTE: Leading spaces and usage of semicolon (;) is prohibited and any trailing spaces will be removed when organ is saved!"));
 		m_displayInvertedYes->SetToolTip(wxT("Yes means that the on and off bitmaps are reversed."));
 		m_displayInvertedNo->SetToolTip(wxT("No is the standard on/off bitmap display."));
 		m_functionChoice->SetToolTip(wxT("Any other function than 'Input' means that the user no longer has direct control over the state of this element, nor can its state be directly changed by a combination, instead it's controlled indirectly by the referenced switch(es).\n\nThe logical function Not can only reference one switch and negates (inverts) the state of the input. And, Xor, Nand, Nor as well as Or has a variable number of inputs.\n\nSee for instance https://en.wikipedia.org/wiki/Logic_gate for further explanations about logical functions."));
@@ -709,6 +710,7 @@ void CouplerPanel::setTooltipsEnabled(bool isEnabled) {
 		m_firstMIDINoteNumberSpin->SetToolTip(wxT("First MIDI note number to forward."));
 		m_numberOfKeysSpin->SetToolTip(wxT("Number of keys to forward starting with FirstMIDINoteNumber."));
 	} else {
+		m_nameField->SetToolTip(wxEmptyString);
 		m_displayInvertedYes->SetToolTip(wxEmptyString);
 		m_displayInvertedNo->SetToolTip(wxEmptyString);
 		m_functionChoice->SetToolTip(wxEmptyString);
@@ -743,6 +745,10 @@ void CouplerPanel::setTooltipsEnabled(bool isEnabled) {
 	}
 }
 
+void CouplerPanel::refreshData() {
+	m_nameField->ChangeValue(m_coupler->getName());
+}
+
 void CouplerPanel::OnNameChange(wxCommandEvent& WXUNUSED(event)) {
 	wxString content = m_nameField->GetValue();
 	GOODF_functions::CheckForStartingWhitespace(&content, m_nameField);

diff --git a/src/CouplerPanel.h b/src/CouplerPanel.h
@@ -1,6 +1,6 @@
 /*
  * CouplerPanel.h is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,6 +33,7 @@ class CouplerPanel : public wxPanel {
 	void setCoupler(Coupler *coupler);
 	void setIsFirstRemoval(bool value);
 	void setTooltipsEnabled(bool isEnabled);
+	void refreshData();
 
 private:
 	DECLARE_EVENT_TABLE()

diff --git a/src/DefaultPathsDialog.cpp b/src/DefaultPathsDialog.cpp
@@ -1,6 +1,6 @@
 /*
  * DefaultPathsDialog.cpp is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/DefaultPathsDialog.h b/src/DefaultPathsDialog.h
@@ -1,6 +1,6 @@
 /*
  * DefaultPathsDialog.h is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/DisplayMetrics.cpp b/src/DisplayMetrics.cpp
@@ -1,6 +1,6 @@
 /*
  * DisplayMetrics.cpp is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/DisplayMetrics.h b/src/DisplayMetrics.h
@@ -1,6 +1,6 @@
 /*
  * DisplayMetrics.h is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/DisplayMetricsPanel.cpp b/src/DisplayMetricsPanel.cpp
@@ -1,6 +1,6 @@
 /*
  * DisplayMetricsPanel.cpp is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/DisplayMetricsPanel.h b/src/DisplayMetricsPanel.h
@@ -1,6 +1,6 @@
 /*
  * DisplayMetricsPanel.h is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/Divisional.cpp b/src/Divisional.cpp
@@ -1,6 +1,6 @@
 /*
  * Divisional.cpp is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/Divisional.h b/src/Divisional.h
@@ -1,6 +1,6 @@
 /*
  * Divisional.h is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/DivisionalCoupler.cpp b/src/DivisionalCoupler.cpp
@@ -1,6 +1,6 @@
 /*
  * DivisionalCoupler.cpp is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/DivisionalCoupler.h b/src/DivisionalCoupler.h
@@ -1,6 +1,6 @@
 /*
  * DivisionalCoupler.h is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/DivisionalCouplerPanel.cpp b/src/DivisionalCouplerPanel.cpp
@@ -1,6 +1,6 @@
 /*
  * DivisionalCouplerPanel.cpp is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -424,6 +424,7 @@ void DivisionalCouplerPanel::setIsFirstRemoval(bool value) {
 
 void DivisionalCouplerPanel::setTooltipsEnabled(bool isEnabled) {
 	if (isEnabled) {
+		m_nameField->SetToolTip(wxT("It's best to make the name unique. NOTE: Leading spaces and usage of semicolon (;) is prohibited and any trailing spaces will be removed when organ is saved!"));
 		m_displayInvertedYes->SetToolTip(wxT("Yes means that the on and off bitmaps are reversed."));
 		m_displayInvertedNo->SetToolTip(wxT("No is the standard on/off bitmap display."));
 		m_functionChoice->SetToolTip(wxT("Any other function than 'Input' means that the user no longer has direct control over the state of this element, nor can its state be directly changed by a combination, instead it's controlled indirectly by the referenced switch(es).\n\nThe logical function Not can only reference one switch and negates (inverts) the state of the input. And, Xor, Nand, Nor as well as Or has a variable number of inputs.\n\nSee for instance https://en.wikipedia.org/wiki/Logic_gate for further explanations about logical functions."));
@@ -441,6 +442,7 @@ void DivisionalCouplerPanel::setTooltipsEnabled(bool isEnabled) {
 		m_availableManuals->SetToolTip(wxT("All available manuals in the organ will be listed here."));
 		m_referencedManuals->SetToolTip(wxT("Here the manuals affected by this divisional coupler will be listed."));
 	} else {
+		m_nameField->SetToolTip(wxEmptyString);
 		m_displayInvertedYes->SetToolTip(wxEmptyString);
 		m_displayInvertedNo->SetToolTip(wxEmptyString);
 		m_functionChoice->SetToolTip(wxEmptyString);
@@ -460,6 +462,10 @@ void DivisionalCouplerPanel::setTooltipsEnabled(bool isEnabled) {
 	}
 }
 
+void DivisionalCouplerPanel::refreshData() {
+	m_nameField->ChangeValue(m_divCplr->getName());
+}
+
 void DivisionalCouplerPanel::OnNameChange(wxCommandEvent& WXUNUSED(event)) {
 	wxString content = m_nameField->GetValue();
 	GOODF_functions::CheckForStartingWhitespace(&content, m_nameField);

diff --git a/src/DivisionalCouplerPanel.h b/src/DivisionalCouplerPanel.h
@@ -1,6 +1,6 @@
 /*
  * DivisionalCouplerPanel.h is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,6 +32,7 @@ class DivisionalCouplerPanel : public wxPanel {
 	void setDivisionalCoupler(DivisionalCoupler *divCplr);
 	void setIsFirstRemoval(bool value);
 	void setTooltipsEnabled(bool isEnabled);
+	void refreshData();
 
 private:
 	DECLARE_EVENT_TABLE()

diff --git a/src/DivisionalPanel.cpp b/src/DivisionalPanel.cpp
@@ -1,6 +1,6 @@
 /*
  * DivisionalPanel.cpp is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -593,18 +593,24 @@ void DivisionalPanel::setIsFirstRemoval(bool value) {
 
 void DivisionalPanel::setTooltipsEnabled(bool isEnabled) {
 	if (isEnabled) {
+		m_nameField->SetToolTip(wxT("It's best to make the name unique. NOTE: Leading spaces and usage of semicolon (;) is prohibited and any trailing spaces will be removed when organ is saved!"));
 		m_isProtectedYes->SetToolTip(wxT("Yes means that the content of the divisional cannot be modified by the user."));
 		m_isProtectedNo->SetToolTip(wxT("No means that the user can modify the state of added elements."));
 		m_displayInvertedYes->SetToolTip(wxT("Yes means that the on and off bitmaps are reversed."));
 		m_displayInvertedNo->SetToolTip(wxT("No is the standard on/off bitmap display."));
 	} else {
+		m_nameField->SetToolTip(wxEmptyString);
 		m_isProtectedYes->SetToolTip(wxEmptyString);
 		m_isProtectedNo->SetToolTip(wxEmptyString);
 		m_displayInvertedYes->SetToolTip(wxEmptyString);
 		m_displayInvertedNo->SetToolTip(wxEmptyString);
 	}
 }
 
+void DivisionalPanel::refreshData() {
+	m_nameField->ChangeValue(m_divisional->getName());
+}
+
 void DivisionalPanel::OnNameChange(wxCommandEvent& WXUNUSED(event)) {
 	wxString content = m_nameField->GetValue();
 	GOODF_functions::CheckForStartingWhitespace(&content, m_nameField);

diff --git a/src/DivisionalPanel.h b/src/DivisionalPanel.h
@@ -1,6 +1,6 @@
 /*
  * DivisionalPanel.h is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,6 +33,7 @@ class DivisionalPanel : public wxPanel {
 	void setDivisional(Divisional *divisional);
 	void setIsFirstRemoval(bool value);
 	void setTooltipsEnabled(bool isEnabled);
+	void refreshData();
 
 private:
 	DECLARE_EVENT_TABLE()

diff --git a/src/DoubleEntryDialog.cpp b/src/DoubleEntryDialog.cpp
@@ -1,6 +1,6 @@
 /*
  * DoubleEntryDialog.cpp is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/DoubleEntryDialog.h b/src/DoubleEntryDialog.h
@@ -1,6 +1,6 @@
 /*
  * DoubleEntryDialog.h is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/Drawstop.cpp b/src/Drawstop.cpp
@@ -1,6 +1,6 @@
 /*
  * Drawstop.cpp is part of GoOdf.
- * Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
+ * Copyright (C) 2025 Lars Palo and contributors (see AUTHORS)
  *
  * GoOdf is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by