More work on native gui. Make data editable.

This commit is contained in:
thooge committed 2026-10-29 18:59:21 +01:00
1 parent 5641e1706f
commit 7aa5d2af3b
43 files changed
+2685 -1036

No files matched your search

+8 -3
View File
@@ -53,11 +53,16 @@ According to your desired language import minimal required dataset into your
new database. For german use
mariadb yms < minimal.sql
or alternatively for english language
or alternatively for english language
mariadb yms < minimal_en.sql
It is strongly recommended to import the following data.
These are selection lists that are typically always required.
mariadb yms < generic.sql
or alternatively for english language
mariadb yms < generic_en.sql
Optional import some sample data
mariadb yms < mariadb_sample.sql
+9 -5
View File
@@ -9,8 +9,12 @@ INSERT INTO user (userid, login, pass, displayname, role) VALUES
(2, 'helmsman', '$2y$10$LFl2jvrt2kB.c2KXBLaCI.RF2XAGNmFsoRc.V2tzLKrfCPiBCbI0e', 'Helmsman', 'helmsman'),
(3, 'sailor', '$2y$10$H5ZKd9r3KLAzI7W5u3ocgOCcXF4aDgjMAFYCzVC9Q9/Q9BqAV0MKS', 'Sailor', 'sailor');
INSERT INTO vessel (vid, vesselname, model, loa, lwl, beam, draught, displacement, ballast) VALUES
(1, 'Generic vessel', 'Generic model', 10.0, 9.5, 3.0, 1.8, 4000, 1200);
INSERT INTO vessel (vid, htype, vesselname, model, loa, lwl, beam, draught, displacement, ballast, shapefile) VALUES
(1, 'mono', 'Generic vessel', 'Generic model', 10.0, 9.5, 3.0, 1.8, 4000, 1200, 'generic.svg');
INSERT INTO settings (userid, sno, valint) VALUES
(2, 1, 1), -- Vessel 1 for helmsman
(3, 1, 1); -- Vessel 1 for sailor
INSERT INTO storage (sid, vid, sname, stype, x, y, z, remarks) VALUES
(0, 1, 'An Bord', 0, 0, 0, 0, 'Alles wo der Ort nicht spezifiziert werden kann');
@@ -30,9 +34,9 @@ INSERT INTO dropdown (ddid, ddval, ddtext) VALUES
(1, 12, 'Sonstiges');
INSERT INTO dropdown (ddid, ddval, ddtext, flags) VALUES
(2, 4, 'Dienstleister', NULL), -- Service
(2, 5, 'Segelmacher', NULL), -- Sailmaker
(2, 6, 'Yachthafen', NULL); -- Marina
(2, 4, 'Dienstleister', NULL),
(2, 5, 'Segelmacher', NULL),
(2, 6, 'Yachthafen', NULL);
INSERT INTO dropdown (ddid, ddval, ddtext, flags) VALUES
(3, 3, 'Bilge', NULL),
+16 -1
View File
@@ -12,6 +12,10 @@ INSERT INTO user (userid, login, pass, displayname, role) VALUES
INSERT INTO vessel (vid, vesselname, model, loa, lwl, beam, draught, displacement, ballast) VALUES
(1, 'Generic vessel', 'Generic model', 10.0, 9.5, 3.0, 1.8, 4000, 1200);
INSERT INTO settings (userid, sno, valint) VALUES
(2, 1, 1), -- Vessel 1 for helmsman
(3, 1, 1); -- Vessel 1 for sailor
INSERT INTO storage (sid, vid, sname, stype, x, y, z, remarks) VALUES
(0, 1, 'An Bord', 0, 0, 0, 0, 'Alles wo der Ort nicht spezifiziert werden kann');
@@ -43,7 +47,7 @@ INSERT INTO dropdown (ddid, ddval, ddtext) VALUES
(4, 2, 'Deck'),
(4, 3, 'Rigging'),
(4, 4, 'Sails'),
(4, 5, 'Eingine'),
(4, 5, 'Engine'),
(4, 6, 'Electrical'),
(4, 7, 'Electronics'),
(4, 8, 'Navigation'),
@@ -139,6 +143,17 @@ INSERT INTO dropdown (ddid, ddval, ddtext) VALUES
(12, 15, 'Aircell 7'),
(12, 16, 'Ecoflex 10');
INSERT INTO dropdown (ddid, ddval, ddtext) VALUES
(13, 1, 'Ropes'),
(13, 2, 'Pantry'),
(13, 3, 'Tools'),
(13, 4, 'Deck'),
(13, 5, 'Safety'),
(13, 6, 'Electrical'),
(13, 7, 'Operating Supplies'),
(13, 8, 'Maintenance'),
(13, 9, 'Miscellaneous');
INSERT INTO dropdown (ddid, ddval, ddtext) VALUES
(15, 1, 'Measurement Data'),
(15, 2, 'Rigging and Sails'),
+88 -136
View File
@@ -1,147 +1,99 @@
/* Generic data suitable for all kind of boats
* SPDX-License-Identifier: WTFPL
Hinzufügen um das System kennenzulernen
Hängt von generic.sql ab
*/
-- minimal vessel
INSERT INTO vessel (vid, vesselname) VALUES (1, 'Generic vessel');
INSERT INTO storage (sid, sname, color) VALUES
(1, 'An Bord', 'F9F06B'),
(2, 'Vorpiek', 'F9F06B'),
(3, 'Achterpiek', 'F9F06B'),
(4, 'Salon BB', 'F9F06B'),
(5, 'Salon STB', 'F9F06B'),
(6, 'Pantry', 'F9F06B'),
(7, 'Ankerkasten', 'F9F06B'),
(8, 'An Deck', 'F9F06B'),
(9, 'Backskiste BB', 'F9F06B'),
(10, 'Backskiste STB', 'F9F06B'),
(11, 'Bilge', 'F9F06B'),
(12, 'Gaskasten', 'F9F06B'),
(13, 'Salonkoje BB', 'F9F06B'),
(14, 'Salonkoje STB ', 'F9F06B');
INSERT INTO user (userid, login, pass, displayname, role) VALUES
(2, 'helmsman', '$2y$10$4keuVm.WD/JeRmAqp2h4MeSxxKITsKv2q07XZrxPUuT/V80CTPbje', 'Helmsman', 'helmsman'),
(3, 'sailor', '$2y$10$4keuVm.WD/JeRmAqp2h4MeSxxKITsKv2q07XZrxPUuT/V80CTPbje', 'Sailor', 'sailor');
INSERT INTO box (boxid, label) VALUES
(1, 'Werkzeugkiste'),
(2, 'Kiste, klein'),
(3, 'Kiste, groß');
INSERT INTO settings (userid, sno, valint) VALUES
(2, 1, 1), -- Vessel 1 for helmsman
(3, 1, 1); -- Vessel 1 for sailor
INSERT INTO equipment (eid, ename) VALUES
(1, 'Großsegel'),
(2, 'Fock'),
(3, 'Genua'),
(4, 'Spinnaker'),
(5, 'Vorstang'),
(6, 'Achterstan'),
(7, 'Oberwant BB'),
(8, 'Unterwant BB'),
(9, 'Oberwant STB'),
(10, 'Unterwant STB'),
(11, 'Motor'),
(12, 'Außenborder'),
(13, 'Schlauchboot'),
(14, 'AIS Transcsiver'),
(15, 'Funkgerät'),
(16, 'Kartenplotter'),
(17, 'Batterie');
INSERT INTO dropdown (ddid, ddval, ddtext) VALUES
(1, 1, 'Einrumpf'), -- Mono
(1, 2, 'Katamaran'),
(1, 3, 'Trimaran');
INSERT INTO inventory (invid, invname, icat, conttype, sid, boxid, eid, number,
weight, price, purchdate, invcond, remarks, flags) VALUES
(1, 'Bootshaken', NULL, 'storage', 1, NULL, NULL, 1, NULL, NULL, NULL, 'unknown', NULL, NULL),
(2, 'Fender', NULL, 'storage', 1, NULL, NULL, 4, NULL, NULL, NULL, 'unknown', NULL, NULL),
(3, 'Winschkurbel', NULL, 'storage', 1, NULL, NULL, 1, NULL, NULL, NULL, 'unknown', NULL, NULL),
(4, 'Landanschlußkabel', NULL, 'storage', 1, NULL, NULL, 1, NULL, NULL, NULL, 'unknown', NULL, NULL),
(5, 'Kochtopf', NULL, 'storage', 24, NULL, NULL, 1, NULL, NULL, NULL, 'unknown', NULL, NULL),
(6, 'Pfanne', NULL, 'storage', 24, NULL, NULL, 1, NULL, NULL, NULL, 'unknown', NULL, NULL),
(7, 'Kombizange', NULL, 'box', NULL, 6, NULL, 1, NULL, NULL, NULL, 'unknown', NULL, NULL),
(8, 'Hammer', NULL, 'box', NULL, 6, NULL, 1, NULL, NULL, NULL, 'unknown', NULL, NULL),
(9, 'Rohrzange', NULL, 'box', NULL, 6, NULL, 1, NULL, NULL, NULL, 'good', NULL, NULL),
(10, 'Schraubenzieher, groß', NULL, 'box', NULL, 6, NULL, 1, NULL, NULL, NULL, 'unknown', NULL, NULL);
INSERT INTO dropdown (ddid, ddval, ddtext) VALUES
(2, 4, 'Dienstleister'), -- Service
(2, 5, 'Segelmacher'), -- Sailmaker
(2, 6, 'Yachthafen'); -- Marina
INSERT INTO provisions (provname) VALUES
('Kaffee'),
('Zucker'),
('Salz'),
('Pfeffer'),
('Milch'),
('Müsliriegel'),
('Erbsensuppe'),
('Gulaschsuppe'),
('Kekse');
INSERT INTO dropdown (ddid, ddval, ddtext) VALUES
(3, 3, 'Bilge'),
(3, 4, 'Schwalbennest');
INSERT INTO checklist (clid, title) VALUES
(1, 'Einwintern'),
(2, 'Auswintern'),
(3, 'Mast legen');
INSERT INTO dropdown (ddid, ddval, ddtext) VALUES
(4, 1, 'Rumpf'),
(4, 2, 'Deck'),
(4, 3, 'Rigg'),
(4, 4, 'Segel'),
(4, 5, 'Motor'),
(4, 6, 'Elektrik'),
(4, 7, 'Elektronik'),
(4, 8, 'Navigation'),
(4, 9, 'Pantry'),
(4, 10, 'Solar'),
(4, 11, 'Sicherheit'),
(4, 12, 'lfd. Gut');
INSERT INTO checkitem (checkid, checkname) VALUES
(1, 'Bilge trocknen'),
(2, 'Frostschutz in Motor einfüllen'),
(3, 'Windpilot abbauen'),
(4, 'Plane über Boot'),
(5, 'Plane Vorschiff unterstützen'),
(5, 'Salinge unterstützen'),
(6, 'Polster ausräumen'),
(7, 'Gardinen abnehmen'),
(8, 'Kleiderschrank leeräumen'),
(9, 'Lebensmittel von Bord');
INSERT INTO dropdown (ddid, ddval, ddtext) VALUES
(5, 1, 'Allgemein'),
(5, 2, 'Getränke'),
(5, 3, 'Naschkram'),
(5, 4, 'Konserven'),
(5, 5, 'Frischware'),
(5, 6, 'Trockenware'),
(5, 7, 'Gefriergetrocknet'),
(5, 8, 'Snacks (salzig)');
INSERT INTO dropdown (ddid, ddval, ddtext, ddshort) VALUES
(6, 1, 'kg', 'kg'),
(6, 2, 'Liter', 'L'),
(6, 3, 'Stück', 'St'),
(6, 4, 'Packung', 'Pkg'),
(6, 5, 'Dose', 'Ds'),
(6, 6, 'Flasche', 'Fl'),
(6, 7, 'Tüte', 'Tue'),
(6, 8, 'Tafel', 'Ta'),
(6, 9, 'Glas', 'Gl');
INSERT INTO dropdown (ddid, ddval, ddtext) VALUES
(7, 1, 'ATO'),
(7, 2, 'Streifensicherung'),
(7, 3, 'Feinsicherung (GS)'),
(7, 4, 'Torpedosicherung'),
(7, 5, 'T-Sicherung');
INSERT INTO dropdown (ddid, ddval, ddshort, ddtext) VALUES
(8, 1, 'mm', 'Millimeter'),
(8, 2, 'cm', 'Zentimeter'),
(8, 3, 'g', 'Gramm'),
(8, 4, 'kg', 'Kilogramm'),
(8, 5, 'm', 'Meter'),
(8, 6, 'kW', 'Kilowatt'),
(8, 7, 'A', 'Ampere'),
(8, 8, 'l', 'Liter');
INSERT INTO dropdown (ddid, ddval, ddtext) VALUES
(9, 1, 'Plastikbox, klein'),
(9, 2, 'Plastikbox, groß'),
(9, 3, 'Sortimentskasten'),
(9, 4, 'Werkzeugkiste');
INSERT INTO dropdown (ddid, ddval, ddtext) VALUES
(10, 1, 'Kabel-Inline'),
(10, 2, 'BlueSea innen'),
(10, 3, 'Bluesea außen'),
(10, 4, 'Panel 1 (STV 103)'),
(10, 5, 'Panel 2 (STV 108)'),
(10, 6, 'Reihenklemme 1'),
(10, 7, 'Reihenklemme 2');
INSERT INTO dropdown (ddid, ddval, ddtext) VALUES
(11, 1, 'Einzelader'),
(11, 2, 'Steuerleitung'),
(11, 3, 'Datenkabel'),
(11, 4, 'Netzwerkkabel'),
(11, 5, 'Koaxialkabel'),
(11, 6, 'Antennenkabel'),
(11, 7, 'Lautsprecherkabel'),
(11, 8, 'Mikrofonkabel'),
(11, 9, 'Batteriekabel'),
(11, 10, 'Solarkabel'),
(11, 11, 'Gummileitung'),
(11, 12, 'Flachbandkabel'),
(11, 13, 'Telefonkabel'),
(11, 14, 'NMEA-Kabel'),
(11, 15, 'CAN-Bus-Kabel'),
(11, 16, 'USB-Kabel');
INSERT INTO dropdown (ddid, ddval, ddtext) VALUES
(12, 1, 'H05V-K'),
(12, 2, 'H07V-K'),
(12, 3, 'H05VV-F'),
(12, 4, 'H07RN-F'),
(12, 5, 'LiYY'),
(12, 6, 'LiYCY'),
(12, 7, 'LiYCY-TP'),
(12, 8, 'Cat 5e'),
(12, 9, 'Cat 6'),
(12, 10, 'RG-58'),
(12, 11, 'RG-213'),
(12, 12, 'RG-316'),
(12, 13, 'H-155'),
(12, 14, 'Aircell 5'),
(12, 15, 'Aircell 7'),
(12, 16, 'Ecoflex 10');
INSERT INTO storage (sid, vid, sname, stype, x, y, z, remarks) VALUES
(0, 1, 'An Bord', 0, 0, 0, 0, 'Alles wo der Ort nicht spezifiziert werden kann');
/* Eine Liste mit häufig verwendeten Herstellern
comptype=2
*/
INSERT INTO company (comptype, compname) VALUES
(2, 'Garmin'),
(2, 'Watcheye'),
(2, 'Digital Yacht'),
(2, 'B&G'),
(2, 'Raymarine'),
(2, 'Harken'),
(2, 'Selden');
INSERT INTO checkref (clid, checkid) VALUES
(1, 1),
(1, 2),
(1, 3),
(1, 4),
(1, 5),
(1, 6),
(1, 7),
(1, 8),
(1, 9);
+5 -114
View File
@@ -1,116 +1,7 @@
/* Generic data suitable for all kind of boats
/* Some sample data
* SPDX-License-Identifier: WTFPL
Add this to get to know the system
Depends on generic_en.sql
*/
-- minimal vessel
INSERT INTO vessel (vid, vesselname) VALUES (1, 'Generic vessel');
INSERT INTO user (userid, login, pass, displayname, role) VALUES
(2, 'helmsman', '$2y$10$4keuVm.WD/JeRmAqp2h4MeSxxKITsKv2q07XZrxPUuT/V80CTPbje', 'Helmsman', 'helmsman'),
(3, 'sailor', '$2y$10$4keuVm.WD/JeRmAqp2h4MeSxxKITsKv2q07XZrxPUuT/V80CTPbje', 'Sailor', 'sailor');
INSERT INTO settings (userid, sno, valint) VALUES
(2, 1, 1), -- Vessel 1 for helmsman
(3, 1, 1); -- Vessel 1 for sailor
INSERT INTO dropdown (ddid, ddval, ddtext) VALUES
(1, 1, 'Monohull'),
(1, 2, 'Catamaran'),
(1, 3, 'Trimaran');
INSERT INTO dropdown (ddid, ddval, ddtext) VALUES
(2, 4, 'Service'),
(2, 5, 'Sailmaker'),
(2, 6, 'Marina');
INSERT INTO dropdown (ddid, ddval, ddtext) VALUES
(3, 3, 'Bilge'),
(3, 4, 'Quarter Berth');
INSERT INTO dropdown (ddid, ddval, ddtext) VALUES
(4, 1, 'Hull'),
(4, 2, 'Deck'),
(4, 3, 'Rigging'),
(4, 4, 'Sails'),
(4, 5, 'Engine'),
(4, 6, 'Electrical'),
(4, 7, 'Electronics'),
(4, 8, 'Navigation'),
(4, 9, 'Galley'),
(4, 10, 'Solar'),
(4, 11, 'Safety'),
(4, 12, 'Running Rigging');
INSERT INTO dropdown (ddid, ddval, ddtext) VALUES
(5, 1, 'General'),
(5, 2, 'Drinks'),
(5, 3, 'Sweets'),
(5, 4, 'Tinned Food'),
(5, 5, 'Fresh Food'),
(5, 6, 'Dry Goods'),
(5, 7, 'Freeze-Dried Food'),
(5, 8, 'Savoury Snacks');
INSERT INTO dropdown (ddid, ddval, ddtext, ddshort) VALUES
(6, 1, 'kg', 'kg'),
(6, 2, 'Litre', 'L'),
(6, 3, 'Piece', 'pc'),
(6, 4, 'Pack', 'pk'),
(6, 5, 'Tin', 'tin'),
(6, 6, 'Bottle', 'btl'),
(6, 7, 'Bag', 'bag'),
(6, 8, 'Bar', 'bar'),
(6, 9, 'Jar', 'jar');
INSERT INTO dropdown (ddid, ddval, ddshort, ddtext) VALUES
(8, 1, 'mm', 'Millimetre'),
(8, 2, 'cm', 'Centimetre'),
(8, 3, 'g', 'Gram'),
(8, 4, 'kg', 'Kilogram'),
(8, 5, 'm', 'Metre'),
(8, 6, 'kW', 'Kilowatt'),
(8, 7, 'A', 'Ampere'),
(8, 8, 'L', 'Litre');
-- TODO add inch, feet, ...
INSERT INTO dropdown (ddid, ddval, ddtext) VALUES
(9, 1, 'Small Plastic Box'),
(9, 2, 'Large Plastic Box'),
(9, 3, 'Parts Organiser'),
(9, 4, 'Toolbox');
INSERT INTO dropdown (ddid, ddval, ddtext) VALUES
(11, 1, 'Single-Core Cable'),
(11, 2, 'Control Cable'),
(11, 3, 'Data Cable'),
(11, 4, 'Network Cable'),
(11, 5, 'Coaxial Cable'),
(11, 6, 'Aerial Cable'),
(11, 7, 'Speaker Cable'),
(11, 8, 'Microphone Cable'),
(11, 9, 'Battery Cable'),
(11, 10, 'Solar Cable'),
(11, 11, 'Rubber Cable'),
(11, 12, 'Ribbon Cable'),
(11, 13, 'Telephone Cable'),
(11, 14, 'NMEA Cable'),
(11, 15, 'CAN Bus Cable'),
(11, 16, 'USB Cable');
INSERT INTO dropdown (ddid, ddval, ddtext) VALUES
(12, 1, 'H05V-K'),
(12, 2, 'H07V-K'),
(12, 3, 'H05VV-F'),
(12, 4, 'H07RN-F'),
(12, 5, 'LiYY'),
(12, 6, 'LiYCY'),
(12, 7, 'LiYCY-TP'),
(12, 8, 'Cat 5e'),
(12, 9, 'Cat 6'),
(12, 10, 'RG-58'),
(12, 11, 'RG-213'),
(12, 12, 'RG-316'),
(12, 13, 'H-155'),
(12, 14, 'Aircell 5'),
(12, 15, 'Aircell 7'),
(12, 16, 'Ecoflex 10');
+368 -362
View File
File diff suppressed because it is too large. Load diff
Binary file not shown.
+9 -2
View File
@@ -1,3 +1,5 @@
# SPDX-License-Identifier: WTFPL
import MySQLdb
import secrets
from gettext import pgettext
@@ -50,6 +52,11 @@ class Database:
def is_connected(self):
return self.conn.open
def is_encrypted(self):
self.cur.execute("SHOW SESSION STATUS LIKE 'Ssl_cipher'")
row = self.cur.fetchone()
return (row and row[1])
def get_timestamp(self):
self.cur.execute("SELECT CURRENT_TIMESTAMP")
return self.cur.fetchone()[0]
@@ -64,13 +71,13 @@ class Database:
def load_enum(self, table, column):
"""
Load an enum directly from a database table and provide it as a
Load an enum or set directly from a database table and provide it as a
dictionary for use in, for example, selection lists.
"""
sql = (
"SELECT TRIM(TRAILING ')' FROM SUBSTRING(column_type,6)) "
"FROM information_schema.columns "
"WHERE table_schema=DATABASE() AND table_name=%s AND column_name=%s AND data_type='enum'"
"WHERE table_schema=DATABASE() AND table_name=%s AND column_name=%s AND data_type IN ('enum','set')"
)
self.cur.execute(sql, (table, column))
row = self.cur.fetchone()
+2 -1
View File
@@ -75,7 +75,8 @@ 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)
contents = buf.get_text(buf.get_start_iter(), buf.get_end_iter(), True).strip()
return contents or None
class TouchPopup():
"""
+25 -18
View File
@@ -16,7 +16,7 @@ Dropdowns, Database enums and Table numbers
"""
class Dropdown(IntEnum):
HULL_TYPE = 1
VESSEL_TYPE = 1
COMPANY_TYPE = 2
STORAGE_TYPE = 3
EQUIPMENT_CATEGORY = 4
@@ -33,51 +33,51 @@ class Dropdown(IntEnum):
MEASUREMENT_CATEGORY = 15
DropdownDeps = {
Dropdown.HULL_TYPE: (
# unused
Dropdown.VESSEL_TYPE: (
('vessel', 'vtype')
),
Dropdown.COMPANY_TYPE: (
('company', 'comptype'),
('company', 'comptype2')
),
Dropdown.STORAGE_TYPE: (
('storage', 'stype'),
('storage', 'stype')
),
Dropdown.EQUIPMENT_CATEGORY: (
('equipment', 'ecat'),
('equipment', 'ecat')
),
Dropdown.PROVISION_CATEGORY: (
('provisions', 'provcat'),
('provisions', 'provcat')
),
Dropdown.PROVISION_UNIT: (
('provisions', 'unit'),
('provisions', 'unit')
),
Dropdown.FUSE_TYPE: (
('fuse', 'ftype'),
('fuse', 'ftype')
),
Dropdown.UNIT: (
('measurement', 'unit'),
('measurement', 'unit')
),
Dropdown.BOX_TYPE: (
('box', 'boxtype'),
('box', 'boxtype')
),
Dropdown.FUSE_BLOCK: (
('fuse', 'location'),
('fuse', 'location')
),
Dropdown.CABLE_TYPE: (
('cable', 'cabletype'),
('cable', 'cabletype')
),
Dropdown.CABLE_TECHNAME: (
('cable', 'techname'),
('cable', 'techname')
),
Dropdown.INVENTORY_CATEGORY: (
('inventory', 'invcat'),
('inventory', 'invcat')
),
Dropdown.BBN_VESSELDATA: (
#unused
),
Dropdown.MEASUREMENT_CATEGORY: (
('measurement', 'mcat'),
('measurement', 'mcat')
)
}
@@ -88,7 +88,7 @@ class Table(IntEnum):
STORAGE = (4, "storage")
BOXES = (5, "boxes")
EQUIPMENT = (6, "equipment")
#INVENTORY = (7, "inventory")
INVENTORY = (7, "inventory")
PROJECTS = (8, "projects")
CABLES = (9, "cables")
FUSES = (10, "fuses")
@@ -114,6 +114,7 @@ class Lookup:
def _load_enums(self):
"""
enums and sets
translation via gettext from db schema
"""
db_enums = {
@@ -223,7 +224,10 @@ class Lookup:
)
self.db.cur.execute(sql, (vid,))
for row in self.db.cur.fetchall():
storagelist[row[0]] = "{} ({}) - {}".format(row[1], row[2], row[3])
if row[3]:
storagelist[row[0]] = "{} ({}) - {}".format(row[1], row[2], row[3])
else:
storagelist[row[0]] = "{} ({})".format(row[1], row[2])
return storagelist
def box(self, vid):
@@ -236,7 +240,10 @@ class Lookup:
)
self.db.cur.execute(sql, (vid,))
for row in self.db.cur.fetchall():
boxlist[row[0]] = "{} - {}".format(row[1], row[2])
if row[2]:
boxlist[row[0]] = "{} - {}".format(row[1], row[2])
else:
boxlist[row[0]] = row[1]
return boxlist
def equipment(self, vid):
+6
View File
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: WTFPL
from .dbrecord import DbRecord
from yms.lookup import Table
class Inventory(DbRecord):
@@ -13,3 +14,8 @@ class Inventory(DbRecord):
def __init__(self, db, invid=None):
super().__init__(db, invid)
self.title = _("Inventory({})")
def save(self, commit=True):
super().save()
if commit:
self.conn.commit()
+5
View File
@@ -13,3 +13,8 @@ class Provision(DbRecord):
def __init__(self, db, provid=None):
super().__init__(db, provid)
self.title = _("Provision({})")
def save(self, commit=True):
super().save()
if commit:
self.conn.commit()
+157 -1
View File
@@ -73,17 +73,25 @@
<object class="GtkBox" id="box_vessel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-start">4</property>
<property name="margin-end">4</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<!-- n-columns=2 n-rows=17 -->
<object class="GtkGrid" id="grd_vessel_detail">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="row-spacing">6</property>
<property name="column-spacing">8</property>
<child>
<object class="GtkLabel">
<object class="GtkLabel" id="lbl_lb_model">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Model</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -95,6 +103,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Year built</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -106,6 +117,12 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">LoA</property>
<attributes>
<attribute name="foreground" value="#3d3d38384646"/>
</attributes>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -117,6 +134,12 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Draught min</property>
<attributes>
<attribute name="foreground" value="#3d3d38384646"/>
</attributes>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -128,6 +151,12 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Draught</property>
<attributes>
<attribute name="foreground" value="#3d3d38384646"/>
</attributes>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -139,6 +168,12 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Beam</property>
<attributes>
<attribute name="foreground" value="#3d3d38384646"/>
</attributes>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -150,6 +185,12 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">LwL</property>
<attributes>
<attribute name="foreground" value="#3d3d38384646"/>
</attributes>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -161,6 +202,12 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Ballast</property>
<attributes>
<attribute name="foreground" value="#3d3d38384646"/>
</attributes>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -173,6 +220,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -185,6 +236,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -197,6 +252,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -209,6 +268,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -221,6 +284,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -233,6 +300,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -245,6 +316,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -257,6 +332,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -283,6 +362,12 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Shipyard</property>
<attributes>
<attribute name="foreground" value="#3d3d38384646"/>
</attributes>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -295,6 +380,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -306,6 +395,12 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Displacement</property>
<attributes>
<attribute name="foreground" value="#3d3d38384646"/>
</attributes>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -318,6 +413,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -329,6 +428,12 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Belt position, bow</property>
<attributes>
<attribute name="foreground" value="#3d3d38384646"/>
</attributes>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -340,6 +445,12 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Belt position, aft</property>
<attributes>
<attribute name="foreground" value="#3d3d38384646"/>
</attributes>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -352,6 +463,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -364,6 +479,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -375,6 +494,12 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Hull shape</property>
<attributes>
<attribute name="foreground" value="#3d3d38384646"/>
</attributes>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -387,6 +512,9 @@
<property name="can-focus">False</property>
<property name="label" translatable="yes">Remarks</property>
<property name="yalign">0</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -400,7 +528,11 @@
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -413,6 +545,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -424,6 +560,12 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Default Storage</property>
<attributes>
<attribute name="foreground" value="#3d3d38384646"/>
</attributes>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -436,6 +578,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -447,6 +593,12 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Hull number</property>
<attributes>
<attribute name="foreground" value="#3d3d38384646"/>
</attributes>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -459,6 +611,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
+66
View File
@@ -236,6 +236,7 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkLabel" id="lbl_title_detail">
<property name="visible">True</property>
@@ -256,11 +257,16 @@
<object class="GtkGrid" id="grd_details">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="row-spacing">6</property>
<property name="column-spacing">8</property>
<child>
<object class="GtkLabel" id="lbl_lb_name">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Label</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -272,6 +278,10 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -284,6 +294,9 @@
<property name="can-focus">False</property>
<property name="label" translatable="yes">Remarks</property>
<property name="yalign">0</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -296,7 +309,11 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -308,6 +325,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Content</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -319,6 +339,10 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -330,6 +354,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Type</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -341,6 +368,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Color</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -352,6 +382,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Weight</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -363,6 +396,10 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -374,6 +411,10 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -385,6 +426,10 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -396,6 +441,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Weight net</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -407,6 +455,10 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -418,6 +470,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Price</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -429,6 +484,10 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -440,6 +499,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Storage</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -451,6 +513,10 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
+82 -3
View File
@@ -250,6 +250,7 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkLabel" id="lbl_title_detail">
<property name="visible">True</property>
@@ -267,16 +268,19 @@
</child>
<child>
<!-- n-columns=2 n-rows=13 -->
<object class="GtkGrid">
<object class="GtkGrid" id="grd_details">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="row-spacing">4</property>
<property name="column-spacing">4</property>
<property name="row-spacing">6</property>
<property name="column-spacing">8</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Name</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -288,6 +292,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -299,6 +306,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Type</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -311,6 +321,9 @@
<property name="can-focus">False</property>
<property name="label" translatable="yes">Tech.-name</property>
<property name="xalign">0</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -322,6 +335,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Length</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -333,6 +349,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Conductors</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -344,6 +363,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Diameter</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -355,6 +377,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Cross section</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -366,6 +391,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Weight</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -377,6 +405,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Color</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -388,6 +419,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Supplier</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -399,6 +433,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Manufacturer</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -410,6 +447,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Condition</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -422,6 +462,9 @@
<property name="can-focus">False</property>
<property name="label" translatable="yes">Remarks</property>
<property name="yalign">0</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -433,6 +476,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -444,6 +490,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -455,6 +504,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -466,6 +518,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -477,6 +532,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -488,6 +546,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">False</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -499,6 +560,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -510,6 +574,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -521,6 +588,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -532,6 +602,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -543,6 +616,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -556,6 +632,9 @@
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="yalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
+148 -2
View File
@@ -207,7 +207,7 @@
</packing>
</child>
<child>
<!-- n-columns=2 n-rows=15 -->
<!-- n-columns=2 n-rows=16 -->
<object class="GtkGrid" id="grd_editor">
<property name="visible">True</property>
<property name="can-focus">False</property>
@@ -425,7 +425,7 @@
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">14</property>
<property name="top-attach">15</property>
</packing>
</child>
<child>
@@ -553,6 +553,55 @@
</object>
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">15</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Flags</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">14</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkCheckButton" id="chk_historic">
<property name="label" translatable="yes">historic</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="chk_deleted">
<property name="label" translatable="yes">deleted</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">14</property>
@@ -618,6 +667,7 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkLabel" id="lbl_title_detail">
<property name="visible">True</property>
@@ -638,6 +688,8 @@
<object class="GtkGrid" id="grd_details">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="row-spacing">6</property>
<property name="column-spacing">8</property>
<child>
<object class="GtkLabel" id="lbl_lb_name">
<property name="visible">True</property>
@@ -654,6 +706,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Type</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -665,6 +720,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Type secondary</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -676,6 +734,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Short name</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -687,6 +748,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Street</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -698,6 +762,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">ZIP</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -709,6 +776,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">City</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -720,6 +790,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Country</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -733,6 +806,9 @@
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -746,6 +822,9 @@
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -759,6 +838,9 @@
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -772,6 +854,9 @@
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -785,6 +870,9 @@
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -798,6 +886,9 @@
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -811,6 +902,9 @@
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -824,6 +918,9 @@
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -835,6 +932,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Contact</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -846,6 +946,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Phone</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -857,6 +960,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Email</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -868,6 +974,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Web</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -879,6 +988,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Customer no.</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -890,6 +1002,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Contract no.</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -902,6 +1017,9 @@
<property name="can-focus">False</property>
<property name="label" translatable="yes">Remarks</property>
<property name="yalign">0</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -915,6 +1033,9 @@
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -928,6 +1049,9 @@
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -941,6 +1065,9 @@
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -954,6 +1081,9 @@
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -967,6 +1097,9 @@
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -980,6 +1113,9 @@
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -993,7 +1129,11 @@
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -1005,6 +1145,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Flags</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -1018,6 +1161,9 @@
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
+100 -41
View File
@@ -2,50 +2,12 @@
<!-- Generated with glade 3.40.0 -->
<interface>
<requires lib="gtk+" version="3.24"/>
<object class="GtkDialog">
<property name="can-focus">False</property>
<property name="type-hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dlg_upload">
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child internal-child="action_area">
<object class="GtkButtonBox">
<property name="can-focus">False</property>
<property name="layout-style">end</property>
<child>
<placeholder/>
</child>
<child>
<object class="GtkButton" id="but_upload_close">
<property name="label" translatable="yes">Close</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</object>
</child>
</object>
<object class="GtkDialog" id="dlg_scanner">
<property name="can-focus">False</property>
<property name="modal">True</property>
<property name="destroy-with-parent">True</property>
<property name="type-hint">dialog</property>
<property name="skip-taskbar-hint">True</property>
<child internal-child="vbox">
<object class="GtkBox">
<property name="can-focus">False</property>
@@ -87,6 +49,7 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<signal name="clicked" handler="on_but_scan_close_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
@@ -155,6 +118,48 @@
</object>
</child>
</object>
<object class="GtkDialog" id="dlg_upload">
<property name="can-focus">False</property>
<property name="type-hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox">
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child internal-child="action_area">
<object class="GtkButtonBox">
<property name="can-focus">False</property>
<property name="layout-style">end</property>
<child>
<placeholder/>
</child>
<child>
<object class="GtkButton" id="but_upload_close">
<property name="label" translatable="yes">Close</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<signal name="clicked" handler="on_but_upload_close_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</object>
</child>
</object>
<object class="GtkStack" id="topobject">
<property name="visible">True</property>
<property name="can-focus">False</property>
@@ -403,6 +408,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Title</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -415,6 +423,9 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -426,6 +437,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Filename</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -437,6 +451,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Image extents</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -448,6 +465,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Mimetype</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -460,6 +480,9 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -472,6 +495,9 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -484,6 +510,9 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -495,6 +524,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">File size</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -506,6 +538,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Upload date</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -517,6 +552,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Document type</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -529,6 +567,9 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -541,6 +582,9 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -553,6 +597,9 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -565,6 +612,9 @@
<property name="can-focus">False</property>
<property name="label" translatable="yes">Remarks</property>
<property name="yalign">0</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -579,6 +629,9 @@
<property name="vexpand">True</property>
<property name="selectable">True</property>
<property name="yalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -590,6 +643,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Role access</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -602,6 +658,9 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
+134 -10
View File
@@ -12,6 +12,11 @@
<property name="step-increment">1</property>
<property name="page-increment">10</property>
</object>
<object class="GtkImage" id="img_calendar">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">x-office-calendar-symbolic</property>
</object>
<object class="GtkStack" id="topobject">
<property name="visible">True</property>
<property name="can-focus">False</property>
@@ -318,6 +323,7 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkLabel" id="lbl_title_detail">
<property name="visible">True</property>
@@ -338,11 +344,16 @@
<object class="GtkGrid" id="grd_details">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="row-spacing">6</property>
<property name="column-spacing">8</property>
<child>
<object class="GtkLabel" id="lbl_lb_name">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Name</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -354,6 +365,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Short name</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -365,6 +379,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Manufacturer</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -376,6 +393,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Model</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -387,6 +407,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Serial no.</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -398,6 +421,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Weight</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -409,6 +435,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Price</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -420,6 +449,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Date purchase</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -431,6 +463,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Supplier</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -442,6 +477,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Category</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -454,6 +492,9 @@
<property name="can-focus">False</property>
<property name="label" translatable="yes">Remarks</property>
<property name="yalign">0</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -466,6 +507,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -478,6 +523,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -490,6 +539,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -502,6 +555,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -514,6 +571,10 @@
<property name="can-focus">False</property>
<property name="hexpand">False</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -526,6 +587,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -538,6 +603,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -550,6 +619,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -562,6 +635,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -574,6 +651,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -587,7 +668,11 @@
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -599,6 +684,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Flags</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -611,6 +699,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -622,6 +714,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Condition</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -634,6 +729,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -890,16 +989,6 @@
<property name="top-attach">4</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="ent_purchdate">
<property name="visible">True</property>
<property name="can-focus">True</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">7</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
@@ -1018,6 +1107,41 @@
<property name="top-attach">10</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box_purchdate">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkEntry" id="ent_purchdate">
<property name="visible">True</property>
<property name="can-focus">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="but_purchdate">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="image">img_calendar</property>
<property name="always-show-image">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">7</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
+51 -2
View File
@@ -235,6 +235,7 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkLabel" id="lbl_title_detail">
<property name="visible">True</property>
@@ -255,14 +256,17 @@
<object class="GtkGrid" id="grd_details">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="row-spacing">4</property>
<property name="column-spacing">4</property>
<property name="row-spacing">6</property>
<property name="column-spacing">8</property>
<child>
<object class="GtkLabel" id="lbl_fnumber">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -274,6 +278,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Number</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -285,6 +292,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Type</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -296,6 +306,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Current</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -307,6 +320,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Cable</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -318,6 +334,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Equipment</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -329,6 +348,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Location</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -340,6 +362,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Description</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -352,6 +377,9 @@
<property name="can-focus">False</property>
<property name="label" translatable="yes">Remarks</property>
<property name="yalign">0</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -364,6 +392,9 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -376,6 +407,9 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -388,6 +422,9 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -402,6 +439,9 @@
<property name="vexpand">True</property>
<property name="selectable">True</property>
<property name="yalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -414,6 +454,9 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -426,6 +469,9 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -438,6 +484,9 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
+145 -82
View File
@@ -17,6 +17,11 @@
<property name="step-increment">1</property>
<property name="page-increment">10</property>
</object>
<object class="GtkImage" id="img_calendar">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">x-office-calendar-symbolic</property>
</object>
<object class="GtkStack" id="topobject">
<property name="visible">True</property>
<property name="can-focus">False</property>
@@ -241,6 +246,7 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkLabel" id="lbl_title_detail">
<property name="visible">True</property>
@@ -257,15 +263,20 @@
</packing>
</child>
<child>
<!-- n-columns=2 n-rows=13 -->
<!-- n-columns=2 n-rows=11 -->
<object class="GtkGrid" id="grd_details">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="row-spacing">6</property>
<property name="column-spacing">8</property>
<child>
<object class="GtkLabel" id="lbl_lb_name">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Name</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -273,10 +284,13 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="lbl_lb_type">
<object class="GtkLabel" id="lbl_lb_container">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Type</property>
<property name="label" translatable="yes">Container</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -284,10 +298,13 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="lbl_lb_storage">
<object class="GtkLabel" id="lbl_lb_equipment">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Storage</property>
<property name="label" translatable="yes">Equipment</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -295,10 +312,13 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="lbl_lb_box">
<object class="GtkLabel" id="lbl_lb_number">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Box</property>
<property name="label" translatable="yes">Number</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -306,10 +326,13 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="lbl_lb_equipment">
<object class="GtkLabel" id="lbl_lb_weight">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Equipment</property>
<property name="label" translatable="yes">Weight</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -317,10 +340,13 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="lbl_lb_number">
<object class="GtkLabel" id="lbl_lb_price">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Number</property>
<property name="label" translatable="yes">Price</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -328,47 +354,31 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="lbl_lb_weight">
<object class="GtkLabel" id="lbl_lb_purchdate">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Weight</property>
<property name="label" translatable="yes">Purchase Date</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">6</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="lbl_lb_price">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Price</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">7</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="lbl_lb_purchdate">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Purchase Date</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">8</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="lbl_lb_condition">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Condition</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">9</property>
<property name="top-attach">7</property>
</packing>
</child>
<child>
@@ -377,10 +387,13 @@
<property name="can-focus">False</property>
<property name="label" translatable="yes">Remarks</property>
<property name="yalign">0</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">12</property>
<property name="top-attach">10</property>
</packing>
</child>
<child>
@@ -389,6 +402,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -401,46 +418,30 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="lbl_storage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="lbl_box">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">3</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="lbl_equipment">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">4</property>
<property name="top-attach">2</property>
</packing>
</child>
<child>
@@ -449,10 +450,14 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">5</property>
<property name="top-attach">3</property>
</packing>
</child>
<child>
@@ -461,10 +466,14 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">6</property>
<property name="top-attach">4</property>
</packing>
</child>
<child>
@@ -473,10 +482,14 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">7</property>
<property name="top-attach">5</property>
</packing>
</child>
<child>
@@ -485,10 +498,14 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">8</property>
<property name="top-attach">6</property>
</packing>
</child>
<child>
@@ -497,10 +514,14 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">9</property>
<property name="top-attach">7</property>
</packing>
</child>
<child>
@@ -511,10 +532,13 @@
<property name="vexpand">True</property>
<property name="selectable">True</property>
<property name="yalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">12</property>
<property name="top-attach">10</property>
</packing>
</child>
<child>
@@ -522,10 +546,13 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Category</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">10</property>
<property name="top-attach">8</property>
</packing>
</child>
<child>
@@ -534,10 +561,14 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">10</property>
<property name="top-attach">8</property>
</packing>
</child>
<child>
@@ -545,10 +576,13 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Flags</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">11</property>
<property name="top-attach">9</property>
</packing>
</child>
<child>
@@ -557,10 +591,14 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">11</property>
<property name="top-attach">9</property>
</packing>
</child>
</object>
@@ -867,16 +905,6 @@
<property name="top-attach">9</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="ent_purchdate">
<property name="visible">True</property>
<property name="can-focus">True</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">8</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="spi_number">
<property name="visible">True</property>
@@ -1013,6 +1041,41 @@
<property name="top-attach">11</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box_purchdate">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkEntry" id="ent_purchdate">
<property name="visible">True</property>
<property name="can-focus">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="but_purchdate">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="image">img_calendar</property>
<property name="always-show-image">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">8</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
+138 -22
View File
@@ -17,6 +17,16 @@
<property name="step-increment">1</property>
<property name="page-increment">10</property>
</object>
<object class="GtkImage" id="img_completion">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">x-office-calendar-symbolic</property>
</object>
<object class="GtkImage" id="img_plandate">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">x-office-calendar-symbolic</property>
</object>
<object class="GtkStack" id="topobject">
<property name="visible">True</property>
<property name="can-focus">False</property>
@@ -220,6 +230,7 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkLabel" id="lbl_title_detail">
<property name="visible">True</property>
@@ -240,11 +251,16 @@
<object class="GtkGrid" id="grd_details">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="row-spacing">6</property>
<property name="column-spacing">8</property>
<child>
<object class="GtkLabel" id="lbl_lb_activities">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Activities</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -257,6 +273,9 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -268,6 +287,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Equipment</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -280,6 +302,9 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -291,6 +316,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Series</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -302,6 +330,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Interval hours</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -313,6 +344,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Last hours</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -324,6 +358,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Plan date</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -335,6 +372,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Completion date</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -346,6 +386,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Status</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -358,6 +401,9 @@
<property name="can-focus">False</property>
<property name="label" translatable="yes">Remarks</property>
<property name="yalign">0</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -370,6 +416,9 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -382,6 +431,9 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -394,6 +446,9 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -406,6 +461,9 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -418,6 +476,9 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -430,6 +491,9 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -444,6 +508,9 @@
<property name="vexpand">True</property>
<property name="selectable">True</property>
<property name="yalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -712,28 +779,6 @@
<property name="top-attach">4</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="ent_plandate">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">5</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="ent_completion">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">6</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="cmb_status">
<property name="visible">True</property>
@@ -764,6 +809,77 @@
<property name="top-attach">8</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box_plandate">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkEntry" id="ent_plandate">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="but_plandate">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="image">img_plandate</property>
<property name="always-show-image">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">5</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box_completion">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkEntry" id="ent_completion">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="but_completion">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="image">img_completion</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">6</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
+122 -12
View File
@@ -17,6 +17,11 @@
<property name="step-increment">1</property>
<property name="page-increment">10</property>
</object>
<object class="GtkImage" id="img_calendar">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">x-office-calendar-symbolic</property>
</object>
<object class="GtkStack" id="topobject">
<property name="visible">True</property>
<property name="can-focus">False</property>
@@ -220,6 +225,7 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkLabel" id="lbl_title_detail">
<property name="visible">True</property>
@@ -240,11 +246,16 @@
<object class="GtkGrid" id="grd_details">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="row-spacing">6</property>
<property name="column-spacing">8</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Name</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -257,6 +268,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -268,6 +283,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Equipment</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -280,6 +298,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -291,6 +313,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Dimensions</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -302,6 +327,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Value 1</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -313,6 +341,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Value 2</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -324,6 +355,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Value 3</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -335,6 +369,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Unit</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -346,6 +383,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Accuracy</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -358,6 +398,9 @@
<property name="can-focus">False</property>
<property name="label" translatable="yes">Note</property>
<property name="yalign">0</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -370,6 +413,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -382,6 +429,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -394,6 +445,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -406,6 +461,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -418,6 +477,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -430,6 +493,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -443,7 +510,11 @@
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -455,6 +526,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Category</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -467,6 +541,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -478,6 +556,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Date</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -490,6 +571,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -613,7 +698,7 @@
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Dimensions</property>
<property name="label" translatable="yes" context="measurement" comments="1 to 3 dimensions">Dimensions</property>
<attributes>
<attribute name="weight" value="semibold"/>
</attributes>
@@ -759,17 +844,6 @@
<property name="top-attach">4</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="ent_date">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">7</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="cmb_equipment">
<property name="visible">True</property>
@@ -853,6 +927,42 @@
<property name="top-attach">6</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkEntry" id="ent_date">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="but_date">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="image">img_calendar</property>
<property name="always-show-image">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">7</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
+90 -11
View File
@@ -245,6 +245,7 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkLabel" id="lbl_title_detail">
<property name="visible">True</property>
@@ -265,11 +266,16 @@
<object class="GtkGrid" id="grd_details">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="row-spacing">6</property>
<property name="column-spacing">8</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Name</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -281,6 +287,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Responsible</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -292,6 +301,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Date start</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -303,6 +315,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Duration, days</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -314,6 +329,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Costs plan</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -325,6 +343,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Costs final</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -336,6 +357,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Status</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -359,6 +383,10 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -370,6 +398,10 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -381,6 +413,10 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -392,6 +428,10 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -403,6 +443,10 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -414,6 +458,10 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -425,6 +473,10 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -439,6 +491,9 @@
<property name="vexpand">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -654,17 +709,6 @@
<property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="ent_date_start">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="spi_duration">
<property name="visible">True</property>
@@ -727,6 +771,41 @@
<property name="top-attach">7</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box_date_start">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkEntry" id="ent_date_start">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="but_date_start">
<property name="label" translatable="yes">button</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
+274 -33
View File
@@ -2,11 +2,26 @@
<!-- Generated with glade 3.40.0 -->
<interface>
<requires lib="gtk+" version="3.24"/>
<object class="GtkAdjustment" id="adj_calories">
<property name="upper">100</property>
<property name="step-increment">1</property>
<property name="page-increment">10</property>
</object>
<object class="GtkAdjustment" id="adj_number">
<property name="upper">100</property>
<property name="step-increment">1</property>
<property name="page-increment">10</property>
</object>
<object class="GtkAdjustment" id="adj_price">
<property name="upper">100</property>
<property name="step-increment">1</property>
<property name="page-increment">10</property>
</object>
<object class="GtkAdjustment" id="adj_target">
<property name="upper">100</property>
<property name="step-increment">1</property>
<property name="page-increment">10</property>
</object>
<object class="GtkAdjustment" id="adj_weight">
<property name="upper">100</property>
<property name="step-increment">1</property>
@@ -17,7 +32,12 @@
<property name="step-increment">1</property>
<property name="page-increment">10</property>
</object>
<object class="GtkImage" id="img_calendar">
<object class="GtkImage" id="img_shelflife">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">x-office-calendar-symbolic</property>
</object>
<object class="GtkImage" id="img_storedate">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">x-office-calendar-symbolic</property>
@@ -46,7 +66,7 @@
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Kategorie</property>
<property name="label" translatable="yes">Category</property>
</object>
<packing>
<property name="left-attach">0</property>
@@ -247,7 +267,7 @@
</packing>
</child>
<child>
<!-- n-columns=2 n-rows=11 -->
<!-- n-columns=2 n-rows=14 -->
<object class="GtkGrid" id="grd_editor">
<property name="visible">True</property>
<property name="can-focus">False</property>
@@ -322,7 +342,7 @@
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">5</property>
<property name="top-attach">6</property>
</packing>
</child>
<child>
@@ -333,7 +353,7 @@
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">6</property>
<property name="top-attach">7</property>
</packing>
</child>
<child>
@@ -344,7 +364,7 @@
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">7</property>
<property name="top-attach">8</property>
</packing>
</child>
<child>
@@ -355,7 +375,7 @@
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">8</property>
<property name="top-attach">11</property>
</packing>
</child>
<child>
@@ -366,7 +386,7 @@
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">9</property>
<property name="top-attach">12</property>
</packing>
</child>
<child>
@@ -421,7 +441,7 @@
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">7</property>
<property name="top-attach">8</property>
</packing>
</child>
<child>
@@ -446,7 +466,7 @@
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">5</property>
<property name="top-attach">6</property>
</packing>
</child>
<child>
@@ -459,18 +479,7 @@
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">6</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="ent_shelflife">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">9</property>
<property name="top-attach">7</property>
</packing>
</child>
<child>
@@ -482,13 +491,15 @@
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">10</property>
<property name="top-attach">13</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="margin-top">4</property>
<property name="margin-bottom">4</property>
<property name="shadow-type">in</property>
<child>
<object class="GtkTextView" id="txt_remarks">
@@ -499,7 +510,7 @@
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">10</property>
<property name="top-attach">13</property>
</packing>
</child>
<child>
@@ -526,7 +537,7 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="image">img_calendar</property>
<property name="image">img_storedate</property>
<property name="always-show-image">True</property>
</object>
<packing>
@@ -538,7 +549,116 @@
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">8</property>
<property name="top-attach">11</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Target</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">5</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="spi_target">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="text" translatable="yes">0</property>
<property name="adjustment">adj_target</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">5</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Calories</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">9</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="spi_calories">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="text" translatable="yes">0</property>
<property name="adjustment">adj_calories</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">9</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Price</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">10</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="spi_price">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="text" translatable="yes">0,00</property>
<property name="adjustment">adj_price</property>
<property name="digits">2</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">10</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box_shelflife">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkEntry" id="ent_shelflife">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="but_shelflife">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="image">img_shelflife</property>
<property name="always-show-image">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">12</property>
</packing>
</child>
</object>
@@ -600,6 +720,7 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkLabel" id="lbl_title_detail">
<property name="visible">True</property>
@@ -616,15 +737,20 @@
</packing>
</child>
<child>
<!-- n-columns=2 n-rows=13 -->
<!-- n-columns=2 n-rows=14 -->
<object class="GtkGrid" id="grd_details">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="row-spacing">6</property>
<property name="column-spacing">8</property>
<child>
<object class="GtkLabel" id="lbl_lb_name">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Name</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -647,6 +773,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Storage</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -659,6 +788,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -671,6 +804,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -683,6 +820,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -694,6 +835,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Box</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -705,6 +849,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Number</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -716,6 +863,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Weight</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -727,6 +877,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Weight net</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -738,6 +891,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Unit</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -749,10 +905,13 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Storedate</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">10</property>
<property name="top-attach">11</property>
</packing>
</child>
<child>
@@ -760,10 +919,13 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Shelflife</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">11</property>
<property name="top-attach">12</property>
</packing>
</child>
<child>
@@ -772,6 +934,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -784,6 +950,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -796,6 +966,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -808,6 +982,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -820,6 +998,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -832,10 +1014,14 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">10</property>
<property name="top-attach">11</property>
</packing>
</child>
<child>
@@ -844,10 +1030,14 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">11</property>
<property name="top-attach">12</property>
</packing>
</child>
<child>
@@ -855,6 +1045,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Price</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -867,6 +1060,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -878,6 +1075,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Target</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -890,6 +1090,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -902,10 +1106,13 @@
<property name="can-focus">False</property>
<property name="label" translatable="yes">Remarks</property>
<property name="yalign">0</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">12</property>
<property name="top-attach">13</property>
</packing>
</child>
<child>
@@ -915,11 +1122,45 @@
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">12</property>
<property name="top-attach">13</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="lbl_lb_calories">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Calories</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">10</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="lbl_calories">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">10</property>
</packing>
</child>
</object>
+1 -1
View File
@@ -178,7 +178,7 @@ thread in "Segeln Forum"</property>
<object class="GtkLabel" id="lbl_version">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">YMS version x.x.x</property>
<property name="label">YMS version x.x.x</property>
</object>
<packing>
<property name="expand">False</property>
+91 -23
View File
@@ -230,6 +230,7 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkLabel" id="lbl_title_detail">
<property name="visible">True</property>
@@ -250,11 +251,16 @@
<object class="GtkGrid" id="grd_details">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="row-spacing">6</property>
<property name="column-spacing">8</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Name</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -267,6 +273,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -278,6 +288,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Type</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -289,6 +302,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Position (x, y, z)</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -300,6 +316,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Dimension (x, y, z)</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -311,6 +330,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Angle</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -322,6 +344,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Capacity</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -334,6 +359,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -346,6 +375,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -358,6 +391,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -370,6 +407,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -382,6 +423,10 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -393,6 +438,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Color</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -406,6 +454,10 @@
<property name="hexpand">True</property>
<property name="use-markup">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -418,6 +470,9 @@
<property name="can-focus">False</property>
<property name="label" translatable="yes">Remarks</property>
<property name="yalign">0</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -431,7 +486,11 @@
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -582,7 +641,7 @@
<property name="can-focus">False</property>
<property name="margin-start">4</property>
<property name="margin-end">4</property>
<property name="label" translatable="yes">X</property>
<property name="label">X</property>
</object>
<packing>
<property name="left-attach">1</property>
@@ -595,7 +654,7 @@
<property name="can-focus">False</property>
<property name="margin-start">4</property>
<property name="margin-end">4</property>
<property name="label" translatable="yes">Y</property>
<property name="label">Y</property>
</object>
<packing>
<property name="left-attach">3</property>
@@ -608,7 +667,7 @@
<property name="can-focus">False</property>
<property name="margin-start">4</property>
<property name="margin-end">4</property>
<property name="label" translatable="yes">Z</property>
<property name="label">Z</property>
</object>
<packing>
<property name="left-attach">5</property>
@@ -663,9 +722,9 @@
<property name="can-focus">True</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="left-attach">2</property>
<property name="top-attach">0</property>
<property name="width">6</property>
<property name="width">5</property>
</packing>
</child>
<child>
@@ -674,9 +733,9 @@
<property name="can-focus">False</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="left-attach">2</property>
<property name="top-attach">1</property>
<property name="width">6</property>
<property name="width">5</property>
</packing>
</child>
<child>
@@ -696,7 +755,7 @@
<property name="can-focus">False</property>
<property name="margin-start">4</property>
<property name="margin-end">4</property>
<property name="label" translatable="yes">WX</property>
<property name="label">WX</property>
</object>
<packing>
<property name="left-attach">1</property>
@@ -709,7 +768,7 @@
<property name="can-focus">False</property>
<property name="margin-start">4</property>
<property name="margin-end">4</property>
<property name="label" translatable="yes">WY</property>
<property name="label">WY</property>
</object>
<packing>
<property name="left-attach">3</property>
@@ -722,7 +781,7 @@
<property name="can-focus">False</property>
<property name="margin-start">4</property>
<property name="margin-end">4</property>
<property name="label" translatable="yes">WZ</property>
<property name="label">WZ</property>
</object>
<packing>
<property name="left-attach">5</property>
@@ -845,9 +904,9 @@
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="left-attach">2</property>
<property name="top-attach">7</property>
<property name="width">6</property>
<property name="width">5</property>
</packing>
</child>
<child>
@@ -872,17 +931,6 @@
<property name="top-attach">5</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Degrees</property>
</object>
<packing>
<property name="left-attach">4</property>
<property name="top-attach">4</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
@@ -920,6 +968,26 @@
<property name="top-attach">6</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Deg</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">4</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
+210 -24
View File
@@ -2,6 +2,27 @@
<!-- Generated with glade 3.40.0 -->
<interface>
<requires lib="gtk+" version="3.24"/>
<object class="GtkImage" id="img_duedate">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="pixel-size">16</property>
<property name="icon-name">stock_calendar</property>
</object>
<object class="GtkImage" id="img_finished">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="pixbuf">icons/appointment.svg</property>
</object>
<object class="GtkImage" id="img_plandate">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">x-office-calendar-symbolic</property>
</object>
<object class="GtkImage" id="img_started">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="pixbuf">icons/appointment.svg</property>
</object>
<object class="GtkStack" id="topobject">
<property name="visible">True</property>
<property name="can-focus">False</property>
@@ -319,6 +340,7 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkLabel" id="lbl_title_detail">
<property name="visible">True</property>
@@ -339,11 +361,16 @@
<object class="GtkGrid" id="grd_details">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="row-spacing">6</property>
<property name="column-spacing">8</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Name</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -356,6 +383,9 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -367,6 +397,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Priority</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -378,6 +411,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Status</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -389,6 +425,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Timestamp</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -401,6 +440,9 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -413,6 +455,9 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -425,6 +470,9 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -436,6 +484,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Plan date</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -447,6 +498,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Due date</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -458,6 +512,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Started</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -470,6 +527,9 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -482,6 +542,9 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -494,6 +557,9 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -506,6 +572,9 @@
<property name="can-focus">False</property>
<property name="label" translatable="yes">Remarks</property>
<property name="yalign">0</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -520,6 +589,9 @@
<property name="vexpand">True</property>
<property name="selectable">True</property>
<property name="yalign">0</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -531,6 +603,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Finished</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -543,6 +618,9 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -554,6 +632,9 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Responsible</property>
<style>
<class name="field-name"/>
</style>
</object>
<packing>
<property name="left-attach">0</property>
@@ -566,6 +647,9 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="selectable">True</property>
<style>
<class name="field-value"/>
</style>
</object>
<packing>
<property name="left-attach">1</property>
@@ -750,16 +834,6 @@
<property name="top-attach">8</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="ent_plandate">
<property name="visible">True</property>
<property name="can-focus">True</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">3</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="cmb_project">
<property name="visible">True</property>
@@ -827,16 +901,6 @@
<property name="top-attach">4</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="ent_duedate">
<property name="visible">True</property>
<property name="can-focus">True</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">4</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="cmb_status">
<property name="visible">True</property>
@@ -884,9 +948,106 @@
</packing>
</child>
<child>
<object class="GtkEntry" id="ent_started">
<object class="GtkBox" id="box_plandate">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkEntry" id="ent_plandate">
<property name="visible">True</property>
<property name="can-focus">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="but_plandate">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="image">img_plandate</property>
<property name="always-show-image">True</property>
<signal name="clicked" handler="on_but_plandate_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">3</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box_duedate">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkEntry" id="ent_duedate">
<property name="visible">True</property>
<property name="can-focus">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="but_duedate">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="image">img_duedate</property>
<property name="always-show-image">True</property>
<signal name="clicked" handler="on_but_duedate_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">4</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box_started">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkEntry" id="ent_started">
<property name="visible">True</property>
<property name="can-focus">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="but_started">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="image">img_started</property>
<signal name="clicked" handler="on_but_started_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="left-attach">1</property>
@@ -894,9 +1055,34 @@
</packing>
</child>
<child>
<object class="GtkEntry" id="ent_finished">
<object class="GtkBox" id="box_finished">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkEntry" id="ent_finished">
<property name="visible">True</property>
<property name="can-focus">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="but_finished">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="image">img_finished</property>
<signal name="clicked" handler="on_but_finished_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="left-attach">1</property>
+20 -4
View File
@@ -84,9 +84,13 @@ class BaseView(View):
storages = self.context.lookup.storage(self.context.vessel.vid)
combobox.load_from_dict(self.combo['storage'], {-1: _("─── none ───")} | storages)
# Vessel types
self.dd_vtype = self.context.lookup.dropdown(Dropdown.VESSEL_TYPE)
combobox.load_from_dict(self.combo['vtype'], {-1: _("─── none ───")} | self.dd_vtype, -1)
# Hull types
self.dd_htype = self.context.lookup.enum('vessel.htype')
combobox.load_from_dict(self.combo['htype'], self.dd_htype)
combobox.load_from_dict(self.combo['htype'], self.dd_htype, 'mono')
# List of available shapes for combobox selection
shapes = self.load_shapes()
@@ -150,7 +154,6 @@ class BaseView(View):
#viewport.height = 240
#self._svg.render_document(ctx, viewport)
# WIP generic remarks handling
self.text['vessel_remarks'].set_size_request(200, 70)
@@ -350,7 +353,14 @@ class BaseView(View):
vessel = self.context.vessel
vessel.vesselname = self.entry['vesselname'].get_text()
vessel.model = self.entry['model'].get_text()
vessel.vtype = combobox.get_list_value(self.combo['vtype'])
if vessel.vtype == -1:
vessel.vtype = None
vessel.year_built = self.spin['year_built'].get_value_as_int()
vessel.hull_number = self.entry['hull_number'].get_text()
vessel.shipyard = combobox.get_list_value(self.combo['shipyard'])
if vessel.shipyard == -1:
vessel.shipyard = None
vessel.loa = self.spin['loa'].get_value()
vessel.lwl = self.spin['lwl'].get_value()
vessel.beam = self.spin['beam'].get_value()
@@ -360,7 +370,10 @@ class BaseView(View):
vessel.ballast = self.spin['ballast'].get_value_as_int()
vessel.beltpos_bow = self.spin['belt_bow'].get_value()
vessel.beltpos_aft = self.spin['belt_aft'].get_value()
vessel.htype = combobox.get_list_value(self.combo['htype'])
vessel.shapefile = combobox.get_list_value(self.combo['hull_shape'])
if vessel.shapefile == '-1':
vessel.shapefile = None
vessel.remarks = gtkutils.get_text_contents(self.text['vessel_remarks'])
vessel.save()
self.stack['vessel'].set_visible_child(self.box['vessel'])
@@ -399,7 +412,10 @@ class BaseView(View):
def edit_vessel(self, vessel):
self.entry['vesselname'].set_text(vessel.vesselname)
self.entry['model'].set_text(vessel.model or '')
combobox.activate_row(self.combo['vtype'], vessel.vtype or -1)
self.spin['year_built'].set_value(vessel.year_built or 0)
self.entry['hull_number'].set_text(vessel.hull_number or '')
combobox.activate_row(self.combo['shipyard'], vessel.shipyard or -1)
self.spin['loa'].set_value(vessel.loa or 0)
self.spin['lwl'].set_value(vessel.lwl or 0)
self.spin['beam'].set_value(vessel.beam or 0)
@@ -409,11 +425,11 @@ class BaseView(View):
self.spin['ballast'].set_value(vessel.ballast or 0)
self.spin['belt_bow'].set_value(vessel.beltpos_bow or 0)
self.spin['belt_aft'].set_value(vessel.beltpos_aft or 0)
combobox.activate_row(self.combo['shipyard'], vessel.shipyard or -1)
self.entry['hull_number'].set_text(vessel.hull_number or '')
combobox.activate_row(self.combo['htype'], vessel.htype)
combobox.activate_row(self.combo['hull_shape'], vessel.shapefile or "-1")
combobox.activate_row(self.combo['storage'], vessel.sid_default or -1)
self.text['vessel_remarks'].get_buffer().set_text(vessel.remarks or '')
self.entry['vesselname'].grab_focus()
def display_user(self, user):
self.entry['user_login'].set_text(user.login)
+2
View File
@@ -65,6 +65,7 @@ class BoxesView(View):
self.spin['weight'].set_value(0)
self.spin['weight_net'].set_value(0)
self.text['remarks'].get_buffer().set_text('')
self.entry['label'].grab_focus()
def display_record(self):
self.label['label'].set_text(self.sbox.label)
@@ -100,6 +101,7 @@ class BoxesView(View):
self.spin['weight'].set_value(self.sbox.weight or 0)
self.spin['weight_net'].set_value(self.sbox.weight_net or 0)
self.text['remarks'].get_buffer().set_text(self.sbox.remarks or '')
self.entry['label'].grab_focus()
def save_record(self):
# fields must have been validated beforehand
+40 -16
View File
@@ -17,13 +17,38 @@ class CablesView(View):
self.newrecord = False
self.lst_cables = Gtk.ListStore(int, str, str)
self.load_list()
treeview.add_column(self.tree['cables'], _('ID'), 0)
treeview.add_column(self.tree['cables'], _('Name'), 1)
treeview.add_column(self.tree['cables'], _('Condition'), 2)
self.tree['cables'].set_model(self.lst_cables)
# Cable type
self.dd_type = self.context.lookup.dropdown(Dropdown.CABLE_TYPE)
combobox.load_from_dict(self.combo['type'], {-1: _("─── none ───")} | self.dd_type)
# Cable tech type
self.dd_tech = self.context.lookup.dropdown(Dropdown.CABLE_TECHNAME)
combobox.load_from_dict(self.combo['techname'], {-1: _("─── none ───")} | self.dd_tech)
# Supplier
self.dd_supplier = self.context.lookup.company(1)
combobox.load_from_dict(self.combo['supplier'], {-1: _("─── none ───")} | self.dd_supplier)
# Manufacturer
self.dd_manufacturer = self.context.lookup.company(2)
combobox.load_from_dict(self.combo['manufacturer'], {-1: _("─── none ───")} | self.dd_manufacturer)
# Condition
self.dd_condition = self.context.lookup.enum('cable.cablecond')
combobox.load_from_dict(self.combo['condition'], self.dd_condition, 'unknown')
def load_list(self):
self.lst_cables.clear()
sql = (
"SELECT cableid, cablename, cablecond "
"FROM cable "
"WHERE vid=%s "
"ORDER BY cableid"
)
self.db.dcur.execute(sql, (context.vessel.vid,))
self.db.dcur.execute(sql, (self.context.vessel.vid,))
for row in self.db.dcur.fetchall():
data = (
row['cableid'],
@@ -32,17 +57,12 @@ class CablesView(View):
)
self.lst_cables.append(data)
treeview.add_column(self.tree['cables'], _('ID'), 0)
treeview.add_column(self.tree['cables'], _('Name'), 1)
treeview.add_column(self.tree['cables'], _('Condition'), 2)
self.tree['cables'].set_model(self.lst_cables)
self.dd_type = self.context.lookup.dropdown(Dropdown.CABLE_TYPE)
self.dd_tech = self.context.lookup.dropdown(Dropdown.CABLE_TECHNAME)
def display_record(self):
self.label['name'].set_text(self.cable.cablename)
self.label['type'].set_text(self.dd_type[self.cable.cabletype])
self.label['name'].set_text(self.cable.cablename or '')
if self.cable.cabletype:
self.label['type'].set_text(self.dd_type[self.cable.cabletype])
else:
self.label['type'].set_text('')
if self.cable.techname:
self.label['techname'].set_text(self.dd_tech[self.cable.techname])
else:
@@ -64,8 +84,8 @@ class CablesView(View):
def edit_record(self):
# fill UI fields from database record
self.entry['name'].set_text(self.cable.cablename)
combobox.activate_row(self.combo['type'], self.cable.cabletype)
combobox.activate_row(self.combo['techname'], self.cable.techname)
combobox.activate_row(self.combo['type'], self.cable.cabletype or -1)
combobox.activate_row(self.combo['techname'], self.cable.techname or -1)
self.spin['length'].set_value(self.cable.length or 0)
self.spin['consuctors'].set_value(self.cable.conductors or 0)
self.spin['diameter'].set_value(self.cable.diameter or 0)
@@ -75,10 +95,11 @@ class CablesView(View):
rgba = Gdk.RGBA()
rgba.parse('#' + self.cable.color)
self.button['color'].set_rgba(rgba)
combobox.activate_row(self.combo['supplier'], self.cable.supplier)
combobox.activate_row(self.combo['manufacturer'], self.cable.manufacturer)
combobox.activate_row(self.combo['consition'], self.cable.cablecond)
combobox.activate_row(self.combo['supplier'], self.cable.supplier or -1)
combobox.activate_row(self.combo['manufacturer'], self.cable.manufacturer or -1)
combobox.activate_row(self.combo['consition'], self.cable.cablecond or 'unknown')
self.text['remarks'].get_buffer().set_text(self.sbox.remarks or '')
self.entry['name'].grab_focus()
def save_record(self):
# fields must have been validated beforehand
@@ -95,6 +116,9 @@ class CablesView(View):
# buttons on list page
def on_but_new_clicked(self, widget):
self.newrecord = True
self.cable.clear()
self.edit_record()
self.topwidget.set_visible_child(self.box['cable_edit'])
def on_but_edit_clicked(self, widget):
+10 -4
View File
@@ -67,6 +67,7 @@ class CompaniesView(View):
self.entry['contractno'].set_text('')
combobox.activate_row(self.combo['comptype'], company.SUPPLIER)
combobox.activate_row(self.combo['comptype2'], -1)
self.entry['compname'].grab_focus()
def display_record(self):
self.label['name'].set_text(self.comp.compname)
@@ -77,20 +78,20 @@ class CompaniesView(View):
self.label['zip'].set_text(self.comp.zip or '')
self.label['city'].set_text(self.comp.city or '')
self.label['country'].set_text(self.comp.country or '')
self.label['contact'].set_text(self.comp.contact or '')
self.label['phone'].set_text(self.comp.phone or '')
self.label['email'].set_text(self.comp.email or '')
self.label['web'].set_text(self.comp.web or '')
self.label['customerno'].set_text(self.comp.customerno or '')
self.label['contractno'].set_text(self.comp.contractno or '')
self.label['flags'].set_text(self.comp.flags or '')
# TODO translation
self.label['remarks'].set_text(self.comp.remarks or '')
def edit_record(self):
self.entry['compname'].set_text(self.comp.compname)
# Type self.dd_comptype.get(self.comp.comptype, -1)
# Type2 self.dd_comptype.get(self.comp.comptype2, -1)
combobox.activate_row(self.combo['comptype'], self.comp.comptype)
combobox.activate_row(self.combo['comptype2'], self.comp.comptype2)
combobox.activate_row(self.combo['comptype2'], self.comp.comptype2 or -1)
self.entry['shortname'].set_text(self.comp.shortname or '')
self.entry['street'].set_text(self.comp.street or '')
self.entry['zip'].set_text(self.comp.zip or '')
@@ -102,7 +103,11 @@ class CompaniesView(View):
self.entry['web'].set_text(self.comp.web or '')
self.entry['customerno'].set_text(self.comp.customerno or '')
self.entry['contractno'].set_text(self.comp.contractno or '')
flags = (self.comp.flags or '').split(',')
for flag in self.dd_flags:
self.check[flag].set_active(flag in flags)
self.text['remarks'].get_buffer().set_text(self.comp.remarks or '')
self.entry['compname'].grab_focus()
def save_record(self):
# fields must have been validated beforehand
@@ -121,7 +126,8 @@ class CompaniesView(View):
self.comp.email = self.entry['email'].get_text()
self.comp.web = self.entry['web'].get_text()
self.comp.customerno = self.entry['customerno'].get_text()
self.comp.conractno = self.entry['contractno'].get_text()
self.comp.contractno = self.entry['contractno'].get_text()
self.comp.flags = self.get_checks(('historic', 'ordered'))
self.comp.remarks = gtkutils.get_text_contents(self.text['remarks'])
# buttons on list page
+18 -3
View File
@@ -19,8 +19,10 @@ class DocumentsView(View):
self.newrecord = False
self.scandialog = self.builder.get_object("dlg_scanner")
print(self.scandialog)
# TODO self.uploaddialog = self.builder.get_object("dlg_upload")
self.scandialog.set_title("Scan new document")
self.uploaddialog = self.builder.get_object("dlg_upload")
self.uploaddialog.set_title("Upload new document")
self.lst_documents = Gtk.ListStore(int, str, str, str, int)
sql = (
@@ -54,6 +56,7 @@ class DocumentsView(View):
self.entry['filename'].set_text('')
combobox.activate_row(self.combo['accesslevel'], 'captain')
self.text['remarks'].get_buffer().set_text('')
self.entry['title'].grab_focus()
def pdf_to_pixbuf(self, filename, max_width=400, max_height=400):
doc = fitz.open(filename)
@@ -122,6 +125,7 @@ class DocumentsView(View):
combobox.activate_row(self.combo['doctype'], self.doc.doctype)
self.entry['title'].set_text(self.doc.title or '')
self.entry['filename'].set_text(self.doc.filename or '')
self.entry['title'].grab_focus()
def save_record(self):
# fields must have been validated beforehand
@@ -223,8 +227,19 @@ class DocumentsView(View):
# sane.exit()
pass
def on_but_scan_close_clicked(self, widget):
self.scandialog.response(Gtk.ResponseType.CLOSE)
def on_but_upload_clicked(self, widget):
pass
response = self.uploaddialog.run()
self.uploaddialog.hide()
if response == Gtk.ResponseType.OK:
print("Upload OK")
else:
print("Upload Not OK")
def on_but_upload_close_clicked(self, widget):
self.uploaddialog.response(Gtk.ResponseType.CLOSE)
def on_but_save_clicked(self, widget):
print(self.doc)
+10 -2
View File
@@ -3,6 +3,7 @@
import os
from gi.repository import GLib, Gtk, Gdk
from dateutil.parser import parse
from gettext import pgettext
from .view import View
from yms import gtkutils, combobox, treeview
@@ -71,6 +72,7 @@ class EquipmentView(View):
combobox.activate_row(self.combo['category'], -1)
combobox.activate_row(self.combo['condition'], 'unknown')
self.text['remarks'].get_buffer().set_text('')
self.entry['name'].grab_focus()
def display_record(self):
print(self.equip)
@@ -94,6 +96,7 @@ class EquipmentView(View):
else:
self.label['category'].set_text('')
self.label['flags'].set_text(self.equip.flags or '')
self.label['condition'].set_text(pgettext("equipment.econd", self.equip.econd))
self.label['remarks'].set_text(self.equip.remarks or '')
def edit_record(self):
@@ -110,8 +113,7 @@ class EquipmentView(View):
combobox.activate_row(self.combo['category'], self.equip.ecat or -1)
combobox.activate_row(self.combo['condition'], self.equip.econd or 'unknown')
self.text['remarks'].get_buffer().set_text(self.equip.remarks or '')
print("Edit record")
print(self.equip)
self.entry['name'].grab_focus()
def save_record(self):
# fields must have been validated beforehand
@@ -125,12 +127,18 @@ class EquipmentView(View):
self.equip.serial = self.entry['serial'].get_text()
self.equip.weight = self.spin['weight'].get_value()
self.equip.price = self.spin['price'].get_value()
try:
# TODO respect configured date format
self.equip.purchdate = parse(self.entry['purchdate'].get_text(), dayfirst=True)
except ValueError:
self.equip.purchdate = None
self.equip.supplier = combobox.get_list_value(self.combo['supplier'])
if self.equip.supplier < 0:
self.equip.supplier = None
self.equip.ecat = combobox.get_list_value(self.combo['category'])
if self.equip.ecat < 0:
self.equip.ecat = None
self.equip.econd = combobox.get_list_value(self.combo['condition'])
self.equip.remarks = gtkutils.get_text_contents(self.text['remarks'])
print(self.equip)
+2
View File
@@ -59,6 +59,7 @@ class FusesView(View):
combobox.activate_row(self.combo['equipment'], -1)
self.entry['location'].set_text('')
self.text['remarks'].get_buffer().set_text('')
self.spin['fnumber'].grab_focus()
def display_record(self):
self.label['fnumber'].set_text(f"F{self.fuse.fnumber}")
@@ -79,6 +80,7 @@ class FusesView(View):
combobox.activate_row(self.combo['equipment'], self.fuse.eid)
self.entry['location'].set_text(self.fuse.location)
self.text['remarks'].get_buffer().set_text(self.prov.remarks or '')
self.spin['fnumber'].grab_focus()
def save_record(self):
# fields must have been validated beforehand
+25 -13
View File
@@ -1,10 +1,9 @@
# SPDX-License-Identifier: WTFPL
import os
from gi.repository import GLib, Gtk, Gdk
from dateutil.parser import parse
from gettext import pgettext
from .view import View
from yms import gtkutils, combobox, treeview
@@ -53,7 +52,7 @@ class InventoryView(View):
combobox.load_from_dict(self.combo['equipment'], {-1: _("─── none ───")} | self.dd_equipment)
# Condition
self.dd_condition = self.context.lookup.enum('inventory.invcond')
combobox.load_from_dict(self.combo['condition'], {"-1": _("─── none ───")} | self.dd_condition)
combobox.load_from_dict(self.combo['condition'], self.dd_condition)
def load_list(self):
self.lst_inventory.clear()
@@ -90,19 +89,22 @@ class InventoryView(View):
combobox.activate_row(self.combo['condition'], 'unknown')
combobox.activate_row(self.combo['category'], -1)
self.text['remarks'].get_buffer().set_text('')
self.entry['name'].grab_focus()
def display_record(self):
# TODO nice formatting
self.label['name'].set_text(self.inv.invname)
self.label['conttype'].set_text(self.inv.conttype)
self.label['storage'].set_text(str(self.inv.sid))
self.label['box'].set_text(str(self.inv.boxid))
container = pgettext("inventory.conttype", self.inv.conttype)
if self.inv.conttype == 'storage':
self.label['conttype'].set_text("{}: {}".format(container, self.dd_storage[self.inv.sid]))
else:
self.label['conttype'].set_text("{}: {}".format(container, self.dd_box[self.inv.boxid]))
self.label['equipment'].set_text(str(self.inv.eid))
self.label['number'].set_text(self.format_int(self.inv.number))
self.label['weight'].set_text(self.format_float(self.inv.weight, suffix='kg'))
self.label['price'].set_text(self.format_float(self.inv.price, suffix='€'))
self.label['purchdate'].set_text(self.format_date(self.inv.purchdate))
self.label['condition'].set_text(self.inv.invcond)
self.label['condition'].set_text(pgettext("inventory.invcond", self.inv.invcond))
if self.inv.icat is not None:
self.label['category'].set_text(self.dd_category[self.inv.icat])
else:
@@ -113,19 +115,20 @@ class InventoryView(View):
def edit_record(self):
self.entry['name'].set_text(self.inv.invname)
combobox.activate_row(self.combo['conttype'], self.inv.conttype)
combobox.activate_row(self.combo['storage'], self.inv.sid)
combobox.activate_row(self.combo['box'], self.inv.boxid)
combobox.activate_row(self.combo['equipment'], self.inv.eid)
combobox.activate_row(self.combo['storage'], self.inv.sid or -1)
combobox.activate_row(self.combo['box'], self.inv.boxid or -1)
combobox.activate_row(self.combo['equipment'], self.inv.eid or -1)
self.spin['number'].set_value(self.inv.number)
self.spin['weight'].set_value(self.inv.weight or 0)
self.spin['price'].set_value(self.inv.price or 0)
self.entry['purchdate'].set_text(self.inv.purchdate or '')
self.entry['purchdate'].set_text(self.format_date(self.inv.purchdate))
combobox.activate_row(self.combo['condition'], self.inv.invcond)
combobox.activate_row(self.combo['category'], self.inv.icat)
combobox.activate_row(self.combo['category'], self.inv.icat or -1)
flags = self.inv.flags.split(',')
for flag in self.context.lookup.enum('inventory.flags'):
self.check[flag].set_active(flag in flags)
self.text['remarks'].get_buffer().set_text(self.inv.remarks or '')
self.entry['name'].grab_focus()
def save_record(self):
# fields must have been validated beforehand
@@ -150,6 +153,8 @@ class InventoryView(View):
self.inv.purchdate = None
self.inv.invcond = combobox.get_list_value(self.combo['condition'])
self.inv.icat = combobox.get_list_value(self.combo['category'])
if self.inv.icat == -1:
self.inv.icat = None
# TODO this could be a generic function operating on a list
# of check controls
flags = []
@@ -251,7 +256,14 @@ class InventoryView(View):
self.save_record()
print(self.inv)
self.inv.save()
self.context.db.conn.commit()
if self.newrecord:
self.load_list()
self.newrecord = False
else:
pass
# TODO aktuelle Listenzeile aktualisieren!
self.display_record()
self.topwidget.set_visible_child(self.box['inv_detail'])
def on_but_cancel_clicked(self, widget):
if not self.newrecord:
+2
View File
@@ -43,6 +43,7 @@ class MaintenanceView(View):
self.entry['completion'].set_text('')
combobox.activate_row(self.combo['status'], 'new')
self.text['remarks'].get_buffer().set_text('')
self.entry['activities'].grab_focus()
def display_record(self):
self.label['activities'].set_text(self.maint.activities)
@@ -65,6 +66,7 @@ class MaintenanceView(View):
self.entry['completion'].set_text(self.maint.completion_date)
combobox.activate_row(self.combo['status'], self.maint.maintstate)
self.text['remarks'].get_buffer().set_text(self.maint.remarks or '')
self.entry['activities'].grab_focus()
def save_record(self):
# fields must have been validated beforehand
+7 -4
View File
@@ -26,7 +26,6 @@ class MeasurementView(View):
# measurement units
self.dd_unit = self.context.lookup.dropdown(Dropdown.UNIT)
print("Unit: {self.dd_unit}")
combobox.load_from_dict(self.combo['unit'], self.dd_unit, 1)
# equipment
@@ -86,6 +85,7 @@ class MeasurementView(View):
combobox.activate_row(self.combo['equipment'], -1)
combobox.activate_row(self.combo['category'], -1)
self.text['note'].get_buffer().set_text('')
self.entry['name'].grab_focus()
def display_record(self):
self.label['name'].set_text(self.measure.mname)
@@ -115,14 +115,15 @@ class MeasurementView(View):
combobox.activate_row(self.combo['equipment'], self.measure.eid)
combobox.activate_row(self.combo['category'], self.measure.mcat)
self.text['note'].get_buffer().set_text(self.task.note or '')
self.entry['name'].grab_focus()
def save_record(self):
# fields must have been validated beforehand
self.measure.mname = self.entry['name'].get_text()
self.measure.nval = combobox.get_list_value(self.combo['dimensions'])
self.measure.val1 = int(self.spin['val1'].get_value())
self.measure.val2 = int(self.spin['val2'].get_value())
self.measure.val3 = int(self.spin['val3'].get_value())
self.measure.val1 = self.spin['val1'].get_value_as_int()
self.measure.val2 = self.spin['val2'].get_value_as_int()
self.measure.val3 = self.spin['val3'].get_value_as_int()
self.measure.accuracy = combobox.get_list_value(self.combo['accurace'])
self.measure.mdate = self.entry['date'].get_text()
self.measure.eid = combobox.get_list_value(self.combo['equipment'])
@@ -185,6 +186,8 @@ class MeasurementView(View):
self.save_record()
print(self.measure)
self.measure.save()
self.display_record()
self.topwidget.set_visible_child(self.box['measure_detail'])
def on_but_cancel_clicked(self, widget):
self.topwidget.set_visible_child(self.box['measurement'])
+4 -1
View File
@@ -2,6 +2,7 @@
import os
from gi.repository import Gtk
from gettext import pgettext
from .view import View
from yms import gtkutils, combobox, treeview
@@ -60,6 +61,7 @@ class ProjectsView(View):
self.spin['costs_final'].set_value(0)
combobox.activate_row(self.combo['status'], 'new')
self.text['remarks'].get_buffer().set_text('')
self.entry['name'].grab_focus()
def display_record(self):
self.label['name'].set_text(self.project.projname)
@@ -68,7 +70,7 @@ class ProjectsView(View):
self.label['duration'].set_text(self.format_int(self.project.duration, suffix="Days"))
self.label['costs_plan'].set_text(self.format_float(self.project.costs_plan, 2, suffix="€"))
self.label['costs_final'].set_text(self.format_float(self.project.costs_final, 2, suffix="€"))
self.label['status'].set_text(self.project.projstate)
self.label['status'].set_text(pgettext("project.projstate", self.project.projstate))
self.label['remarks'].set_text(self.project.remarks or '')
def edit_record(self):
@@ -79,6 +81,7 @@ class ProjectsView(View):
self.spin['costs_final'].set_value(self.project.costs_final)
combobox.activate_row(self.combo['status'], self.project.projstate)
self.text['remarks'].get_buffer().set_text(self.project.remarks or '')
self.entry['name'].grab_focus()
def save_record(self):
# fields must have been validated beforehand
+116 -38
View File
@@ -8,6 +8,7 @@ from datetime import datetime
from .view import View, DatePicker
from yms import gtkutils, combobox, treeview
from yms.model import provision
from yms.lookup import Dropdown
class ProvisionsView(View):
@@ -18,25 +19,21 @@ class ProvisionsView(View):
self.prov = provision.Provision(context.db) # current record
self.newrecord = False
self.load_dropdown()
# Category
self.dd_category = self.context.lookup.dropdown(Dropdown.PROVISION_CATEGORY)
combobox.load_from_dict(self.combo['category'], {-1: _("─── none ───")} | self.dd_category, -1)
# Storage
self.dd_storage = self.context.lookup.storage(context.vessel.vid)
combobox.load_from_dict(self.combo['storage'], {-1: _("─── none ───")} | self.dd_storage)
# Box
self.dd_box = self.context.lookup.box(context.vessel.vid)
combobox.load_from_dict(self.combo['box'], {-1: _("─── none ───")} | self.dd_box)
# Provision unit
self.dd_unit = self.context.lookup.dropdown(Dropdown.PROVISION_UNIT)
combobox.load_from_dict(self.combo['unit'], {-1: _("─── none ───")} | self.dd_unit, -1)
self.lst_provisions = Gtk.ListStore(int, str, int, str, str, str)
sql = (
"SELECT p.provid, p.provname, p.number, p.unit, p.storedate, p.shelflife "
"FROM provisions AS p LEFT OUTER JOIN storage AS s USING (sid) "
"WHERE s.vid=%s OR vid IS NULL"
)
self.db.dcur.execute(sql, (context.vessel.vid,))
for row in self.db.dcur.fetchall():
data = (
row['provid'],
row['provname'],
row['number'],
self.prov_unit[row['unit']],
self.format_date(row['storedate']),
self.format_date(row['shelflife'])
)
self.lst_provisions.append(data)
self.load_list()
treeview.add_column(self.tree['provisions'], _('ID'), 0)
treeview.add_column(self.tree['provisions'], _('Description'), 1)
@@ -49,9 +46,49 @@ class ProvisionsView(View):
# TODO Date format
self.entry['storedate'].set_placeholder_text("TT.MM.JJJJ")
self.dt_storedate = DatePicker(self.entry['storedate'], self.button['storedate'], context.datefmt)
self.entry['shelflife'].set_placeholder_text("TT.MM.JJJJ")
self.dt_shelflife = DatePicker(self.entry['shelflife'], self.button['shelflife'], context.datefmt)
def load_list(self):
selected_id = treeview.get_value(self.tree['provisions'])
self.lst_provisions.clear()
sql = (
"SELECT p.provid, p.provname, p.number, p.unit, p.storedate, p.shelflife "
"FROM provisions AS p LEFT OUTER JOIN storage AS s USING (sid) "
"WHERE s.vid=%s OR vid IS NULL"
)
self.db.dcur.execute(sql, (self.context.vessel.vid,))
for row in self.db.dcur.fetchall():
data = (
row['provid'],
row['provname'],
row['number'],
self.dd_unit[row['unit']] if row['unit'] is not None else _("─── none ───"),
self.format_date(row['storedate']),
self.format_date(row['shelflife'])
)
treeiter = self.lst_provisions.append(data)
if row['provid'] == selected_id:
# restore previous selected row
selection.select_iter(treeiter)
def clear_record(self):
self.prov.clear()
self.entry['name'].set_text('')
combobox.activate_row(self.combo['category'], -1)
combobox.activate_row(self.combo['storage'], -1)
combobox.activate_row(self.combo['box'], -1)
self.spin['number'].set_value(1)
self.spin['target'].set_value(0)
combobox.activate_row(self.combo['unit'], -1)
self.spin['weight'].set_value(0)
self.spin['weight_net'].set_value(0)
self.spin['price'].set_value(0)
self.spin['calories'].set_value(0)
self.entry['storedate'].set_text('')
self.entry['shelflife'].set_text('')
self.text['remarks'].get_buffer().set_text( '')
self.entry['name'].grab_focus()
def display_record(self):
self.label['name'].set_text(self.prov.provname)
@@ -59,44 +96,67 @@ class ProvisionsView(View):
self.label['storage'].set_text(str(self.prov.sid))
self.label['box'].set_text(str(self.prov.boxid))
self.label['number'].set_text(str(self.prov.number))
self.label['unit'].set_text(str(self.prov.unit))
self.label['target'].set_text(str(self.prov.target))
self.label['unit'].set_text(str(self.prov.unit))
self.label['weight'].set_text(self.format_float(self.prov.weight, 2, suffix='kg'))
self.label['weight_net'].set_text(self.format_float(self.prov.weight_net, 2, suffix='kg'))
self.label['price'].set_text(self.format_float(self.prov.price, 2, suffix='€'))
self.label['calories'].set_text(str(self.prov.calories))
self.label['storedate'].set_text(self.prov.storedate or '')
self.label['shelflife'].set_text(self.prov.shelflife or '')
self.label['remarks'].set_text(self.prov.remarks or '')
def edit_record(self):
self.entry['name'].set_text(self.prov.provname)
combobox.activate_row(self.combo['category'], self.prov.provcat)
combobox.activate_row(self.combo['storage'], self.prov.sid)
combobox.activate_row(self.combo['box'], self.prov.boxid)
self.spin['number'].set_value(self.prov.number)
combobox.activate_row(self.combo['category'], self.prov.provcat or -1)
combobox.activate_row(self.combo['storage'], self.prov.sid or -1)
combobox.activate_row(self.combo['box'], self.prov.boxid or -1)
self.spin['number'].set_value(self.prov.number or 1)
self.spin['target'].set_value(self.prov.target or 0)
combobox.activate_row(self.combo['unit'], self.prov.unit or -1)
self.spin['weight'].set_value(self.prov.weight or 0)
self.spin['weight_net'].set_value(self.prov.weight_net or 0)
combobox.activate_row(self.combo['unit'], self.prov.unit)
self.spin['price'].set_value(self.prov.price or 0)
self.spin['calories'].set_value(self.prov.calories or 0)
self.entry['storedate'].set_text(self.prov.storedate or '')
self.entry['shelflife'].set_text(self.prov.shelflife or '')
# self.dt_storedate.set_date
# self.dt_shelflife.set_date
self.text['remarks'].get_buffer().set_text(self.prov.remarks or '')
self.entry['name'].grab_focus()
def save_record(self):
# fields must have been validated beforehand
self.prov.provname = self.entry['name'].get_text()
self.prov.provcat = combobox.get_list_value(self.combo['category'])
if self.prov.provcat == -1:
self.prov.provcat = None
self.prov.sid = combobox.get_list_value(self.combo['storage'])
if self.prov.sid == -1:
self.prov.sid = None
self.prov.boxid = combobox.get_list_value(self.combo['box'])
self.prov.number = int(self.spin['number'].get_value())
if self.prov.boxid == -1:
self.prov.boxid = None
self.prov.number = self.spin['number'].get_value_as_int()
self.prov.target = self.spin['target'].get_value_as_int()
self.prov.weight = self.spin['weight'].get_value()
self.prov.weight_net = self.spin['wehigt_net'].get_value()
self.prov.weight_net = self.spin['weight_net'].get_value()
self.prov.unit = combobox.get_list_value(self.combo['unit'])
self.prov.storedate = self.entry['storedate'].get_text()
self.prov.shelflife = self.entry['shelflife'].get_text()
if self.prov.unit == -1:
self.prov.unit = None
# TODO respect configured date format
# self.prov.storedate = self.dt_storedate.get_date()
# self.prov.shelflife = self.dt_shelflife.get_date()
try:
self.prov.storedate = parse(self.entry['storedate'].get_text(), dayfirst=True)
except ValueError:
self.prov.shelfstoredatelife = None
try:
self.prov.shelflife = parse(self.entry['shelflife'].get_text(), dayfirst=True)
except ValueError:
self.prov.shelflife = None
self.prov.remarks = gtkutils.get_text_contents(self.text['remarks'])
def load_dropdown(self):
self.db.cur.execute("SELECT ddval, ddtext FROM dropdown WHERE ddid=6 ORDER BY ddval")
self.prov_unit = dict(self.db.cur.fetchall())
# buttons on list page
def on_but_new_clicked(self, widget):
self.newrecord = True
@@ -144,21 +204,39 @@ class ProvisionsView(View):
# buttons on edit page
def on_but_storedate_clicked(self, widget):
try:
curdate = parse(self.entry['storedate'].get_text())
except:
curdate = datetime.date.today()
selected_date = self.calendar_dialog(None, self.entry['storedate'], curdate)
self.entry['storedate'].set_text(self.format_date(selected_date, curdate))
#try:
# curdate = parse(self.entry['storedate'].get_text())
#except:
# curdate = datetime.today()
#selected_date = self.calendar_dialog(None, self.entry['storedate'], curdate)
#self.entry['storedate'].set_text(self.format_date(selected_date, curdate))
pass
def on_but_shelflife_clicked(self, widget):
#try:
# curdate = parse(self.entry['shelflife'].get_text())
#except:
# curdate = datetime.today()
#selected_date = self.calendar_dialog(None, self.entry['shelflife'], curdate)
#self.entry['shelflife'].set_text(self.format_date(selected_date, curdate))
pass
def on_but_save_clicked(self, widget):
# check mandatory fields
if not self.entry['provname'].get_text().strip():
if not self.entry['name'].get_text().strip():
# TODO error marker
return
self.save_record()
print(self.prov)
self.prov.save()
if self.newrecord:
self.load_list()
else:
pass
# TODO aktuelle Listenzeile aktualisieren!
self.newrecord = False
self.display_record()
self.topwidget.set_visible_child(self.box['prov_detail'])
def on_but_cancel_clicked(self, widget):
self.topwidget.set_visible_child(self.box['provisions'])
+4 -2
View File
@@ -76,6 +76,7 @@ class StorageView(View):
combobox.activate_row(self.combo['type'], storage.GENERIC)
combobox.activate_row(self.combo['unit'], "-1")
self.text['remarks'].get_buffer().set_text('')
self.entry['sname'].grab_focus()
def display_record(self):
self.label['name'].set_text(self.storage.sname)
@@ -108,6 +109,7 @@ class StorageView(View):
rgba.parse('#' + (self.storage.color or '000000'))
self.button['color'].set_rgba(rgba)
self.text['remarks'].get_buffer().set_text(self.storage.remarks or '')
self.entry['sname'].grab_focus()
def save_record(self):
# fields must have been validated beforehand
@@ -187,10 +189,10 @@ class StorageView(View):
self.storage.save()
if self.newrecord:
self.load_list()
self.newrecord = False
else:
pass
# TODO aktuelle Listenzeile aktualisieren!
self.newrecord = False
self.display_record()
self.topwidget.set_visible_child(self.box['stor_detail'])
@@ -206,7 +208,7 @@ class StorageView(View):
self.set_color_from_entry(entry)
def on_ent_color_focus_out_event(self, entry, event):
self.set_color_from_entry(entry)
self.set_color_from_entry(entry, self.button['color'])
return False
def on_but_cancel_clicked(self, widget):
+43 -18
View File
@@ -17,23 +17,7 @@ class TasksView(View):
self.newrecord = False
self.lst_tasks = Gtk.ListStore(int, str, str, str, str)
sql = (
"SELECT t.taskid, t.taskname, t.priority, t.taskstate, "
"u.displayname AS responsible "
"FROM task AS t JOIN user AS u ON (t.responsible=u.userid)"
"WHERE t.vid=%s "
"ORDER BY t.taskid"
)
self.db.dcur.execute(sql, (context.vessel.vid,))
for row in self.db.dcur.fetchall():
data = (
row['taskid'],
row['taskname'],
row['priority'],
row['taskstate'],
row['responsible']
)
self.lst_tasks.append(data)
self.load_list()
treeview.add_column(self.tree['tasks'], _('ID'), 0)
treeview.add_column(self.tree['tasks'], _('Name'), 1)
@@ -58,6 +42,25 @@ class TasksView(View):
self.dd_user = context.lookup.user()
combobox.load_from_dict(self.combo['responsible'], self.dd_user)
def load_list(self):
sql = (
"SELECT t.taskid, t.taskname, t.priority, t.taskstate, "
"u.displayname AS responsible "
"FROM task AS t JOIN user AS u ON (t.responsible=u.userid)"
"WHERE t.vid=%s "
"ORDER BY t.taskid"
)
self.db.dcur.execute(sql, (self.context.vessel.vid,))
for row in self.db.dcur.fetchall():
data = (
row['taskid'],
row['taskname'],
row['priority'],
row['taskstate'],
row['responsible']
)
self.lst_tasks.append(data)
def clear_record(self):
self.task.clear()
self.entry['name'].set_text('')
@@ -70,6 +73,7 @@ class TasksView(View):
combobox.activate_row(self.combo['status'], 'new')
combobox.activate_row(self.combo['responsible'], 0)
self.text['remarks'].get_buffer().set_text('')
self.entry['name'].grab_focus()
def display_record(self):
self.label['name'].set_text(self.task.taskname)
@@ -88,6 +92,7 @@ class TasksView(View):
combobox.activate_row(self.combo['taskstate'], self.task.taskstate)
combobox.activate_row(self.combo['responsible'], self.task.responsible)
self.text['remarks'].get_buffer().set_text(self.task.remarks or '')
self.entry['name'].grab_focus()
def save_record(self):
# fields must have been validated beforehand
@@ -151,12 +156,32 @@ class TasksView(View):
# buttons on edit page
def on_but_save_clicked(self, widget):
# check mandatory fields
if not self.entry['taskname'].get_text().strip():
if not self.entry['name'].get_text().strip():
# TODO error marker
return
self.save_record()
print(self.task)
self.task.save()
if self.newrecord:
self.load_list()
self.newrecord = False
else:
pass
# TODO aktuelle Listenzeile aktualisieren!
self.display_record()
self.topwidget.set_visible_child(self.box['task_detail'])
def on_but_plandate_clicked(self, widget):
pass
def on_but_duedate_clicked(self, widget):
pass
def on_but_started_clicked(self, widget):
pass
def on_but_finished_clicked(self, widget):
pass
def on_but_cancel_clicked(self, widget):
self.topwidget.set_visible_child(self.box['tasks'])
+15 -19
View File
@@ -32,20 +32,6 @@ class View:
self.topwidget = self.builder.get_object("topobject")
gtkutils.init_named_controls(self, self.builder)
css = Gtk.CssProvider()
css.load_from_data(b"""
.invalid {
color: #cc0000;
background-color: #ffdddd;
}
""")
Gtk.StyleContext.add_provider_for_screen(
Gdk.Screen.get_default(),
css,
Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION
)
def format_int(self, ival, separator=True, suffix=None, default=''):
if ival is None:
return default
@@ -133,16 +119,26 @@ class View:
else:
context.add_class("invalid")
def set_color_from_entry(self, entry):
def set_color_from_entry(self, entry, colorbutton):
# TODO this was a fast hack!
text = entry.get_text().strip()
rgba = Gdk.RGBA()
if len(text) == 7 and rgba.parse(text):
self.last_valid_rgb = text.lstrip('#')
self.entry['color'].set_text(text)
self.button['color'].set_rgba(rgba)
self.set_entry_valid(self.entry['color'], True)
self.entry.set_text(text)
colorbutton.set_rgba(rgba)
self.set_entry_valid(entry, True)
else:
self.set_entry_valid(self.entry['color'], False)
self.set_entry_valid(entry, False)
def get_checks(self, checkboxlist):
# checkbox helper function
# self.check[] from ui file
checks = []
for c in checkboxlist:
if c in self.check and self.check[c].get_active():
checks.append(c)
return ','.join(checks)
class DatePicker:
def __init__(self, entry, button, datefmt='"%d.%m.%Y"'):
+17 -3
View File
@@ -15,6 +15,7 @@ Configuration file located at ~/.config/ymsgui.conf:
[Documents]
basepath = /var/local/lib/yms
scanner = off
[Data]
shapedir = /usr/local/share/yms/shapes
@@ -69,7 +70,8 @@ class AppContext:
'db': 'yms',
'user': 'yms',
'docpath': '/var/local/lib/yms',
'shapedir': '/usr/local/share/yms/shapes'
'shapedir': '/usr/local/share/yms/shapes',
'scanner': 'off'
}
# mapping between PHP and Python
@@ -115,7 +117,7 @@ class AppContext:
print(row[0])
except KeyError:
# almost impossible case where db value is not in mapping
print("internal error: date format mapping missing")
print("internal error: date format mapping missing ({})".format(row[0]))
else:
# perhaps create missing record here?
pass
@@ -135,6 +137,15 @@ class Frontend:
self.initializing = True
self.context = context
self.db = context.db
css = Gtk.CssProvider()
css.load_from_path("yms/style.css")
Gtk.StyleContext.add_provider_for_screen(
Gdk.Screen.get_default(),
css,
Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION
)
builder = Gtk.Builder()
builder.set_translation_domain(context.textdomain)
ui_path = os.path.join(context.ui_path)
@@ -228,7 +239,8 @@ def create_config(cfg, cfgfile):
fh.write('user = {}\n'.format(cfg['user']))
fh.write('pass = changeme!\n\n')
fh.write('[Documents]\n')
fh.write('basepath = {}\n\n'.format(cfg['docpath']))
fh.write('basepath = {}\n'.format(cfg['docpath']))
fh.write('scanner = {}\n\n'.format(cfg['scanner']))
fh.write('[Data]\n')
fh.write('shapedir = {}\n'.format(cfg['shapedir']))
# secure configuration
@@ -265,6 +277,8 @@ if __name__ == "__main__":
context.cfg['pass'] = config.get('DB', 'pass')
connected = db.connect(context.cfg['user'], context.cfg['pass'])
if connected:
# TODO check database schema version
schema_required = 1
context.load()
# check if shapedir exists
context.cfg['shapedir'] = config.get('Data', 'shapedir')