Experimenting different UI.

3 files changed, 89 insertions, 77 deletions

diff --git a/fonts/font_icons.tres b/fonts/font_icons.tres
new file mode 100644
index 0000000..77ff369
--- /dev/null
+++ b/fonts/font_icons.tres
@@ -0,0 +1,8 @@
+[gd_resource type="DynamicFont" load_steps=2 format=2]
+
+[ext_resource path="res://fonts/B612Mono-Regular.ttf" type="DynamicFontData" id=1]
+
+[resource]
+size = 128
+use_filter = true
+font_data = ExtResource( 1 )
diff --git a/main.tscn b/main.tscn
index f0194b1..6f38c89 100644
--- a/main.tscn
+++ b/main.tscn
@@ -1,13 +1,11 @@
-[gd_scene load_steps=13 format=2]
+[gd_scene load_steps=11 format=2]
 
 [ext_resource path="res://main.gd" type="Script" id=1]
 [ext_resource path="res://date_picker/date_picker.tscn" type="PackedScene" id=2]
 [ext_resource path="res://theme_white.tres" type="Theme" id=3]
 [ext_resource path="res://menu/menu.gd" type="Script" id=4]
 [ext_resource path="res://logic/database.gd" type="Script" id=5]
-[ext_resource path="res://icons/edit.png" type="Texture" id=6]
-[ext_resource path="res://icons/add.png" type="Texture" id=7]
-[ext_resource path="res://icons/delete.png" type="Texture" id=8]
+[ext_resource path="res://fonts/font_icons.tres" type="DynamicFont" id=6]
 [ext_resource path="res://logic/stage.gd" type="Script" id=9]
 [ext_resource path="res://logic/popup_list.gd" type="Script" id=10]
 [ext_resource path="res://touch_item_list/touch_item_list.tscn" type="PackedScene" id=11]
@@ -16,6 +14,8 @@
 [node name="main" type="Control"]
 anchor_right = 1.0
 anchor_bottom = 1.0
+margin_left = -4.0
+margin_right = -4.0
 theme = ExtResource( 3 )
 script = ExtResource( 1 )
 __meta__ = {
@@ -23,49 +23,63 @@ __meta__ = {
 }
 
 [node name="database" parent="." instance=ExtResource( 11 )]
+margin_top = 0.0
 script = ExtResource( 5 )
 
+[node name="menu" type="MenuButton" parent="database"]
+anchor_left = 1.0
+anchor_right = 1.0
+margin_right = -32.0
+grow_horizontal = 0
+custom_fonts/font = ExtResource( 6 )
+text = "≡"
+script = ExtResource( 4 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
 [node name="actions" type="VBoxContainer" parent="database"]
 anchor_left = 1.0
 anchor_top = 1.0
 anchor_right = 1.0
 anchor_bottom = 1.0
-margin_left = -160.0
-margin_top = -430.0
+margin_right = -32.0
+margin_bottom = -32.0
+grow_horizontal = 0
+grow_vertical = 0
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="delete" type="Button" parent="database/actions"]
-margin_right = 160.0
-margin_bottom = 134.0
 focus_mode = 0
+custom_fonts/font = ExtResource( 6 )
 enabled_focus_mode = 0
-icon = ExtResource( 8 )
+text = ""
 flat = true
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="edit" type="Button" parent="database/actions"]
-margin_top = 138.0
-margin_right = 160.0
-margin_bottom = 272.0
+anchor_top = 0.333
+anchor_bottom = 0.333
 focus_mode = 0
+custom_fonts/font = ExtResource( 6 )
 enabled_focus_mode = 0
-icon = ExtResource( 6 )
+text = ""
 flat = true
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="add" type="Button" parent="database/actions"]
-margin_top = 276.0
-margin_right = 160.0
-margin_bottom = 410.0
+anchor_top = 0.667
+anchor_bottom = 0.667
 focus_mode = 0
+custom_fonts/font = ExtResource( 6 )
 enabled_focus_mode = 0
-icon = ExtResource( 7 )
+text = ""
 flat = true
 __meta__ = {
 "_edit_use_anchors_": false
@@ -73,23 +87,19 @@ __meta__ = {
 
 [node name="stage" parent="." instance=ExtResource( 12 )]
 visible = false
-margin_top = 60.0
 script = ExtResource( 9 )
 
-[node name="controls" parent="stage" index="0"]
-margin_bottom = 1860.0
-
 [node name="process_id" type="LineEdit" parent="stage/controls" index="0"]
 margin_right = 1080.0
-margin_bottom = 49.0
+margin_bottom = 62.0
 placeholder_text = "Nº Processo"
 caret_blink = true
 caret_blink_speed = 0.5
 
 [node name="surgery_id" type="LineEdit" parent="stage/controls" index="1"]
-margin_top = 53.0
+margin_top = 66.0
 margin_right = 1080.0
-margin_bottom = 102.0
+margin_bottom = 128.0
 placeholder_text = "Nº Cirurgia"
 caret_blink = true
 caret_blink_speed = 0.5
@@ -97,166 +107,167 @@ caret_blink_speed = 0.5
 [node name="date_picker" parent="stage/controls" index="2" instance=ExtResource( 2 )]
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_top = 106.0
-margin_right = 1080.0
-margin_bottom = 306.0
+margin_left = 340.0
+margin_top = 132.0
+margin_right = 740.0
+margin_bottom = 332.0
 rect_min_size = Vector2( 400, 200 )
 size_flags_horizontal = 4
 
 [node name="place" type="LineEdit" parent="stage/controls" index="3"]
-margin_top = 310.0
+margin_top = 336.0
 margin_right = 1080.0
-margin_bottom = 359.0
+margin_bottom = 398.0
 placeholder_text = "Local"
 caret_blink = true
 caret_blink_speed = 0.5
 
 [node name="option_set" type="Button" parent="stage/controls/place"]
-anchor_left = 0.85
+anchor_left = 0.88
 anchor_right = 1.0
 anchor_bottom = 1.0
-text = "X"
+text = "▽"
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="anesthesia" type="LineEdit" parent="stage/controls" index="4"]
-margin_top = 363.0
+margin_top = 402.0
 margin_right = 1080.0
-margin_bottom = 412.0
+margin_bottom = 464.0
 placeholder_text = "Anestesia"
 caret_blink = true
 caret_blink_speed = 0.5
 
 [node name="option_set" type="Button" parent="stage/controls/anesthesia"]
-anchor_left = 0.85
+anchor_left = 0.88
 anchor_right = 1.0
 anchor_bottom = 1.0
-text = "X"
+text = "▽"
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="first_assistant" type="LineEdit" parent="stage/controls" index="5"]
-margin_top = 416.0
+margin_top = 468.0
 margin_right = 1080.0
-margin_bottom = 465.0
+margin_bottom = 530.0
 placeholder_text = "1º Ajudante"
 caret_blink = true
 caret_blink_speed = 0.5
 
 [node name="option_set" type="Button" parent="stage/controls/first_assistant"]
-anchor_left = 0.85
+anchor_left = 0.88
 anchor_right = 1.0
 anchor_bottom = 1.0
-text = "X"
+text = "▽"
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="type" type="LineEdit" parent="stage/controls" index="6"]
-margin_top = 469.0
+margin_top = 534.0
 margin_right = 1080.0
-margin_bottom = 518.0
+margin_bottom = 596.0
 placeholder_text = "Tipo"
 caret_blink = true
 caret_blink_speed = 0.5
 
 [node name="option_set" type="Button" parent="stage/controls/type"]
-anchor_left = 0.85
+anchor_left = 0.88
 anchor_right = 1.0
 anchor_bottom = 1.0
-text = "X"
+text = "▽"
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="sub_type" type="LineEdit" parent="stage/controls" index="7"]
-margin_top = 522.0
+margin_top = 600.0
 margin_right = 1080.0
-margin_bottom = 571.0
+margin_bottom = 662.0
 placeholder_text = "Subtipo"
 caret_blink = true
 caret_blink_speed = 0.5
 
 [node name="option_set" type="Button" parent="stage/controls/sub_type"]
-anchor_left = 0.85
+anchor_left = 0.88
 anchor_right = 1.0
 anchor_bottom = 1.0
-text = "X"
+text = "▽"
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="sub_sub_type" type="LineEdit" parent="stage/controls" index="8"]
-margin_top = 575.0
+margin_top = 666.0
 margin_right = 1080.0
-margin_bottom = 624.0
+margin_bottom = 728.0
 placeholder_text = "Sub-Subtipo"
 caret_blink = true
 caret_blink_speed = 0.5
 
 [node name="option_set" type="Button" parent="stage/controls/sub_sub_type"]
-anchor_left = 0.85
+anchor_left = 0.88
 anchor_right = 1.0
 anchor_bottom = 1.0
-text = "X"
+text = "▽"
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="pathology" type="LineEdit" parent="stage/controls" index="9"]
-margin_top = 628.0
+margin_top = 732.0
 margin_right = 1080.0
-margin_bottom = 677.0
+margin_bottom = 794.0
 placeholder_text = "Patologia"
 caret_blink = true
 caret_blink_speed = 0.5
 
 [node name="option_set" type="Button" parent="stage/controls/pathology"]
-anchor_left = 0.85
+anchor_left = 0.88
 anchor_right = 1.0
 anchor_bottom = 1.0
-text = "X"
+text = "▽"
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="intervention" type="LineEdit" parent="stage/controls" index="10"]
-margin_top = 681.0
+margin_top = 798.0
 margin_right = 1080.0
-margin_bottom = 730.0
+margin_bottom = 860.0
 placeholder_text = "Intervenção"
 caret_blink = true
 caret_blink_speed = 0.5
 
 [node name="option_set" type="Button" parent="stage/controls/intervention"]
-anchor_left = 0.85
+anchor_left = 0.88
 anchor_right = 1.0
 anchor_bottom = 1.0
-text = "X"
+text = "▽"
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="is_urgency" type="CheckBox" parent="stage/controls" index="11"]
-margin_top = 734.0
+margin_top = 864.0
 margin_right = 1080.0
-margin_bottom = 781.0
+margin_bottom = 924.0
 text = "Urgência"
 
 [node name="notes" type="LineEdit" parent="stage/controls" index="12"]
-margin_top = 785.0
+margin_top = 928.0
 margin_right = 1080.0
-margin_bottom = 834.0
+margin_bottom = 990.0
 placeholder_text = "Notas"
 caret_blink = true
 caret_blink_speed = 0.5
 
 [node name="discard" type="Button" parent="stage/controls" index="13"]
-margin_top = 838.0
+margin_top = 994.0
 margin_right = 1080.0
-margin_bottom = 888.0
+margin_bottom = 1052.0
 grow_horizontal = 2
 grow_vertical = 2
 rect_min_size = Vector2( 0, 50 )
@@ -266,9 +277,9 @@ __meta__ = {
 }
 
 [node name="save" type="Button" parent="stage/controls" index="14"]
-margin_top = 892.0
+margin_top = 1056.0
 margin_right = 1080.0
-margin_bottom = 942.0
+margin_bottom = 1114.0
 grow_horizontal = 2
 grow_vertical = 2
 rect_min_size = Vector2( 0, 50 )
@@ -277,16 +288,6 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="menu" type="MenuButton" parent="."]
-anchor_right = 1.0
-margin_bottom = 60.0
-text = "≡"
-align = 2
-script = ExtResource( 4 )
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
 [node name="file_picker" type="FileDialog" parent="."]
 anchor_right = 1.0
 anchor_bottom = 1.0
diff --git a/readme.md b/readme.md
index 46a143b..795d37c 100644
--- a/readme.md
+++ b/readme.md
@@ -42,6 +42,9 @@ Surgery Log
 			else:
 				has_permissions = true
     ```
+- [ ] Fix the show option sets buttons; they are drawn over the input fields and hide inserted text;
+- [ ] Database menu and action buttons are not nice; Improve appearance;
+- [ ] Show title of database (Log/Historico) and stage (New entry/Novo registo);
 - [ ] check if import_option_sets, store_option_sets, store_database require the parameter save_changes; this requires changes on databse, stage and menu scripts;
 - [ ] fix back button:
     - on stage screen should show pop-up asking it changes are to be discarded;