diff --git a/gui/forms/SettingsForm.tscn b/gui/forms/SettingsForm.tscn index 6f583d5..d66c08a 100644 --- a/gui/forms/SettingsForm.tscn +++ b/gui/forms/SettingsForm.tscn @@ -35,7 +35,6 @@ margin_bottom = 230.0 rect_min_size = Vector2( 350, 230 ) [node name="Providers" type="Control" parent="CenterContainer/VBoxContainer/TabContainer"] -visible = false anchor_right = 1.0 anchor_bottom = 1.0 margin_left = 4.0 @@ -113,6 +112,7 @@ disabled = true text = "Some other Chat Commands" [node name="General" type="Control" parent="CenterContainer/VBoxContainer/TabContainer"] +visible = false anchor_right = 1.0 anchor_bottom = 1.0 margin_left = 4.0 diff --git a/gui/forms/twitch_config/TwitchAuthConfig.gd b/gui/forms/twitch_config/TwitchAuthConfig.gd index 4932eeb..8f19c5b 100644 --- a/gui/forms/twitch_config/TwitchAuthConfig.gd +++ b/gui/forms/twitch_config/TwitchAuthConfig.gd @@ -114,3 +114,7 @@ func _on_ClientIdHelpButton_pressed(): func _on_OAuthHelpButton_pressed(): var _done = OS.shell_open("https://twitchapps.com/tmi/") + + +func _on_HelpButton_pressed(): + $TwitchSettingsHelpPopup.popup_centered() diff --git a/gui/forms/twitch_config/TwitchAuthConfig.tscn b/gui/forms/twitch_config/TwitchAuthConfig.tscn index c6e2ab4..0865fec 100644 --- a/gui/forms/twitch_config/TwitchAuthConfig.tscn +++ b/gui/forms/twitch_config/TwitchAuthConfig.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=4 format=2] [ext_resource path="res://gui/forms/twitch_config/TwitchAuthConfig.gd" type="Script" id=1] [ext_resource path="res://gui/widgets/Background.tscn" type="PackedScene" id=2] +[ext_resource path="res://gui/popups/TwitchSettingsHelpPopup.tscn" type="PackedScene" id=3] [node name="TwitchAuthConfig" type="Control"] anchor_right = 1.0 @@ -145,8 +146,20 @@ margin_right = 54.0 margin_bottom = 20.0 text = "Cancel" -[node name="VSeparator" type="VSeparator" parent="CenterContainer/VBoxContainer/ButtonsContainer"] +[node name="VSeparator1" type="VSeparator" parent="CenterContainer/VBoxContainer/ButtonsContainer"] margin_left = 58.0 +margin_right = 83.0 +margin_bottom = 20.0 +size_flags_horizontal = 3 + +[node name="HelpButton" type="Button" parent="CenterContainer/VBoxContainer/ButtonsContainer"] +margin_left = 87.0 +margin_right = 129.0 +margin_bottom = 20.0 +text = "Help" + +[node name="VSeparator2" type="VSeparator" parent="CenterContainer/VBoxContainer/ButtonsContainer"] +margin_left = 133.0 margin_right = 158.0 margin_bottom = 20.0 size_flags_horizontal = 3 @@ -156,7 +169,10 @@ margin_left = 162.0 margin_right = 203.0 margin_bottom = 20.0 text = "Save" + +[node name="TwitchSettingsHelpPopup" parent="." instance=ExtResource( 3 )] [connection signal="pressed" from="CenterContainer/VBoxContainer/ClientIdContainer/ClientIdHelpButton" to="." method="_on_ClientIdHelpButton_pressed"] [connection signal="pressed" from="CenterContainer/VBoxContainer/OAuthContainer/OAuthHelpButton" to="." method="_on_OAuthHelpButton_pressed"] [connection signal="pressed" from="CenterContainer/VBoxContainer/ButtonsContainer/CancelButton" to="." method="_on_CancelButton_pressed"] +[connection signal="pressed" from="CenterContainer/VBoxContainer/ButtonsContainer/HelpButton" to="." method="_on_HelpButton_pressed"] [connection signal="pressed" from="CenterContainer/VBoxContainer/ButtonsContainer/SaveButton" to="." method="_on_SaveButton_pressed"] diff --git a/gui/popups/TwitchSettingsHelpPopup.tscn b/gui/popups/TwitchSettingsHelpPopup.tscn new file mode 100644 index 0000000..6ae3cfe --- /dev/null +++ b/gui/popups/TwitchSettingsHelpPopup.tscn @@ -0,0 +1,25 @@ +[gd_scene format=2] + +[node name="TwitchSettingsHelpPopup" type="AcceptDialog"] +margin_right = 83.0 +margin_bottom = 58.0 +window_title = "Your friend is here!" +dialog_text = "What are all these things? +> Hover the mouse over the fields to see hints. +> Basically, that's what twitch requires to let us read your chat. + +Copy/paste does not work! +> Using the browser? W3C's Clipboard API is not yet everywhere. +> Try Chrome, or install the Clipboard API extension for Firefox? +> There are builds for Windows and Linux, as well. (perhaps Mac) + +This is not encrypted, you fools! +> Encryption can be achieved. This is libre software. +> That means YOU are free to improve it for everyone to enjoy! +> Note that the configuration is stored on YOUR computer, +> there is no server side to this application. + +Though justice be thy plea, consider this: +that in the course of justice, none of us +should see salvation. We do pray for mercy, +-- Merchant of Venice, Shakespeare"