#14,#15,#29,#31: Added qr, added more settings, added keymap, changed about page.

MainWindow.gd

@@ -61,6 +61,15 @@ var settings_button: Button = $SettingsButton
 @onready
 var settings_window: Control = $SettingsWindow
 
+@onready
+var shortcuts_window: Control = %ShortcutsWindow
+
+@onready
+var qr_window: Control = %QRWindow
+
+@onready
+var qr_button: Button = $QRButton
+
 @onready
 var statistics_button: Button = $StatisticsButton
 
@@ -70,11 +79,14 @@ var statistic_popup: PopupPanel = $StatisticsPopupPanel
 @onready
 var statistic_label: Label = $StatisticsPopupPanel/StatisticsLabel
 
+@onready
+var shortcuts_button: Button = $ShortcutsButton
+
 @onready
 var about_button: Button = $AboutButton
 
 @onready
-var about_popup: PopupPanel = $AboutPopupPanel
+var about_window: Control = %AboutWindow
 
 @onready
 var show_answer_button: Button = $ShowAnswerButton
@@ -103,18 +115,6 @@ var search_button: Button = $SearchButton
 @onready
 var search_view: Control= $Search
 
-@onready
-var version_label: Label = $AboutPopupPanel/VBoxContainer/VersionLabel
-
-@onready
-var whats_new_label: Label = $AboutPopupPanel/VBoxContainer/HBoxContainer/NewLabel
-
-@onready
-var shortcut_label: Label = $AboutPopupPanel/VBoxContainer/HBoxContainer/ShortcutsLabel
-
-@onready
-var coming_label: Label = $AboutPopupPanel/VBoxContainer/HBoxContainer/CommingLabel
-
 @onready
 var winner_popup: PopupPanel = $WinnerPopupPanel
 
@@ -161,8 +161,10 @@ func _ready() -> void:
 	sync_button.pressed.connect(sync_games)
 	sound_test_button.pressed.connect(music_player_container.get_sound_test_song)
 	statistics_button.pressed.connect(get_statistics)
+	shortcuts_button.pressed.connect(show_shortcuts)
 	about_button.pressed.connect(show_about)
 	settings_button.pressed.connect(show_settings)
+	qr_button.pressed.connect(show_qr)
 	reset_playlist_button.pressed.connect(reset_playlist)
 	reset_points_button.pressed.connect(reset_points)
 	
@@ -212,6 +214,8 @@ func _input(event: InputEvent) -> void:
 				DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_FULLSCREEN)
 			if Settings.fullscreen == false:
 				DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_WINDOWED)
+		if event.alt_pressed && event.keycode == KEY_K:
+			shortcuts_window.visible = !shortcuts_window.visible
 		if event.alt_pressed && event.keycode == KEY_L:
 			log.visible = !log.visible
 
@@ -356,16 +360,20 @@ func reset_points() -> void:
 
 func show_about() -> void:
 	print("show_about")
-	about_popup.visible = true
-	version_label.text = Settings.version
-	whats_new_label.text = Settings.whats_new
-	shortcut_label.text = Settings.shortcuts
-	coming_label.text = Settings.whats_left
+	about_window.show_window()
+
+func show_shortcuts() -> void:
+	print("show_shortcuts")
+	shortcuts_window.visible = true
 	
 func show_settings() -> void:
 	print("show_settings")
 	settings_window.visible = true
 	
+func show_qr() -> void:
+	print("show_qr")
+	qr_window.show_window()
+	
 func get_statistics() -> void:
 	print("get_statistics")
 	statistic_popup.visible = true
@@ -418,7 +426,7 @@ func add_players() -> void:
 
 func add_player() -> void:
 	print("add_player")
-	if new_player_name_field.text != "":
+	if new_player_name_field.text != "" && Settings.player_array.size() < Settings.MAX_NUMBER_OF_PLAYERS:
 		var new_player_object: PlayerObject = PlayerObject.new(new_player_name_field.text, Settings.player_array.size())
 		new_player_name_field.text = ""
 		Settings.player_array.append(new_player_object)
@@ -440,7 +448,7 @@ func load_players() -> void:
 		var new_player: Player = player.instantiate()
 		new_player.id = counter
 		
-		new_player.connect("change_character_clicked", _on_player_change_character_clicked.bind(new_player))
+		new_player.connect("change_character_clicked", _on_player_change_character_clicked.bind(new_player, player_object.player_name))
 		new_player.connect("player_removed", _on_player_removed.bind(counter))
 
 		player_container.add_child(new_player)
@@ -482,10 +490,11 @@ func _on_player_removed(player_to_remove: int) -> void:
 	Playlist.remove_player_from_list(player_to_remove)
 	update_song_list()
 
-func _on_player_change_character_clicked(new_player: Node) -> void:
+func _on_player_change_character_clicked(new_player: Player, player_name: String) -> void:
 	print("_on_player_change_character_clicked")
 	current_player = new_player
-	new_character_select.show_grid()
+	print("Change character for: " + player_name)
+	new_character_select.show_grid(player_name)
 
 func _on_character_selected(file_name: String) -> void:
 	print("_on_character_selected")