#1: Fixed bug with inspiration list and search list not updating on sync and server changed
All checks were successful
Build / build (push) Successful in 1m30s
All checks were successful
Build / build (push) Successful in 1m30s
This commit is contained in:
@@ -63,6 +63,9 @@ var settings_button: Button = $SettingsButton
|
|||||||
@onready
|
@onready
|
||||||
var settings_popup: PopupPanel = $SettingsPopupPanel
|
var settings_popup: PopupPanel = $SettingsPopupPanel
|
||||||
|
|
||||||
|
@onready
|
||||||
|
var settings_window: BoxContainer = $SettingsPopupPanel/SettingsWindow
|
||||||
|
|
||||||
@onready
|
@onready
|
||||||
var statistics_button: Button = $StatisticsButton
|
var statistics_button: Button = $StatisticsButton
|
||||||
|
|
||||||
@@ -129,6 +132,9 @@ var auto_repeat_song_button: CheckButton = $RepeatSongCheckButton
|
|||||||
@onready
|
@onready
|
||||||
var music_player_container: PanelContainer = $MusicPlayer
|
var music_player_container: PanelContainer = $MusicPlayer
|
||||||
|
|
||||||
|
@onready
|
||||||
|
var debug_label: Label = $DebugLabel
|
||||||
|
|
||||||
var player := preload("res://Player.tscn")
|
var player := preload("res://Player.tscn")
|
||||||
var song_list_object := preload("res://song_list_object.tscn")
|
var song_list_object := preload("res://song_list_object.tscn")
|
||||||
|
|
||||||
@@ -142,6 +148,7 @@ func _ready() -> void:
|
|||||||
var is_mac: bool = OS.has_feature("macos")
|
var is_mac: bool = OS.has_feature("macos")
|
||||||
if is_debug:
|
if is_debug:
|
||||||
print("is_debug")
|
print("is_debug")
|
||||||
|
debug_label.visible = true
|
||||||
##Settings.default_path = "http://localhost:8080"
|
##Settings.default_path = "http://localhost:8080"
|
||||||
##Settings.selected_server = 3
|
##Settings.selected_server = 3
|
||||||
Settings.default_path = "http://localhost:8080"
|
Settings.default_path = "http://localhost:8080"
|
||||||
@@ -164,6 +171,7 @@ func _ready() -> void:
|
|||||||
new_player_name_field.connect("enter_key_pressed", add_player)
|
new_player_name_field.connect("enter_key_pressed", add_player)
|
||||||
music_player_container.connect("play_next_song", fetch_song.bind(false))
|
music_player_container.connect("play_next_song", fetch_song.bind(false))
|
||||||
music_player_container.connect("update_song_list", update_song_list)
|
music_player_container.connect("update_song_list", update_song_list)
|
||||||
|
settings_window.connect("server_changed", server_updated)
|
||||||
|
|
||||||
add_players_button.pressed.connect(add_players)
|
add_players_button.pressed.connect(add_players)
|
||||||
add_player_button.pressed.connect(add_player)
|
add_player_button.pressed.connect(add_player)
|
||||||
@@ -199,6 +207,17 @@ func _input(event: InputEvent) -> void:
|
|||||||
if Settings.fullscreen == false:
|
if Settings.fullscreen == false:
|
||||||
DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_WINDOWED)
|
DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_WINDOWED)
|
||||||
|
|
||||||
|
func server_updated() -> void:
|
||||||
|
print("server_updated")
|
||||||
|
update_from_server()
|
||||||
|
reset_playlist()
|
||||||
|
reset_points()
|
||||||
|
|
||||||
|
func update_from_server() -> void:
|
||||||
|
print("update_from_server")
|
||||||
|
search_view.get_list_of_games()
|
||||||
|
get_suggestion_list()
|
||||||
|
|
||||||
func repeat_song() -> void:
|
func repeat_song() -> void:
|
||||||
Settings.auto_repeat_song = !Settings.auto_repeat_song
|
Settings.auto_repeat_song = !Settings.auto_repeat_song
|
||||||
|
|
||||||
@@ -349,8 +368,7 @@ func sync_games() -> void:
|
|||||||
sync_popup.visible = true
|
sync_popup.visible = true
|
||||||
print("games_synced")
|
print("games_synced")
|
||||||
reset_playlist()
|
reset_playlist()
|
||||||
get_suggestion_list()
|
update_from_server()
|
||||||
search_view.get_list_of_games()
|
|
||||||
|
|
||||||
var new_games_synced: Callable = func new_games_synced(synced) -> void:
|
var new_games_synced: Callable = func new_games_synced(synced) -> void:
|
||||||
sync_button.disabled = false
|
sync_button.disabled = false
|
||||||
@@ -358,8 +376,7 @@ func sync_games() -> void:
|
|||||||
print("games_synced")
|
print("games_synced")
|
||||||
print("synced: ", synced)
|
print("synced: ", synced)
|
||||||
reset_playlist()
|
reset_playlist()
|
||||||
get_suggestion_list()
|
update_from_server()
|
||||||
search_view.get_list_of_games()
|
|
||||||
|
|
||||||
if Settings.quick_sync == true:
|
if Settings.quick_sync == true:
|
||||||
Settings.make_request2("/sync/new", new_games_synced, true)
|
Settings.make_request2("/sync/new", new_games_synced, true)
|
||||||
@@ -371,6 +388,7 @@ func get_suggestion_list() -> void:
|
|||||||
var populate_list: Callable = func populate_list(array) -> void:
|
var populate_list: Callable = func populate_list(array) -> void:
|
||||||
if typeof(array) == TYPE_ARRAY:
|
if typeof(array) == TYPE_ARRAY:
|
||||||
games = []
|
games = []
|
||||||
|
Settings.delete_children(inspiration_list)
|
||||||
games.append_array(array)
|
games.append_array(array)
|
||||||
for game: String in games:
|
for game: String in games:
|
||||||
var inspiration_label: Label = Label.new()
|
var inspiration_label: Label = Label.new()
|
||||||
|
|||||||
@@ -477,7 +477,7 @@ size = Vector2i(268, 233)
|
|||||||
offset_left = 4.0
|
offset_left = 4.0
|
||||||
offset_top = 4.0
|
offset_top = 4.0
|
||||||
offset_right = 264.0
|
offset_right = 264.0
|
||||||
offset_bottom = 354.0
|
offset_bottom = 229.0
|
||||||
|
|
||||||
[node name="WinnerPopupPanel" type="PopupPanel" parent="."]
|
[node name="WinnerPopupPanel" type="PopupPanel" parent="."]
|
||||||
initial_position = 2
|
initial_position = 2
|
||||||
@@ -513,4 +513,16 @@ focus_mode = 0
|
|||||||
action_mode = 0
|
action_mode = 0
|
||||||
text = "Auto repeat"
|
text = "Auto repeat"
|
||||||
|
|
||||||
|
[node name="DebugLabel" type="Label" parent="."]
|
||||||
|
layout_mode = 0
|
||||||
|
offset_left = 974.0
|
||||||
|
offset_top = 904.0
|
||||||
|
offset_right = 1014.0
|
||||||
|
offset_bottom = 927.0
|
||||||
|
scale = Vector2(3, 3)
|
||||||
|
text = "DEBUG"
|
||||||
|
horizontal_alignment = 1
|
||||||
|
vertical_alignment = 1
|
||||||
|
autowrap_mode = 2
|
||||||
|
|
||||||
[connection signal="dir_selected" from="FileDialog" to="." method="_on_file_dialog_dir_selected"]
|
[connection signal="dir_selected" from="FileDialog" to="." method="_on_file_dialog_dir_selected"]
|
||||||
|
|||||||
@@ -99,9 +99,11 @@ func compile_regex(search_term: String) -> RegEx:
|
|||||||
return regex
|
return regex
|
||||||
|
|
||||||
func get_list_of_games() -> void:
|
func get_list_of_games() -> void:
|
||||||
|
print("get_list_of_games")
|
||||||
var handle_games = func handle_games(array):
|
var handle_games = func handle_games(array):
|
||||||
if typeof(array) == TYPE_ARRAY:
|
if typeof(array) == TYPE_ARRAY:
|
||||||
games = []
|
games = []
|
||||||
|
Settings.delete_children(search_list)
|
||||||
games.append_array(array)
|
games.append_array(array)
|
||||||
for game in games:
|
for game in games:
|
||||||
var label := Label.new()
|
var label := Label.new()
|
||||||
|
|||||||
@@ -23,9 +23,11 @@ var latest_played_song: int = 0
|
|||||||
var currently_playing_song: int = -1
|
var currently_playing_song: int = -1
|
||||||
var edit_players: bool = false
|
var edit_players: bool = false
|
||||||
|
|
||||||
var version: String = "1.5.0"
|
var version: String = "1.6.0"
|
||||||
|
|
||||||
var whats_new: String = "Changelog:
|
var whats_new: String = "Changelog:
|
||||||
|
1.6.0:
|
||||||
|
#1: Fixed bug with inspiration list not reloding after sync
|
||||||
1.5.0: Made big changes to players and the song list and how the local song list works
|
1.5.0: Made big changes to players and the song list and how the local song list works
|
||||||
0.9.0-Beta: Fixed settings and updated the player view
|
0.9.0-Beta: Fixed settings and updated the player view
|
||||||
0.8.0-Beta: Fixed reset buttons and some other small things
|
0.8.0-Beta: Fixed reset buttons and some other small things
|
||||||
@@ -34,10 +36,8 @@ var whats_new: String = "Changelog:
|
|||||||
0.7-Beta: Can now hop between songs"
|
0.7-Beta: Can now hop between songs"
|
||||||
|
|
||||||
var whats_left: String = "Things left to do:
|
var whats_left: String = "Things left to do:
|
||||||
Fix graphics in lists
|
|
||||||
Fix layout
|
Fix layout
|
||||||
Fix for local play
|
Fix for local play"
|
||||||
Change some buttons to icons"
|
|
||||||
|
|
||||||
var shortcuts: String = "Shortcuts:
|
var shortcuts: String = "Shortcuts:
|
||||||
Alt + S = Search
|
Alt + S = Search
|
||||||
|
|||||||
@@ -33,8 +33,13 @@ var quick_sync_button := $QuickSyncButton
|
|||||||
@onready
|
@onready
|
||||||
var local_button := $LocalButton
|
var local_button := $LocalButton
|
||||||
|
|
||||||
|
signal server_changed
|
||||||
|
|
||||||
# Called when the node enters the scene tree for the first time.
|
# Called when the node enters the scene tree for the first time.
|
||||||
func _ready():
|
func _ready():
|
||||||
|
fullscreen_button.button_pressed = Settings.fullscreen
|
||||||
|
select_server_button.selected = Settings.selected_server
|
||||||
|
|
||||||
stop_after_current_button.pressed.connect(stop_after_current)
|
stop_after_current_button.pressed.connect(stop_after_current)
|
||||||
hide_next_track_button.pressed.connect(hide_next_track)
|
hide_next_track_button.pressed.connect(hide_next_track)
|
||||||
add_to_database_button.pressed.connect(add_to_database)
|
add_to_database_button.pressed.connect(add_to_database)
|
||||||
@@ -96,3 +101,4 @@ func select_server(new_server: int) -> void:
|
|||||||
print("Settings.selected_server: " + str(Settings.selected_server))
|
print("Settings.selected_server: " + str(Settings.selected_server))
|
||||||
print("new_server: " + str(new_server))
|
print("new_server: " + str(new_server))
|
||||||
print("select_server_button.get_item_text(new_server): " + select_server_button.get_item_text(new_server))
|
print("select_server_button.get_item_text(new_server): " + select_server_button.get_item_text(new_server))
|
||||||
|
server_changed.emit()
|
||||||
|
|||||||
@@ -77,15 +77,17 @@ text = "+1"
|
|||||||
[node name="SelectServerButton" type="OptionButton" parent="."]
|
[node name="SelectServerButton" type="OptionButton" parent="."]
|
||||||
layout_mode = 2
|
layout_mode = 2
|
||||||
selected = 0
|
selected = 0
|
||||||
item_count = 4
|
item_count = 5
|
||||||
popup/item_0/text = "https://music.sanplex.tech"
|
popup/item_0/text = "https://music.sanplex.tech"
|
||||||
popup/item_0/id = 1
|
popup/item_0/id = 1
|
||||||
popup/item_1/text = "https://tmusic.sanplex.tech"
|
popup/item_1/text = "https://tmusic.sanplex.tech"
|
||||||
popup/item_1/id = 1
|
popup/item_1/id = 2
|
||||||
popup/item_2/text = "http://192.168.86.100:8085"
|
popup/item_2/text = "https://rmusic.sanplex.tech"
|
||||||
popup/item_2/id = 2
|
popup/item_2/id = 3
|
||||||
popup/item_3/text = "http://localhost:8080"
|
popup/item_3/text = "https://old-music.sanplex.tech"
|
||||||
popup/item_3/id = 3
|
popup/item_3/id = 4
|
||||||
|
popup/item_4/text = "http://localhost:8080"
|
||||||
|
popup/item_4/id = 5
|
||||||
|
|
||||||
[node name="FullscreenButton" type="CheckButton" parent="."]
|
[node name="FullscreenButton" type="CheckButton" parent="."]
|
||||||
layout_mode = 2
|
layout_mode = 2
|
||||||
|
|||||||
Reference in New Issue
Block a user