aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordam <dam@gudinoff>2022-03-28 16:03:15 +0000
committerdam <dam@gudinoff>2022-03-28 16:03:15 +0000
commita34abdedf2feebcd17e402d9ed650a7cd17cbfe9 (patch)
treef272360a101e32623791a352d4bc4d789e2704f2
parent5b578acee611e8f5c2d64e88d1e7edbea6144c3f (diff)
downloadsurgery-log-a34abdedf2feebcd17e402d9ed650a7cd17cbfe9.tar.zst
surgery-log-a34abdedf2feebcd17e402d9ed650a7cd17cbfe9.zip
Changed from mono to regular font. Database screen kept the mono font. Updated to do list.
-rw-r--r--fonts/B612-Regular.ttfbin0 -> 153192 bytes
-rw-r--r--fonts/B612Mono-Bold.ttfbin135908 -> 0 bytes
-rw-r--r--fonts/B612Mono-BoldItalic.ttfbin121736 -> 0 bytes
-rw-r--r--fonts/B612Mono-Italic.ttfbin118892 -> 0 bytes
-rw-r--r--fonts/font_icons.tres2
-rw-r--r--fonts/font_mono_regular.tres8
-rw-r--r--fonts/font_regular.tres2
-rw-r--r--main.tscn24
-rw-r--r--readme.md10
9 files changed, 27 insertions, 19 deletions
diff --git a/fonts/B612-Regular.ttf b/fonts/B612-Regular.ttf
new file mode 100644
index 0000000..0574897
--- /dev/null
+++ b/fonts/B612-Regular.ttf
Binary files differ
diff --git a/fonts/B612Mono-Bold.ttf b/fonts/B612Mono-Bold.ttf
deleted file mode 100644
index 5e7df80..0000000
--- a/fonts/B612Mono-Bold.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/B612Mono-BoldItalic.ttf b/fonts/B612Mono-BoldItalic.ttf
deleted file mode 100644
index 8a6cd6c..0000000
--- a/fonts/B612Mono-BoldItalic.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/B612Mono-Italic.ttf b/fonts/B612Mono-Italic.ttf
deleted file mode 100644
index 84bbffc..0000000
--- a/fonts/B612Mono-Italic.ttf
+++ /dev/null
Binary files 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;