From 00825f2a5664000fa98d36922c0c329b052a724f Mon Sep 17 00:00:00 2001 From: dam Date: Wed, 16 Feb 2022 00:25:26 +0000 Subject: Experimenting different UI. --- fonts/font_icons.tres | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 fonts/font_icons.tres (limited to 'fonts/font_icons.tres') 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 ) -- cgit v1.2.3 From a34abdedf2feebcd17e402d9ed650a7cd17cbfe9 Mon Sep 17 00:00:00 2001 From: dam Date: Mon, 28 Mar 2022 16:03:15 +0000 Subject: Changed from mono to regular font. Database screen kept the mono font. Updated to do list. --- fonts/B612-Regular.ttf | Bin 0 -> 153192 bytes fonts/B612Mono-Bold.ttf | Bin 135908 -> 0 bytes fonts/B612Mono-BoldItalic.ttf | Bin 121736 -> 0 bytes fonts/B612Mono-Italic.ttf | Bin 118892 -> 0 bytes fonts/font_icons.tres | 2 +- fonts/font_mono_regular.tres | 8 ++++++++ fonts/font_regular.tres | 2 +- main.tscn | 24 ++++++++---------------- readme.md | 10 +++++++++- 9 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 fonts/B612-Regular.ttf delete mode 100644 fonts/B612Mono-Bold.ttf delete mode 100644 fonts/B612Mono-BoldItalic.ttf delete mode 100644 fonts/B612Mono-Italic.ttf create mode 100644 fonts/font_mono_regular.tres (limited to 'fonts/font_icons.tres') diff --git a/fonts/B612-Regular.ttf b/fonts/B612-Regular.ttf new file mode 100644 index 0000000..0574897 Binary files /dev/null and b/fonts/B612-Regular.ttf differ diff --git a/fonts/B612Mono-Bold.ttf b/fonts/B612Mono-Bold.ttf deleted file mode 100644 index 5e7df80..0000000 Binary files a/fonts/B612Mono-Bold.ttf and /dev/null differ diff --git a/fonts/B612Mono-BoldItalic.ttf b/fonts/B612Mono-BoldItalic.ttf deleted file mode 100644 index 8a6cd6c..0000000 Binary files a/fonts/B612Mono-BoldItalic.ttf and /dev/null differ diff --git a/fonts/B612Mono-Italic.ttf b/fonts/B612Mono-Italic.ttf deleted file mode 100644 index 84bbffc..0000000 Binary files a/fonts/B612Mono-Italic.ttf and /dev/null differ diff --git a/fonts/font_icons.tres b/fonts/font_icons.tres index 77ff369..90f92cf 100644 --- a/fonts/font_icons.tres +++ b/fonts/font_icons.tres @@ -1,6 +1,6 @@ [gd_resource type="DynamicFont" load_steps=2 format=2] -[ext_resource path="res://fonts/B612Mono-Regular.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://fonts/B612-Regular.ttf" type="DynamicFontData" id=1] [resource] size = 128 diff --git a/fonts/font_mono_regular.tres b/fonts/font_mono_regular.tres new file mode 100644 index 0000000..d42e75b --- /dev/null +++ b/fonts/font_mono_regular.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 = 42 +use_filter = true +font_data = ExtResource( 1 ) diff --git a/fonts/font_regular.tres b/fonts/font_regular.tres index d42e75b..718443e 100644 --- a/fonts/font_regular.tres +++ b/fonts/font_regular.tres @@ -1,6 +1,6 @@ [gd_resource type="DynamicFont" load_steps=2 format=2] -[ext_resource path="res://fonts/B612Mono-Regular.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://fonts/B612-Regular.ttf" type="DynamicFontData" id=1] [resource] size = 42 diff --git a/main.tscn b/main.tscn index 8e750d4..0b3d4a0 100644 --- a/main.tscn +++ b/main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=13 format=2] +[gd_scene load_steps=14 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,6 +12,7 @@ [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] [node name="main" type="Control"] anchor_right = 1.0 @@ -20,6 +21,7 @@ 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"] @@ -48,7 +50,7 @@ __meta__ = { } [node name="delete" type="Button" parent="database/actions"] -margin_right = 95.0 +margin_right = 102.0 margin_bottom = 162.0 focus_mode = 0 custom_fonts/font = ExtResource( 6 ) @@ -61,7 +63,7 @@ __meta__ = { [node name="edit" type="Button" parent="database/actions"] margin_top = 166.0 -margin_right = 95.0 +margin_right = 102.0 margin_bottom = 328.0 focus_mode = 0 custom_fonts/font = ExtResource( 6 ) @@ -74,7 +76,7 @@ __meta__ = { [node name="add" type="Button" parent="database/actions"] margin_top = 332.0 -margin_right = 95.0 +margin_right = 102.0 margin_bottom = 494.0 focus_mode = 0 custom_fonts/font = ExtResource( 6 ) @@ -224,7 +226,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 size_flags_horizontal = 3 size_flags_vertical = 3 -window_title = "PICK FILE" +window_title = "" mode_overrides_title = false access = 2 filters = PoolStringArray( "*.*" ) @@ -240,7 +242,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 size_flags_horizontal = 3 size_flags_vertical = 3 -window_title = "CONFIRM ACTION" +window_title = "" dialog_text = "Do you confirm this action?" dialog_autowrap = true @@ -262,14 +264,4 @@ visible = false rect_clip_content = true script = ExtResource( 8 ) -[node name="debug" type="Label" parent="."] -visible = false -anchor_right = 1.0 -anchor_bottom = 1.0 -margin_top = 60.0 -valign = 2 -__meta__ = { -"_edit_use_anchors_": false -} - [editable path="stage"] diff --git a/readme.md b/readme.md index 4db4993..942dbde 100644 --- a/readme.md +++ b/readme.md @@ -48,7 +48,15 @@ Surgery Log - [x] Tweak 'POINTER_VELOCITY_DECAYING_FACTOR' and 'POINTER_VELOCITY_BOOST_FACTOR' on database and stage screens; - [x] Allow to parse option sets from database file; - [x] 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 option sets GUI element to provide word-wrap, otherwise long texts will be hidden; +- [x] Maybe replace fonts with non-mono version; +- [x] Fix option sets GUI element to provide word-wrap, otherwise long texts will be hidden; +- [ ] Maybe include different font with better icons; +- [ ] After save and load, entries opened on stage always detect changes (even when no change occurs); +- [ ] Check google icons as alternatives; +- [ ] Make all buttons with same style; +- [ ] Option set list should show title; +- [ ] Option set list should have close button: maybe use the "hide" signal to better control when the "option_set_list" and "popup" close; This way, the popup may have it's own button to close it? And maybe even a title? +- [ ] Make confirm dialog look better; - [ ] Fix back button: - on stage screen should show pop-up asking it changes are to be discarded; - on file-pickers screen should close them; -- cgit v1.2.3 From f40df1987a35adbc234a1b04b018d92d420b1e92 Mon Sep 17 00:00:00 2001 From: dam Date: Mon, 4 Apr 2022 10:02:13 +0000 Subject: Replaced icons and simplified dialog button labels. --- dialog/dialog.gd | 2 -- fonts/entypo-fontello.ttf | Bin 0 -> 6832 bytes fonts/font_icons.tres | 4 +-- logic/database.gd | 2 +- logic/stage.gd | 2 +- main.tscn | 66 ++++++++++++++++++++++++++++----------------- menu/menu.gd | 4 +-- option_set/option_set.tscn | 6 +++-- theme_dark.tres | 6 ----- themes/dark.tres | 6 +++++ 10 files changed, 58 insertions(+), 40 deletions(-) create mode 100644 fonts/entypo-fontello.ttf delete mode 100644 theme_dark.tres create mode 100644 themes/dark.tres (limited to 'fonts/font_icons.tres') diff --git a/dialog/dialog.gd b/dialog/dialog.gd index bfdbab5..1cf0e66 100644 --- a/dialog/dialog.gd +++ b/dialog/dialog.gd @@ -19,7 +19,6 @@ func _init(): self.connect("hide", self, "_clear_signals") reject = Button.new() - reject.text = "reject" reject.anchor_top = 1.0 reject.anchor_left = 0.0 reject.anchor_right = 0.5 @@ -29,7 +28,6 @@ func _init(): add_child(reject) accept = Button.new() - accept.text = "accept" accept.anchor_top = 1.0 accept.anchor_left = 0.5 accept.anchor_right = 1.0 diff --git a/fonts/entypo-fontello.ttf b/fonts/entypo-fontello.ttf new file mode 100644 index 0000000..0e95ba4 Binary files /dev/null and b/fonts/entypo-fontello.ttf differ diff --git a/fonts/font_icons.tres b/fonts/font_icons.tres index 90f92cf..cc86d17 100644 --- a/fonts/font_icons.tres +++ b/fonts/font_icons.tres @@ -1,8 +1,8 @@ [gd_resource type="DynamicFont" load_steps=2 format=2] -[ext_resource path="res://fonts/B612-Regular.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://fonts/entypo-fontello.ttf" type="DynamicFontData" id=1] [resource] -size = 128 +size = 64 use_filter = true font_data = ExtResource( 1 ) diff --git a/logic/database.gd b/logic/database.gd index f3a5928..ed39d43 100644 --- a/logic/database.gd +++ b/logic/database.gd @@ -75,7 +75,7 @@ func delete_action(): if selected_idx < 0: return - dialog.setup("The entry with process ID '%s' will be deleted from the database." % db[selected_idx].process_id, "Yes, delete", "No") + dialog.setup("The entry with process ID '%s' will be deleted from the database." % db[selected_idx].process_id, "Delete", "No") dialog.connect("accepted", self, "delete_action_confirmed") popup.open_popup("Delete entry?", dialog) diff --git a/logic/stage.gd b/logic/stage.gd index 2101ad9..104e888 100644 --- a/logic/stage.gd +++ b/logic/stage.gd @@ -112,7 +112,7 @@ func save_action(): func discard_action(): if get_stage().hash() != staged_entry_hash: - dialog.setup("Changes made to this entry will be discarded.", "Yes, discard", "No") + dialog.setup("Changes made to this entry will be discarded.", "Discard", "No") dialog.connect("accepted", self, "discard_action_confirmed") popup.open_popup("Discard changes?", dialog) else: diff --git a/main.tscn b/main.tscn index 7ee0c04..644d393 100644 --- a/main.tscn +++ b/main.tscn @@ -1,8 +1,8 @@ -[gd_scene load_steps=16 format=2] +[gd_scene load_steps=17 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_dark.tres" type="Theme" id=3] +[ext_resource path="res://themes/dark.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://fonts/font_icons.tres" type="DynamicFont" id=6] @@ -16,6 +16,20 @@ [ext_resource path="res://dialog/dialog.gd" type="Script" id=14] [ext_resource path="res://file_picker.gd" type="Script" id=15] +[sub_resource type="StyleBoxFlat" id=1] +content_margin_left = 15.0 +content_margin_right = 15.0 +content_margin_top = 15.0 +content_margin_bottom = 15.0 +bg_color = Color( 0, 0, 0, 0.75 ) +border_color = Color( 1, 1, 1, 1 ) +corner_radius_top_left = 50 +corner_radius_top_right = 50 +corner_radius_bottom_right = 50 +corner_radius_bottom_left = 50 +expand_margin_left = 7.0 +expand_margin_right = 7.0 + [node name="main" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 @@ -29,10 +43,13 @@ script = ExtResource( 5 ) [node name="menu" type="MenuButton" parent="database"] anchor_left = 1.0 anchor_right = 1.0 +margin_top = 32.0 margin_right = -32.0 grow_horizontal = 0 custom_fonts/font = ExtResource( 6 ) -text = "≡" +custom_styles/normal = SubResource( 1 ) +text = "" +flat = false script = ExtResource( 4 ) [node name="actions" type="VBoxContainer" parent="database"] @@ -46,39 +63,39 @@ grow_horizontal = 0 grow_vertical = 0 [node name="delete" type="Button" parent="database/actions"] -margin_right = 102.0 -margin_bottom = 162.0 +margin_right = 80.0 +margin_bottom = 95.0 focus_mode = 0 custom_fonts/font = ExtResource( 6 ) +custom_styles/normal = SubResource( 1 ) enabled_focus_mode = 0 -text = "" -flat = true +text = "" __meta__ = { "_edit_use_anchors_": false } [node name="edit" type="Button" parent="database/actions"] -margin_top = 166.0 -margin_right = 102.0 -margin_bottom = 328.0 +margin_top = 99.0 +margin_right = 80.0 +margin_bottom = 194.0 focus_mode = 0 custom_fonts/font = ExtResource( 6 ) +custom_styles/normal = SubResource( 1 ) enabled_focus_mode = 0 -text = "" -flat = true +text = "" __meta__ = { "_edit_use_anchors_": false } [node name="add" type="Button" parent="database/actions"] -margin_top = 332.0 -margin_right = 102.0 -margin_bottom = 494.0 +margin_top = 198.0 +margin_right = 80.0 +margin_bottom = 293.0 focus_mode = 0 custom_fonts/font = ExtResource( 6 ) +custom_styles/normal = SubResource( 1 ) enabled_focus_mode = 0 -text = "" -flat = true +text = "" __meta__ = { "_edit_use_anchors_": false } @@ -208,14 +225,14 @@ margin_bottom = 994.0 [node name="discard" type="Button" parent="stage/controls/buttons"] anchor_right = 0.5 -text = "discard" +text = "Discard" [node name="save" type="Button" parent="stage/controls/buttons"] anchor_left = 0.5 anchor_right = 1.0 margin_bottom = 58.0 grow_horizontal = 0 -text = "save" +text = "Save" [node name="file_picker" type="FileDialog" parent="."] anchor_right = 1.0 @@ -248,11 +265,11 @@ anchor_right = 0.95 anchor_bottom = 0.975 [node name="title" type="Label" parent="popup"] -anchor_left = 0.05 +anchor_left = 0.124 anchor_top = 0.025 anchor_right = 0.95 anchor_bottom = 0.1 -margin_left = 80.0 +margin_left = 0.0799866 margin_right = -80.0 margin_bottom = -20.0 align = 1 @@ -262,11 +279,12 @@ autowrap = true [node name="dismiss" type="Button" parent="popup"] anchor_left = 0.05 anchor_top = 0.025 -anchor_right = 0.95 +anchor_right = 0.124 anchor_bottom = 0.1 -margin_right = -892.0 +margin_right = 0.0799866 margin_bottom = -20.0 -text = "<" +custom_fonts/font = ExtResource( 6 ) +text = "" flat = true [node name="option_set_list" type="Control" parent="."] diff --git a/menu/menu.gd b/menu/menu.gd index 6bb5de0..5f13949 100644 --- a/menu/menu.gd +++ b/menu/menu.gd @@ -69,7 +69,7 @@ func export_option_sets_action(): func clear_option_sets_action(): - dialog.setup("All option sets from the dropdown menus will be deleted.", "Yes, delete.", "No") + dialog.setup("All option sets from the dropdown menus will be deleted.", "Delete all", "No") dialog.connect("accepted", stage, "clear_option_sets") popup.open_popup("Clear option sets?", dialog) @@ -85,7 +85,7 @@ func export_data_action(): func clear_data_action(): - dialog.setup("All entries from the database will be deleted.", "Yes, delete.", "No") + dialog.setup("All entries from the database will be deleted.", "Delete all", "No") dialog.connect("accepted", database, "clear_database") popup.open_popup("Clear database?", dialog) diff --git a/option_set/option_set.tscn b/option_set/option_set.tscn index 2b0bc76..5499361 100644 --- a/option_set/option_set.tscn +++ b/option_set/option_set.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=2 format=2] +[gd_scene load_steps=3 format=2] [ext_resource path="res://option_set/option_set.gd" type="Script" id=1] +[ext_resource path="res://fonts/font_icons.tres" type="DynamicFont" id=2] [node name="option_set" type="Control"] anchor_right = 1.0 @@ -26,7 +27,8 @@ anchor_right = 1.0 anchor_bottom = 1.0 margin_left = -100.0 grow_horizontal = 0 -text = "▽" +custom_fonts/font = ExtResource( 2 ) +text = "" __meta__ = { "_edit_use_anchors_": false } diff --git a/theme_dark.tres b/theme_dark.tres deleted file mode 100644 index 832b226..0000000 --- a/theme_dark.tres +++ /dev/null @@ -1,6 +0,0 @@ -[gd_resource type="Theme" load_steps=2 format=2] - -[ext_resource path="res://fonts/font_regular.tres" type="DynamicFont" id=1] - -[resource] -default_font = ExtResource( 1 ) diff --git a/themes/dark.tres b/themes/dark.tres new file mode 100644 index 0000000..832b226 --- /dev/null +++ b/themes/dark.tres @@ -0,0 +1,6 @@ +[gd_resource type="Theme" load_steps=2 format=2] + +[ext_resource path="res://fonts/font_regular.tres" type="DynamicFont" id=1] + +[resource] +default_font = ExtResource( 1 ) -- cgit v1.2.3 From 2e70e18f24a14f74c00850bfc88071d23ec66da9 Mon Sep 17 00:00:00 2001 From: dam Date: Tue, 5 Apr 2022 05:33:23 +0000 Subject: WIP creating theme and improving UI/UX. --- dialog/dialog.gd | 2 + fonts/entypo-fontello.ttf | Bin 6832 -> 6560 bytes fonts/font_icons.tres | 2 +- logic/database.gd | 14 ++--- logic/stage.gd | 5 +- main.tscn | 136 ++++++++++++++++++++++++--------------------- option_set/option_set.tscn | 2 +- project.godot | 1 + themes/dark.tres | 61 +++++++++++++++++++- 9 files changed, 147 insertions(+), 76 deletions(-) (limited to 'fonts/font_icons.tres') 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 Binary files a/fonts/entypo-fontello.ttf and b/fonts/entypo-fontello.ttf differ 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 -- cgit v1.2.3