From cbb14bf919094ac1ebbaed2dc554e4add6f0ba82 Mon Sep 17 00:00:00 2001 From: Marc Platt Date: Tue, 6 Aug 2024 17:28:20 -0400 Subject: [PATCH 1/4] new wallet location and mainchain file. needs updated godot engine --- source/application/wallet_creator.gd | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/source/application/wallet_creator.gd b/source/application/wallet_creator.gd index 760c5a1..eb74a81 100644 --- a/source/application/wallet_creator.gd +++ b/source/application/wallet_creator.gd @@ -420,7 +420,7 @@ func save_wallet_data(): return var user_data_dir = OS.get_user_data_dir() - var file = FileAccess.open(user_data_dir.path_join("starters/wallet_master_seed.txt"), FileAccess.WRITE) + var file = FileAccess.open(user_data_dir.path_join("wallet_starters/wallet_master_seed.txt"), FileAccess.WRITE) var json_string = JSON.stringify(seed_data) file.store_string(json_string) file.close() @@ -482,7 +482,7 @@ func _on_load_button_pressed(): "seed_hex": result["seed"] } var user_data_dir = OS.get_user_data_dir() - var file = FileAccess.open(user_data_dir.path_join("starters/wallet_master_seed.txt"), FileAccess.WRITE) + var file = FileAccess.open(user_data_dir.path_join("wallet_starters/wallet_master_seed.txt"), FileAccess.WRITE) var json_string = JSON.stringify(seed_data) file.store_string(json_string) file.close() @@ -522,13 +522,23 @@ func save_sidechain_info(sidechain_data): if key.begins_with("sidechain_"): var slot = key.split("_")[1] var user_data_dir = OS.get_user_data_dir() - var filename = user_data_dir.path_join("starters/sidechain_%s_starter.txt" % slot) + var filename = user_data_dir.path_join("wallet_starters/sidechain_%s_starter.txt" % slot) var file = FileAccess.open(filename, FileAccess.WRITE) if file: file.store_string(JSON.stringify(sidechain_data[key])) file.close() else: print("Failed to save sidechain starter information for slot ", slot) + elif key.begins_with("mainchain"): + var user_data_dir = OS.get_user_data_dir() + var filename = user_data_dir.path_join("wallet_starters/mainchain_starter.txt") + var file = FileAccess.open(filename, FileAccess.WRITE) + if file: + file.store_string(JSON.stringify(sidechain_data[key])) + file.close() + else: + print("Failed to save sidechain starter information for mainchain") + func reset_wallet_tab(): @@ -545,7 +555,7 @@ func _on_tab_changed(tab): func ensure_starters_directory(): var user_data_dir = OS.get_user_data_dir() - var starters_dir = user_data_dir.path_join("starters") + var starters_dir = user_data_dir.path_join("wallet_starters") var dir = DirAccess.open(user_data_dir) - if not dir.dir_exists("starters"): - dir.make_dir("starters") + if not dir.dir_exists("wallet_starters"): + dir.make_dir("wallet_starters") From 8e46a8720df141e8a3f2e95a829c2684378e82a0 Mon Sep 17 00:00:00 2001 From: Marc Platt Date: Tue, 6 Aug 2024 17:51:57 -0400 Subject: [PATCH 2/4] delete old starter folder --- starters/.DS_Store | Bin 6148 -> 0 bytes starters/STARTERS.md | 1 - 2 files changed, 1 deletion(-) delete mode 100644 starters/.DS_Store delete mode 100644 starters/STARTERS.md diff --git a/starters/.DS_Store b/starters/.DS_Store deleted file mode 100644 index 5f69335b554a4efc18b61db4755fd59123bb9c7e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKF-`+P474Fdq%MR_QEhWUZ;=jsxl6Q;~qO(*~YeZYfq!LiG2IffxCe>@i@T4Q(s;(CfiAgt)lX0Iq*=s`a zI34*G<>oz6Q3^ Date: Wed, 7 Aug 2024 12:32:18 -0400 Subject: [PATCH 3/4] disabled node panel formatting fixed --- resource/theme/black.theme | Bin 1818 -> 1775 bytes source/nodes/node_panel/node_panel.gd | 8 ++++++++ 2 files changed, 8 insertions(+) diff --git a/resource/theme/black.theme b/resource/theme/black.theme index 67bb235c8b501a7fcc29d26b383df02fbd3b06e4..76c4a22a41039511856cc2df4c7b9c2c6c1b79e5 100644 GIT binary patch literal 1775 zcmVt)PY2oWwpHpV7eUM7u~D|2n%cG)}m+8NU` z%G=QyRMy+g|IqC<>AjuJ{|A$vT5@JzTgKj%9iJL*m$?U-%KsPxof1EIX}JV34va-^n+ZZEN|uJXmzBWY8Y*d%ntDHk1g)Nl*k=Iv>rhRZ~Kz=}S?J)PsE0< z-DUMoir&DS-ie}Ry~`5kClP@ssKGHZBSRxeN|Fo*p#+3DP)T__5oxB~$4OG+wSmA2B96YfPhc{3_uM4 z3;^(6a1@&7e@;5J@q*S?JTd4riQ*WXlqcoM1gbtMPY$w-Dcc8r|AJ2s&(43KlM{lU zhjU|7V}p{EI+~e3K<2k%V7M2T&0a0DBvVt1tr*M7rScP`pq!YLkc^0gfPDOw$9LGv zv7zxhWMEv_Yf&NbQ%wBVqL2s_VyV;#_yr=eAEM#6?0w7$b^Z^(!q4zmKf)h?gs8z~!Bji@9FPJM6S8d*AQdzzhgd5Z ziIYHKK|xt{stpQcBTF|KNuo)|1!Q2DO!M1-aFot=+>H!{`3ND|#{xW~b~>ZdeZOLx z>s+xL2p{MOy9~O?gv3BTRsLNrA*cnc55+e6gM06l{)wEN)1;8oPliS+>P-)0&)*nm zFatbTcz^!bJC&`~#6CdDZcPxW)A3 zyRLH0WsFFHOfQt(#^0bM8;&+0KCaXso#2z{Z_V6S>Avpe+YIU*T8oLnxGnY{DyoQC R2eEfNqtBNfXw*_uLqjfwOxpke literal 1818 zcmV+#2j%!uQ$s@n000005C8ze7XSbj1pol(0RR9fwJ-f(01ss-0A@0$M&MRSI$(GV z;T(0(_!{B~QZh7(MySEMfpRzp(Z)#jn~}ZS+TVl_xe4i!=yhtrVNHo2RU0%dmh;zf zsK3s|`#y9_POub&0E+;Y0FiG)l?E~}wu_MKt3B(>;cR&&7`3cy7e=C28&=A4qDI-; zcQ*EjxWfMkUa6$m)2{ypez{mN`xL#GUJQOWEmoIv^tSwFE#Hh<<2mk|q`%&A%iC=wP5l#~Yp*T_IMB@~byEoStXxr$yn z@70Ffn`Il)X{qS-JX}S2fc_g0!9vK75<)3Dp52>MS$0~hz#wH;zLR?_+t#vWb*S)` z(dSO;^AE5whiz?FPHtM-@hCC@=& zEHCTQc(uN|n#M}f)kVwf(vs+ak*WqwNrC1tVC)=RIt<<-KzKwMD*fgq^iwHcA2kt79$!f=rU zggDMgh&>Vja&Z>rAmx~V7^KXQh>VC7#+o(g00fy_9D%(y=m80J7V=hge-baciT`>= znvV}1F8%vKL$lzC%>-`?r@9(AVEx+Tvs5kBqZOAkbK>gRj)i+DAIj&%)w3N7E4#1{ zG;p}8l`?zN7^T5Pd=!Q7y5c{FPHT?7i>Y|^=?X7lInj5>H?XW}gHTxL+;AeK5h6SIOt@sj z<8k0;!aL?|sl&vUOuz&n3$Nq2n7J1;mcdz7d~`sJk1PgJ;}$OUcSP}?xt2hVIKGTT zih_(EeNTFhaKjCBV#W=ifm(?O9LD?z*!m*wYhWb0a9-A~0%M>FeqvCf_vT5Fv#I z`L)I^9^F05aiK5e2gyte)+K^k%ME{YYlEQxs5klov`KlHz;oKWj!N2IhCsUY2y3ZElK67He4rVJs^u zDJUl|lM<2NF2ps`S(v_zTtr;b=!W*@#2Zi9f;*@C!6BEc^uj_q+CWnkzApq*q2vzr&xf z`b_Sp?9u|4cLLFp)|f7>r1W-655?C zx2|I=@arDG!NI;!vf9qdZBpx589;?970{nm$p}XxCprz_IL2n1Cpsf8V&|rH)lbp( zXHXJE)96lz5r$IXGY@oc3+KLSJUG2|ZUCG*fc_UwPnlMhkJUgR(hDTBZwKs+Xo(cz z+a~--2oEs4O1`&(=(@jOHDI7`ibic{#}~k${njmh%P?dIX80-W3`6goL@@#Ur}_eN I6;e|}L(QpC3IG5A diff --git a/source/nodes/node_panel/node_panel.gd b/source/nodes/node_panel/node_panel.gd index dc7f471..4138df5 100644 --- a/source/nodes/node_panel/node_panel.gd +++ b/source/nodes/node_panel/node_panel.gd @@ -101,8 +101,12 @@ func update_sidechain_view(): download_button.disabled = not drivechain_running if not drivechain_running: download_button.modulate = Color(0.5, 0.5, 0.5) # Grey out the button + heading_label.modulate = Color(0.5, 0.5, 0.5) # Grey out the heading text + description_label.modulate = Color(0.5, 0.5, 0.5) # Grey out the description text else: download_button.modulate = Color(1, 1, 1) # Normal color + heading_label.modulate = Color(1, 1, 1) # Normal color for heading text + description_label.modulate = Color(1, 1, 1) # Normal color for description text update_button_state() func update_overlay(): @@ -115,9 +119,13 @@ func update_overlay(): if drivechain_running: overlay.color = Color(1, 1, 1, 0) overlay.mouse_filter = Control.MOUSE_FILTER_IGNORE + heading_label.modulate = Color(1, 1, 1) # Normal color for heading text + description_label.modulate = Color(1, 1, 1) # Normal color for description text else: overlay.color = Color(1, 1, 1, 0.5) # Semi-transparent white overlay.mouse_filter = Control.MOUSE_FILTER_STOP + heading_label.modulate = Color(0.5, 0.5, 0.5) # Grey out the heading text + description_label.modulate = Color(0.5, 0.5, 0.5) # Grey out the description text func update_button_state(): var drivechain_provider = Appstate.get_drivechain_provider() From 35f59731a306c1a1399d726bd5397c1d1e6b6960 Mon Sep 17 00:00:00 2001 From: Marc Platt Date: Wed, 7 Aug 2024 17:01:50 -0400 Subject: [PATCH 4/4] resized font on FW and fixed crunchy arrows --- source/fast_withdrawal/fast_withdraw-new.tscn | 1 + ui/components/left_menu/left_menu.tscn | 21 +++++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/source/fast_withdrawal/fast_withdraw-new.tscn b/source/fast_withdrawal/fast_withdraw-new.tscn index 658b501..9f980d4 100644 --- a/source/fast_withdrawal/fast_withdraw-new.tscn +++ b/source/fast_withdrawal/fast_withdraw-new.tscn @@ -78,6 +78,7 @@ layout_mode = 2 [node name="ChainSelectionButton" type="OptionButton" parent="HBoxContainer2"] layout_mode = 2 +theme_override_font_sizes/font_size = 14 item_count = 3 selected = 0 popup/item_0/text = "Testchain" diff --git a/ui/components/left_menu/left_menu.tscn b/ui/components/left_menu/left_menu.tscn index 5e87eb8..f48c1b2 100644 --- a/ui/components/left_menu/left_menu.tscn +++ b/ui/components/left_menu/left_menu.tscn @@ -1,8 +1,6 @@ -[gd_scene load_steps=8 format=3 uid="uid://dwhtby81ylt3s"] +[gd_scene load_steps=6 format=3 uid="uid://dwhtby81ylt3s"] [ext_resource type="Script" path="res://ui/components/left_menu/left_menu.gd" id="1_yja75"] -[ext_resource type="Texture2D" uid="uid://c865fxarlp4e1" path="res://assets/images/left-arrow-svgrepo-com.png" id="2_5g8my"] -[ext_resource type="Texture2D" uid="uid://4ulwmgydwoi2" path="res://assets/images/right-arrow-next-svgrepo-com (2).png" id="3_2rq81"] [ext_resource type="Script" path="res://ui/components/left_menu/Quotes.gd" id="7_kx1k8"] [ext_resource type="FontFile" uid="uid://ciu7chyqqs4k7" path="res://assets/fonts/Saira_Expanded-Bold.ttf" id="11_6qy05"] [ext_resource type="FontFile" uid="uid://dgxbgdcr3s84u" path="res://assets/fonts/Saira_Expanded-Regular.ttf" id="12_nwgc3"] @@ -38,12 +36,18 @@ theme_override_constants/separation = 8 [node name="PrevButton" type="Button" parent="MarginContainer/HBox"] texture_filter = 4 +layout_direction = 1 layout_mode = 2 -size_flags_horizontal = 4 +size_flags_horizontal = 0 size_flags_vertical = 4 -icon = ExtResource("2_5g8my") +theme_override_font_sizes/font_size = 38 +text = "<" flat = true +[node name="Control" type="Control" parent="MarginContainer/HBox"] +custom_minimum_size = Vector2(5, 2.08165e-12) +layout_mode = 2 + [node name="Quotes" type="Label" parent="MarginContainer/HBox"] custom_minimum_size = Vector2(250, 0) layout_direction = 3 @@ -54,12 +58,17 @@ theme_override_font_sizes/font_size = 13 vertical_alignment = 1 autowrap_mode = 2 +[node name="Control2" type="Control" parent="MarginContainer/HBox"] +custom_minimum_size = Vector2(5, 2.08165e-12) +layout_mode = 2 + [node name="NextButton" type="Button" parent="MarginContainer/HBox"] texture_filter = 4 layout_mode = 2 size_flags_horizontal = 8 size_flags_vertical = 4 -icon = ExtResource("3_2rq81") +theme_override_font_sizes/font_size = 38 +text = ">" flat = true [node name="QuotesDialog" type="AcceptDialog" parent="."]