Added message function to views in native gui

This commit is contained in:
thooge committed 2026-11-14 13:08:35 +01:00
1 parent db74fb6970
commit 47bc6fccb4
15 files changed
+123 -47

No files matched your search

+1 -1
View File
@@ -10,7 +10,7 @@ yms (0.3.0-1) unstable; urgency=medium
* webgui: set file access rights
* fix debian packaging
-- Thomas Hooge <thomas@hoogi.de> Wed, 11 Nov 2026 19:00:00 +0200
-- Thomas Hooge <thomas@hoogi.de> Wed, 11 Nov 2026 19:00:00 +0100
yms (0.2.2-1) unstable; urgency=medium
+3 -2
View File
@@ -13,6 +13,7 @@ class Database:
self.cur = None
self.dcur = None
self.error = None
self.last_sql = None
def connect(self, dbuser, dbpass):
if self.conn:
@@ -63,7 +64,7 @@ class Database:
def last_error(self):
if not self.error:
return('UnknownType', 0, '')
return('NoError', 0, _('No error information available'))
etype = type(self.error).__name__
ecode = 0
@@ -74,7 +75,7 @@ class Database:
etext = str(self.error.args[1])
self.error = None
return(etype, ecode, etext)
return (etype, ecode, etext)
def load_enum(self, table, column):
"""
+7 -4
View File
@@ -225,22 +225,24 @@ class BoxesView(View):
def on_but_save_clicked(self, widget):
# check mandatory fields
if not self.entry['label'].get_text().strip():
# TODO error marker
self.show_message(_("Label is mandatory. Please enter one."), Gtk.MessageType.WARNING)
self.entry['label'].grab_focus()
return
self.save_record()
print(self.sbox)
if not self.sbox.save():
pass
(etype, ecode, etext) = self.context.db.last_error()
self.show_message(f"{etype} ({ecode}): {etext}", Gtk.MessageType.ERROR)
return
self.record_unlock()
if self.newrecord:
#self.load_list()
self.add_row()
self.context.publish("box_modified", self.context.EVENT_ADD, (self.sbox.pk_value, self.sbox.label))
else:
self.refresh_row()
self.context.publish("box_modified", self.context.EVENT_UPD, (self.sbox.pk_value, self.sbox.label))
self.newrecord = False
self.hide_message()
self.display_record()
self.topwidget.set_visible_child(self.box['box_detail'])
@@ -264,5 +266,6 @@ class BoxesView(View):
return False
def on_but_cancel_clicked(self, widget):
self.hide_message()
self.record_unlock()
self.topwidget.set_visible_child(self.box['box'])
+6 -5
View File
@@ -281,18 +281,17 @@ class CablesView(View):
# name, type, length, conductors, xsection
cname = self.entry['name'].get_text().strip()
if not cname:
# TODO error marker
self.show_message(_("Name is mandatory. Please enter one."), Gtk.MessageType.WARNING)
self.entry['name'].grab_focus()
return
self.save_record()
print(self.cable)
if not self.cable.save():
print("ERROR saving cable")
# TODO error in infobox
print(self.context.db.last_error())
(etype, ecode, etext) = self.context.db.last_error()
self.show_message(f"{etype} ({ecode}): {etext}", Gtk.MessageType.ERROR)
return
self.record_unlock()
if self.newrecord:
#self.load_list()
self.add_row()
self.context.publish("cable_modified", self.context.EVENT_ADD,
(self.cable.pk_value, self.cable.cablename)
@@ -303,10 +302,12 @@ class CablesView(View):
(self.cable.pk_value, self.cable.cablename)
)
self.newrecord = False
self.hide_message()
self.display_record()
self.topwidget.set_visible_child(self.box['cable_detail'])
def on_but_cancel_clicked(self, widget):
self.hide_message()
self.record_unlock()
self.topwidget.set_visible_child(self.box['cables'])
+7 -2
View File
@@ -222,12 +222,15 @@ class CompaniesView(View):
compname = self.entry['compname'].get_text().strip()
# TODO type
if not compname:
# TODO error marker
self.show_message(_("Name is mandatory. Please enter one."), Gtk.MessageType.WARNING)
self.entry['compname'].grab_focus()
return
self.save_record()
print(self.comp)
if not self.comp.save():
pass
(etype, ecode, etext) = self.context.db.last_error()
self.show_message(f"{etype} ({ecode}): {etext}", Gtk.MessageType.ERROR)
return
self.record_unlock()
if self.newrecord:
self.add_row()
@@ -240,9 +243,11 @@ class CompaniesView(View):
(self.comp.pk_value, self.comp.comptype, self.comp.compname)
)
self.newrecord = False
self.hide_message()
self.display_record()
self.topwidget.set_visible_child(self.box['comp_detail'])
def on_but_cancel_clicked(self, widget):
self.hide_message()
self.record_unlock()
self.topwidget.set_visible_child(self.box['companies'])
+7 -3
View File
@@ -281,13 +281,15 @@ class EquipmentView(View):
def on_but_save_clicked(self, widget):
# check mandatory fields
if not self.entry['name'].get_text().strip():
# TODO error marker
self.show_message(_("Name is mandatory. Please enter one."), Gtk.MessageType.WARNING)
self.entry['name'].grab_focus()
return
self.save_record()
print(self.equip)
if not self.equip.save():
# TODO error handling
pass
(etype, ecode, etext) = self.context.db.last_error()
self.show_message(f"{etype} ({ecode}): {etext}", Gtk.MessageType.ERROR)
return
self.record_unlock()
if self.newrecord:
self.add_row()
@@ -301,10 +303,12 @@ class EquipmentView(View):
(self.equip.pk_value, self.equip.ename)
)
self.newrecord = False
self.hide_message()
self.display_record()
self.topwidget.set_visible_child(self.box['equip_detail'])
def on_but_cancel_clicked(self, widget):
self.hide_message()
self.record_unlock()
self.topwidget.set_visible_child(self.box['equipment'])
+9 -4
View File
@@ -289,7 +289,8 @@ class FusesView(View):
fnumber = self.spin['fnumber'].get_value_as_int()
current = self.spin['current'].get_value()
if (fnumber == 0) or (current == 0):
# TODO error marker
self.show_message(_("Fnumber and current are mandatory. Please enter them."), Gtk.MessageType.WARNING)
self.spin['fnumber'].grab_focus()
return
if self.newrecord:
# TODO check for duplicate number!
@@ -297,23 +298,27 @@ class FusesView(View):
self.context.db.cur.execute(sql, (fnumber,))
if self.context.db.cur.fetchone()[0] > 0:
# Duplicate fuse number
print("duplicate fuse number")
self.show_message(_("Duplicate fuse number. Please select a unused one."), Gtk.MessageType.WARNING)
self.entry['fnumber'].grab_focus()
return
self.save_record()
print(self.fuse)
if not self.fuse.save():
pass
(etype, ecode, etext) = self.context.db.last_error()
self.show_message(f"{etype} ({ecode}): {etext}", Gtk.MessageType.ERROR)
return
self.record_unlock()
if self.newrecord:
#self.load_list()
self.add_row()
self.newrecord = False
else:
self.refresh_row()
self.hide_message()
self.display_record()
self.topwidget.set_visible_child(self.box['fuse_detail'])
def on_but_cancel_clicked(self, widget):
self.hide_message()
self.record_unlock()
self.topwidget.set_visible_child(self.box['fuses'])
+7 -2
View File
@@ -319,21 +319,26 @@ class InventoryView(View):
def on_but_save_clicked(self, widget):
# check mandatory fields
if not self.entry['name'].get_text().strip():
# TODO error marker
self.show_message(_("Name is mandatory. Please enter one."), Gtk.MessageType.WARNING)
self.entry['name'].grab_focus()
return
self.save_record()
print(self.inv)
if not self.inv.save():
pass
(etype, ecode, etext) = self.context.db.last_error()
self.show_message(f"{etype} ({ecode}): {etext}", Gtk.MessageType.ERROR)
return
self.record_unlock()
if self.newrecord:
self.load_list()
self.newrecord = False
else:
pass
self.hide_message()
self.display_record()
self.topwidget.set_visible_child(self.box['inv_detail'])
def on_but_cancel_clicked(self, widget):
self.hide_message()
self.record_unlock()
self.topwidget.set_visible_child(self.box['inventory'])
+6 -4
View File
@@ -202,14 +202,14 @@ class MaintenanceView(View):
def on_but_save_clicked(self, widget):
# check mandatory fields
if not self.entry['activities'].get_text().strip():
# TODO error marker
self.show_message(_("Activities is mandatory. Please enter one."), Gtk.MessageType.WARNING)
self.entry['name'].grab_focus()
return
self.save_record()
print(self.maint)
if not self.maint.save():
print("Save error")
# TODO error in infobox
print(self.context.db.last_error())
(etype, ecode, etext) = self.context.db.last_error()
self.show_message(f"{etype} ({ecode}): {etext}", Gtk.MessageType.ERROR)
return
self.record_unlock()
if self.newrecord:
@@ -217,9 +217,11 @@ class MaintenanceView(View):
self.newrecord = False
else:
self.refresh_row()
self.hide_message()
self.display_record()
self.topwidget.set_visible_child(self.box['maint_detail'])
def on_but_cancel_clicked(self, widget):
self.hide_message()
self.record_unlock()
self.topwidget.set_visible_child(self.box['maintenance'])
+7 -7
View File
@@ -319,11 +319,8 @@ class MeasurementView(View):
def on_but_save_clicked(self, widget):
# check mandatory fields
if not self.entry['name'].get_text().strip():
# TODO error marker
print("Save error mandatory fields missing")
self.infobar.set_message_type(Gtk.MessageType.WARNING)
self.infobar_label.set_text("Save error mandatory fields missing")
self.infobar.set_revealed(True)
self.show_message(_("Name is mandatory. Please enter one."), Gtk.MessageType.WARNING)
self.entry['name'].grab_focus()
return
else:
self.infobar_label.set_text('')
@@ -331,17 +328,20 @@ class MeasurementView(View):
self.save_record()
print(self.measure)
if not self.measure.save():
pass
(etype, ecode, etext) = self.context.db.last_error()
self.show_message(f"{etype} ({ecode}): {etext}", Gtk.MessageType.ERROR)
return
self.record_unlock()
if self.newrecord:
#self.load_list()
self.add_row()
self.newrecord = False
else:
self.refresh_row()
self.hide_message()
self.display_record()
self.topwidget.set_visible_child(self.box['measure_detail'])
def on_but_cancel_clicked(self, widget):
self.hide_message()
self.record_unlock()
self.topwidget.set_visible_child(self.box['measurement'])
+6 -5
View File
@@ -199,25 +199,26 @@ class ProjectsView(View):
def on_but_save_clicked(self, widget):
# check mandatory fields
if not self.entry['name'].get_text().strip():
# TODO error marker
self.show_message(_("Name is mandatory. Please enter one."), Gtk.MessageType.WARNING)
self.entry['name'].grab_focus()
return
self.save_record()
print(self.project)
if not self.project.save():
print("Project save error")
# TODO error in infobox
print(self.context.db.last_error())
(etype, ecode, etext) = self.context.db.last_error()
self.show_message(f"{etype} ({ecode}): {etext}", Gtk.MessageType.ERROR)
return
self.record_unlock()
if self.newrecord:
#self.load_list()
self.add_row()
self.newrecord = False
else:
self.refresh_row()
self.hide_message()
self.display_record()
self.topwidget.set_visible_child(self.box['proj_detail'])
def on_but_cancel_clicked(self, widget):
self.hide_message()
self.record_unlock()
self.topwidget.set_visible_child(self.box['projects'])
+7 -3
View File
@@ -321,22 +321,26 @@ class ProvisionsView(View):
def on_but_save_clicked(self, widget):
# check mandatory fields
if not self.entry['name'].get_text().strip():
# TODO error marker
self.show_message(_("Name is mandatory. Please enter one."), Gtk.MessageType.WARNING)
self.entry['name'].grab_focus()
return
self.save_record()
print(self.prov)
if not self.prov.save():
pass
(etype, ecode, etext) = self.context.db.last_error()
self.show_message(f"{etype} ({ecode}): {etext}", Gtk.MessageType.ERROR)
return
self.record_unlock()
if self.newrecord:
#self.load_list()
self.add_row()
else:
self.refresh_row()
self.newrecord = False
self.hide_message()
self.display_record()
self.topwidget.set_visible_child(self.box['prov_detail'])
def on_but_cancel_clicked(self, widget):
self.hide_message()
self.record_unlock()
self.topwidget.set_visible_child(self.box['provisions'])
+7 -3
View File
@@ -197,21 +197,24 @@ class StorageView(View):
def on_but_save_clicked(self, widget):
# check mandatory fields
if not self.entry['sname'].get_text().strip():
# TODO error marker
self.show_message(_("Name is mandatory. Please enter one."), Gtk.MessageType.WARNING)
self.entry['sname'].grab_focus()
return
self.save_record()
print(self.storage)
if not self.storage.save():
pass
(etype, ecode, etext) = self.context.db.last_error()
self.show_message(f"{etype} ({ecode}): {etext}", Gtk.MessageType.ERROR)
return
self.record_unlock()
if self.newrecord:
#self.load_list()
self.add_row()
self.context.publish("storage_modified", self.context.EVENT_ADD, (self.storage.pk_value, self.storage.sname))
self.newrecord = False
else:
self.refresh_row()
self.context.publish("storage_modified", self.context.EVENT_UPD, (self.storage.pk_value, self.storage.sname))
self.hide_message()
self.display_record()
self.topwidget.set_visible_child(self.box['stor_detail'])
@@ -231,5 +234,6 @@ class StorageView(View):
return False
def on_but_cancel_clicked(self, widget):
self.hide_message()
self.record_unlock()
self.topwidget.set_visible_child(self.box['storage'])
+7 -2
View File
@@ -216,12 +216,15 @@ class TasksView(View):
def on_but_save_clicked(self, widget):
# check mandatory fields
if not self.entry['name'].get_text().strip():
# TODO error marker
self.show_message(_("Name is mandatory. Please enter one."), Gtk.MessageType.WARNING)
self.entry['name'].grab_focus()
return
self.save_record()
print(self.task)
if not self.task.save():
pass
(etype, ecode, etext) = self.context.db.last_error()
self.show_message(f"{etype} ({ecode}): {etext}", Gtk.MessageType.ERROR)
return
self.record_unlock()
if self.newrecord:
self.load_list()
@@ -229,6 +232,7 @@ class TasksView(View):
else:
pass
# TODO aktuelle Listenzeile aktualisieren!
self.hide_message()
self.display_record()
self.topwidget.set_visible_child(self.box['task_detail'])
@@ -245,5 +249,6 @@ class TasksView(View):
pass
def on_but_cancel_clicked(self, widget):
self.hide_message()
self.record_unlock()
self.topwidget.set_visible_child(self.box['tasks'])
+36
View File
@@ -33,12 +33,48 @@ class View:
self.builder.connect_signals(self)
self.topwidget = self.builder.get_object("topobject")
# create infobar here, not statically in glade
# Messagetypes from Gtk.MessageType (INFO, WARNING, ERROR, QUESTION, OTHER)
self.infobar = self.builder.get_object("infobar")
if self.infobar:
self.infobar.set_no_show_all(True)
self.infobar.set_revealed(False)
self.infobar_label = Gtk.Label()
self.infobar.get_content_area().add(self.infobar_label)
self.infobar.set_show_close_button(True)
self.infobar.connect("response", self.on_infobar_response)
gtkutils.init_named_controls(self, self.builder)
def on_infobar_response(self, infobar, response_id):
self.hide_message()
def hide_message(self):
if not self.infobar.get_revealed():
# already hidden do nothing
return
# Start hide animation
self.infobar.set_revealed(False)
GLib.timeout_add(200, self.finish_hide_message)
def finish_hide_message(self):
# Animation helper
self.infobar_label.set_text('')
self.infobar.set_message_type(Gtk.MessageType.OTHER)
self.infobar.hide()
return GLib.SOURCE_REMOVE
def show_message(self, message, message_type):
# TODO what if already shown?
if not self.infobar:
print("internal error: this module has no infobar!")
self.infobar_label.set_text(message)
self.infobar_label.show()
self.infobar.set_message_type(message_type)
self.infobar.show()
self.infobar.set_revealed(True)
def record_lock(self, table, pk_value):
self._lock_token = self.context.db.lock_acquire(table, pk_value, self.user.user_id)
if self._lock_token is None: