Skip to content

Consistent window/dialog title casing #1264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
williamchange wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Consistent window/dialog title casing #1264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion material_maker/nodes/debug/debug_popup.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion material_maker/panels/paint/paint_project_settings.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion material_maker/tools/environment_manager/environment_manager.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion material_maker/tools/share/share_node_dialog.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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="."]
Expand Down
3 changes: 2 additions & 1 deletion material_maker/tools/share/upload_dialog.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
9 changes: 5 additions & 4 deletions material_maker/widgets/curve_edit/curve_dialog.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion material_maker/widgets/lattice_edit/lattice_dialog.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
4 changes: 3 additions & 1 deletion material_maker/widgets/pixels_edit/pixels_dialog.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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="."]
Expand Down
2 changes: 1 addition & 1 deletion material_maker/widgets/polygon_edit/polygon_dialog.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
2 changes: 1 addition & 1 deletion material_maker/widgets/splines_edit/splines_dialog.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
2 changes: 2 additions & 0 deletions material_maker/widgets/splines_edit/splines_dialog.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
1 change: 1 addition & 0 deletions material_maker/windows/desc_dialog/desc_dialog.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion material_maker/windows/export_animation/export_animation.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
1 change: 0 additions & 1 deletion material_maker/windows/file_dialog/file_dialog.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion material_maker/windows/load_from_website/load_from_website.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
4 changes: 2 additions & 2 deletions material_maker/windows/material_editor/export_editor.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down