diff --git a/godot/NewEntry.tscn b/godot/NewEntry.tscn deleted file mode 100644 index fbc5fb8..0000000 --- a/godot/NewEntry.tscn +++ /dev/null @@ -1,56 +0,0 @@ -[gd_scene format=3 uid="uid://dutnsmmhm8px6"] - -[node name="PopupPanel" type="PopupPanel"] -size = Vector2i(100, 389) -visible = true - -[node name="GridContainer" type="GridContainer" parent="."] -offset_left = 4.0 -offset_top = 4.0 -offset_right = 96.0 -offset_bottom = 385.0 -columns = 3 - -[node name="0" type="Button" parent="GridContainer"] -layout_mode = 2 -text = "0" - -[node name="1" type="Button" parent="GridContainer"] -layout_mode = 2 -text = "1" - -[node name="2" type="Button" parent="GridContainer"] -layout_mode = 2 -text = "2" - -[node name="3" type="Button" parent="GridContainer"] -layout_mode = 2 -text = "3" - -[node name="4" type="Button" parent="GridContainer"] -layout_mode = 2 -text = "4" - -[node name="5" type="Button" parent="GridContainer"] -layout_mode = 2 -text = "5" - -[node name="6" type="Button" parent="GridContainer"] -layout_mode = 2 -text = "6" - -[node name="7" type="Button" parent="GridContainer"] -layout_mode = 2 -text = "7" - -[node name="8" type="Button" parent="GridContainer"] -layout_mode = 2 -text = "8" - -[node name="9" type="Button" parent="GridContainer"] -layout_mode = 2 -text = "9" - -[node name="dot" type="Button" parent="GridContainer"] -layout_mode = 2 -text = "." diff --git a/godot/global.gd b/godot/global.gd index ee74620..e9528ea 100644 --- a/godot/global.gd +++ b/godot/global.gd @@ -21,16 +21,7 @@ func _ready(): var err = config.load(config_path) if err == OK: var db_path = config.get_value("general", "db_path") - var db_success = load_db(db_path) - if not db_success: - # HACK: File picker on Android is broken - const possible_cfg_paths = ["/foo/bar/logue.cfg"] - for possible_path in possible_cfg_paths: - if FileAccess.file_exists(possible_path): - db_success = load_db(possible_path) - if db_success: - break - + load_db(db_path) func switch_state(new: State): var old = current_state diff --git a/godot/loaded.gd b/godot/loaded.gd deleted file mode 100644 index 48ab559..0000000 --- a/godot/loaded.gd +++ /dev/null @@ -1,9 +0,0 @@ -extends VBoxContainer - -func _on_button_2_pressed(): - var p = ResourceLoader.load("res://NewEntry.tscn") - var pop_up: PopupPanel = p.instantiate() - add_child(pop_up) - #pop_up.transient = true - #pop_up.exclusive = true - pop_up.show() diff --git a/godot/loaded.tscn b/godot/loaded.tscn index 3dc91fb..9c1ddbc 100644 --- a/godot/loaded.tscn +++ b/godot/loaded.tscn @@ -1,6 +1,4 @@ -[gd_scene load_steps=2 format=3 uid="uid://h1sdn3cjclqi"] - -[ext_resource type="Script" path="res://loaded.gd" id="1_ntmjw"] +[gd_scene format=3 uid="uid://h1sdn3cjclqi"] [node name="VBoxContainer" type="VBoxContainer"] anchors_preset = 15 @@ -8,7 +6,6 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -script = ExtResource("1_ntmjw") [node name="Label" type="Label" parent="."] layout_mode = 2 @@ -33,26 +30,3 @@ text = "another one" layout_mode = 2 size_flags_horizontal = 10 theme_override_font_sizes/font_size = 1 - -[node name="PanelContainer2" type="PanelContainer" parent="."] -layout_mode = 2 - -[node name="HBoxContainer" type="HBoxContainer" parent="PanelContainer2"] -layout_mode = 2 -alignment = 1 - -[node name="TextureButton" type="TextureButton" parent="PanelContainer2/HBoxContainer"] -custom_minimum_size = Vector2(32, 32) -layout_mode = 2 -size_flags_horizontal = 0 - -[node name="Label" type="Label" parent="PanelContainer2/HBoxContainer"] -layout_mode = 2 -text = "Foobar" - -[node name="Button2" type="Button" parent="PanelContainer2/HBoxContainer"] -layout_mode = 2 -size_flags_horizontal = 10 -text = "+ NEW" - -[connection signal="pressed" from="PanelContainer2/HBoxContainer/Button2" to="." method="_on_button_2_pressed"] diff --git a/godot/project.godot b/godot/project.godot index a747d48..d914bcb 100644 --- a/godot/project.godot +++ b/godot/project.godot @@ -23,7 +23,6 @@ Global="*res://global.gd" window/size/viewport_width=600 window/size/viewport_height=900 -window/stretch/mode="canvas_items" window/handheld/orientation=1 [editor_plugins]