Skip to content

Commit 694d034

Browse files
committed
Rename editor "File" MenuOption enums for clarity
1 parent 32eafc1 commit 694d034

12 files changed

+439
-433
lines changed

editor/dependency_editor.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -302,9 +302,9 @@ void DependencyEditorOwners::_list_rmb_clicked(int p_item, const Vector2 &p_pos,
302302
}
303303

304304
if (only_scenes_selected) {
305-
file_options->add_icon_item(get_editor_theme_icon(SNAME("Load")), TTRN("Open Scene", "Open Scenes", selected_items.size()), FILE_OPEN_);
305+
file_options->add_icon_item(get_editor_theme_icon(SNAME("Load")), TTRN("Open Scene", "Open Scenes", selected_items.size()), FILE_MENU_OPEN);
306306
} else if (selected_items.size() == 1) {
307-
file_options->add_icon_item(get_editor_theme_icon(SNAME("Load")), TTR("Open"), FILE_OPEN_);
307+
file_options->add_icon_item(get_editor_theme_icon(SNAME("Load")), TTR("Open"), FILE_MENU_OPEN);
308308
} else {
309309
return;
310310
}
@@ -333,7 +333,7 @@ void DependencyEditorOwners::_empty_clicked(const Vector2 &p_pos, MouseButton p_
333333

334334
void DependencyEditorOwners::_file_option(int p_option) {
335335
switch (p_option) {
336-
case FILE_OPEN_: {
336+
case FILE_MENU_OPEN: {
337337
PackedInt32Array selected_items = owners->get_selected_items();
338338
for (int i = 0; i < selected_items.size(); i++) {
339339
int item_idx = selected_items[i];

editor/dependency_editor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class DependencyEditorOwners : public AcceptDialog {
8080

8181
private:
8282
enum FileMenu {
83-
FILE_OPEN_,
83+
FILE_MENU_OPEN,
8484
};
8585

8686
public:

editor/editor_node.cpp

Lines changed: 71 additions & 71 deletions
Large diffs are not rendered by default.

editor/editor_node.h

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -138,23 +138,23 @@ class EditorNode : public Node {
138138

139139
enum MenuOptions {
140140
// Scene menu.
141-
FILE_NEW_SCENE,
142-
FILE_NEW_INHERITED_SCENE,
143-
FILE_OPEN_SCENE,
144-
FILE_OPEN_PREV,
145-
FILE_OPEN_RECENT,
146-
FILE_SAVE_SCENE,
147-
FILE_SAVE_AS_SCENE,
148-
FILE_SAVE_ALL_SCENES,
149-
FILE_MULTI_SAVE_AS_SCENE,
150-
FILE_QUICK_OPEN,
151-
FILE_QUICK_OPEN_SCENE,
152-
FILE_QUICK_OPEN_SCRIPT,
153-
FILE_UNDO,
154-
FILE_REDO,
155-
FILE_RELOAD_SAVED_SCENE,
156-
FILE_CLOSE,
157-
FILE_QUIT,
141+
SCENE_NEW_SCENE,
142+
SCENE_NEW_INHERITED_SCENE,
143+
SCENE_OPEN_SCENE,
144+
SCENE_OPEN_PREV,
145+
SCENE_OPEN_RECENT,
146+
SCENE_SAVE_SCENE,
147+
SCENE_SAVE_AS_SCENE,
148+
SCENE_SAVE_ALL_SCENES,
149+
SCENE_MULTI_SAVE_AS_SCENE,
150+
SCENE_QUICK_OPEN,
151+
SCENE_QUICK_OPEN_SCENE,
152+
SCENE_QUICK_OPEN_SCRIPT,
153+
SCENE_UNDO,
154+
SCENE_REDO,
155+
SCENE_RELOAD_SAVED_SCENE,
156+
SCENE_CLOSE,
157+
SCENE_QUIT,
158158

159159
FILE_EXPORT_MESH_LIBRARY,
160160

@@ -210,8 +210,8 @@ class EditorNode : public Node {
210210

211211
// Non-menu options.
212212
SCENE_TAB_CLOSE,
213-
FILE_SAVE_AND_RUN,
214-
FILE_SAVE_AND_RUN_MAIN_SCENE,
213+
SAVE_AND_RUN,
214+
SAVE_AND_RUN_MAIN_SCENE,
215215
RESOURCE_SAVE,
216216
RESOURCE_SAVE_AS,
217217
SETTINGS_PICK_MAIN_SCENE,
@@ -756,7 +756,7 @@ class EditorNode : public Node {
756756
void trigger_menu_option(int p_option, bool p_confirmed);
757757
bool has_previous_closed_scenes() const;
758758

759-
void new_inherited_scene() { _menu_option_confirm(FILE_NEW_INHERITED_SCENE, false); }
759+
void new_inherited_scene() { _menu_option_confirm(SCENE_NEW_INHERITED_SCENE, false); }
760760

761761
void update_distraction_free_mode();
762762
void set_distraction_free_mode(bool p_enter);

0 commit comments

Comments
 (0)