claude godot 4 port

scenes/main/alarm.gd

@@ -1,30 +1,29 @@
 extends MarginContainer
 
-var alarm:Alarm
+var alarm: Alarm
 var playing := false
 
-onready var time_talker = $"../time talker"
-onready var weather_api_node = $"../WeatherAPINode"
-onready var snooze_timer = $"snooze timer"
-onready var snooze_button = $VBoxContainer/HBoxContainer/snooze
-onready var sleep_mode = $"../sleep_mode"
+@onready var time_talker = $"../time talker"
+@onready var weather_api_node = $"../WeatherAPINode"
+@onready var snooze_timer = $"snooze timer"
+@onready var snooze_button = $VBoxContainer/HBoxContainer/snooze
+@onready var sleep_mode = $"../sleep_mode"
 
 var _day
 var _weather
 
-func popup(alarm:Alarm):
-	if !alarm.active:
+func popup(alarm_in: Alarm):
+	if !alarm_in.active:
 		return
-	self.alarm = alarm
-	
+	self.alarm = alarm_in
+
 	sleep_mode.prevent_sleep = true
-	snooze_button.visible = alarm.snooze
+	snooze_button.visible = alarm_in.snooze
 	snooze_timer.stop()
 	time_talker.stop()
-	
+
 	_weather = Constants.WEATHER.UNKNOWN
-	var json = yield(weather_api_node.get_forecast(),"completed")
-	var temperature = json['current']['temp_c']
+	var json = await weather_api_node.get_forecast()
 	if json is Dictionary:
 		_weather = Constants.code_to_weather(json['current']['condition']['code'])
 	_day = Time.get_date_dict_from_system()['weekday']
@@ -38,7 +37,7 @@ func _play():
 		time_talker.play(alarm.moment, _day, _weather, alarm.weather_music if alarm.override_weather_music else null, alarm.play_music, alarm.speak_time)
 
 func _on_snooze_timer_timeout():
-	if alarm!=null and !alarm.active:
+	if alarm != null and !alarm.active:
 		_on_stop_pressed()
 		return
 	show()
@@ -59,9 +58,8 @@ func _on_snooze_pressed():
 	print("Ya snooze...")
 	playing = false
 	time_talker.stop(2.5)
-	snooze_timer.start(5*60)
+	snooze_timer.start(5 * 60)
 	self.hide()
-#	snooze_timer.start(5)
 
 
 func _on_time_talker_finished():

scenes/main/alarm.gd.uid

@@ -0,0 +1 @@
+uid://cins64joste5c

scenes/main/main.gd

@@ -1,14 +1,14 @@
 extends MarginContainer
 
-onready var tab_buttons = $"%tab_buttons"
-onready var weather_api_node = $WeatherAPINode
+@onready var tab_buttons = $"%tab_buttons"
+@onready var weather_api_node = $WeatherAPINode
 
-onready var backgrounds = get_tree().get_nodes_in_group("background")
-onready var foreground = $foreground
-onready var screens = $"%screens"
-onready var time_talker = $"time talker"
-onready var sleep_mode = $sleep_mode
-onready var minute_timer = $"minute timer"
+@onready var backgrounds = get_tree().get_nodes_in_group("background")
+@onready var foreground = $foreground
+@onready var screens = $"%screens"
+@onready var time_talker = $"time talker"
+@onready var sleep_mode = $sleep_mode
+@onready var minute_timer = $"minute timer"
 
 const version := '1.0'
 const linkbacks := true
@@ -21,11 +21,15 @@ func _ready():
 		get_tree().call_group("linkbacks", "hide")
 		get_tree().call_group("linkbacks", "set_text", '')
 
+	if OS.get_name() in ['Android', 'iOS']:
+		var win = get_window()
+		win.content_scale_mode = Window.CONTENT_SCALE_MODE_CANVAS_ITEMS
+		win.content_scale_aspect = Window.CONTENT_SCALE_ASPECT_EXPAND
+		win.content_scale_size = Vector2i(
+			ProjectSettings.get_setting("display/window/size/viewport_width"),
+			ProjectSettings.get_setting("display/window/size/viewport_height"))
 
-	if OS.get_name() in ['Android', 'IOS']:
-		get_tree().set_screen_stretch( SceneTree.STRETCH_MODE_2D, SceneTree.STRETCH_ASPECT_EXPAND, Vector2(ProjectSettings.get_setting("display/window/size/width"), ProjectSettings.get_setting("display/window/size/height")))
-
-	Config.connect("changed", self, "_on_config_changed")
+	Config.changed.connect(_on_config_changed)
 	_on_config_changed(true)
 	print(screens)
 	audio_button = screens.tabs_holder.get_child(0).audio
@@ -34,11 +38,11 @@ func _ready():
 	_on_hourly_weather_timer_timeout()
 	_on_minute_timer_timeout()
 	var seconds = Time.get_time_dict_from_system()['second']
-	minute_timer.start(60-seconds)
+	minute_timer.start(60 - seconds)
 
 
-func _on_config_changed(skip_api_update:=false):
-	
+func _on_config_changed(skip_api_update: bool = false):
+
 	if !skip_api_update and (weather_api_node.location != Config.flags.location or weather_api_node.api_key != Config.flags.api_key):
 		weather_api_node.api_key = Config.flags.api_key
 		weather_api_node.location = Config.flags.location
@@ -54,16 +58,16 @@ func _on_TabContainer_tab_selected(tab):
 	if !tab_buttons:
 		return
 	for item in tab_buttons.get_children():
-		item.pressed = x == tab
+		item.button_pressed = x == tab
 		x += 1
 
 func _notification(what):
-	if what == NOTIFICATION_WM_QUIT_REQUEST or what == NOTIFICATION_APP_PAUSED or what == NOTIFICATION_WM_FOCUS_OUT:
+	if what == NOTIFICATION_WM_CLOSE_REQUEST or what == NOTIFICATION_APPLICATION_PAUSED or what == NOTIFICATION_APPLICATION_FOCUS_OUT:
 		Config.save_flags()
-	if what == NOTIFICATION_WM_QUIT_REQUEST:
+	if what == NOTIFICATION_WM_CLOSE_REQUEST:
 		get_tree().quit()
 
-func tween_background(color:Color, duration := 0.75):
+func tween_background(color: Color, duration: float = 0.75):
 	for background in backgrounds:
 		var tween = get_tree().create_tween()
 		tween.tween_property(background, 'color', color, duration)
@@ -74,36 +78,35 @@ func _on_hourly_weather_timer_timeout():
 
 func _on_WeatherAPINode_received_forecast(json):
 	var WC = Constants.WEATHER.UNKNOWN
-	print('weather update: ',json)
-	if json != null and not json.get('error'):
+	print('weather update: ', json)
+	if json != null and json is Dictionary and not json.get('error'):
 		weather_data.append(json)
 		WC = json['current']['condition']['code']
 	get_tree().call_group("hourly_weather_updates", "hourly_weather_update", json)
 	var weather = Constants.code_to_weather(WC)
 	tween_background(Constants.weather_to_color(weather))
 
-func set_transition(stage:float):
-	foreground.material.set_shader_param('transition', stage)
+func set_transition(stage: float):
+	foreground.material.set_shader_parameter('transition', stage)
 
 func _on_minute_timer_timeout():
 	var time = Time.get_time_dict_from_system()
 	get_tree().call_group("minute_timer_updates", "minute_timer_update", time)
 	_check_dark_mode(time)
 	minute_timer.start(60.0)
-	
+
 func _check_dark_mode(time):
-	var ctrans = foreground.material.get_shader_param('transition')
+	var ctrans = foreground.material.get_shader_parameter('transition')
 	var target = 0.0
 	if Config.flags.automatic_dark_mode and (time['hour'] >= 20 or time['hour'] <= 6):
 		print('go')
 		target = 1.0
 	if ctrans != target:
 		var tween = get_tree().create_tween()
-		tween.tween_method(self, "set_transition", 1.0-target, target, 2.0)
+		tween.tween_method(set_transition, 1.0 - target, target, 2.0)
 		tween.play()
 
 
-
 func _on_audio_toggled(button_pressed):
 	if button_pressed:
 		var weather = Constants.WEATHER.UNKNOWN
@@ -115,21 +118,18 @@ func _on_audio_toggled(button_pressed):
 
 
 func _on_time_talker_finished():
-	pass # Replace with function body.
-	audio_button.pressed = false
+	audio_button.button_pressed = false
 
 
 func _on_hide_sleepmode_pressed():
 	sleep_mode.hide()
 
 
-func _on_tab_button_pressed(idx:int):
+func _on_tab_button_pressed(idx: int):
 	if screens:
 		screens.switch_tab(idx)
 
 
-
-
 func _on_credits_button_pressed():
 	if linkbacks:
 		OS.shell_open("https://lisanne.gay/")

scenes/main/main.gd.uid

@@ -0,0 +1 @@
+uid://dhutm786peqfq

scenes/main/main.tscn

@@ -1,144 +1,54 @@
-[gd_scene load_steps=37 format=2]
+[gd_scene load_steps=30 format=3]
 
-[ext_resource path="res://assets/texture/buttons/clock.png" type="Texture" id=1]
-[ext_resource path="res://assets/texture/buttons/clock_on.png" type="Texture" id=2]
-[ext_resource path="res://assets/texture/buttons/time.png" type="Texture" id=3]
-[ext_resource path="res://scenes/current_time_screen/current_time_screen.tscn" type="PackedScene" id=4]
-[ext_resource path="res://assets/texture/buttons/globe.png" type="Texture" id=5]
-[ext_resource path="res://assets/texture/buttons/globe_on.png" type="Texture" id=6]
-[ext_resource path="res://assets/texture/buttons/time_on.png" type="Texture" id=7]
-[ext_resource path="res://scenes/main/main.gd" type="Script" id=8]
-[ext_resource path="res://addons/WeatherAPI/node.gd" type="Script" id=9]
-[ext_resource path="res://scripts/AudioArrayPlayer.gd" type="Script" id=10]
-[ext_resource path="res://scenes/main/time talker.gd" type="Script" id=11]
-[ext_resource path="res://assets/texture/buttons/settings.png" type="Texture" id=12]
-[ext_resource path="res://assets/texture/buttons/settings_on.png" type="Texture" id=13]
-[ext_resource path="res://assets/texture/buttons/time_hover.png" type="Texture" id=14]
-[ext_resource path="res://assets/texture/buttons/globe_hover.png" type="Texture" id=15]
-[ext_resource path="res://assets/texture/buttons/clock_hover.png" type="Texture" id=16]
-[ext_resource path="res://assets/texture/buttons/settings_hover.png" type="Texture" id=17]
-[ext_resource path="res://assets/main.tres" type="Theme" id=18]
-[ext_resource path="res://addons/BetterTabContainer/BetterTabContainer.gd" type="Script" id=19]
-[ext_resource path="res://assets/texture/buttons/moon.png" type="Texture" id=20]
-[ext_resource path="res://scenes/alarms_screen/alarms_screen.tscn" type="PackedScene" id=21]
-[ext_resource path="res://scenes/main/sleep_mode.gd" type="Script" id=22]
-[ext_resource path="res://assets/texture/alarms/cancel.png" type="Texture" id=23]
-[ext_resource path="res://assets/texture/alarms/wakeup.png" type="Texture" id=24]
-[ext_resource path="res://scenes/main/alarm.gd" type="Script" id=25]
-[ext_resource path="res://scenes/settings_screen/settings_screen.tscn" type="PackedScene" id=26]
-[ext_resource path="res://icon.png" type="Texture" id=27]
+[ext_resource type="Texture2D" path="res://assets/texture/buttons/clock.png" id="1"]
+[ext_resource type="Texture2D" path="res://assets/texture/buttons/clock_on.png" id="2"]
+[ext_resource type="Texture2D" path="res://assets/texture/buttons/time.png" id="3"]
+[ext_resource type="PackedScene" path="res://scenes/current_time_screen/current_time_screen.tscn" id="4"]
+[ext_resource type="Texture2D" path="res://assets/texture/buttons/globe.png" id="5"]
+[ext_resource type="Texture2D" path="res://assets/texture/buttons/globe_on.png" id="6"]
+[ext_resource type="Texture2D" path="res://assets/texture/buttons/time_on.png" id="7"]
+[ext_resource type="Script" path="res://scenes/main/main.gd" id="8"]
+[ext_resource type="Script" path="res://addons/WeatherAPI/node.gd" id="9"]
+[ext_resource type="Script" path="res://scripts/AudioArrayPlayer.gd" id="10"]
+[ext_resource type="Script" path="res://scenes/main/time talker.gd" id="11"]
+[ext_resource type="Texture2D" path="res://assets/texture/buttons/settings.png" id="12"]
+[ext_resource type="Texture2D" path="res://assets/texture/buttons/settings_on.png" id="13"]
+[ext_resource type="Texture2D" path="res://assets/texture/buttons/time_hover.png" id="14"]
+[ext_resource type="Texture2D" path="res://assets/texture/buttons/globe_hover.png" id="15"]
+[ext_resource type="Texture2D" path="res://assets/texture/buttons/clock_hover.png" id="16"]
+[ext_resource type="Texture2D" path="res://assets/texture/buttons/settings_hover.png" id="17"]
+[ext_resource type="Theme" path="res://assets/main.tres" id="18"]
+[ext_resource type="Script" path="res://addons/BetterTabContainer/BetterTabContainer.gd" id="19"]
+[ext_resource type="Texture2D" path="res://assets/texture/buttons/moon.png" id="20"]
+[ext_resource type="PackedScene" path="res://scenes/alarms_screen/alarms_screen.tscn" id="21"]
+[ext_resource type="Script" path="res://scenes/main/sleep_mode.gd" id="22"]
+[ext_resource type="Texture2D" path="res://assets/texture/alarms/cancel.png" id="23"]
+[ext_resource type="Texture2D" path="res://assets/texture/alarms/wakeup.png" id="24"]
+[ext_resource type="Script" path="res://scenes/main/alarm.gd" id="25"]
+[ext_resource type="PackedScene" path="res://scenes/settings_screen/settings_screen.tscn" id="26"]
+[ext_resource type="Texture2D" path="res://icon.png" id="27"]
+[ext_resource type="Shader" path="res://assets/foreground_invert.gdshader" id="28"]
 
-[sub_resource type="VisualShaderNodeInput" id=5]
-input_name = "screen_texture"
-
-[sub_resource type="VisualShaderNodeTexture" id=6]
-source = 5
-
-[sub_resource type="VisualShaderNodeInput" id=7]
-input_name = "screen_uv"
-
-[sub_resource type="VisualShaderNodeVectorOp" id=8]
-default_input_values = [ 0, Vector3( 1, 1, 1 ), 1, Vector3( 0, 0, 0 ) ]
-operator = 1
-
-[sub_resource type="VisualShaderNodeVectorInterp" id=9]
-
-[sub_resource type="VisualShaderNodeScalarConstant" id=10]
-constant = 1.0
-
-[sub_resource type="VisualShaderNodeScalarUniform" id=11]
-uniform_name = "transition"
-hint = 1
-default_value_enabled = true
-
-[sub_resource type="VisualShader" id=3]
-code = "shader_type canvas_item;
-uniform float transition : hint_range(0, 1) = 0;
-
-
-
-void vertex() {
-// Output:0
-
-}
-
-void fragment() {
-// Input:4
-	vec3 n_out4p0 = vec3(SCREEN_UV, 0.0);
-
-// Input:2
-
-// Texture:3
-	vec3 n_out3p0;
-	float n_out3p1;
-	{
-		vec4 SCREEN_TEXTURE_tex_read = texture(SCREEN_TEXTURE, n_out4p0.xy);
-		n_out3p0 = SCREEN_TEXTURE_tex_read.rgb;
-		n_out3p1 = SCREEN_TEXTURE_tex_read.a;
-	}
-
-// Scalar:7
-	float n_out7p0 = 1.000000;
-
-// VectorOp:5
-	vec3 n_out5p0 = vec3(n_out7p0) - n_out3p0;
-
-// ScalarUniform:8
-	float n_out8p0 = transition;
-
-// VectorMix:6
-	vec3 n_out6p0 = mix(n_out3p0, n_out5p0, vec3(n_out8p0));
-
-// Output:0
-	COLOR.rgb = n_out6p0;
-
-}
-
-void light() {
-// Output:0
-
-}
-"
-graph_offset = Vector2( -259.29, 244.334 )
-mode = 1
-flags/light_only = false
-nodes/fragment/0/position = Vector2( 760, 120 )
-nodes/fragment/2/node = SubResource( 5 )
-nodes/fragment/2/position = Vector2( -180, 200 )
-nodes/fragment/3/node = SubResource( 6 )
-nodes/fragment/3/position = Vector2( 80, 120 )
-nodes/fragment/4/node = SubResource( 7 )
-nodes/fragment/4/position = Vector2( -180, 140 )
-nodes/fragment/5/node = SubResource( 8 )
-nodes/fragment/5/position = Vector2( 280, 100 )
-nodes/fragment/6/node = SubResource( 9 )
-nodes/fragment/6/position = Vector2( 520, 140 )
-nodes/fragment/7/node = SubResource( 10 )
-nodes/fragment/7/position = Vector2( 80, 60 )
-nodes/fragment/8/node = SubResource( 11 )
-nodes/fragment/8/position = Vector2( 200, 260 )
-nodes/fragment/connections = PoolIntArray( 2, 0, 3, 2, 4, 0, 3, 0, 3, 0, 5, 1, 7, 0, 5, 0, 6, 0, 0, 0, 8, 0, 6, 2, 5, 0, 6, 1, 3, 0, 6, 0 )
-
-[sub_resource type="ShaderMaterial" id=4]
-shader = SubResource( 3 )
-shader_param/transition = 0.0
+[sub_resource type="ShaderMaterial" id="4"]
+shader = ExtResource("28")
+shader_parameter/transition = 0.0
 
 [node name="main" type="MarginContainer"]
 anchor_right = 1.0
 anchor_bottom = 1.0
 mouse_filter = 2
-theme = ExtResource( 18 )
-script = ExtResource( 8 )
+theme = ExtResource("18")
+script = ExtResource("8")
 
 [node name="background" type="ColorRect" parent="." groups=["background"]]
-margin_right = 350.0
-margin_bottom = 650.0
+offset_right = 350.0
+offset_bottom = 650.0
 mouse_filter = 2
-color = Color( 0.815686, 0.815686, 0.815686, 1 )
+color = Color(0.815686, 0.815686, 0.815686, 1)
 
 [node name="TabContainer" type="TabContainer" parent="."]
-margin_right = 350.0
-margin_bottom = 650.0
+offset_right = 350.0
+offset_bottom = 650.0
 tabs_visible = false
 
 [node name="VBoxContainer" type="VBoxContainer" parent="TabContainer"]
@@ -150,105 +60,105 @@ size_flags_vertical = 3
 
 [node name="screens" type="ScrollContainer" parent="TabContainer/VBoxContainer"]
 unique_name_in_owner = true
-margin_right = 350.0
-margin_bottom = 582.0
+offset_right = 350.0
+offset_bottom = 582.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
-script = ExtResource( 19 )
+script = ExtResource("19")
 swipe_threshold = 32.0
 
-[node name="current_time_screen" parent="TabContainer/VBoxContainer/screens" instance=ExtResource( 4 )]
-margin_bottom = 582.0
+[node name="current_time_screen" parent="TabContainer/VBoxContainer/screens" instance=ExtResource("4")]
+offset_bottom = 582.0
 
 [node name="Control3" parent="TabContainer/VBoxContainer/screens/current_time_screen" index="0"]
-margin_bottom = 582.0
+offset_bottom = 582.0
 
 [node name="VBoxContainer" parent="TabContainer/VBoxContainer/screens/current_time_screen" index="1"]
-margin_bottom = 582.0
+offset_bottom = 582.0
 
 [node name="Control" parent="TabContainer/VBoxContainer/screens/current_time_screen/VBoxContainer" index="0"]
-margin_bottom = 56.0
+offset_bottom = 56.0
 
 [node name="time_display" parent="TabContainer/VBoxContainer/screens/current_time_screen/VBoxContainer" index="1"]
-margin_top = 60.0
-margin_bottom = 149.0
+offset_top = 60.0
+offset_bottom = 149.0
 
 [node name="weather_display" parent="TabContainer/VBoxContainer/screens/current_time_screen/VBoxContainer" index="2"]
-margin_top = 153.0
-margin_bottom = 353.0
+offset_top = 153.0
+offset_bottom = 353.0
 
 [node name="location_display" parent="TabContainer/VBoxContainer/screens/current_time_screen/VBoxContainer" index="3"]
-margin_top = 357.0
-margin_bottom = 377.0
+offset_top = 357.0
+offset_bottom = 377.0
 
 [node name="temperature_display" parent="TabContainer/VBoxContainer/screens/current_time_screen/VBoxContainer" index="4"]
-margin_top = 381.0
-margin_bottom = 417.0
+offset_top = 381.0
+offset_bottom = 417.0
 
 [node name="Control2" parent="TabContainer/VBoxContainer/screens/current_time_screen/VBoxContainer" index="5"]
-margin_top = 421.0
-margin_bottom = 477.0
+offset_top = 421.0
+offset_bottom = 477.0
 
 [node name="audio" parent="TabContainer/VBoxContainer/screens/current_time_screen/VBoxContainer" index="6"]
-margin_top = 481.0
-margin_bottom = 521.0
+offset_top = 481.0
+offset_bottom = 521.0
 
 [node name="Control3" parent="TabContainer/VBoxContainer/screens/current_time_screen/VBoxContainer" index="7"]
-margin_top = 525.0
-margin_bottom = 582.0
+offset_top = 525.0
+offset_bottom = 582.0
 
 [node name="Control4" parent="TabContainer/VBoxContainer/screens/current_time_screen" index="2"]
-margin_bottom = 582.0
+offset_bottom = 582.0
 
-[node name="alarms_screen" parent="TabContainer/VBoxContainer/screens" instance=ExtResource( 21 )]
+[node name="alarms_screen" parent="TabContainer/VBoxContainer/screens" instance=ExtResource("21")]
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_right = 350.0
-margin_bottom = 582.0
+offset_right = 350.0
+offset_bottom = 582.0
 
 [node name="globe_screen" type="ScrollContainer" parent="TabContainer/VBoxContainer/screens"]
-margin_right = 304.0
+offset_right = 304.0
 mouse_filter = 2
-scroll_horizontal_enabled = false
+horizontal_scroll_mode = 0
 
 [node name="globe_screen" type="VBoxContainer" parent="TabContainer/VBoxContainer/screens/globe_screen"]
-margin_right = 288.0
-margin_bottom = 528.0
+offset_right = 288.0
+offset_bottom = 528.0
 mouse_filter = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
 alignment = 1
 
 [node name="MarginContainer" type="MarginContainer" parent="TabContainer/VBoxContainer/screens/globe_screen/globe_screen"]
-margin_right = 288.0
-margin_bottom = 300.0
+offset_right = 288.0
+offset_bottom = 300.0
 mouse_filter = 2
 size_flags_horizontal = 3
-custom_constants/margin_right = 25
-custom_constants/margin_left = 25
+theme_override_constants/margin_right = 25
+theme_override_constants/margin_left = 25
 
 [node name="TextureRect" type="TextureRect" parent="TabContainer/VBoxContainer/screens/globe_screen/globe_screen/MarginContainer"]
-margin_left = 25.0
-margin_right = 263.0
-margin_bottom = 300.0
-rect_min_size = Vector2( 0, 300 )
+offset_left = 25.0
+offset_right = 263.0
+offset_bottom = 300.0
+custom_minimum_size = Vector2(0, 300)
 mouse_filter = 2
 size_flags_horizontal = 3
-texture = ExtResource( 27 )
-expand = true
-stretch_mode = 6
+texture = ExtResource("27")
+expand_mode = 1
+stretch_mode = 5
 
 [node name="version" type="Label" parent="TabContainer/VBoxContainer/screens/globe_screen/globe_screen"]
-margin_top = 304.0
-margin_right = 288.0
-margin_bottom = 326.0
+offset_top = 304.0
+offset_right = 288.0
+offset_bottom = 326.0
 text = "UNIQLONE v1.0"
-align = 1
+horizontal_alignment = 1
 
 [node name="credits" type="Label" parent="TabContainer/VBoxContainer/screens/globe_screen/globe_screen" groups=["linkbacks"]]
-margin_top = 330.0
-margin_right = 288.0
-margin_bottom = 502.0
+offset_top = 330.0
+offset_right = 288.0
+offset_bottom = 502.0
 text = "
 Made by (lis)anne
 Original app & assets by UNIQLO
@@ -256,173 +166,173 @@ Created in Godot engine
 Name by @Sneakilli
 BetterTabContainer by Ucrash
 "
-align = 1
+horizontal_alignment = 1
 
 [node name="credits_button" type="LinkButton" parent="TabContainer/VBoxContainer/screens/globe_screen/globe_screen" groups=["linkbacks"]]
-margin_left = 30.0
-margin_top = 506.0
-margin_right = 257.0
-margin_bottom = 528.0
+offset_left = 30.0
+offset_top = 506.0
+offset_right = 257.0
+offset_bottom = 528.0
 size_flags_horizontal = 4
-custom_colors/font_color = Color( 0, 0, 0, 1 )
+theme_override_colors/font_color = Color(0, 0, 0, 1)
 text = "Check out my other stuff"
 
-[node name="settings_screen" parent="TabContainer/VBoxContainer/screens" instance=ExtResource( 26 )]
-margin_bottom = 582.0
+[node name="settings_screen" parent="TabContainer/VBoxContainer/screens" instance=ExtResource("26")]
+offset_bottom = 582.0
 
 [node name="tab_buttons" type="HBoxContainer" parent="TabContainer/VBoxContainer"]
 unique_name_in_owner = true
-margin_top = 586.0
-margin_right = 350.0
-margin_bottom = 636.0
-rect_min_size = Vector2( 0, 50 )
+offset_top = 586.0
+offset_right = 350.0
+offset_bottom = 636.0
+custom_minimum_size = Vector2(0, 50)
 
 [node name="current_button" type="TextureButton" parent="TabContainer/VBoxContainer/tab_buttons"]
-margin_right = 84.0
-margin_bottom = 50.0
+offset_right = 84.0
+offset_bottom = 50.0
 mouse_default_cursor_shape = 2
 size_flags_horizontal = 3
 toggle_mode = true
-pressed = true
-texture_normal = ExtResource( 3 )
-texture_pressed = ExtResource( 7 )
-texture_hover = ExtResource( 14 )
-expand = true
+button_pressed = true
+texture_normal = ExtResource("3")
+texture_pressed = ExtResource("7")
+texture_hover = ExtResource("14")
+ignore_texture_size = true
 stretch_mode = 5
 
 [node name="alarms_button" type="TextureButton" parent="TabContainer/VBoxContainer/tab_buttons"]
-margin_left = 88.0
-margin_right = 173.0
-margin_bottom = 50.0
+offset_left = 88.0
+offset_right = 173.0
+offset_bottom = 50.0
 mouse_default_cursor_shape = 2
 size_flags_horizontal = 3
 toggle_mode = true
-texture_normal = ExtResource( 1 )
-texture_pressed = ExtResource( 2 )
-texture_hover = ExtResource( 16 )
-expand = true
+texture_normal = ExtResource("1")
+texture_pressed = ExtResource("2")
+texture_hover = ExtResource("16")
+ignore_texture_size = true
 stretch_mode = 5
 
 [node name="globe_button" type="TextureButton" parent="TabContainer/VBoxContainer/tab_buttons"]
-margin_left = 177.0
-margin_right = 261.0
-margin_bottom = 50.0
+offset_left = 177.0
+offset_right = 261.0
+offset_bottom = 50.0
 mouse_default_cursor_shape = 2
 size_flags_horizontal = 3
 toggle_mode = true
-texture_normal = ExtResource( 5 )
-texture_pressed = ExtResource( 6 )
-texture_hover = ExtResource( 15 )
-expand = true
+texture_normal = ExtResource("5")
+texture_pressed = ExtResource("6")
+texture_hover = ExtResource("15")
+ignore_texture_size = true
 stretch_mode = 5
 
 [node name="settings_button" type="TextureButton" parent="TabContainer/VBoxContainer/tab_buttons"]
-margin_left = 265.0
-margin_right = 350.0
-margin_bottom = 50.0
+offset_left = 265.0
+offset_right = 350.0
+offset_bottom = 50.0
 mouse_default_cursor_shape = 2
 size_flags_horizontal = 3
 toggle_mode = true
-texture_normal = ExtResource( 12 )
-texture_pressed = ExtResource( 13 )
-texture_hover = ExtResource( 17 )
-expand = true
+texture_normal = ExtResource("12")
+texture_pressed = ExtResource("13")
+texture_hover = ExtResource("17")
+ignore_texture_size = true
 stretch_mode = 5
 
 [node name="Control" type="Control" parent="TabContainer/VBoxContainer"]
-margin_top = 640.0
-margin_right = 350.0
-margin_bottom = 650.0
-rect_min_size = Vector2( 0, 10 )
+offset_top = 640.0
+offset_right = 350.0
+offset_bottom = 650.0
+custom_minimum_size = Vector2(0, 10)
 
 [node name="alarm" type="MarginContainer" parent="."]
 visible = false
-margin_right = 350.0
-margin_bottom = 650.0
-script = ExtResource( 25 )
+offset_right = 350.0
+offset_bottom = 650.0
+script = ExtResource("25")
 
 [node name="background" type="ColorRect" parent="alarm" groups=["background"]]
-margin_right = 350.0
-margin_bottom = 650.0
+offset_right = 350.0
+offset_bottom = 650.0
 mouse_filter = 2
-color = Color( 0.815686, 0.815686, 0.815686, 1 )
+color = Color(0.815686, 0.815686, 0.815686, 1)
 
 [node name="VBoxContainer" type="VBoxContainer" parent="alarm"]
-margin_right = 350.0
-margin_bottom = 650.0
+offset_right = 350.0
+offset_bottom = 650.0
 
-[node name="current_time_screen" parent="alarm/VBoxContainer" instance=ExtResource( 4 )]
-margin_bottom = 532.0
+[node name="current_time_screen" parent="alarm/VBoxContainer" instance=ExtResource("4")]
+offset_bottom = 532.0
 
 [node name="Control3" parent="alarm/VBoxContainer/current_time_screen" index="0"]
-margin_bottom = 532.0
+offset_bottom = 532.0
 
 [node name="VBoxContainer" parent="alarm/VBoxContainer/current_time_screen" index="1"]
-margin_bottom = 532.0
+offset_bottom = 532.0
 
 [node name="Control" parent="alarm/VBoxContainer/current_time_screen/VBoxContainer" index="0"]
-margin_bottom = 72.0
+offset_bottom = 72.0
 
 [node name="TextureRect" type="TextureRect" parent="alarm/VBoxContainer/current_time_screen/VBoxContainer" index="1"]
-margin_top = 76.0
-margin_right = 300.0
-margin_bottom = 76.0
+offset_top = 76.0
+offset_right = 300.0
+offset_bottom = 76.0
 
 [node name="time_display" parent="alarm/VBoxContainer/current_time_screen/VBoxContainer" index="2"]
-margin_top = 80.0
-margin_bottom = 169.0
+offset_top = 80.0
+offset_bottom = 169.0
 
 [node name="weather_display" parent="alarm/VBoxContainer/current_time_screen/VBoxContainer" index="3"]
-margin_top = 173.0
-margin_bottom = 391.0
+offset_top = 173.0
+offset_bottom = 391.0
 
 [node name="location_display" parent="alarm/VBoxContainer/current_time_screen/VBoxContainer" index="4"]
-margin_top = 395.0
-margin_bottom = 415.0
+offset_top = 395.0
+offset_bottom = 415.0
 
 [node name="temperature_display" parent="alarm/VBoxContainer/current_time_screen/VBoxContainer" index="5"]
-margin_top = 419.0
-margin_bottom = 455.0
+offset_top = 419.0
+offset_bottom = 455.0
 
 [node name="Control2" parent="alarm/VBoxContainer/current_time_screen/VBoxContainer" index="6"]
-margin_top = 459.0
-margin_bottom = 532.0
+offset_top = 459.0
+offset_bottom = 532.0
 
 [node name="audio" parent="alarm/VBoxContainer/current_time_screen/VBoxContainer" index="7"]
 visible = false
 
 [node name="Control3" parent="alarm/VBoxContainer/current_time_screen/VBoxContainer" index="8"]
 visible = false
-margin_top = 528.0
+offset_top = 528.0
 
 [node name="Control4" parent="alarm/VBoxContainer/current_time_screen" index="2"]
-margin_bottom = 532.0
+offset_bottom = 532.0
 
 [node name="HBoxContainer" type="HBoxContainer" parent="alarm/VBoxContainer"]
-margin_top = 536.0
-margin_right = 350.0
-margin_bottom = 600.0
-rect_min_size = Vector2( 0, 64 )
+offset_top = 536.0
+offset_right = 350.0
+offset_bottom = 600.0
+custom_minimum_size = Vector2(0, 64)
 
 [node name="snooze" type="TextureButton" parent="alarm/VBoxContainer/HBoxContainer"]
-margin_right = 173.0
-margin_bottom = 64.0
+offset_right = 173.0
+offset_bottom = 64.0
 mouse_default_cursor_shape = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
-texture_normal = ExtResource( 23 )
-expand = true
+texture_normal = ExtResource("23")
+ignore_texture_size = true
 stretch_mode = 5
 
 [node name="stop" type="TextureButton" parent="alarm/VBoxContainer/HBoxContainer"]
-margin_left = 177.0
-margin_right = 350.0
-margin_bottom = 64.0
+offset_left = 177.0
+offset_right = 350.0
+offset_bottom = 64.0
 mouse_default_cursor_shape = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
-texture_normal = ExtResource( 24 )
-expand = true
+texture_normal = ExtResource("24")
+ignore_texture_size = true
 stretch_mode = 5
 
 [node name="snooze timer" type="Timer" parent="alarm"]
@@ -430,66 +340,60 @@ wait_time = 300.0
 one_shot = true
 
 [node name="foreground" type="ColorRect" parent="."]
-material = SubResource( 4 )
-margin_right = 350.0
-margin_bottom = 650.0
+material = SubResource("4")
+offset_right = 350.0
+offset_bottom = 650.0
 mouse_filter = 2
-__meta__ = {
-"_edit_lock_": true
-}
 
 [node name="sleep_mode" type="MarginContainer" parent="." groups=["minute_timer_updates"]]
 visible = false
-margin_right = 350.0
-margin_bottom = 650.0
+offset_right = 350.0
+offset_bottom = 650.0
 mouse_default_cursor_shape = 2
-script = ExtResource( 22 )
-__meta__ = {
-"_edit_lock_": true
-}
+script = ExtResource("22")
 
 [node name="ColorRect" type="ColorRect" parent="sleep_mode"]
-margin_right = 350.0
-margin_bottom = 650.0
-color = Color( 0, 0, 0, 1 )
+offset_right = 350.0
+offset_bottom = 650.0
+color = Color(0, 0, 0, 1)
 
 [node name="CenterContainer" type="CenterContainer" parent="sleep_mode"]
-margin_right = 350.0
-margin_bottom = 650.0
+offset_right = 350.0
+offset_bottom = 650.0
 
 [node name="VBoxContainer" type="VBoxContainer" parent="sleep_mode/CenterContainer"]
-modulate = Color( 1, 1, 1, 0.47451 )
-margin_left = 128.0
-margin_top = 267.0
-margin_right = 221.0
-margin_bottom = 383.0
+modulate = Color(1, 1, 1, 0.47451)
+offset_left = 128.0
+offset_top = 267.0
+offset_right = 221.0
+offset_bottom = 383.0
 
 [node name="TextureRect" type="TextureRect" parent="sleep_mode/CenterContainer/VBoxContainer"]
-margin_right = 93.0
-margin_bottom = 64.0
-rect_min_size = Vector2( 64, 64 )
-texture = ExtResource( 20 )
-expand = true
-stretch_mode = 6
+offset_right = 93.0
+offset_bottom = 64.0
+custom_minimum_size = Vector2(64, 64)
+texture = ExtResource("20")
+expand_mode = 1
+stretch_mode = 5
 
 [node name="Label" type="Label" parent="sleep_mode/CenterContainer/VBoxContainer"]
-margin_top = 68.0
-margin_right = 93.0
-margin_bottom = 90.0
+offset_top = 68.0
+offset_right = 93.0
+offset_bottom = 90.0
 text = "Good night"
-align = 1
+horizontal_alignment = 1
 
 [node name="time" type="Label" parent="sleep_mode/CenterContainer/VBoxContainer"]
 unique_name_in_owner = true
-margin_top = 94.0
-margin_right = 93.0
-margin_bottom = 116.0
+offset_top = 94.0
+offset_right = 93.0
+offset_bottom = 116.0
 text = "7 AM"
-align = 1
+horizontal_alignment = 1
 
 [node name="hide_sleepmode" type="Button" parent="sleep_mode"]
-margin_right = 350.0
-margin_bottom = 650.0
+offset_right = 350.0
+offset_bottom = 650.0
 mouse_default_cursor_shape = 2
 flat = true
 
@@ -497,15 +401,15 @@ flat = true
 one_shot = true
 
 [node name="time talker" type="Node" parent="."]
-script = ExtResource( 11 )
+script = ExtResource("11")
 
 [node name="speech" type="AudioStreamPlayer" parent="time talker"]
-script = ExtResource( 10 )
+script = ExtResource("10")
 
 [node name="music" type="AudioStreamPlayer" parent="time talker"]
 
 [node name="WeatherAPINode" type="Node" parent="."]
-script = ExtResource( 9 )
+script = ExtResource("9")
 
 [node name="minute timer" type="Timer" parent="."]
 
@@ -516,10 +420,10 @@ autostart = true
 [connection signal="tab_switched" from="TabContainer/VBoxContainer/screens" to="." method="_on_TabContainer_tab_selected"]
 [connection signal="toggled" from="TabContainer/VBoxContainer/screens/current_time_screen/VBoxContainer/audio" to="." method="_on_audio_toggled"]
 [connection signal="pressed" from="TabContainer/VBoxContainer/screens/globe_screen/globe_screen/credits_button" to="." method="_on_credits_button_pressed"]
-[connection signal="pressed" from="TabContainer/VBoxContainer/tab_buttons/current_button" to="." method="_on_tab_button_pressed" binds= [ 0 ]]
-[connection signal="pressed" from="TabContainer/VBoxContainer/tab_buttons/alarms_button" to="." method="_on_tab_button_pressed" binds= [ 1 ]]
-[connection signal="pressed" from="TabContainer/VBoxContainer/tab_buttons/globe_button" to="." method="_on_tab_button_pressed" binds= [ 2 ]]
-[connection signal="pressed" from="TabContainer/VBoxContainer/tab_buttons/settings_button" to="." method="_on_tab_button_pressed" binds= [ 3 ]]
+[connection signal="pressed" from="TabContainer/VBoxContainer/tab_buttons/current_button" to="." method="_on_tab_button_pressed" binds= [0]]
+[connection signal="pressed" from="TabContainer/VBoxContainer/tab_buttons/alarms_button" to="." method="_on_tab_button_pressed" binds= [1]]
+[connection signal="pressed" from="TabContainer/VBoxContainer/tab_buttons/globe_button" to="." method="_on_tab_button_pressed" binds= [2]]
+[connection signal="pressed" from="TabContainer/VBoxContainer/tab_buttons/settings_button" to="." method="_on_tab_button_pressed" binds= [3]]
 [connection signal="pressed" from="alarm/VBoxContainer/HBoxContainer/snooze" to="alarm" method="_on_snooze_pressed"]
 [connection signal="pressed" from="alarm/VBoxContainer/HBoxContainer/stop" to="alarm" method="_on_stop_pressed"]
 [connection signal="timeout" from="alarm/snooze timer" to="alarm" method="_on_snooze_timer_timeout"]

scenes/main/sleep_mode.gd

@@ -1,16 +1,16 @@
 extends MarginContainer
 
-export var auto_sleep :float = 60*2
-export var prevent_sleep := false setget set_prevent_sleep
-#export var auto_sleep :float = 6
+@export var auto_sleep: float = 60 * 2
+@export var prevent_sleep: bool = false:
+	set = set_prevent_sleep
 
-onready var sleep_timer = $sleep_timer
+@onready var sleep_timer = $sleep_timer
 
 
 func _ready():
 	sleep_timer.start(auto_sleep)
 
-func set_prevent_sleep(new:bool):
+func set_prevent_sleep(new: bool):
 	if new or Config.flags.prevent_sleep_mode:
 		hide()
 		sleep_timer.stop()

scenes/main/sleep_mode.gd.uid

@@ -0,0 +1 @@
+uid://ptun8kaxl2lg

scenes/main/time talker.gd

@@ -2,8 +2,8 @@ extends Node
 
 signal finished
 
-onready var node_speech = $speech
-onready var node_music = $music
+@onready var node_speech = $speech
+@onready var node_music = $music
 
 const greet := [preload("res://assets/audio/clips/greet/voc_en_greet_goodmorning.mp3"), preload("res://assets/audio/clips/greet/voc_en_greet_hello.mp3")]
 const its := preload("res://assets/audio/clips/misc/voc_en_its.mp3")
@@ -15,12 +15,12 @@ const weather := [preload("res://assets/audio/clips/weather/voc_en_weather_cloud
 
 const music := [preload("res://assets/audio/clips/music/music_cloudy.wav"), preload("res://assets/audio/clips/music/music_foggy.wav"), preload("res://assets/audio/clips/music/music_partlycloudy.wav"), preload("res://assets/audio/clips/music/music_rainy.wav"), preload("res://assets/audio/clips/music/music_snowy.wav"), preload("res://assets/audio/clips/music/music_stormy.wav"), preload("res://assets/audio/clips/music/music_sunny.wav"), preload("res://assets/audio/clips/music/music_unknown.wav")]
 
-var tween:SceneTreeTween
+var tween: Tween
 
 var A_finished = true
 var B_finished = true
 
-func play(moment:Moment, day:int, weather:int, music_weather_override=null, play_music := true, speak_time := true):
+func play(moment: Moment, day: int, weather_idx: int, music_weather_override = null, play_music: bool = true, speak_time: bool = true):
 	stop()
 	if tween:
 		tween.kill()
@@ -34,16 +34,16 @@ func play(moment:Moment, day:int, weather:int, music_weather_override=null, play
 			1.0, # sleep for 1 second
 			greet[0] if moment.is_morning() else greet[1],
 			its,
-			load(hours[int(moment.hour-1) % 12]),
+			load(hours[int(moment.hour - 1) % 12]),
 			load(minutes[moment.minute]),
 			am_pm[0 if moment.is_am() else 1],
 			weekday[day],
 		]
 	var tune = music[Constants.WEATHER.UNKNOWN]
-	if weather < Constants.WEATHER.UNKNOWN:
-		out.append(self.weather[weather])
-		tune = music[weather]
-	
+	if weather_idx < Constants.WEATHER.UNKNOWN:
+		out.append(self.weather[weather_idx])
+		tune = music[weather_idx]
+
 	if music_weather_override != null:
 		tune = music[music_weather_override]
 
@@ -52,15 +52,15 @@ func play(moment:Moment, day:int, weather:int, music_weather_override=null, play
 	if play_music:
 		node_music.stream = tune
 		node_music.play()
-	
-	if A_finished and B_finished:
-		emit_signal("finished")
 
-func stop(fadeout:=0.0):
+	if A_finished and B_finished:
+		finished.emit()
+
+func stop(fadeout: float = 0.0):
 	if tween:
 		tween.kill()
 	if fadeout > 0:
-		print("fadeout ",fadeout)
+		print("fadeout ", fadeout)
 		tween = get_tree().create_tween()
 		tween.set_parallel(true)
 		tween.tween_property(node_music, "volume_db", -60.0, fadeout)
@@ -68,9 +68,7 @@ func stop(fadeout:=0.0):
 		tween.set_parallel(false)
 		tween.tween_interval(fadeout)
 		tween.play()
-		yield(tween, 'finished')
-#		tween.connect("finished", self, "stop")
-#		return
+		await tween.finished
 	node_music.stop()
 	node_speech.stop()
 
@@ -82,15 +80,11 @@ func is_playing():
 
 func _on_speech_all_finished():
 	A_finished = true
-#	print("a_finished")
 	if A_finished and B_finished:
-#		print('boop')
-		emit_signal("finished")
+		finished.emit()
 
 
 func _on_music_finished():
 	B_finished = true
-#	print("b_finished")
 	if A_finished and B_finished:
-#		print('boop')
-		emit_signal("finished")
+		finished.emit()

scenes/main/time talker.gd.uid

@@ -0,0 +1 @@
+uid://eqpwcx4a3qyy