Work on native gui: list views for objects; set version to 0.2.2

yms/view/base.py

@@ -2,14 +2,11 @@
 
 """
 Spezial:
-Notebook mit Vessel, User, Lists, Company
+Notebook mit Vessel, User, Lists, Settings
 
 """
 
 import os
-import gi
-gi.require_version("Gtk", "3.0")
-gi.require_version('Rsvg', '2.0')
 from gi.repository import GLib, Gtk, Gdk, Rsvg
 
 from .view import View
@@ -28,22 +25,6 @@ class BaseView(View):
         #self.topwidget = builder.get_object("topobject")
         #gtkutils.init_named_controls(self, builder)
 
-        # company types
-        self.db.cur.execute("SELECT ddval, ddtext FROM dropdown WHERE ddid=2 ORDER BY ddval")
-        self.comptype = dict(self.db.cur.fetchall())
-        combobox.load_from_dict(self.combo['flt_type'], {-2: _("─── all ───")} | self.comptype, -1)
-
-        # companies
-        self.lst_companies = Gtk.ListStore(int, str, str, str)
-        self.db.cur.execute("SELECT compid, compname, comptype, remarks FROM company ORDER BY compname")
-        for row in self.db.cur.fetchall():
-            self.lst_companies.append((row[0], row[1], self.comptype[row[2]], row[3]))
-        treeview.add_column(self.tree['companies'], _('ID'), 0)
-        treeview.add_column(self.tree['companies'], _('Name'), 1)
-        treeview.add_column(self.tree['companies'], _('Type'), 2)
-        treeview.add_column(self.tree['companies'], _('Remarks'), 3)
-        self.tree['companies'].set_model(self.lst_companies)
-
         # combos
         roles = {'captain': 'Captain', 'helmsman': 'Helmsman', 'sailor': 'Sailor'}
         combobox.load_from_dict(self.combo['user_role'], roles)
@@ -118,6 +99,9 @@ class BaseView(View):
         treeview.add_column(self.tree['ddlists'], _('Records'), 2)
         self.tree['ddlists'].set_model(self.lst_lists)
 
+        # Settings date format selection list
+        # self.context.datefmt_map
+
         # load shape of vessel if available
         if self.context.vessel.vid > 0:
             self.db.cur.execute("SELECT shapefile FROM vessel WHERE vid=%s", (self.context.vessel.vid, ))
@@ -186,9 +170,7 @@ class BaseView(View):
         vessel.draught_min = self.spin['draught_min'].get_value()
         vessel.displacement = self.spin['displacement'].get_value_as_int()
         vessel.ballast = self.spin['ballast'].get_value_as_int()
-
-        txtbuf = self.text['vessel_remarks'].get_buffer()
-        vessel.remarks = txtbuf.get_text(txtbuf.get_start_iter(), txtbuf.get_end_iter(), True)
+        vessel.remarks = gtkutils.get_text_contents(self.text['vessel_remarks'])
         vessel.save()
         self.stack['vessel'].set_visible_child(self.box['vessel'])
 
@@ -198,20 +180,11 @@ class BaseView(View):
     def on_but_vessel_delete_clicked(self, widget):
         pass
 
-    def on_but_comp_new_clicked(self, widget):
-        print("New company")
-
-    def on_but_comp_edit_clicked(self, widget):
-        print("Edit company")
-
-    def on_but_comp_detail_clicked(self, widget):
-        print("Company details")
-
-    def on_but_comp_save_clicked(self, widget):
-        print("Save company")
-
-    def on_but_comp_cancel_clicked(self, widget):
-        pass
+    def on_but_settings_save_clicked(self, widget):
+        print("Save settings")
+        #self.entry['sys_currency']
+        #self.spin['sys_max_width']
+        #self.spin['sys_max_height']
 
     def display_vessel(self, vessel):
         self.label['vesselname'].set_text(vessel.vesselname)
@@ -242,22 +215,6 @@ class BaseView(View):
         self.check['user_deleted'].set_active('deleted' in user.flags)
         self.entry['user_pass'].set_text('')
 
-    def display_company(self, company):
-        self.entry['compname'].set_text(company.compname)
-        # Type
-        # Type2
-        self.entry['shortname'].set_text(company.shortname)
-        self.entry['street'].set_text(company.street)
-        self.entry['zip'].set_text(company.zip)
-        self.entry['city'].set_text(company.city)
-        self.entry['country'].set_text(company.country)
-        self.entry['contact'].set_text(company.contact)
-        self.entry['phone'].set_text(company.phone)
-        self.entry['email'].set_text(company.email)
-        self.entry['web'].set_text(company.web)
-        self.entry['customerno'].set_text(company.customerno)
-        self.entry['contractno'].set_text(company.contractno)
-
     def on_tvw_user_row_activated(self, widget, path, column):
         # load selected user
         self.context.user.user_id = treeview.get_value(widget, 0)