diff --git a/CHANGELOG b/CHANGELOG
index d797929..59a5f1e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,22 @@
CHANGELOG
=========
+0.2.2 - 2026-09-21
+------------------
+
+ * native gui: prepared list views for main objects
+ * added position to equipment
+ * box improved with dimensions, net weight and price
+ * experimental signalk integration
+ * added config for currency symbol support
+ * database prepared for lazy record locking feature
+ * some small database improvements
+ * webgui: some improvements and fixes
+ * work on native gui: display data lists
+ * prepare dynamic language support for webgui
+ * improve image uploading and scaling code
+ * added date formatting code
+
0.2.1 - 2026-08-28
------------------
diff --git a/db/measurement.sql b/db/measurement.sql
new file mode 100644
index 0000000..82e0e78
--- /dev/null
+++ b/db/measurement.sql
@@ -0,0 +1,30 @@
+INSERT INTO measurement (mname, val1, accuracy) VALUES
+('SA - Segelflaeche', 0, 'unknown'),
+('P - Großsegel-Vorliek', 0, 'unknown'),
+('E - Großsegel-Unterliek', 0, 'unknown'),
+('I - Höhe des Vorsegeldreiecks', 0, 'unknown'),
+('J - Basis des Vorsegeldreiecks', 0, 'unknown'),
+('ISP - Höhe des Spinnakerfalls', 0, 'unknown'),
+('SPL - Länge des Spinnakerbaums', 0, 'unknown'),
+('TPS - Abstand Tackpunkt - Mast', 0, 'unknown'),
+('FL - Vorstaglänge', 0, 'unknown'),
+('IG - Höhe des inneren Vorsegelfalls', 0, 'unknown'),
+('JH - Höhe des Vorsegelfalls', 0, 'unknown'),
+('BAS - Großbaumhöhe', 0, 'unknown'),
+('LP - Abstand Schothorn - Vorliek Fock', 0, 'unknown'),
+('LPG - Abstand Schothorn Vorliek Genua', 0, 'unknown'),
+('MW - Großsegelbreite', 0, 'unknown')
+('MUW - Obere Großsegelbreite', 0, 'unknown')
+('MTW - Großsegelbreite am Kopf', 0, 'unknown')
+('MGU - Großsegel oberer Meßpunkt', 0, 'unknown')
+('MGM - Großsegel mittlerer Meßpunkt', 0, 'unknown')
+('MGL - Großsegel unterer Meßpunkt', 0, 'unknown')
+('SHW - Halbe Spinnakerbreite', 0, 'unknown')
+('SMG - Spinnaker Mid-Girth', 0, 'unknown')
+('SFL - Spinnaker-Unterliekslänge', 0, 'unknown')
+('LOA - Länge ueber alles', 0, 'unknown')
+('LWL - Wasserlinienlänge', 0, 'unknown')
+('BOA - Grösste Breite', 0, 'unknown')
+('BWL - Breite an der Wasserlinie', 0, 'unknown')
+('D - Tiefgang', 0, 'unknown')
+('DISP - Verdrängung', 0, 'unknown');
diff --git a/webgui/globals.inc b/webgui/globals.inc
index bb506f9..b7c139a 100644
--- a/webgui/globals.inc
+++ b/webgui/globals.inc
@@ -14,6 +14,7 @@
* 0.1.0 2024-03-12 Started development tho
* 0.2.0 2026-08-18 First public release tho
* 0.2.1 2026-08-28 Foreign keys, bugfixes and output sanitation tho
+ * 0.2.2 2026-09-21 Lots of improvements and fixes tho
*
*/
@@ -49,7 +50,7 @@ define('ROLE_SAILOR', 'sailor');
// ========== PAGE START CODE =================================================
// global version string
-$g_version = 'v0.2.1';
+$g_version = 'v0.2.2';
$g_scriptname = basename($_SERVER['SCRIPT_NAME']);
diff --git a/yms/gtkutils.py b/yms/gtkutils.py
index 0a79b18..0ae453b 100644
--- a/yms/gtkutils.py
+++ b/yms/gtkutils.py
@@ -50,9 +50,7 @@ def messagebox(messagetext, symbol=None, title=None, parent=None):
def questionbox(messagetext, symbol=None, title=None, parent=None):
"""
- Ja/Nein-Nachfrage bei wirklich wichtigen Entscheidungen
- Die Entscheidung wird als Rückgabewert geliefert: True falls
- zugestimmt wurde, False bei Ablehnung
+ The decision is returned as a value: True if agreed to, False if rejected
"""
if not symbol:
symbol = Gtk.MessageType.QUESTION
@@ -69,3 +67,10 @@ def questionbox(messagetext, symbol=None, title=None, parent=None):
response = md.run()
md.destroy()
return response == Gtk.ResponseType.YES
+
+def get_text_contents(textview):
+ """
+ Convenience function to get all contents from GtkTextView
+ """
+ buf = textview.get_buffer()
+ return buf.get_text(buf.get_start_iter(), buf.get_end_iter(), True)
diff --git a/yms/model/dbrecord.py b/yms/model/dbrecord.py
index 5f750e5..a2b041b 100644
--- a/yms/model/dbrecord.py
+++ b/yms/model/dbrecord.py
@@ -29,10 +29,10 @@ class DbRecord:
self.pk_value = int(record_id)
self.load()
else:
- self.pk_value = None
self.clear()
def clear(self):
+ self.pk_value = None
self.data = {} # for old/new checks
for field in self.fields:
setattr(self, field, None)
diff --git a/yms/model/storage.py b/yms/model/storage.py
index b32d2ad..d256fd8 100644
--- a/yms/model/storage.py
+++ b/yms/model/storage.py
@@ -6,9 +6,18 @@ class Storage(DbRecord):
table = "storage"
pk_field = "sid"
- fields = ('sid', 'vid', 'sname', 'stype', 'capacity', 'capaunit',
+ fields = ('vid', 'sname', 'stype', 'capacity', 'capaunit',
'x', 'y', 'z', 'wx', 'wy', 'wz', 'angle', 'color', 'remarks')
def __init__(self, db, sid=None):
super().__init__(db, sid)
self.title = _("Storage({})")
+
+ def save(self, commit=True):
+ super().save()
+ if commit:
+ self.conn.commit()
+
+ def delete(self):
+ # there must be no assiciated data!
+ pass
diff --git a/yms/model/vessel.py b/yms/model/vessel.py
index 36e92ea..5a650fc 100644
--- a/yms/model/vessel.py
+++ b/yms/model/vessel.py
@@ -36,9 +36,10 @@ class Vessel(DbRecord):
self._insert()
self.conn.commit()
- def save(self):
+ def save(self, commit=True):
super().save()
- self.conn.commit()
+ if commit:
+ self.conn.commit()
def delete(self):
# there must be no assiciated data!
diff --git a/yms/ui/base.ui b/yms/ui/base.ui
index 2b23c80..0d4037e 100644
--- a/yms/ui/base.ui
+++ b/yms/ui/base.ui
@@ -12,6 +12,16 @@
0.10
1
+
+
+
+
0
- 10
+ 9
@@ -665,7 +748,7 @@
1
- 9
+ 8
@@ -676,7 +759,7 @@
1
- 10
+ 9
@@ -687,7 +770,7 @@
0
- 12
+ 15
@@ -697,7 +780,7 @@
1
- 11
+ 14
@@ -708,28 +791,7 @@
0
- 11
-
-
-
-
-
- 0
- 8
-
-
-
-
-
- 1
- 8
+ 14
@@ -756,7 +818,7 @@
1
- 12
+ 15
@@ -782,6 +844,98 @@
2
+
+
+
+ 0
+ 13
+
+
+
+
+
+ 1
+ 13
+
+
+
+
+
+ 0
+ 12
+
+
+
+
+
+ 1
+ 12
+
+
+
+
+
+ 1
+ 10
+
+
+
+
+
+ 1
+ 11
+
+
+
+
+
+ 0
+ 10
+
+
+
+
+
+ 0
+ 11
+
+
True
@@ -1267,622 +1421,176 @@
-
-
-
-
-
-