Work on native gui. Display records and add missing tasks and measurements.
This commit is contained in:
+40
-25
@@ -5,14 +5,13 @@ from gi.repository import GLib, Gtk, Gdk
|
||||
|
||||
from .view import View
|
||||
from yms import gtkutils, combobox, treeview
|
||||
from yms.model import storage
|
||||
from yms.lookup import Dropdown
|
||||
from yms.model import storage
|
||||
|
||||
class StorageView(View):
|
||||
|
||||
def __init__(self, context):
|
||||
super().__init__(context, _("Storage"), "storage.ui")
|
||||
|
||||
self.context = context
|
||||
|
||||
self.storage = storage.Storage(context.db) # current record
|
||||
@@ -27,15 +26,11 @@ class StorageView(View):
|
||||
treeview.add_column(self.tree['storage'], _('Remarks'), 3)
|
||||
self.tree['storage'].set_model(self.lst_storage)
|
||||
|
||||
#combodict = self.context.lookup.dropdown(Dropdown.STORAGE_TYPE)
|
||||
#combobox.load_from_dict(self.combo['type'], combodict)
|
||||
self.dd_stype = self.context.lookup.dropdown(Dropdown.STORAGE_TYPE)
|
||||
combobox.load_from_dict(self.combo['type'], self.dd_stype)
|
||||
|
||||
combodict = self.context.lookup.dropdown(Dropdown.STORAGE_TYPE)
|
||||
print(combodict)
|
||||
combobox.load_from_dict(self.combo['type'], combodict)
|
||||
|
||||
combodict = self.context.lookup.enum('storage.capaunit')
|
||||
combobox.load_from_dict(self.combo['unit'], combodict)
|
||||
self.dd_unit = self.context.lookup.enum('storage.capaunit')
|
||||
combobox.load_from_dict(self.combo['unit'], self.dd_unit)
|
||||
|
||||
def add_row(self):
|
||||
pass
|
||||
@@ -55,8 +50,32 @@ class StorageView(View):
|
||||
for row in self.db.cur.fetchall():
|
||||
self.lst_storage.append(row)
|
||||
|
||||
def clear_record(self):
|
||||
self.storage.clear()
|
||||
self.entry['sname'].set_text('')
|
||||
self.spin['x'].set_value(0)
|
||||
self.spin['y'].set_value(0)
|
||||
self.spin['z'].set_value(0)
|
||||
self.spin['wx'].set_value(0)
|
||||
self.spin['wy'].set_value(0)
|
||||
self.spin['wz'].set_value(0)
|
||||
self.spin['angle'].set_value(0)
|
||||
self.spin['capacity'].set_value(0)
|
||||
combobox.activate_row(self.combo['type'], -1)
|
||||
combobox.activate_row(self.combo['unit'], -1)
|
||||
self.text['remarks'].get_buffer().set_text('')
|
||||
|
||||
def display_record(self):
|
||||
self.label['name'].set_text(self.storage.sname)
|
||||
self.label['type'].set_text(self.dd_stype[self.storage.stype])
|
||||
self.label['position'].set_text(f"({self.storage.x}, {self.storage.y}, {self.storage.z})")
|
||||
self.label['dimension'].set_text(f"({self.storage.wx}, {self.storage.wy}, {self.storage.wz})")
|
||||
self.label['angle'].set_text(f"{self.storage.angle}°")
|
||||
self.label['capacity'].set_text(f"{self.storage.capacity} {self.storage.capaunit}")
|
||||
if self.storage.color:
|
||||
self.label['color'].set_markup(f'#{self.storage.color} <span foreground="#{self.storage.color}">●</span>')
|
||||
else:
|
||||
self.label['color'].set_text('')
|
||||
self.label['remarks'].set_text(self.storage.remarks or '')
|
||||
|
||||
def edit_record(self):
|
||||
@@ -71,23 +90,9 @@ class StorageView(View):
|
||||
self.spin['capacity'].set_value(self.storage.capacity)
|
||||
combobox.activate_row(self.combo['type'], self.storage.stype)
|
||||
combobox.activate_row(self.combo['unit'], self.storage.capaunit)
|
||||
# flags
|
||||
self.text['remarks'].get_buffer().set_text(self.storage.remarks or '')
|
||||
|
||||
def clear_record(self):
|
||||
self.storage.clear()
|
||||
self.entry['sname'].set_text('')
|
||||
self.spin['x'].set_value(0)
|
||||
self.spin['y'].set_value(0)
|
||||
self.spin['z'].set_value(0)
|
||||
self.spin['wx'].set_value(0)
|
||||
self.spin['wy'].set_value(0)
|
||||
self.spin['wz'].set_value(0)
|
||||
self.spin['angle'].set_value(0)
|
||||
self.spin['capacity'].set_value(0)
|
||||
combobox.activate_row(self.combo['type'], -1)
|
||||
combobox.activate_row(self.combo['unit'], .1)
|
||||
self.text['remarks'].get_buffer().set_text('')
|
||||
|
||||
# buttons on list page
|
||||
def on_but_new_clicked(self, widget):
|
||||
self.newrecord = True
|
||||
@@ -108,9 +113,19 @@ class StorageView(View):
|
||||
|
||||
def on_but_detail_clicked(self, widget):
|
||||
sid = treeview.get_value(self.tree['storage'], 0)
|
||||
if not sid:
|
||||
return
|
||||
self.storage.load(sid)
|
||||
self.display_record()
|
||||
self.topwidget.set_visible_child(self.box['stor_detail'])
|
||||
self.button['close'].grab_focus()
|
||||
|
||||
def on_tvw_storage_row_activated(self, widget, path, column):
|
||||
sid = treeview.get_value(widget, 0)
|
||||
self.storage.load(sid)
|
||||
self.display_record()
|
||||
self.topwidget.set_visible_child(self.box['stor_detail'])
|
||||
self.button['close'].grab_focus()
|
||||
|
||||
# buttons on detail page
|
||||
# edit2 uses edit callback
|
||||
|
||||
Reference in New Issue
Block a user