WIP creating theme and improving UI/UX.

9 files changed, 147 insertions, 76 deletions

diff --git a/dialog/dialog.gd b/dialog/dialog.gd
index 1cf0e66..71981c7 100644
--- a/dialog/dialog.gd
+++ b/dialog/dialog.gd
@@ -22,6 +22,7 @@ func _init():
 	reject.anchor_top		= 1.0
 	reject.anchor_left		= 0.0
 	reject.anchor_right		= 0.5
+	reject.margin_right		= -5.0
 	reject.grow_vertical	= Control.GROW_DIRECTION_BEGIN
 	reject.name				= "reject"
 	reject.connect("pressed", self, "_signal_rejected")
@@ -31,6 +32,7 @@ func _init():
 	accept.anchor_top		= 1.0
 	accept.anchor_left		= 0.5
 	accept.anchor_right		= 1.0
+	accept.margin_left		= 5.0
 	accept.grow_vertical	= Control.GROW_DIRECTION_BEGIN
 	accept.name				= "accept"
 	accept.connect("pressed", self, "_signal_accepted")
diff --git a/fonts/entypo-fontello.ttf b/fonts/entypo-fontello.ttf
index 0e95ba4..345bd55 100644
--- a/fonts/entypo-fontello.ttf
+++ b/fonts/entypo-fontello.ttf
diff --git a/fonts/font_icons.tres b/fonts/font_icons.tres
index cc86d17..6bc9f3d 100644
--- a/fonts/font_icons.tres
+++ b/fonts/font_icons.tres
@@ -3,6 +3,6 @@
 [ext_resource path="res://fonts/entypo-fontello.ttf" type="DynamicFontData" id=1]
 
 [resource]
-size = 64
+size = 55
 use_filter = true
 font_data = ExtResource( 1 )
diff --git a/logic/database.gd b/logic/database.gd
index ea27ef2..262a18a 100644
--- a/logic/database.gd
+++ b/logic/database.gd
@@ -44,18 +44,18 @@ func get_entry_view(database_entry: Dictionary) -> String:
 
 func item_selected(index: int):
 	selected_idx = index
-	fade_action_buttons(1.0)
+	set_buttons_active(true)
 
 
 func clear_selection():
 	selected_idx = -1
 	unselect_all()
-	fade_action_buttons(0.25)
+	set_buttons_active(false)
 
 
-func fade_action_buttons(target_alpha: float):
-	get_node("actions/delete").modulate.a = target_alpha
-	get_node("actions/edit").modulate.a = target_alpha
+func set_buttons_active(active: bool):
+	(get_node("actions/delete") as Button).disabled = !active
+	(get_node("actions/edit") as Button).disabled = !active
 
 
 func delete_action():
@@ -83,14 +83,14 @@ func edit_action():
 	self.visible = false
 	stage.visible = true
 	var staged := (db[staged_idx] as Dictionary).duplicate(true)
-	stage.set_stage(staged)
+	stage.set_stage(staged, "Entry #%d" % (staged_idx+1))
 
 
 func add_action():
 	self.visible = false
 	stage.visible = true
 	var staged := DatabaseEntry.instance_entry()
-	stage.set_stage(staged)
+	stage.set_stage(staged, "New entry")
 
 
 func save_stage(entry: Dictionary):
diff --git a/logic/stage.gd b/logic/stage.gd
index 104e888..e2248fa 100644
--- a/logic/stage.gd
+++ b/logic/stage.gd
@@ -23,7 +23,7 @@ const OPTION_SETS_TREE_STRUCTURE := {
 var staged_entry_hash: int
 var option_sets: Dictionary
 
-
+onready var title			:= get_node("controls/title") as Label
 onready var process_id		:= get_node("controls/process_id") as LineEdit
 onready var surgery_id		:= get_node("controls/surgery_id") as LineEdit
 onready var date			:= get_node("controls/date_picker") as DatePicker
@@ -124,7 +124,8 @@ func discard_action_confirmed():
 	emit_signal("discard")
 
 
-func set_stage(entry: Dictionary):
+func set_stage(entry: Dictionary, title: String):
+	self.title.text			= title
 	staged_entry_hash 		= entry.hash()
 	process_id.text			= entry.process_id
 	surgery_id.text			= entry.surgery_id
diff --git a/main.tscn b/main.tscn
index 644d393..157f171 100644
--- a/main.tscn
+++ b/main.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=17 format=2]
+[gd_scene load_steps=16 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]
@@ -12,7 +12,6 @@
 [ext_resource path="res://logic/popup.gd" type="Script" id=10]
 [ext_resource path="res://touch_item_list/touch_item_list.tscn" type="PackedScene" id=11]
 [ext_resource path="res://touch_vertical_container/touch_vertical_container.tscn" type="PackedScene" id=12]
-[ext_resource path="res://fonts/font_mono_regular.tres" type="DynamicFont" id=13]
 [ext_resource path="res://dialog/dialog.gd" type="Script" id=14]
 [ext_resource path="res://file_picker.gd" type="Script" id=15]
 
@@ -37,7 +36,6 @@ theme = ExtResource( 3 )
 script = ExtResource( 1 )
 
 [node name="database" parent="." instance=ExtResource( 11 )]
-custom_fonts/font = ExtResource( 13 )
 script = ExtResource( 5 )
 
 [node name="menu" type="MenuButton" parent="database"]
@@ -63,11 +61,12 @@ grow_horizontal = 0
 grow_vertical = 0
 
 [node name="delete" type="Button" parent="database/actions"]
-margin_right = 80.0
-margin_bottom = 95.0
+margin_right = 73.0
+margin_bottom = 86.0
 focus_mode = 0
 custom_fonts/font = ExtResource( 6 )
 custom_styles/normal = SubResource( 1 )
+shortcut_in_tooltip = false
 enabled_focus_mode = 0
 text = ""
 __meta__ = {
@@ -75,12 +74,13 @@ __meta__ = {
 }
 
 [node name="edit" type="Button" parent="database/actions"]
-margin_top = 99.0
-margin_right = 80.0
-margin_bottom = 194.0
+margin_top = 90.0
+margin_right = 73.0
+margin_bottom = 176.0
 focus_mode = 0
 custom_fonts/font = ExtResource( 6 )
 custom_styles/normal = SubResource( 1 )
+shortcut_in_tooltip = false
 enabled_focus_mode = 0
 text = ""
 __meta__ = {
@@ -88,12 +88,13 @@ __meta__ = {
 }
 
 [node name="add" type="Button" parent="database/actions"]
-margin_top = 198.0
-margin_right = 80.0
-margin_bottom = 293.0
+margin_top = 180.0
+margin_right = 73.0
+margin_bottom = 266.0
 focus_mode = 0
 custom_fonts/font = ExtResource( 6 )
 custom_styles/normal = SubResource( 1 )
+shortcut_in_tooltip = false
 enabled_focus_mode = 0
 text = ""
 __meta__ = {
@@ -104,133 +105,140 @@ __meta__ = {
 visible = false
 script = ExtResource( 9 )
 
-[node name="process_id" type="LineEdit" parent="stage/controls" index="0"]
+[node name="title" type="Label" parent="stage/controls" index="0"]
 margin_right = 1080.0
-margin_bottom = 62.0
+margin_bottom = 52.0
+align = 1
+
+[node name="process_id" type="LineEdit" parent="stage/controls" index="1"]
+margin_top = 56.0
+margin_right = 1080.0
+margin_bottom = 118.0
 max_length = 32
-placeholder_text = "Nº Processo"
+placeholder_text = "Process #"
 caret_blink = true
 caret_blink_speed = 0.5
 
-[node name="surgery_id" type="LineEdit" parent="stage/controls" index="1"]
-margin_top = 66.0
+[node name="surgery_id" type="LineEdit" parent="stage/controls" index="2"]
+margin_top = 122.0
 margin_right = 1080.0
-margin_bottom = 128.0
+margin_bottom = 184.0
 max_length = 32
-placeholder_text = "Nº Cirurgia"
+placeholder_text = "Surgery #"
 caret_blink = true
 caret_blink_speed = 0.5
 
-[node name="date_picker" parent="stage/controls" index="2" instance=ExtResource( 2 )]
+[node name="date_picker" parent="stage/controls" index="3" instance=ExtResource( 2 )]
 anchor_right = 0.0
 anchor_bottom = 0.0
 margin_left = 340.0
-margin_top = 132.0
+margin_top = 188.0
 margin_right = 740.0
-margin_bottom = 332.0
+margin_bottom = 388.0
 rect_min_size = Vector2( 400, 200 )
 size_flags_horizontal = 4
 
-[node name="place" parent="stage/controls" index="3" instance=ExtResource( 7 )]
+[node name="place" parent="stage/controls" index="4" instance=ExtResource( 7 )]
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_top = 336.0
+margin_top = 392.0
 margin_right = 1080.0
-margin_bottom = 398.0
+margin_bottom = 454.0
 rect_min_size = Vector2( 0, 62 )
-placeholder = "Local"
+placeholder = "Place"
 
-[node name="anesthesia" parent="stage/controls" index="4" instance=ExtResource( 7 )]
+[node name="anesthesia" parent="stage/controls" index="5" instance=ExtResource( 7 )]
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_top = 402.0
+margin_top = 458.0
 margin_right = 1080.0
-margin_bottom = 464.0
+margin_bottom = 520.0
 rect_min_size = Vector2( 0, 62 )
-placeholder = "Anestesia"
+placeholder = "Anesthesia"
 
-[node name="first_assistant" parent="stage/controls" index="5" instance=ExtResource( 7 )]
+[node name="first_assistant" parent="stage/controls" index="6" instance=ExtResource( 7 )]
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_top = 468.0
+margin_top = 524.0
 margin_right = 1080.0
-margin_bottom = 530.0
+margin_bottom = 586.0
 rect_min_size = Vector2( 0, 62 )
-placeholder = "1º Ajudante"
+placeholder = "First assistant"
 
-[node name="type" parent="stage/controls" index="6" instance=ExtResource( 7 )]
+[node name="type" parent="stage/controls" index="7" instance=ExtResource( 7 )]
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_top = 534.0
+margin_top = 590.0
 margin_right = 1080.0
-margin_bottom = 596.0
+margin_bottom = 652.0
 rect_min_size = Vector2( 0, 62 )
-placeholder = "Tipo"
+placeholder = "Type"
 
-[node name="sub_type" parent="stage/controls" index="7" instance=ExtResource( 7 )]
+[node name="sub_type" parent="stage/controls" index="8" instance=ExtResource( 7 )]
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_top = 600.0
+margin_top = 656.0
 margin_right = 1080.0
-margin_bottom = 662.0
+margin_bottom = 718.0
 rect_min_size = Vector2( 0, 62 )
-placeholder = "Sub-tipo"
+placeholder = "Sub-type"
 
-[node name="sub_sub_type" parent="stage/controls" index="8" instance=ExtResource( 7 )]
+[node name="sub_sub_type" parent="stage/controls" index="9" instance=ExtResource( 7 )]
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_top = 666.0
+margin_top = 722.0
 margin_right = 1080.0
-margin_bottom = 728.0
+margin_bottom = 784.0
 rect_min_size = Vector2( 0, 62 )
-placeholder = "Sub-sub-tipo"
+placeholder = "Sub-sub-type"
 
-[node name="pathology" parent="stage/controls" index="9" instance=ExtResource( 7 )]
+[node name="pathology" parent="stage/controls" index="10" instance=ExtResource( 7 )]
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_top = 732.0
+margin_top = 788.0
 margin_right = 1080.0
-margin_bottom = 794.0
+margin_bottom = 850.0
 rect_min_size = Vector2( 0, 62 )
-placeholder = "Patologia"
+placeholder = "Pathology"
 
-[node name="intervention" parent="stage/controls" index="10" instance=ExtResource( 7 )]
+[node name="intervention" parent="stage/controls" index="11" instance=ExtResource( 7 )]
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_top = 798.0
+margin_top = 854.0
 margin_right = 1080.0
-margin_bottom = 860.0
+margin_bottom = 916.0
 rect_min_size = Vector2( 0, 62 )
-placeholder = "Intervenção"
+placeholder = "Intervention"
 
-[node name="is_urgency" type="CheckBox" parent="stage/controls" index="11"]
-margin_top = 864.0
+[node name="is_urgency" type="CheckBox" parent="stage/controls" index="12"]
+margin_top = 920.0
 margin_right = 1080.0
-margin_bottom = 924.0
+margin_bottom = 972.0
 text = "Urgência"
 
-[node name="notes" type="LineEdit" parent="stage/controls" index="12"]
-margin_top = 928.0
+[node name="notes" type="LineEdit" parent="stage/controls" index="13"]
+margin_top = 976.0
 margin_right = 1080.0
-margin_bottom = 990.0
+margin_bottom = 1038.0
 max_length = 4096
-placeholder_text = "Notas"
+placeholder_text = "Notes"
 caret_blink = true
 caret_blink_speed = 0.5
 
-[node name="buttons" type="Control" parent="stage/controls" index="13"]
-margin_top = 994.0
+[node name="buttons" type="Control" parent="stage/controls" index="14"]
+margin_top = 1042.0
 margin_right = 1080.0
-margin_bottom = 994.0
+margin_bottom = 1042.0
 
 [node name="discard" type="Button" parent="stage/controls/buttons"]
 anchor_right = 0.5
+margin_right = -5.0
 text = "Discard"
 
 [node name="save" type="Button" parent="stage/controls/buttons"]
 anchor_left = 0.5
 anchor_right = 1.0
-margin_bottom = 58.0
+margin_left = 5.0
 grow_horizontal = 0
 text = "Save"
 
diff --git a/option_set/option_set.tscn b/option_set/option_set.tscn
index 5499361..3d09674 100644
--- a/option_set/option_set.tscn
+++ b/option_set/option_set.tscn
@@ -28,7 +28,7 @@ anchor_bottom = 1.0
 margin_left = -100.0
 grow_horizontal = 0
 custom_fonts/font = ExtResource( 2 )
-text = ""
+text = ""
 __meta__ = {
 "_edit_use_anchors_": false
 }
diff --git a/project.godot b/project.godot
index 4a3e1ed..36429fc 100644
--- a/project.godot
+++ b/project.godot
@@ -115,4 +115,5 @@ common/enable_pause_aware_picking=true
 [rendering]
 
 vram_compression/import_etc=true
+environment/default_clear_color=Color( 0, 0, 0, 1 )
 environment/default_environment="res://default_env.tres"
diff --git a/themes/dark.tres b/themes/dark.tres
index 832b226..717b9c2 100644
--- a/themes/dark.tres
+++ b/themes/dark.tres
@@ -1,6 +1,65 @@
-[gd_resource type="Theme" load_steps=2 format=2]
+[gd_resource type="Theme" load_steps=9 format=2]
 
 [ext_resource path="res://fonts/font_regular.tres" type="DynamicFont" id=1]
+[ext_resource path="res://fonts/font_mono_regular.tres" type="DynamicFont" id=2]
+
+[sub_resource type="StyleBoxFlat" id=2]
+bg_color = Color( 0.11, 0.11, 0.11, 1 )
+corner_radius_top_left = 8
+corner_radius_top_right = 8
+corner_radius_bottom_right = 8
+corner_radius_bottom_left = 8
+
+[sub_resource type="StyleBoxFlat" id=8]
+bg_color = Color( 0.109804, 0.109804, 0.109804, 1 )
+border_width_left = 3
+border_width_top = 3
+border_width_right = 3
+border_width_bottom = 3
+border_color = Color( 0.223529, 0.352941, 0.501961, 1 )
+corner_radius_top_left = 8
+corner_radius_top_right = 8
+corner_radius_bottom_right = 8
+corner_radius_bottom_left = 8
+
+[sub_resource type="StyleBoxFlat" id=4]
+bg_color = Color( 0.223529, 0.352941, 0.501961, 1 )
+corner_radius_top_left = 8
+corner_radius_top_right = 8
+corner_radius_bottom_right = 8
+corner_radius_bottom_left = 8
+
+[sub_resource type="StyleBoxEmpty" id=5]
+
+[sub_resource type="StyleBoxFlat" id=9]
+content_margin_left = 10.0
+content_margin_right = 10.0
+content_margin_top = 5.0
+content_margin_bottom = 5.0
+bg_color = Color( 0, 0, 0, 0 )
+draw_center = false
+border_width_bottom = 3
+border_color = Color( 0.223529, 0.352941, 0.501961, 1 )
+
+[sub_resource type="StyleBoxFlat" id=7]
+content_margin_left = 10.0
+content_margin_right = 10.0
+content_margin_top = 5.0
+content_margin_bottom = 5.0
+bg_color = Color( 0, 0, 0, 0 )
+draw_center = false
+border_width_bottom = 3
+border_color = Color( 0.33, 0.33, 0.33, 1 )
 
 [resource]
 default_font = ExtResource( 1 )
+Button/styles/disabled = null
+Button/styles/focus = SubResource( 2 )
+Button/styles/hover = SubResource( 8 )
+Button/styles/normal = SubResource( 2 )
+Button/styles/pressed = SubResource( 4 )
+ItemList/fonts/font = ExtResource( 2 )
+ItemList/styles/bg = SubResource( 5 )
+LineEdit/styles/focus = SubResource( 9 )
+LineEdit/styles/normal = SubResource( 7 )
+LineEdit/styles/read_only = null