asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #22133 from YeldhamDev/all_oks_shall_be_banished

Browse source 
Remove unnecessary "OK"s text settings
This commit is contained in:
Rémi Verschelde 2018-09-16 11:28:15 +02:00 committed by GitHub
commit 5614692a1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 0 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
editor/editor_about.cpp
View file

@ -113,7 +113,6 @@ ScrollContainer *EditorAbout::_populate_list(const String &p_name, const List<St
EditorAbout::EditorAbout() { EditorAbout::EditorAbout() {
set_title(TTR("Thanks from the Godot community!")); set_title(TTR("Thanks from the Godot community!"));
get_ok()->set_text(TTR("OK"));
set_hide_on_ok(true); set_hide_on_ok(true);
set_resizable(true); set_resizable(true);

2
editor/inspector_dock.cpp
View file

@ -158,7 +158,6 @@ void InspectorDock::_resource_file_selected(String p_file) {
RES res = ResourceLoader::load(p_file); RES res = ResourceLoader::load(p_file);
if (res.is_null()) { if (res.is_null()) {
warning_dialog->get_ok()->set_text(TTR("OK"));
warning_dialog->set_text(TTR("Failed to load resource.")); warning_dialog->set_text(TTR("Failed to load resource."));
return; return;
}; };
@ -319,7 +318,6 @@ void InspectorDock::_transform_keyed(Object *sp, const String &p_sub, const Tran
} }
void InspectorDock::_warning_pressed() { void InspectorDock::_warning_pressed() {
warning_dialog->get_ok()->set_text(TTR("Ok"));
warning_dialog->popup_centered_minsize(); warning_dialog->popup_centered_minsize();
} }

2
editor/plugins/canvas_item_editor_plugin.cpp
View file

@ -4917,7 +4917,6 @@ void CanvasItemEditorViewport::_perform_drop_data() {
// Without root dropping multiple files is not allowed // Without root dropping multiple files is not allowed
if (!target_node && selected_files.size() > 1) { if (!target_node && selected_files.size() > 1) {
accept->get_ok()->set_text(TTR("Ok"));
accept->set_text(TTR("Cannot instantiate multiple nodes without root.")); accept->set_text(TTR("Cannot instantiate multiple nodes without root."));
accept->popup_centered_minsize(); accept->popup_centered_minsize();
return; return;
@ -4979,7 +4978,6 @@ void CanvasItemEditorViewport::_perform_drop_data() {
files_str += error_files[i].get_file().get_basename() + ","; files_str += error_files[i].get_file().get_basename() + ",";
} }
files_str = files_str.substr(0, files_str.length() - 1); files_str = files_str.substr(0, files_str.length() - 1);
accept->get_ok()->set_text(TTR("OK"));
accept->set_text(vformat(TTR("Error instancing scene from %s"), files_str.c_str())); accept->set_text(vformat(TTR("Error instancing scene from %s"), files_str.c_str()));
accept->popup_centered_minsize(); accept->popup_centered_minsize();
} }

1
editor/plugins/script_editor_plugin.cpp
View file

@ -3133,7 +3133,6 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) {
error_dialog = memnew(AcceptDialog); error_dialog = memnew(AcceptDialog);
add_child(error_dialog); add_child(error_dialog);
error_dialog->get_ok()->set_text(TTR("OK"));
debugger = memnew(ScriptEditorDebugger(editor)); debugger = memnew(ScriptEditorDebugger(editor));
debugger->connect("goto_script_line", this, "_goto_script_line"); debugger->connect("goto_script_line", this, "_goto_script_line");

3
editor/plugins/spatial_editor_plugin.cpp
View file

@ -3267,7 +3267,6 @@ void SpatialEditorViewport::_perform_drop_data() {
files_str += error_files[i].get_file().get_basename() + ","; files_str += error_files[i].get_file().get_basename() + ",";
} }
files_str = files_str.substr(0, files_str.length() - 1); files_str = files_str.substr(0, files_str.length() - 1);
accept->get_ok()->set_text(TTR("OK"));
accept->set_text(vformat(TTR("Error instancing scene from %s"), files_str.c_str())); accept->set_text(vformat(TTR("Error instancing scene from %s"), files_str.c_str()));
accept->popup_centered_minsize(); accept->popup_centered_minsize();
} }
@ -3348,7 +3347,6 @@ void SpatialEditorViewport::drop_data_fw(const Point2 &p_point, const Variant &p
if (root_node) { if (root_node) {
list.push_back(root_node); list.push_back(root_node);
} else { } else {
accept->get_ok()->set_text(TTR("OK"));
accept->set_text(TTR("No parent to instance a child at.")); accept->set_text(TTR("No parent to instance a child at."));
accept->popup_centered_minsize(); accept->popup_centered_minsize();
_remove_preview(); _remove_preview();
@ -3356,7 +3354,6 @@ void SpatialEditorViewport::drop_data_fw(const Point2 &p_point, const Variant &p
} }
} }
if (list.size() != 1) { if (list.size() != 1) {
accept->get_ok()->set_text(TTR("OK"));
accept->set_text(TTR("This operation requires a single selected node.")); accept->set_text(TTR("This operation requires a single selected node."));
accept->popup_centered_minsize(); accept->popup_centered_minsize();
_remove_preview(); _remove_preview();

21
editor/scene_tree_dock.cpp
View file

@ -119,7 +119,6 @@ void SceneTreeDock::instance(const String &p_file) {
if (!edited_scene) { if (!edited_scene) {
current_option = -1; current_option = -1;
accept->get_ok()->set_text(TTR("OK"));
accept->set_text(TTR("No parent to instance a child at.")); accept->set_text(TTR("No parent to instance a child at."));
accept->popup_centered_minsize(); accept->popup_centered_minsize();
return; return;
@ -142,7 +141,6 @@ void SceneTreeDock::instance_scenes(const Vector<String> &p_files, Node *p_paren
if (!parent || !edited_scene) { if (!parent || !edited_scene) {
accept->get_ok()->set_text(TTR("OK"));
accept->set_text(TTR("No parent to instance the scenes at.")); accept->set_text(TTR("No parent to instance the scenes at."));
accept->popup_centered_minsize(); accept->popup_centered_minsize();
return; return;
@ -164,7 +162,6 @@ void SceneTreeDock::_perform_instance_scenes(const Vector<String> &p_files, Node
Ref<PackedScene> sdata = ResourceLoader::load(p_files[i]); Ref<PackedScene> sdata = ResourceLoader::load(p_files[i]);
if (!sdata.is_valid()) { if (!sdata.is_valid()) {
current_option = -1; current_option = -1;
accept->get_ok()->set_text(TTR("OK"));
accept->set_text(vformat(TTR("Error loading scene from %s"), p_files[i])); accept->set_text(vformat(TTR("Error loading scene from %s"), p_files[i]));
accept->popup_centered_minsize(); accept->popup_centered_minsize();
error = true; error = true;
@ -174,7 +171,6 @@ void SceneTreeDock::_perform_instance_scenes(const Vector<String> &p_files, Node
Node *instanced_scene = sdata->instance(PackedScene::GEN_EDIT_STATE_INSTANCE); Node *instanced_scene = sdata->instance(PackedScene::GEN_EDIT_STATE_INSTANCE);
if (!instanced_scene) { if (!instanced_scene) {
current_option = -1; current_option = -1;
accept->get_ok()->set_text(TTR("OK"));
accept->set_text(vformat(TTR("Error instancing scene from %s"), p_files[i])); accept->set_text(vformat(TTR("Error instancing scene from %s"), p_files[i]));
accept->popup_centered_minsize(); accept->popup_centered_minsize();
error = true; error = true;
@ -185,7 +181,6 @@ void SceneTreeDock::_perform_instance_scenes(const Vector<String> &p_files, Node
if (_cyclical_dependency_exists(edited_scene->get_filename(), instanced_scene)) { if (_cyclical_dependency_exists(edited_scene->get_filename(), instanced_scene)) {
accept->get_ok()->set_text(TTR("Ok"));
accept->set_text(vformat(TTR("Cannot instance the scene '%s' because the current scene exists within one of its nodes."), p_files[i])); accept->set_text(vformat(TTR("Cannot instance the scene '%s' because the current scene exists within one of its nodes."), p_files[i]));
accept->popup_centered_minsize(); accept->popup_centered_minsize();
error = true; error = true;
@ -233,7 +228,6 @@ void SceneTreeDock::_perform_instance_scenes(const Vector<String> &p_files, Node
void SceneTreeDock::_replace_with_branch_scene(const String &p_file, Node *base) { void SceneTreeDock::_replace_with_branch_scene(const String &p_file, Node *base) {
Ref<PackedScene> sdata = ResourceLoader::load(p_file); Ref<PackedScene> sdata = ResourceLoader::load(p_file);
if (!sdata.is_valid()) { if (!sdata.is_valid()) {
accept->get_ok()->set_text(TTR("OK"));
accept->set_text(vformat(TTR("Error loading scene from %s"), p_file)); accept->set_text(vformat(TTR("Error loading scene from %s"), p_file));
accept->popup_centered_minsize(); accept->popup_centered_minsize();
return; return;
@ -241,7 +235,6 @@ void SceneTreeDock::_replace_with_branch_scene(const String &p_file, Node *base)
Node *instanced_scene = sdata->instance(PackedScene::GEN_EDIT_STATE_INSTANCE); Node *instanced_scene = sdata->instance(PackedScene::GEN_EDIT_STATE_INSTANCE);
if (!instanced_scene) { if (!instanced_scene) {
accept->get_ok()->set_text(TTR("OK"));
accept->set_text(vformat(TTR("Error instancing scene from %s"), p_file)); accept->set_text(vformat(TTR("Error instancing scene from %s"), p_file));
accept->popup_centered_minsize(); accept->popup_centered_minsize();
return; return;
@ -416,7 +409,6 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
if (scene_tree->get_selected() == edited_scene) { if (scene_tree->get_selected() == edited_scene) {
current_option = -1; current_option = -1;
accept->get_ok()->set_text(TTR("OK"));
accept->set_text(TTR("This operation can't be done on the tree root.")); accept->set_text(TTR("This operation can't be done on the tree root."));
accept->popup_centered_minsize(); accept->popup_centered_minsize();
break; break;
@ -477,7 +469,6 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
if (editor_selection->is_selected(edited_scene)) { if (editor_selection->is_selected(edited_scene)) {
current_option = -1; current_option = -1;
accept->get_ok()->set_text(TTR("OK"));
accept->set_text(TTR("This operation can't be done on the tree root.")); accept->set_text(TTR("This operation can't be done on the tree root."));
accept->popup_centered_minsize(); accept->popup_centered_minsize();
break; break;
@ -547,7 +538,6 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
if (editor_selection->is_selected(edited_scene)) { if (editor_selection->is_selected(edited_scene)) {
current_option = -1; current_option = -1;
accept->get_ok()->set_text(TTR("OK"));
accept->set_text(TTR("This operation can't be done on the tree root.")); accept->set_text(TTR("This operation can't be done on the tree root."));
accept->popup_centered_minsize(); accept->popup_centered_minsize();
break; break;
@ -634,7 +624,6 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
Node *scene = editor_data->get_edited_scene_root(); Node *scene = editor_data->get_edited_scene_root();
if (!scene) { if (!scene) {
accept->get_ok()->set_text(TTR("OK"));
accept->set_text(TTR("This operation can't be done without a scene.")); accept->set_text(TTR("This operation can't be done without a scene."));
accept->popup_centered_minsize(); accept->popup_centered_minsize();
break; break;
@ -643,7 +632,6 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
List<Node *> selection = editor_selection->get_selected_node_list(); List<Node *> selection = editor_selection->get_selected_node_list();
if (selection.size() != 1) { if (selection.size() != 1) {
accept->get_ok()->set_text(TTR("OK"));
accept->set_text(TTR("This operation requires a single selected node.")); accept->set_text(TTR("This operation requires a single selected node."));
accept->popup_centered_minsize(); accept->popup_centered_minsize();
break; break;
@ -652,14 +640,12 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
Node *tocopy = selection.front()->get(); Node *tocopy = selection.front()->get();
if (tocopy == scene) { if (tocopy == scene) {
accept->get_ok()->set_text(TTR("OK"));
accept->set_text(TTR("Can not perform with the root node.")); accept->set_text(TTR("Can not perform with the root node."));
accept->popup_centered_minsize(); accept->popup_centered_minsize();
break; break;
} }
if (tocopy != editor_data->get_edited_scene_root() && tocopy->get_filename() != "") { if (tocopy != editor_data->get_edited_scene_root() && tocopy->get_filename() != "") {
accept->get_ok()->set_text(TTR("OK"));
accept->set_text(TTR("This operation can't be done on instanced scenes.")); accept->set_text(TTR("This operation can't be done on instanced scenes."));
accept->popup_centered_minsize(); accept->popup_centered_minsize();
break; break;
@ -1304,7 +1290,6 @@ bool SceneTreeDock::_validate_no_foreign() {
if (E->get() != edited_scene && E->get()->get_owner() != edited_scene) { if (E->get() != edited_scene && E->get()->get_owner() != edited_scene) {
accept->get_ok()->set_text(TTR("OK"));
accept->set_text(TTR("Can't operate on nodes from a foreign scene!")); accept->set_text(TTR("Can't operate on nodes from a foreign scene!"));
accept->popup_centered_minsize(); accept->popup_centered_minsize();
return false; return false;
@ -1312,7 +1297,6 @@ bool SceneTreeDock::_validate_no_foreign() {
if (edited_scene->get_scene_inherited_state().is_valid() && edited_scene->get_scene_inherited_state()->find_node_by_path(edited_scene->get_path_to(E->get())) >= 0) { if (edited_scene->get_scene_inherited_state().is_valid() && edited_scene->get_scene_inherited_state()->find_node_by_path(edited_scene->get_path_to(E->get())) >= 0) {
accept->get_ok()->set_text(TTR("OK"));
accept->set_text(TTR("Can't operate on nodes the current scene inherits from!")); accept->set_text(TTR("Can't operate on nodes the current scene inherits from!"));
accept->popup_centered_minsize(); accept->popup_centered_minsize();
return false; return false;
@ -1792,14 +1776,12 @@ void SceneTreeDock::_new_scene_from(String p_file) {
List<Node *> selection = editor_selection->get_selected_node_list(); List<Node *> selection = editor_selection->get_selected_node_list();
if (selection.size() != 1) { if (selection.size() != 1) {
accept->get_ok()->set_text(TTR("OK"));
accept->set_text(TTR("This operation requires a single selected node.")); accept->set_text(TTR("This operation requires a single selected node."));
accept->popup_centered_minsize(); accept->popup_centered_minsize();
return; return;
} }
if (EditorNode::get_singleton()->is_scene_open(p_file)) { if (EditorNode::get_singleton()->is_scene_open(p_file)) {
accept->get_ok()->set_text(TTR("OK"));
accept->set_text(TTR("Can't overwrite scene that is still open!")); accept->set_text(TTR("Can't overwrite scene that is still open!"));
accept->popup_centered_minsize(); accept->popup_centered_minsize();
return; return;
@ -1817,7 +1799,6 @@ void SceneTreeDock::_new_scene_from(String p_file) {
memdelete(copy); memdelete(copy);
if (err != OK) { if (err != OK) {
accept->get_ok()->set_text(TTR("OK"));
accept->set_text(TTR("Couldn't save new scene. Likely dependencies (instances) couldn't be satisfied.")); accept->set_text(TTR("Couldn't save new scene. Likely dependencies (instances) couldn't be satisfied."));
accept->popup_centered_minsize(); accept->popup_centered_minsize();
return; return;
@ -1829,14 +1810,12 @@ void SceneTreeDock::_new_scene_from(String p_file) {
err = ResourceSaver::save(p_file, sdata, flg); err = ResourceSaver::save(p_file, sdata, flg);
if (err != OK) { if (err != OK) {
accept->get_ok()->set_text(TTR("OK"));
accept->set_text(TTR("Error saving scene.")); accept->set_text(TTR("Error saving scene."));
accept->popup_centered_minsize(); accept->popup_centered_minsize();
return; return;
} }
_replace_with_branch_scene(p_file, base); _replace_with_branch_scene(p_file, base);
} else { } else {
accept->get_ok()->set_text(TTR("OK"));
accept->set_text(TTR("Error duplicating scene to save it.")); accept->set_text(TTR("Error duplicating scene to save it."));
accept->popup_centered_minsize(); accept->popup_centered_minsize();
return; return;

2
editor/script_create_dialog.cpp
View file

@ -164,7 +164,6 @@ void ScriptCreateDialog::_create_new() {
if (script_template != "") { if (script_template != "") {
scr = ResourceLoader::load(script_template); scr = ResourceLoader::load(script_template);
if (scr.is_null()) { if (scr.is_null()) {
alert->get_ok()->set_text(TTR("OK"));
alert->set_text(vformat(TTR("Error loading template '%s'"), script_template)); alert->set_text(vformat(TTR("Error loading template '%s'"), script_template));
alert->popup_centered(); alert->popup_centered();
return; return;
@ -201,7 +200,6 @@ void ScriptCreateDialog::_load_exist() {
String path = file_path->get_text(); String path = file_path->get_text();
RES p_script = ResourceLoader::load(path, "Script"); RES p_script = ResourceLoader::load(path, "Script");
if (p_script.is_null()) { if (p_script.is_null()) {
alert->get_ok()->set_text(TTR("OK"));
alert->set_text(vformat(TTR("Error loading script from %s"), path)); alert->set_text(vformat(TTR("Error loading script from %s"), path));
alert->popup_centered(); alert->popup_centered();
return; return;