From 48d41615ab7de357177170e6946496280f1dc055 Mon Sep 17 00:00:00 2001 From: LMW Date: Fri, 16 Jan 2026 13:07:49 +0800 Subject: [PATCH] Consistent window titles --- material_maker/nodes/debug/debug_popup.tscn | 2 +- material_maker/panels/paint/paint_project_settings.tscn | 2 +- .../tools/environment_manager/environment_manager.gd | 2 +- material_maker/tools/share/share_node_dialog.tscn | 2 +- material_maker/tools/share/upload_dialog.tscn | 3 ++- material_maker/widgets/curve_edit/curve_dialog.tscn | 9 +++++---- material_maker/widgets/lattice_edit/lattice_dialog.gd | 2 +- material_maker/widgets/pixels_edit/pixels_dialog.tscn | 4 +++- material_maker/widgets/polygon_edit/polygon_dialog.gd | 2 +- material_maker/widgets/splines_edit/splines_dialog.gd | 2 +- material_maker/widgets/splines_edit/splines_dialog.tscn | 2 ++ material_maker/windows/desc_dialog/desc_dialog.tscn | 1 + .../windows/export_animation/export_animation.tscn | 2 +- material_maker/windows/file_dialog/file_dialog.tscn | 1 - .../windows/load_from_website/load_from_website.tscn | 2 +- material_maker/windows/material_editor/export_editor.gd | 4 ++-- 16 files changed, 24 insertions(+), 18 deletions(-) diff --git a/material_maker/nodes/debug/debug_popup.tscn b/material_maker/nodes/debug/debug_popup.tscn index d1b933a57..df9080e33 100644 --- a/material_maker/nodes/debug/debug_popup.tscn +++ b/material_maker/nodes/debug/debug_popup.tscn @@ -12,7 +12,7 @@ resource_local_to_scene = true shader = SubResource("2") [node name="GeneratedShaderWindow" type="Window"] -title = "Generated shader" +title = "Generated Shader" size = Vector2i(500, 500) exclusive = true script = ExtResource("1") diff --git a/material_maker/panels/paint/paint_project_settings.tscn b/material_maker/panels/paint/paint_project_settings.tscn index 802f0c537..20c0990ad 100644 --- a/material_maker/panels/paint/paint_project_settings.tscn +++ b/material_maker/panels/paint/paint_project_settings.tscn @@ -5,7 +5,7 @@ [ext_resource type="Script" path="res://material_maker/panels/paint/paint_project_settings.gd" id="3"] [node name="PaintProjectSettings" type="Window"] -title = "Paint project settings" +title = "Paint Project Settings" exclusive = true always_on_top = true extend_to_title = true diff --git a/material_maker/tools/environment_manager/environment_manager.gd b/material_maker/tools/environment_manager/environment_manager.gd index c0b828138..2dd18e57a 100644 --- a/material_maker/tools/environment_manager/environment_manager.gd +++ b/material_maker/tools/environment_manager/environment_manager.gd @@ -188,7 +188,7 @@ func read_hdr(index : int, url : String) -> bool: return true if accept_dialog == null: accept_dialog = AcceptDialog.new() - accept_dialog.title = "HDRI download error" + accept_dialog.title = "HDRI Download Error" accept_dialog.dialog_text = "Failed to download %s" % url accept_dialog.content_scale_factor = get_window().content_scale_factor accept_dialog.min_size = accept_dialog.get_contents_minimum_size() * accept_dialog.content_scale_factor diff --git a/material_maker/tools/share/share_node_dialog.tscn b/material_maker/tools/share/share_node_dialog.tscn index 1a388ac70..07c8f0718 100644 --- a/material_maker/tools/share/share_node_dialog.tscn +++ b/material_maker/tools/share/share_node_dialog.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" path="res://material_maker/tools/share/share_node_dialog.gd" id="1"] [node name="Share" type="Window"] -title = "Share custom node" +title = "Share Custom Node" script = ExtResource("1") [node name="MarginContainer" type="MarginContainer" parent="."] diff --git a/material_maker/tools/share/upload_dialog.tscn b/material_maker/tools/share/upload_dialog.tscn index cb47d42af..f0463e2f6 100644 --- a/material_maker/tools/share/upload_dialog.tscn +++ b/material_maker/tools/share/upload_dialog.tscn @@ -3,7 +3,8 @@ [ext_resource type="Script" uid="uid://bkpwlw0cvm7a3" path="res://material_maker/tools/share/upload_dialog.gd" id="1"] [node name="UploadDialog" type="Window"] -title = "Share asset" +oversampling_override = 1.0 +title = "Share Asset" position = Vector2i(0, 36) size = Vector2i(600, 500) script = ExtResource("1") diff --git a/material_maker/widgets/curve_edit/curve_dialog.tscn b/material_maker/widgets/curve_edit/curve_dialog.tscn index 4f43b25e4..7e749de58 100644 --- a/material_maker/widgets/curve_edit/curve_dialog.tscn +++ b/material_maker/widgets/curve_edit/curve_dialog.tscn @@ -7,7 +7,8 @@ [ext_resource type="PackedScene" uid="uid://rflulhsuy3ax" path="res://material_maker/widgets/float_edit/float_edit.tscn" id="3_fe25e"] [node name="CurveDialog" type="Window"] -title = "Edit curve" +oversampling_override = 1.0 +title = "Edit Curve" position = Vector2i(0, 36) size = Vector2i(300, 300) exclusive = true @@ -160,9 +161,9 @@ text = "Cancel" [connection signal="ready" from="VBoxContainer/CurveViewSettingsContainer/CurveViewSettings" to="VBoxContainer/CurveViewSettingsContainer/CurveViewSettings" method="_on_ready"] [connection signal="value_changed" from="VBoxContainer/CurveViewSettingsContainer/CurveViewSettings/HBoxContainer/GridDensity" to="VBoxContainer/CurveViewSettingsContainer/CurveViewSettings" method="_on_grid_density_value_changed"] [connection signal="value_changed" from="VBoxContainer/EditorContainer/CurveEditor" to="." method="_on_CurveEditor_value_changed"] -[connection signal="gui_input" from="VBoxContainer/EditorContainer/CurveEditor/@Control@283287" to="VBoxContainer/EditorContainer/CurveEditor/@Control@283287" method="_on_ControlPoint_gui_input"] -[connection signal="mouse_entered" from="VBoxContainer/EditorContainer/CurveEditor/@Control@283287" to="VBoxContainer/EditorContainer/CurveEditor/@Control@283287" method="_on_mouse_entered"] -[connection signal="mouse_exited" from="VBoxContainer/EditorContainer/CurveEditor/@Control@283287" to="VBoxContainer/EditorContainer/CurveEditor/@Control@283287" method="_on_mouse_exited"] +[connection signal="gui_input" from="VBoxContainer/EditorContainer/CurveEditor/@Control@82379" to="VBoxContainer/EditorContainer/CurveEditor/@Control@82379" method="_on_ControlPoint_gui_input"] +[connection signal="mouse_entered" from="VBoxContainer/EditorContainer/CurveEditor/@Control@82379" to="VBoxContainer/EditorContainer/CurveEditor/@Control@82379" method="_on_mouse_entered"] +[connection signal="mouse_exited" from="VBoxContainer/EditorContainer/CurveEditor/@Control@82379" to="VBoxContainer/EditorContainer/CurveEditor/@Control@82379" method="_on_mouse_exited"] [connection signal="value_changed" from="VBoxContainer/ControlUIContainer/ControlUI/PositionX" to="VBoxContainer/EditorContainer/CurveEditor" method="_on_position_x_value_changed"] [connection signal="value_changed" from="VBoxContainer/ControlUIContainer/ControlUI/PositionY" to="VBoxContainer/EditorContainer/CurveEditor" method="_on_position_y_value_changed"] [connection signal="value_changed" from="VBoxContainer/ControlUIContainer/ControlUI/LeftSlope" to="VBoxContainer/EditorContainer/CurveEditor" method="_on_left_slope_value_changed"] diff --git a/material_maker/widgets/lattice_edit/lattice_dialog.gd b/material_maker/widgets/lattice_edit/lattice_dialog.gd index 4eac74ea2..f055b702a 100644 --- a/material_maker/widgets/lattice_edit/lattice_dialog.gd +++ b/material_maker/widgets/lattice_edit/lattice_dialog.gd @@ -15,7 +15,7 @@ func _ready(): func set_closed(c : bool = true): closed = c - title = "Edit lattice" if closed else "Edit polyline" + title = "Edit Lattice" if closed else "Edit Polyline" $VBoxContainer/EditorContainer/LatticeEditor.set_closed(closed) func _on_CurveDialog_popup_hide(): diff --git a/material_maker/widgets/pixels_edit/pixels_dialog.tscn b/material_maker/widgets/pixels_edit/pixels_dialog.tscn index d569708ac..659eaf087 100644 --- a/material_maker/widgets/pixels_edit/pixels_dialog.tscn +++ b/material_maker/widgets/pixels_edit/pixels_dialog.tscn @@ -1,9 +1,11 @@ [gd_scene load_steps=3 format=3 uid="uid://b4i6k8ehbdp3d"] -[ext_resource type="Script" path="res://material_maker/widgets/pixels_edit/pixels_dialog.gd" id="1_ohhhw"] +[ext_resource type="Script" uid="uid://yadmqxchgo1r" path="res://material_maker/widgets/pixels_edit/pixels_dialog.gd" id="1_ohhhw"] [ext_resource type="PackedScene" uid="uid://b51634rcdiyr" path="res://material_maker/widgets/pixels_edit/pixels_editor.tscn" id="2_ie4b0"] [node name="PixelsDialog" type="Window"] +oversampling_override = 1.0 +title = "Edit Pixels" script = ExtResource("1_ohhhw") [node name="VBoxContainer" type="VBoxContainer" parent="."] diff --git a/material_maker/widgets/polygon_edit/polygon_dialog.gd b/material_maker/widgets/polygon_edit/polygon_dialog.gd index baeaa775b..eed2b7ff6 100644 --- a/material_maker/widgets/polygon_edit/polygon_dialog.gd +++ b/material_maker/widgets/polygon_edit/polygon_dialog.gd @@ -14,7 +14,7 @@ func _ready(): func set_closed(c : bool = true): closed = c - title = "Edit polygon" if closed else "Edit polyline" + title = "Edit Polygon" if closed else "Edit Polyline" $VBoxContainer/EditorContainer/PolygonEditor.set_closed(closed) func _on_CurveDialog_popup_hide(): diff --git a/material_maker/widgets/splines_edit/splines_dialog.gd b/material_maker/widgets/splines_edit/splines_dialog.gd index 48ba3d2b7..d6af1227a 100644 --- a/material_maker/widgets/splines_edit/splines_dialog.gd +++ b/material_maker/widgets/splines_edit/splines_dialog.gd @@ -14,7 +14,7 @@ func _ready(): func set_closed(c : bool = true): closed = c - title = "Edit splines" if closed else "Edit polyline" + title = "Edit Splines" if closed else "Edit Polyline" $VBoxContainer/EditorContainer/SplinesEditor.set_closed(closed) func _on_CurveDialog_popup_hide(): diff --git a/material_maker/widgets/splines_edit/splines_dialog.tscn b/material_maker/widgets/splines_edit/splines_dialog.tscn index 19a7b15b8..01c09d88d 100644 --- a/material_maker/widgets/splines_edit/splines_dialog.tscn +++ b/material_maker/widgets/splines_edit/splines_dialog.tscn @@ -4,6 +4,8 @@ [ext_resource type="PackedScene" uid="uid://b08bcbwwosrrk" path="res://material_maker/widgets/splines_edit/splines_editor.tscn" id="2"] [node name="SplinesDialog" type="Window"] +oversampling_override = 1.0 +title = "Edit Splines" position = Vector2i(0, 36) script = ExtResource("1_u3y6s") diff --git a/material_maker/windows/desc_dialog/desc_dialog.tscn b/material_maker/windows/desc_dialog/desc_dialog.tscn index 01f52546b..128231bb0 100644 --- a/material_maker/windows/desc_dialog/desc_dialog.tscn +++ b/material_maker/windows/desc_dialog/desc_dialog.tscn @@ -3,6 +3,7 @@ [ext_resource type="Script" uid="uid://3rcb1a63iu8s" path="res://material_maker/windows/desc_dialog/desc_dialog.gd" id="1"] [node name="Window" type="Window"] +oversampling_override = 1.0 position = Vector2i(0, 36) size = Vector2i(300, 150) script = ExtResource("1") diff --git a/material_maker/windows/export_animation/export_animation.tscn b/material_maker/windows/export_animation/export_animation.tscn index 4330be36b..5d21c223f 100644 --- a/material_maker/windows/export_animation/export_animation.tscn +++ b/material_maker/windows/export_animation/export_animation.tscn @@ -80,7 +80,7 @@ render_priority = 0 shader = SubResource("10") [node name="ExportAnimation" type="Window"] -title = "Export animation" +title = "Export Animation" position = Vector2i(0, 36) size = Vector2i(750, 300) script = ExtResource("1") diff --git a/material_maker/windows/file_dialog/file_dialog.tscn b/material_maker/windows/file_dialog/file_dialog.tscn index 867de2417..33a86dc45 100644 --- a/material_maker/windows/file_dialog/file_dialog.tscn +++ b/material_maker/windows/file_dialog/file_dialog.tscn @@ -6,7 +6,6 @@ title = "Open a File" initial_position = 2 size = Vector2i(500, 400) -visible = false ok_button_text = "Open" file_mode = 0 access = 2 diff --git a/material_maker/windows/load_from_website/load_from_website.tscn b/material_maker/windows/load_from_website/load_from_website.tscn index 92faf71f4..ba5a3f168 100644 --- a/material_maker/windows/load_from_website/load_from_website.tscn +++ b/material_maker/windows/load_from_website/load_from_website.tscn @@ -4,7 +4,7 @@ [node name="LoadFromWebsite" type="Window"] oversampling_override = 1.0 -title = "Load from website" +title = "Load From Website" exclusive = true script = ExtResource("1") diff --git a/material_maker/windows/material_editor/export_editor.gd b/material_maker/windows/material_editor/export_editor.gd index c50b59c64..4f5c230d4 100644 --- a/material_maker/windows/material_editor/export_editor.gd +++ b/material_maker/windows/material_editor/export_editor.gd @@ -140,7 +140,7 @@ func _on_Load_Export_pressed(): dialog.min_size = Vector2(500, 500) dialog.access = FileDialog.ACCESS_FILESYSTEM dialog.file_mode = FileDialog.FILE_MODE_OPEN_FILES - dialog.title = "Load export target from file" + dialog.title = "Load Export Target" dialog.add_filter("*.mme;Material Maker Export target") var files = await dialog.select_files() if files.size() > 0: @@ -163,7 +163,7 @@ func _on_Save_Export_pressed(): dialog.min_size = Vector2(500, 500) dialog.access = FileDialog.ACCESS_FILESYSTEM dialog.file_mode = FileDialog.FILE_MODE_SAVE_FILE - dialog.title = "Save export target to file" + dialog.title = "Save Export Target" dialog.add_filter("*.mme;Material Maker Export target") var files = await dialog.select_files() if files.size() > 0: