From c48a25f810436abf149225020279220dac3b78ec Mon Sep 17 00:00:00 2001 From: dam Date: Tue, 5 Apr 2022 06:18:39 +0000 Subject: Improved is_urgency button layout and visual. Changed font size. --- fonts/font_regular.tres | 2 +- main.tscn | 68 ++++++++++++++++++++++++------------------------- themes/dark.tres | 36 +++++++++++++------------- 3 files changed, 54 insertions(+), 52 deletions(-) diff --git a/fonts/font_regular.tres b/fonts/font_regular.tres index 718443e..1090222 100644 --- a/fonts/font_regular.tres +++ b/fonts/font_regular.tres @@ -3,6 +3,6 @@ [ext_resource path="res://fonts/B612-Regular.ttf" type="DynamicFontData" id=1] [resource] -size = 42 +size = 32 use_filter = true font_data = ExtResource( 1 ) diff --git a/main.tscn b/main.tscn index 157f171..bbb3a13 100644 --- a/main.tscn +++ b/main.tscn @@ -74,9 +74,9 @@ __meta__ = { } [node name="edit" type="Button" parent="database/actions"] -margin_top = 90.0 +margin_top = 96.0 margin_right = 73.0 -margin_bottom = 176.0 +margin_bottom = 182.0 focus_mode = 0 custom_fonts/font = ExtResource( 6 ) custom_styles/normal = SubResource( 1 ) @@ -88,9 +88,9 @@ __meta__ = { } [node name="add" type="Button" parent="database/actions"] -margin_top = 180.0 +margin_top = 192.0 margin_right = 73.0 -margin_bottom = 266.0 +margin_bottom = 278.0 focus_mode = 0 custom_fonts/font = ExtResource( 6 ) custom_styles/normal = SubResource( 1 ) @@ -111,18 +111,18 @@ margin_bottom = 52.0 align = 1 [node name="process_id" type="LineEdit" parent="stage/controls" index="1"] -margin_top = 56.0 +margin_top = 62.0 margin_right = 1080.0 -margin_bottom = 118.0 +margin_bottom = 124.0 max_length = 32 placeholder_text = "Process #" caret_blink = true caret_blink_speed = 0.5 [node name="surgery_id" type="LineEdit" parent="stage/controls" index="2"] -margin_top = 122.0 +margin_top = 134.0 margin_right = 1080.0 -margin_bottom = 184.0 +margin_bottom = 196.0 max_length = 32 placeholder_text = "Surgery #" caret_blink = true @@ -132,103 +132,103 @@ caret_blink_speed = 0.5 anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 340.0 -margin_top = 188.0 +margin_top = 206.0 margin_right = 740.0 -margin_bottom = 388.0 +margin_bottom = 406.0 rect_min_size = Vector2( 400, 200 ) size_flags_horizontal = 4 [node name="place" parent="stage/controls" index="4" instance=ExtResource( 7 )] anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 392.0 +margin_top = 416.0 margin_right = 1080.0 -margin_bottom = 454.0 +margin_bottom = 478.0 rect_min_size = Vector2( 0, 62 ) placeholder = "Place" [node name="anesthesia" parent="stage/controls" index="5" instance=ExtResource( 7 )] anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 458.0 +margin_top = 488.0 margin_right = 1080.0 -margin_bottom = 520.0 +margin_bottom = 550.0 rect_min_size = Vector2( 0, 62 ) placeholder = "Anesthesia" [node name="first_assistant" parent="stage/controls" index="6" instance=ExtResource( 7 )] anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 524.0 +margin_top = 560.0 margin_right = 1080.0 -margin_bottom = 586.0 +margin_bottom = 622.0 rect_min_size = Vector2( 0, 62 ) placeholder = "First assistant" [node name="type" parent="stage/controls" index="7" instance=ExtResource( 7 )] anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 590.0 +margin_top = 632.0 margin_right = 1080.0 -margin_bottom = 652.0 +margin_bottom = 694.0 rect_min_size = Vector2( 0, 62 ) placeholder = "Type" [node name="sub_type" parent="stage/controls" index="8" instance=ExtResource( 7 )] anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 656.0 +margin_top = 704.0 margin_right = 1080.0 -margin_bottom = 718.0 +margin_bottom = 766.0 rect_min_size = Vector2( 0, 62 ) placeholder = "Sub-type" [node name="sub_sub_type" parent="stage/controls" index="9" instance=ExtResource( 7 )] anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 722.0 +margin_top = 776.0 margin_right = 1080.0 -margin_bottom = 784.0 +margin_bottom = 838.0 rect_min_size = Vector2( 0, 62 ) placeholder = "Sub-sub-type" [node name="pathology" parent="stage/controls" index="10" instance=ExtResource( 7 )] anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 788.0 +margin_top = 848.0 margin_right = 1080.0 -margin_bottom = 850.0 +margin_bottom = 910.0 rect_min_size = Vector2( 0, 62 ) placeholder = "Pathology" [node name="intervention" parent="stage/controls" index="11" instance=ExtResource( 7 )] anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 854.0 +margin_top = 920.0 margin_right = 1080.0 -margin_bottom = 916.0 +margin_bottom = 982.0 rect_min_size = Vector2( 0, 62 ) placeholder = "Intervention" -[node name="is_urgency" type="CheckBox" parent="stage/controls" index="12"] -margin_top = 920.0 +[node name="is_urgency" type="CheckButton" parent="stage/controls" index="12"] +margin_top = 992.0 margin_right = 1080.0 -margin_bottom = 972.0 -text = "UrgĂȘncia" +margin_bottom = 1044.0 +text = "Is urgency" [node name="notes" type="LineEdit" parent="stage/controls" index="13"] -margin_top = 976.0 +margin_top = 1054.0 margin_right = 1080.0 -margin_bottom = 1038.0 +margin_bottom = 1116.0 max_length = 4096 placeholder_text = "Notes" caret_blink = true caret_blink_speed = 0.5 [node name="buttons" type="Control" parent="stage/controls" index="14"] -margin_top = 1042.0 +margin_top = 1126.0 margin_right = 1080.0 -margin_bottom = 1042.0 +margin_bottom = 1126.0 [node name="discard" type="Button" parent="stage/controls/buttons"] anchor_right = 0.5 diff --git a/themes/dark.tres b/themes/dark.tres index 717b9c2..b556b88 100644 --- a/themes/dark.tres +++ b/themes/dark.tres @@ -1,28 +1,33 @@ -[gd_resource type="Theme" load_steps=9 format=2] +[gd_resource type="Theme" load_steps=10 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 ) +[sub_resource type="StyleBoxEmpty" id=10] +content_margin_left = 10.0 +content_margin_right = 10.0 + +[sub_resource type="StyleBoxFlat" id=11] +content_margin_left = 10.0 +content_margin_right = 10.0 +bg_color = Color( 0.22, 0.35, 0.5, 0.5 ) 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 ) +[sub_resource type="StyleBoxFlat" id=2] +content_margin_left = 10.0 +content_margin_right = 10.0 +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=4] +content_margin_left = 10.0 +content_margin_right = 10.0 bg_color = Color( 0.223529, 0.352941, 0.501961, 1 ) corner_radius_top_left = 8 corner_radius_top_right = 8 @@ -34,8 +39,6 @@ corner_radius_bottom_left = 8 [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 @@ -44,8 +47,6 @@ 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 @@ -53,9 +54,9 @@ 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/disabled = SubResource( 10 ) +Button/styles/focus = SubResource( 10 ) +Button/styles/hover = SubResource( 11 ) Button/styles/normal = SubResource( 2 ) Button/styles/pressed = SubResource( 4 ) ItemList/fonts/font = ExtResource( 2 ) @@ -63,3 +64,4 @@ ItemList/styles/bg = SubResource( 5 ) LineEdit/styles/focus = SubResource( 9 ) LineEdit/styles/normal = SubResource( 7 ) LineEdit/styles/read_only = null +VBoxContainer/constants/separation = 10 -- cgit v1.2.3