Browse Source

added label displaying last used output folder and fixed centring issues on input and output nodes

Jonathan Higgins 3 months ago
parent
commit
fa47e59963
2 changed files with 39 additions and 6 deletions
  1. 27 2
      scenes/Nodes/nodes.tscn
  2. 12 4
      scenes/main/scripts/control.gd

+ 27 - 2
scenes/Nodes/nodes.tscn

@@ -52,6 +52,7 @@ layout_mode = 2
 
 
 [node name="AudioPlayer" parent="inputfile" groups=["inputnode"] instance=ExtResource("2_b6nw4")]
 [node name="AudioPlayer" parent="inputfile" groups=["inputnode"] instance=ExtResource("2_b6nw4")]
 layout_mode = 2
 layout_mode = 2
+size_flags_horizontal = 4
 metadata/loadenable = true
 metadata/loadenable = true
 metadata/inputfunction = "audioplayer"
 metadata/inputfunction = "audioplayer"
 
 
@@ -90,14 +91,15 @@ layout_mode = 2
 
 
 [node name="AudioPlayer" parent="preview" groups=["inputnode"] instance=ExtResource("2_b6nw4")]
 [node name="AudioPlayer" parent="preview" groups=["inputnode"] instance=ExtResource("2_b6nw4")]
 layout_mode = 2
 layout_mode = 2
+size_flags_horizontal = 4
 metadata/inputfunction = "audioplayer"
 metadata/inputfunction = "audioplayer"
 
 
 [node name="outputfile" type="GraphNode" parent="."]
 [node name="outputfile" type="GraphNode" parent="."]
 layout_mode = 0
 layout_mode = 0
 offset_left = 523.0
 offset_left = 523.0
 offset_top = 6.0
 offset_top = 6.0
-offset_right = 954.0
-offset_bottom = 519.0
+offset_right = 959.0
+offset_bottom = 555.0
 tooltip_text = "Handles everything to do with audio output. "
 tooltip_text = "Handles everything to do with audio output. "
 title = "Output File"
 title = "Output File"
 slot/0/left_enabled = true
 slot/0/left_enabled = true
@@ -217,6 +219,15 @@ slot/12/right_type = 0
 slot/12/right_color = Color(1, 1, 1, 1)
 slot/12/right_color = Color(1, 1, 1, 1)
 slot/12/right_icon = null
 slot/12/right_icon = null
 slot/12/draw_stylebox = true
 slot/12/draw_stylebox = true
+slot/13/left_enabled = false
+slot/13/left_type = 0
+slot/13/left_color = Color(1, 1, 1, 1)
+slot/13/left_icon = null
+slot/13/right_enabled = false
+slot/13/right_type = 0
+slot/13/right_color = Color(1, 1, 1, 1)
+slot/13/right_icon = null
+slot/13/draw_stylebox = true
 script = ExtResource("3_0jqh0")
 script = ExtResource("3_0jqh0")
 metadata/command = "outputfile"
 metadata/command = "outputfile"
 metadata/utility = true
 metadata/utility = true
@@ -265,6 +276,19 @@ text = "Reuse Last Output Folder"
 expand_icon = true
 expand_icon = true
 metadata/outputfunction = "reusefolder"
 metadata/outputfunction = "reusefolder"
 
 
+[node name="OutputFolderMargin" type="MarginContainer" parent="outputfile"]
+layout_mode = 2
+theme_override_constants/margin_left = 7
+theme_override_constants/margin_top = 6
+theme_override_constants/margin_right = 7
+theme_override_constants/margin_bottom = 9
+
+[node name="OutputFolderLabel" type="Label" parent="outputfile/OutputFolderMargin"]
+layout_mode = 2
+size_flags_horizontal = 3
+clip_text = true
+text_overrun_behavior = 3
+
 [node name="OpenOutputFolder" type="Button" parent="outputfile" groups=["outputnode"]]
 [node name="OpenOutputFolder" type="Button" parent="outputfile" groups=["outputnode"]]
 custom_minimum_size = Vector2(0, 43)
 custom_minimum_size = Vector2(0, 43)
 layout_mode = 2
 layout_mode = 2
@@ -294,6 +318,7 @@ theme_override_constants/margin_bottom = 2
 
 
 [node name="AudioPlayer" parent="outputfile" groups=["outputnode"] instance=ExtResource("2_b6nw4")]
 [node name="AudioPlayer" parent="outputfile" groups=["outputnode"] instance=ExtResource("2_b6nw4")]
 layout_mode = 2
 layout_mode = 2
+size_flags_horizontal = 4
 metadata/outputfunction = "audioplayer"
 metadata/outputfunction = "audioplayer"
 
 
 [node name="notes" type="GraphNode" parent="."]
 [node name="notes" type="GraphNode" parent="."]

+ 12 - 4
scenes/main/scripts/control.gd

@@ -20,6 +20,7 @@ var uiscale = 1.0 #tracks scaling for retina screens
 var use_anyway #used to store the folder selected for cdprogs when it appears the wrong folder is selected but the user wants to use it anyway
 var use_anyway #used to store the folder selected for cdprogs when it appears the wrong folder is selected but the user wants to use it anyway
 var main_theme = preload("res://theme/main_theme.tres") #load the theme
 var main_theme = preload("res://theme/main_theme.tres") #load the theme
 var default_input_node #stores a reference to the input node created on launch to allow auto loading a wav file
 var default_input_node #stores a reference to the input node created on launch to allow auto loading a wav file
+var output_folder_label
 
 
 
 
 #scripts
 #scripts
@@ -56,8 +57,8 @@ func _ready() -> void:
 	
 	
 	load_scripts()
 	load_scripts()
 	make_signal_connections()
 	make_signal_connections()
-	check_user_preferences()
 	hidpi_adjustment()
 	hidpi_adjustment()
+	check_user_preferences()
 	new_patch()
 	new_patch()
 	await get_tree().process_frame
 	await get_tree().process_frame
 	load_from_filesystem()
 	load_from_filesystem()
@@ -143,6 +144,13 @@ func new_patch():
 	effect.position_offset = Vector2((DisplayServer.screen_get_size().x - 480) / uiscale, 80)
 	effect.position_offset = Vector2((DisplayServer.screen_get_size().x - 480) / uiscale, 80)
 	graph_edit._register_node_movement() #link nodes for tracking position changes for changes tracking
 	graph_edit._register_node_movement() #link nodes for tracking position changes for changes tracking
 	
 	
+	#set label for last output folder
+	var interface_settings = ConfigHandler.load_interface_settings()
+	output_folder_label = effect.get_node("OutputFolderMargin/OutputFolderLabel")
+	if output_folder_label != null and interface_settings.last_used_output_folder != "no_file":
+		output_folder_label.text = interface_settings.last_used_output_folder
+		output_folder_label.get_parent().tooltip_text = interface_settings.last_used_output_folder
+	
 	changesmade = false #so it stops trying to save unchanged empty files
 	changesmade = false #so it stops trying to save unchanged empty files
 	get_window().title = "SoundThread"
 	get_window().title = "SoundThread"
 	link_output()
 	link_output()
@@ -198,9 +206,6 @@ func check_user_preferences():
 	#set the theme to either the main theme or inverted theme depending on user preferences
 	#set the theme to either the main theme or inverted theme depending on user preferences
 	invert_theme_toggled(interface_settings.invert_theme)
 	invert_theme_toggled(interface_settings.invert_theme)
 	swap_zoom_and_move(interface_settings.swap_zoom_and_move)
 	swap_zoom_and_move(interface_settings.swap_zoom_and_move)
-	
-	#set the global outfile to the last used directory
-	#Global.outfile = interface_settings.last_used_output_folder
 
 
 		
 		
 func show_cdp_location():
 func show_cdp_location():
@@ -337,6 +342,9 @@ func _run_process() -> void:
 func _on_file_dialog_dir_selected(dir: String) -> void:
 func _on_file_dialog_dir_selected(dir: String) -> void:
 	#lastoutputfolder = dir
 	#lastoutputfolder = dir
 	ConfigHandler.save_interface_settings("last_used_output_folder", dir)
 	ConfigHandler.save_interface_settings("last_used_output_folder", dir)
+	if output_folder_label != null:
+		output_folder_label.text = dir
+		output_folder_label.tooltip_text = dir
 	console_output.clear()
 	console_output.clear()
 	var interface_settings = ConfigHandler.load_interface_settings()
 	var interface_settings = ConfigHandler.load_interface_settings()
 	if interface_settings.disable_progress_bar == false:
 	if interface_settings.disable_progress_bar == false: