Skip to content

Commit

Permalink
new settings icon and small change to FW script - still not functional
Browse files Browse the repository at this point in the history
  • Loading branch information
Marc Platt authored and Marc Platt committed Jul 30, 2024
1 parent de7a325 commit 17fb67e
Show file tree
Hide file tree
Showing 11 changed files with 93 additions and 15 deletions.
Binary file modified .DS_Store
Binary file not shown.
1 change: 1 addition & 0 deletions assets/images/icons8-settings.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 37 additions & 0 deletions assets/images/icons8-settings.svg.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://drrrqh5w6tl8t"
path="res://.godot/imported/icons8-settings.svg-3abab0a1cc1e22f71f96e60e0862595e.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/images/icons8-settings.svg"
dest_files=["res://.godot/imported/icons8-settings.svg-3abab0a1cc1e22f71f96e60e0862595e.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
svg/scale=1.0
editor/scale_with_editor_scale=false
editor/convert_colors_with_editor_theme=false
5 changes: 5 additions & 0 deletions assets/images/settings-svgrepo-com.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 37 additions & 0 deletions assets/images/settings-svgrepo-com.svg.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://clgheu7bkd1bg"
path="res://.godot/imported/settings-svgrepo-com.svg-83e6bf16288c1cb3e1817702b2284b13.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/images/settings-svgrepo-com.svg"
dest_files=["res://.godot/imported/settings-svgrepo-com.svg-83e6bf16288c1cb3e1817702b2284b13.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
svg/scale=1.0
editor/scale_with_editor_scale=false
editor/convert_colors_with_editor_theme=false
3 changes: 2 additions & 1 deletion source/application/application.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,12 @@ script = ExtResource("2_6g70o")

[node name="Wallet" type="TabContainer" parent="MarginContainer/VBoxContainer/TabContainer"]
layout_mode = 2
current_tab = 1
tabs_visible = false
script = ExtResource("3_rk7qs")

[node name="MarginContainer" type="MarginContainer" parent="MarginContainer/VBoxContainer/TabContainer/Wallet"]
visible = false
layout_mode = 2

[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/VBoxContainer/TabContainer/Wallet/MarginContainer"]
Expand Down Expand Up @@ -133,7 +135,6 @@ layout_mode = 2
text = "CREATE NEW WALLET"

[node name="MarginContainer2" type="MarginContainer" parent="MarginContainer/VBoxContainer/TabContainer/Wallet"]
visible = false
layout_mode = 2

[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/VBoxContainer/TabContainer/Wallet/MarginContainer2"]
Expand Down
17 changes: 6 additions & 11 deletions source/application/wallet_creator.gd
Original file line number Diff line number Diff line change
Expand Up @@ -117,33 +117,30 @@ func _create_wallet(input: String):
update_bip39_panel(output)
update_launch_panel(output)
_toggle_output_visibility(true) # Ensure output is visible
hide_button.button_pressed = false # Reset hide button state
hide_button.button_pressed = false
else:
clear_all_output()

func clear_all_output():
# Clear grid, but not headers

entropy_in.text = ""
for i in range(1, mnemonic_out.get_child_count()):
if i != 13 and i != 26: # Skip BIN and INDEX headers
if i != 13 and i != 26:
var label = mnemonic_out.get_child(i).get_child(0) as Label
if label:
label.text = ""

# Clear BIP39 info
var bip39_info_label = bip39_panel.get_node("BIP39Info")
if bip39_info_label:
bip39_info_label.text = ""

# Clear Launch panel info
var launch_info_label = launch_panel.get_node("VBoxContainer/LaunchInfo")
if launch_info_label:
launch_info_label.text = ""

setup_bip39_headers()
setup_launch_panel_headers()

# Reset hide button state
hide_button.button_pressed = false
_toggle_output_visibility(true)

Expand Down Expand Up @@ -419,9 +416,9 @@ func _toggle_output_visibility(is_visible: bool):
var headers_text = """[table=2]
[cell][color=white][b][u]BIP39 Hex:[/u][/b][/color][/cell] [cell][/cell]
[cell][color=white][b][u]BIP39 Bin:
[/u][/b][/color][/cell] [cell][/cell]
[cell][color=white][b][u]BIP39 Checksum:[/u][/b][/color][/cell] [cell][/cell]
[cell][color=white][b][u]BIP39 Checksum Hex:[/u][/b][/color][/cell] [cell][/cell]
Expand All @@ -431,10 +428,8 @@ func _toggle_output_visibility(is_visible: bool):
var launch_info_label = launch_panel.get_node("VBoxContainer/LaunchInfo")
if launch_info_label:
if is_visible:
# Restore the full content
update_launch_panel(current_wallet_data)
else:
# Keep only headers visible
var headers_text = """[table=2]
[cell][color=white][b][u]HD Key Data:
Expand Down
5 changes: 3 additions & 2 deletions source/nodes/node_panel/node_panel.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[ext_resource type="Script" path="res://source/nodes/node_panel/node_panel.gd" id="1_ijj0w"]
[ext_resource type="Texture2D" uid="uid://2xouba13q8q7" path="res://assets/images/pattern_33.png" id="2_lb2fn"]
[ext_resource type="PackedScene" uid="uid://cjfcxi77d8pjt" path="res://source/nodes/node_panel/download.tscn" id="2_ubul7"]
[ext_resource type="Texture2D" uid="uid://btvncw88xfvn" path="res://assets/images/info-settings.svg" id="7_2nmum"]
[ext_resource type="Texture2D" uid="uid://drrrqh5w6tl8t" path="res://assets/images/icons8-settings.svg" id="4_8w22k"]
[ext_resource type="Texture2D" uid="uid://jpde6uqywmlg" path="res://assets/images/trash-svgrepo-com(1).svg" id="8_8l4af"]

[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_dqqs8"]
Expand Down Expand Up @@ -90,7 +90,7 @@ custom_minimum_size = Vector2(0, 32)
layout_mode = 2
size_flags_vertical = 4
focus_mode = 0
icon = ExtResource("7_2nmum")
icon = ExtResource("4_8w22k")

[node name="Delete" type="Button" parent="MarginContainer/Container/Header"]
custom_minimum_size = Vector2(0, 32)
Expand All @@ -107,6 +107,7 @@ text = "Description"
text_overrun_behavior = 3

[node name="Overlay" type="ColorRect" parent="."]
visible = false
modulate = Color(0, 0, 0, 0.541176)
material = SubResource("CanvasItemMaterial_cnrh3")
layout_mode = 1
Expand Down
Binary file added starters/.DS_Store
Binary file not shown.
1 change: 1 addition & 0 deletions starters/STARTERS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Folder that contains starter files based on master seed
2 changes: 1 addition & 1 deletion ui/components/fast_withdraw/fast_withdraw.gd
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func _on_button_copy_address_pressed() -> void:

func _on_button_invoice_paid_pressed() -> void:
# Tell the server we paid
var txid : String = $LineEditTXID.text
var txid : String = $HBoxContainer4/LineEditTXID.text
$"/root/Net".invoice_paid.rpc_id(1, txid, $SpinBoxAmount.value, $LineEditMainchainAddress.text)


Expand Down

0 comments on commit 17fb67e

Please sign in to comment.