Input shortcuts, cue merging, and VF fixes

Author: not-my-username

assets/icons/remove.svg.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://b2irkd31agi0x"
-path="res://.godot/imported/remove.svg-4d209cc049dad917abe1dad4ca8edd56.ctex"
+path="res://.godot/imported/Remove.svg-d6b561eec13de9ed9a6b262ecffa42bf.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://assets/icons/remove.svg"
-dest_files=["res://.godot/imported/remove.svg-4d209cc049dad917abe1dad4ca8edd56.ctex"]
+source_file="res://assets/icons/Remove.svg"
+dest_files=["res://.godot/imported/Remove.svg-d6b561eec13de9ed9a6b262ecffa42bf.ctex"]
 
 [params]
 

components/ComponentMethodPicker/ComponentMethodPicker.tscn

@@ -2,7 +2,7 @@
 
 [ext_resource type="Theme" uid="uid://cyua45ur0ijqo" path="res://assets/Main.theme" id="1_fsimf"]
 [ext_resource type="Texture2D" uid="uid://rqf8w11gk6ud" path="res://assets/icons/Edit.svg" id="2_31l28"]
-[ext_resource type="Script" path="res://components/ComponentMethodPicker/ComponentMethodPicker.gd" id="2_nh1rv"]
+[ext_resource type="Script" uid="uid://dxl21h3kaey1t" path="res://components/ComponentMethodPicker/ComponentMethodPicker.gd" id="2_nh1rv"]
 [ext_resource type="Texture2D" uid="uid://bi4ttx5uklwl7" path="res://assets/icons/Check.svg" id="3_hdv2q"]
 [ext_resource type="Texture2D" uid="uid://b3hmh5jlggqxa" path="res://assets/icons/cross.svg" id="4_h27m0"]
 [ext_resource type="Texture2D" uid="uid://dfrrs2dnvlvsu" path="res://assets/icons/Delete.svg" id="5_54dlw"]

components/CueItem/CueItem.gd

@@ -33,6 +33,10 @@ var _current_tween: Tween = null
 	"PreWait": $VBoxContainer/HBoxContainer/VBoxContainer2/HBoxContainer/PanelContainer4/HBoxContainer/PreWait,
 }
 
+
+func _ready() -> void:
+	Programmer.store_mode_changed.connect(_on_store_mode_changed)
+
 ## Sets the cue represented by this CueItem
 func set_cue(cue: Cue, cue_list: CueList) -> void:
 	if _cue_list: _cue_list.cue_changed.disconnect(_on_cue_number_changed)
@@ -110,6 +114,11 @@ func set_trigger_mode(trigger_mode: int) -> void:
 		Cue.TRIGGER_MODE.WITH_LAST: $VBoxContainer/HBoxContainer/VBoxContainer2/HBoxContainer/PanelContainer/VBoxContainer/WithLast.show()
 
 
+## Called when store mode is changed
+func _on_store_mode_changed(store_mode: bool, class_hint: String) -> void:
+	$StoreMode.visible = store_mode
+
+
 ## Called when an input event is decected in the panel
 func _on_gui_input(event: InputEvent) -> void:
 	if event is InputEventMouseButton:
@@ -121,3 +130,6 @@ func _on_gui_input(event: InputEvent) -> void:
 
 		else:
 			clicked.emit()
+			
+			if Programmer.get_store_mode():
+				Programmer.resolve_store_mode(_cue)

components/CueItem/CueItem.tscn

@@ -1,9 +1,9 @@
-[gd_scene load_steps=14 format=3 uid="uid://owx4rxrtg50d"]
+[gd_scene load_steps=15 format=3 uid="uid://cd6jlfv6bfubw"]
 
 [ext_resource type="Theme" uid="uid://cyua45ur0ijqo" path="res://assets/Main.theme" id="1_t3b7b"]
 [ext_resource type="Texture2D" uid="uid://cxtdx7cj44nk" path="res://assets/icons/Touch.svg" id="1_yeptw"]
 [ext_resource type="Texture2D" uid="uid://gntqv7ddcqvv" path="res://assets/icons/Fade.svg" id="2_2p1lo"]
-[ext_resource type="Script" path="res://components/CueItem/CueItem.gd" id="2_aostn"]
+[ext_resource type="Script" uid="uid://dhbb4w3i6cv8f" path="res://components/CueItem/CueItem.gd" id="2_aostn"]
 [ext_resource type="Texture2D" uid="uid://txqtfrlvm3r7" path="res://assets/icons/ReturnFlipped.svg" id="2_dbt18"]
 [ext_resource type="Texture2D" uid="uid://doaysnonvo60k" path="res://assets/icons/PreWait.svg" id="3_ns1ii"]
 [ext_resource type="Texture2D" uid="uid://03gtlskodjas" path="res://assets/icons/Cue.svg" id="3_u1n7c"]
@@ -26,6 +26,18 @@ corner_radius_top_right = 5
 corner_radius_bottom_right = 5
 corner_radius_bottom_left = 5
 
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_vgny8"]
+bg_color = Color(0.701961, 0.0156863, 1, 0.156863)
+border_width_left = 2
+border_width_top = 2
+border_width_right = 2
+border_width_bottom = 2
+border_color = Color(0.701961, 0.0156863, 1, 1)
+corner_radius_top_left = 3
+corner_radius_top_right = 3
+corner_radius_bottom_right = 3
+corner_radius_bottom_left = 3
+
 [sub_resource type="LabelSettings" id="LabelSettings_odw3y"]
 font_color = Color(0.707967, 0.707967, 0.707967, 1)
 
@@ -49,6 +61,12 @@ theme = ExtResource("1_t3b7b")
 theme_override_styles/panel = SubResource("StyleBoxFlat_lrd3y")
 script = ExtResource("2_aostn")
 
+[node name="StoreMode" type="Panel" parent="."]
+visible = false
+layout_mode = 2
+mouse_filter = 1
+theme_override_styles/panel = SubResource("StyleBoxFlat_vgny8")
+
 [node name="VBoxContainer" type="VBoxContainer" parent="."]
 layout_mode = 2
 

components/TriggerButton/TriggerButton.gd

@@ -150,7 +150,7 @@ func make_dummy_of(master_trigger: TriggerButton) -> void:
 
 ## Adds an input event as a shortcut
 func add_shortcut(event: InputEvent) -> void:
-	shortcut.events.append(event)
+	shortcut.events = [event]
 	shortcut_added.emit(event)
 
 
@@ -170,6 +170,13 @@ func _on_button_up() -> void:
 		_button_up_trigger.call_method()
 
 
+## Called when the button is pressed
+func _on_pressed() -> void:
+	_on_button_down()
+	await get_tree().create_timer(0.01).timeout
+	_on_button_up()
+
+
 ## Called when this button is toggled in toggle mode, will call the corresponding _on_button_* method
 func _on_button_toggled(toggled_on: bool) -> void:
 	if toggled_on:

components/TriggerButton/TriggerButton.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=6 format=3 uid="uid://c2c3t6jriymr6"]
 
-[ext_resource type="Script" path="res://components/TriggerButton/TriggerButton.gd" id="1_3rl6v"]
+[ext_resource type="Script" uid="uid://cdy72t0e4kh8p" path="res://components/TriggerButton/TriggerButton.gd" id="1_3rl6v"]
 [ext_resource type="Theme" uid="uid://cyua45ur0ijqo" path="res://assets/Main.theme" id="1_v6l20"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_rpw8u"]
@@ -73,4 +73,5 @@ text_overrun_behavior = 3
 
 [connection signal="button_down" from="." to="." method="_on_button_down"]
 [connection signal="button_up" from="." to="." method="_on_button_up"]
+[connection signal="pressed" from="." to="." method="_on_pressed"]
 [connection signal="resized" from="." to="." method="_on_resized"]

components/TriggerButtonSettings/TriggerButtonSettings.gd

@@ -141,4 +141,7 @@ func _on_component_method_picker_method_confired(method_trigger: MethodTrigger)
 ## Called when a shortcut is added
 func _on_add_shortcut_button_shortcut_changed(input_event: InputEvent) -> void:
 	if trigger_button:
+		input_event.device = -1
+		#input_event.physical_keycode = 0
+		#input_event.key_label = 0
 		trigger_button.add_shortcut(input_event)

core/components/fixtures/DMXFixture.gd

@@ -8,6 +8,9 @@ class_name DMXFixture extends Fixture
 ## Emitted when the channel is changed
 signal channel_changed(channel: int)
 
+## Emitted when the manifest is changed
+signal manifest_changed(manifest: FixtureManifest)
+
 
 ## The DMX channel of this fixture
 var _channel: int = 0
@@ -92,6 +95,8 @@ func get_manifest() -> FixtureManifest:
 func _set_manifest(p_manifest: FixtureManifest, p_mode: String) -> void:
 	_mode = p_mode
 	_manifest = p_manifest
+	
+	manifest_changed.emit(_manifest)
 
 
 ## Gets all the override values

panels/Functions/Functions.gd

@@ -12,6 +12,13 @@ class_name UIFunctions extends UIPanel
 @export var _component_list: ComponentList
 
 
+
+func _input(event: InputEvent) -> void:
+	if event is InputEventKey and event.is_pressed():
+		print(var_to_str(event))
+		print("Shortcut:", var_to_str($VBoxContainer/HBoxContainer/VBoxContainer/PanelContainer/HBoxContainer/Create.shortcut.events[0]))
+
+
 ## Called when the Create button is pressed
 func _on_create_pressed() -> void:
 	Interface.show_create_component(CreateComponent.Mode.Component, "Function", true)

panels/Functions/Functions.tscn

@@ -2,7 +2,7 @@
 
 [ext_resource type="StyleBox" uid="uid://daxhx5qr5qdeu" path="res://assets/styles/SolidPanel.tres" id="1_es5ky"]
 [ext_resource type="Script" uid="uid://byqpqgm3d03aq" path="res://panels/Functions/Functions.gd" id="2_bfwkh"]
-[ext_resource type="PackedScene" uid="uid://dr0kfolsg46yu" path="res://components/PanelMenuBar.tscn" id="3_rou2v"]
+[ext_resource type="PackedScene" path="res://components/PanelMenuBar.tscn" id="3_rou2v"]
 [ext_resource type="PackedScene" uid="uid://c4vlxpk3ywg42" path="res://components/ComponentList/ComponentList.tscn" id="4_bosbs"]
 [ext_resource type="Texture2D" uid="uid://bbennjke0ioen" path="res://assets/icons/Add.svg" id="5_7afv4"]
 [ext_resource type="PackedScene" uid="uid://dwtaoj1uy0dok" path="res://components/ComponentSettings/ComponentSettings.tscn" id="5_re3nl"]

panels/NewCuePlayback/NewCuePlayback.gd

@@ -25,7 +25,8 @@ var _cues: Dictionary = {}
 var _previous_uuid: String = ""
 
 var _signal_connections: Dictionary = {
-	"cues_added": _reload_cues
+	"cues_added": _reload_cues,
+	"cues_removed": _reload_cues
 }
 
 ## Sets the cuelist to control

panels/NewCuePlayback/NewCuePlayback.tscn

@@ -3,7 +3,7 @@
 [ext_resource type="Theme" uid="uid://cyua45ur0ijqo" path="res://assets/Main.theme" id="1_u3x3w"]
 [ext_resource type="Script" uid="uid://b014dpwwf0a4j" path="res://panels/NewCuePlayback/NewCuePlayback.gd" id="2_4bo1g"]
 [ext_resource type="StyleBox" uid="uid://daxhx5qr5qdeu" path="res://assets/styles/SolidPanel.tres" id="2_bilu6"]
-[ext_resource type="Script" uid="uid://bcsro4uc8aseb" path="res://panels/NewCuePlayback/Controls.gd" id="3_ijo7h"]
+[ext_resource type="Script" uid="uid://cpkbkcmifpr2n" path="res://panels/NewCuePlayback/Controls.gd" id="3_ijo7h"]
 [ext_resource type="Texture2D" uid="uid://dnfqijjcnit7c" path="res://assets/icons/CueList.svg" id="3_qadkc"]
 [ext_resource type="Texture2D" uid="uid://c1cl6qetwg8st" path="res://assets/icons/Arrow_back.svg" id="3_v1amt"]
 [ext_resource type="StyleBox" uid="uid://csle20exwqtti" path="res://assets/styles/PanelMenuBar.tres" id="4_4ngmv"]

panels/VirtualFixtures/VirtualFixture/VirtualFixture.gd

@@ -37,6 +37,7 @@ var _fixture_signal_connections: Dictionary = {
 	"all_override_removed": _on_override_value_erased,
 	"parameter_changed": _on_parameter_changed,
 	"parameter_erased": _on_parameter_eraced,
+	"manifest_changed": _on_dmx_fixture_manifest_changed
 }
 
 
@@ -102,6 +103,10 @@ func render_color():
 		else:
 			base_color = Color.BLACK
 
+	if _fixture is DMXFixture and not _fixture.get_manifest():
+			base_color = Color.BLACK
+		
+	
 	set_color(base_color)
 
 
@@ -153,6 +158,11 @@ func _on_override_value_erased(parameter: String = "", zone: String = "") -> voi
 	render_color()
 
 
+## Called when the manifest is changed on a DMXFixture
+func _on_dmx_fixture_manifest_changed(manifest: FixtureManifest):
+	render_color()
+
+
 func _on_gui_input(event: InputEvent) -> void:
 	if event is InputEventMouseMotion and event.button_mask == MOUSE_BUTTON_MASK_LEFT:
 		move_requested.emit(event.relative) 

panels/VirtualFixtures/VirtualFixtures.gd

@@ -108,7 +108,10 @@ func _on_grid_align_pressed() -> void:
 func _save() -> Dictionary:
 	if fixture_container.fixture_group:
 		return {
-			"fixture_group": fixture_container.fixture_group.uuid
+			"fixture_group": fixture_container.fixture_group.uuid,
+			"scroll_h": real_scroll.scroll_horizontal,
+			"scroll_v": real_scroll.scroll_vertical,
+			"zoom": fixture_container.scale.x
 		}
 	else:
 		return {}
@@ -121,6 +124,15 @@ func _load(saved_data) -> void:
 			if fixture_group is FixtureGroup:
 				fixture_container.set_fixture_group(fixture_group)
 		)
+	
+	real_scroll.scroll_horizontal = type_convert(saved_data.get("scroll_h"), TYPE_INT)
+	real_scroll.scroll_vertical = type_convert(saved_data.get("scroll_v"), TYPE_INT)
+	
+	fixture_container.scale = Vector2(
+		type_convert(saved_data.get("zoom"), TYPE_FLOAT),
+		type_convert(saved_data.get("zoom"), TYPE_FLOAT)
+	)
+
 
 
 func _on_table_gui_input(event: InputEvent) -> void: