Give every script a class name and use it for typed references
The popups, the volume slider, the player name field and the main window get a class_name, so the main window and the quiz hold them by their real type instead of Control. The classes already use the names the files will get.
This commit is contained in:
1 parent
5831e1e73d
commit
b7d67b573e
15 files changed
+23
-10
No files matched your search
@@ -1,3 +1,4 @@
|
|||||||
|
class_name AboutPopup
|
||||||
extends PopupWindow
|
extends PopupWindow
|
||||||
|
|
||||||
@onready
|
@onready
|
||||||
|
|||||||
+7
-6
@@ -1,3 +1,4 @@
|
|||||||
|
class_name MainWindow
|
||||||
extends Control
|
extends Control
|
||||||
## The main window: the top bar, the popups opened from it and the quiz below it.
|
## The main window: the top bar, the popups opened from it and the quiz below it.
|
||||||
##
|
##
|
||||||
@@ -11,22 +12,22 @@ var top_bar: TopBar = $TopBar
|
|||||||
var quiz: Quiz = $Quiz
|
var quiz: Quiz = $Quiz
|
||||||
|
|
||||||
@onready
|
@onready
|
||||||
var search_view: Control = $Search
|
var search_view: SearchPopup = $Search
|
||||||
|
|
||||||
@onready
|
@onready
|
||||||
var sync_window: Control = %SyncWindow
|
var sync_window: SyncPopup = %SyncWindow
|
||||||
|
|
||||||
@onready
|
@onready
|
||||||
var shortcuts_window: Control = %ShortcutsWindow
|
var shortcuts_window: ShortcutsPopup = %ShortcutsWindow
|
||||||
|
|
||||||
@onready
|
@onready
|
||||||
var qr_window: Control = %QRWindow
|
var qr_window: QRPopup = %QRWindow
|
||||||
|
|
||||||
@onready
|
@onready
|
||||||
var about_window: Control = %AboutWindow
|
var about_window: AboutPopup = %AboutWindow
|
||||||
|
|
||||||
@onready
|
@onready
|
||||||
var log_window: Control = %Log
|
var log_window: LogPopup = %Log
|
||||||
|
|
||||||
@onready
|
@onready
|
||||||
var statistic_popup: PopupPanel = $StatisticsPopupPanel
|
var statistic_popup: PopupPanel = $StatisticsPopupPanel
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
class_name ScrollToEndContainer
|
||||||
extends ScrollContainer
|
extends ScrollContainer
|
||||||
|
|
||||||
var max_value = 0;
|
var max_value = 0;
|
||||||
|
|||||||
+1
-1
@@ -25,7 +25,7 @@ var sound_effect_player: AudioStreamPlayer = $AudioSoundEffectPlayer
|
|||||||
var progress_slider: HSlider = $PlayerBar/MusicPlayerContainer/MusicPlayerSlider
|
var progress_slider: HSlider = $PlayerBar/MusicPlayerContainer/MusicPlayerSlider
|
||||||
|
|
||||||
@onready
|
@onready
|
||||||
var volume_slider: HSlider = $PlayerBar/MusicPlayerContainer/VolumeSlider
|
var volume_slider: VolumeSlider = $PlayerBar/MusicPlayerContainer/VolumeSlider
|
||||||
|
|
||||||
@onready
|
@onready
|
||||||
var music_time_label: Label = $PlayerBar/MusicPlayerContainer/MusicTimeLabel
|
var music_time_label: Label = $PlayerBar/MusicPlayerContainer/MusicTimeLabel
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
class_name PlayerNameField
|
||||||
extends TextEdit
|
extends TextEdit
|
||||||
|
|
||||||
signal enter_key_pressed
|
signal enter_key_pressed
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
class_name QRPopup
|
||||||
extends PopupWindow
|
extends PopupWindow
|
||||||
|
|
||||||
@onready
|
@onready
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
class_name SearchPopup
|
||||||
extends PopupWindow
|
extends PopupWindow
|
||||||
|
|
||||||
@onready
|
@onready
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
class_name SettingsPopup
|
||||||
extends PopupWindow
|
extends PopupWindow
|
||||||
|
|
||||||
@onready
|
@onready
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
class_name LogPopup
|
||||||
extends PopupWindow
|
extends PopupWindow
|
||||||
|
|
||||||
@onready
|
@onready
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
class_name CharacterSelectPopup
|
||||||
extends PopupWindow
|
extends PopupWindow
|
||||||
|
|
||||||
@onready
|
@onready
|
||||||
|
|||||||
@@ -33,10 +33,10 @@ var players_panel: PlayersPanel = $PlayersPanel
|
|||||||
var toolbar: QuizToolbar = $QuizToolbar
|
var toolbar: QuizToolbar = $QuizToolbar
|
||||||
|
|
||||||
@onready
|
@onready
|
||||||
var settings_window: Control = $SettingsWindow
|
var settings_window: SettingsPopup = $SettingsWindow
|
||||||
|
|
||||||
@onready
|
@onready
|
||||||
var winner_window: Control = %WinnerWindow
|
var winner_window: WinnerPopup = %WinnerWindow
|
||||||
|
|
||||||
@onready
|
@onready
|
||||||
var song_controls: SongControls = $SongControls
|
var song_controls: SongControls = $SongControls
|
||||||
@@ -48,7 +48,7 @@ var song_loader: SongLoader = $SongLoader
|
|||||||
var music_list_panel: MusicListPanel = $MusicListPanel
|
var music_list_panel: MusicListPanel = $MusicListPanel
|
||||||
|
|
||||||
@onready
|
@onready
|
||||||
var new_character_select: Control = %NewCharacterSelect
|
var new_character_select: CharacterSelectPopup = %NewCharacterSelect
|
||||||
|
|
||||||
@onready
|
@onready
|
||||||
var music_player_container: MusicPlayer = $MusicPlayer
|
var music_player_container: MusicPlayer = $MusicPlayer
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
class_name ShortcutsPopup
|
||||||
extends PopupWindow
|
extends PopupWindow
|
||||||
|
|
||||||
@onready
|
@onready
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
class_name SyncPopup
|
||||||
extends PopupWindow
|
extends PopupWindow
|
||||||
|
|
||||||
@onready
|
@onready
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
class_name VolumeSlider
|
||||||
extends HSlider
|
extends HSlider
|
||||||
|
|
||||||
@export
|
@export
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
class_name WinnerPopup
|
||||||
extends PopupWindow
|
extends PopupWindow
|
||||||
|
|
||||||
@onready
|
@onready
|
||||||
|
|||||||
Reference in new issue
Block a user