You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-06 12:20:30 +00:00
A Whole New World (clang-format edition)
I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
This commit is contained in:
Rémi Verschelde
@@ -28,84 +28,81 @@
|
||||
/*************************************************************************/
|
||||
#include "script_create_dialog.h"
|
||||
|
||||
#include "script_language.h"
|
||||
#include "editor_file_system.h"
|
||||
#include "global_config.h"
|
||||
#include "io/resource_saver.h"
|
||||
#include "os/file_access.h"
|
||||
#include "editor_file_system.h"
|
||||
#include "script_language.h"
|
||||
|
||||
void ScriptCreateDialog::config(const String& p_base_name,const String&p_base_path) {
|
||||
void ScriptCreateDialog::config(const String &p_base_name, const String &p_base_path) {
|
||||
|
||||
class_name->set_text("");
|
||||
parent_name->set_text(p_base_name);
|
||||
if (p_base_path!="") {
|
||||
initial_bp=p_base_path.get_basename();
|
||||
file_path->set_text(initial_bp+"."+ScriptServer::get_language( language_menu->get_selected() )->get_extension());
|
||||
if (p_base_path != "") {
|
||||
initial_bp = p_base_path.get_basename();
|
||||
file_path->set_text(initial_bp + "." + ScriptServer::get_language(language_menu->get_selected())->get_extension());
|
||||
} else {
|
||||
initial_bp="";
|
||||
initial_bp = "";
|
||||
file_path->set_text("");
|
||||
}
|
||||
_class_name_changed("");
|
||||
_path_changed(file_path->get_text());
|
||||
}
|
||||
|
||||
bool ScriptCreateDialog::_validate(const String& p_string) {
|
||||
bool ScriptCreateDialog::_validate(const String &p_string) {
|
||||
|
||||
if (p_string.length()==0)
|
||||
if (p_string.length() == 0)
|
||||
return false;
|
||||
|
||||
for (int i = 0; i < p_string.length(); i++) {
|
||||
|
||||
for(int i=0;i<p_string.length();i++) {
|
||||
|
||||
if (i==0) {
|
||||
if (p_string[0]>='0' && p_string[0]<='9')
|
||||
if (i == 0) {
|
||||
if (p_string[0] >= '0' && p_string[0] <= '9')
|
||||
return false; // no start with number plz
|
||||
}
|
||||
|
||||
bool valid_char = (p_string[i]>='0' && p_string[i]<='9') || (p_string[i]>='a' && p_string[i]<='z') || (p_string[i]>='A' && p_string[i]<='Z') || p_string[i]=='_';
|
||||
bool valid_char = (p_string[i] >= '0' && p_string[i] <= '9') || (p_string[i] >= 'a' && p_string[i] <= 'z') || (p_string[i] >= 'A' && p_string[i] <= 'Z') || p_string[i] == '_';
|
||||
|
||||
if (!valid_char)
|
||||
return false;
|
||||
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void ScriptCreateDialog::_class_name_changed(const String& p_name) {
|
||||
void ScriptCreateDialog::_class_name_changed(const String &p_name) {
|
||||
|
||||
if (!_validate(parent_name->get_text())) {
|
||||
error_label->set_text(TTR("Invalid parent class name"));
|
||||
error_label->add_color_override("font_color",Color(1,0.4,0.0,0.8));
|
||||
error_label->add_color_override("font_color", Color(1, 0.4, 0.0, 0.8));
|
||||
} else if (class_name->is_editable()) {
|
||||
if (class_name->get_text()=="") {
|
||||
error_label->set_text(TTR("Valid chars:")+" a-z A-Z 0-9 _");
|
||||
error_label->add_color_override("font_color",Color(1,1,1,0.6));
|
||||
if (class_name->get_text() == "") {
|
||||
error_label->set_text(TTR("Valid chars:") + " a-z A-Z 0-9 _");
|
||||
error_label->add_color_override("font_color", Color(1, 1, 1, 0.6));
|
||||
} else if (!_validate(class_name->get_text())) {
|
||||
error_label->set_text(TTR("Invalid class name"));
|
||||
error_label->add_color_override("font_color",Color(1,0.2,0.2,0.8));
|
||||
error_label->add_color_override("font_color", Color(1, 0.2, 0.2, 0.8));
|
||||
} else {
|
||||
error_label->set_text(TTR("Valid name"));
|
||||
error_label->add_color_override("font_color",Color(0,1.0,0.8,0.8));
|
||||
error_label->add_color_override("font_color", Color(0, 1.0, 0.8, 0.8));
|
||||
}
|
||||
} else {
|
||||
|
||||
error_label->set_text(TTR("N/A"));
|
||||
error_label->add_color_override("font_color",Color(0,1.0,0.8,0.8));
|
||||
error_label->add_color_override("font_color", Color(0, 1.0, 0.8, 0.8));
|
||||
}
|
||||
}
|
||||
|
||||
void ScriptCreateDialog::ok_pressed() {
|
||||
|
||||
if (create_new){
|
||||
if (create_new) {
|
||||
_create_new();
|
||||
} else {
|
||||
_load_exist();
|
||||
}
|
||||
|
||||
create_new=true;
|
||||
create_new = true;
|
||||
_update_controls();
|
||||
|
||||
}
|
||||
|
||||
void ScriptCreateDialog::_create_new() {
|
||||
@@ -123,14 +120,14 @@ void ScriptCreateDialog::_create_new() {
|
||||
|
||||
String cname;
|
||||
if (class_name->is_editable())
|
||||
cname=class_name->get_text();
|
||||
cname = class_name->get_text();
|
||||
|
||||
Ref<Script> scr = ScriptServer::get_language( language_menu->get_selected() )->get_template(cname,parent_name->get_text());
|
||||
Ref<Script> scr = ScriptServer::get_language(language_menu->get_selected())->get_template(cname, parent_name->get_text());
|
||||
|
||||
String selected_language = language_menu->get_item_text(language_menu->get_selected());
|
||||
editor_settings->set_project_metadata("script_setup", "last_selected_language", selected_language);
|
||||
|
||||
if (cname!="")
|
||||
if (cname != "")
|
||||
scr->set_name(cname);
|
||||
|
||||
if (!internal->is_pressed()) {
|
||||
@@ -141,8 +138,8 @@ void ScriptCreateDialog::_create_new() {
|
||||
alert->popup_centered_minsize();
|
||||
return;
|
||||
}
|
||||
Error err = ResourceSaver::save(lpath,scr,ResourceSaver::FLAG_CHANGE_PATH);
|
||||
if (err!=OK) {
|
||||
Error err = ResourceSaver::save(lpath, scr, ResourceSaver::FLAG_CHANGE_PATH);
|
||||
if (err != OK) {
|
||||
alert->set_text(TTR("Could not create script in filesystem."));
|
||||
alert->popup_centered_minsize();
|
||||
return;
|
||||
@@ -150,13 +147,12 @@ void ScriptCreateDialog::_create_new() {
|
||||
}
|
||||
|
||||
hide();
|
||||
emit_signal("script_created",scr);
|
||||
|
||||
emit_signal("script_created", scr);
|
||||
}
|
||||
|
||||
void ScriptCreateDialog::_load_exist() {
|
||||
|
||||
String path=file_path->get_text();
|
||||
String path = file_path->get_text();
|
||||
RES p_script = ResourceLoader::load(path, "Script");
|
||||
if (p_script.is_null()) {
|
||||
alert->get_ok()->set_text(TTR("Ugh"));
|
||||
@@ -166,41 +162,40 @@ void ScriptCreateDialog::_load_exist() {
|
||||
}
|
||||
|
||||
hide();
|
||||
emit_signal("script_created",p_script.get_ref_ptr());
|
||||
|
||||
emit_signal("script_created", p_script.get_ref_ptr());
|
||||
}
|
||||
|
||||
void ScriptCreateDialog::_lang_changed(int l) {
|
||||
|
||||
l=language_menu->get_selected();
|
||||
if (ScriptServer::get_language( l )->has_named_classes()) {
|
||||
l = language_menu->get_selected();
|
||||
if (ScriptServer::get_language(l)->has_named_classes()) {
|
||||
class_name->set_editable(true);
|
||||
} else {
|
||||
class_name->set_editable(false);
|
||||
}
|
||||
|
||||
String selected_ext="."+ScriptServer::get_language( l )->get_extension();
|
||||
String path=file_path->get_text();
|
||||
String extension="";
|
||||
if (path.find(".")>=0) {
|
||||
extension=path.get_extension();
|
||||
String selected_ext = "." + ScriptServer::get_language(l)->get_extension();
|
||||
String path = file_path->get_text();
|
||||
String extension = "";
|
||||
if (path.find(".") >= 0) {
|
||||
extension = path.get_extension();
|
||||
}
|
||||
|
||||
if (extension.length()==0) {
|
||||
if (extension.length() == 0) {
|
||||
// add extension if none
|
||||
path+=selected_ext;
|
||||
path += selected_ext;
|
||||
_path_changed(path);
|
||||
} else {
|
||||
// change extension by selected language
|
||||
List<String> extensions;
|
||||
// get all possible extensions for script
|
||||
for (int l=0;l<language_menu->get_item_count();l++) {
|
||||
ScriptServer::get_language( l )->get_recognized_extensions(&extensions);
|
||||
for (int l = 0; l < language_menu->get_item_count(); l++) {
|
||||
ScriptServer::get_language(l)->get_recognized_extensions(&extensions);
|
||||
}
|
||||
|
||||
for(List<String>::Element *E=extensions.front();E;E=E->next()) {
|
||||
if (E->get().nocasecmp_to(extension)==0) {
|
||||
path=path.get_basename()+selected_ext;
|
||||
for (List<String>::Element *E = extensions.front(); E; E = E->next()) {
|
||||
if (E->get().nocasecmp_to(extension) == 0) {
|
||||
path = path.get_basename() + selected_ext;
|
||||
_path_changed(path);
|
||||
break;
|
||||
}
|
||||
@@ -208,7 +203,6 @@ void ScriptCreateDialog::_lang_changed(int l) {
|
||||
}
|
||||
file_path->set_text(path);
|
||||
_class_name_changed(class_name->get_text());
|
||||
|
||||
}
|
||||
|
||||
void ScriptCreateDialog::_built_in_pressed() {
|
||||
@@ -218,7 +212,6 @@ void ScriptCreateDialog::_built_in_pressed() {
|
||||
} else {
|
||||
path_vb->show();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void ScriptCreateDialog::_browse_path() {
|
||||
@@ -229,80 +222,76 @@ void ScriptCreateDialog::_browse_path() {
|
||||
List<String> extensions;
|
||||
|
||||
// get all possible extensions for script
|
||||
for (int l=0;l<language_menu->get_item_count();l++) {
|
||||
ScriptServer::get_language( l )->get_recognized_extensions(&extensions);
|
||||
for (int l = 0; l < language_menu->get_item_count(); l++) {
|
||||
ScriptServer::get_language(l)->get_recognized_extensions(&extensions);
|
||||
}
|
||||
|
||||
for(List<String>::Element *E=extensions.front();E;E=E->next()) {
|
||||
file_browse->add_filter("*."+E->get());
|
||||
for (List<String>::Element *E = extensions.front(); E; E = E->next()) {
|
||||
file_browse->add_filter("*." + E->get());
|
||||
}
|
||||
|
||||
file_browse->set_current_path(file_path->get_text());
|
||||
file_browse->popup_centered_ratio();
|
||||
|
||||
}
|
||||
|
||||
void ScriptCreateDialog::_file_selected(const String& p_file) {
|
||||
void ScriptCreateDialog::_file_selected(const String &p_file) {
|
||||
|
||||
String p = GlobalConfig::get_singleton()->localize_path(p_file);
|
||||
file_path->set_text(p);
|
||||
_path_changed(p);
|
||||
|
||||
}
|
||||
|
||||
void ScriptCreateDialog::_path_changed(const String& p_path) {
|
||||
void ScriptCreateDialog::_path_changed(const String &p_path) {
|
||||
|
||||
path_valid=false;
|
||||
String p =p_path;
|
||||
path_valid = false;
|
||||
String p = p_path;
|
||||
|
||||
if (p=="") {
|
||||
if (p == "") {
|
||||
|
||||
path_error_label->set_text(TTR("Path is empty"));
|
||||
path_error_label->add_color_override("font_color",Color(1,0.4,0.0,0.8));
|
||||
path_error_label->add_color_override("font_color", Color(1, 0.4, 0.0, 0.8));
|
||||
return;
|
||||
|
||||
}
|
||||
|
||||
p = GlobalConfig::get_singleton()->localize_path(p);
|
||||
if (!p.begins_with("res://")) {
|
||||
|
||||
path_error_label->set_text(TTR("Path is not local"));
|
||||
path_error_label->add_color_override("font_color",Color(1,0.4,0.0,0.8));
|
||||
path_error_label->add_color_override("font_color", Color(1, 0.4, 0.0, 0.8));
|
||||
return;
|
||||
}
|
||||
|
||||
if (p.find("/") || p.find("\\")) {
|
||||
DirAccess *d = DirAccess::create(DirAccess::ACCESS_RESOURCES);
|
||||
|
||||
if (d->change_dir(p.get_base_dir())!=OK) {
|
||||
if (d->change_dir(p.get_base_dir()) != OK) {
|
||||
|
||||
path_error_label->set_text(TTR("Invalid base path"));
|
||||
path_error_label->add_color_override("font_color",Color(1,0.4,0.0,0.8));
|
||||
path_error_label->add_color_override("font_color", Color(1, 0.4, 0.0, 0.8));
|
||||
memdelete(d);
|
||||
return;
|
||||
|
||||
}
|
||||
memdelete(d);
|
||||
}
|
||||
|
||||
FileAccess *f = FileAccess::create(FileAccess::ACCESS_RESOURCES);
|
||||
create_new=!f->file_exists(p);
|
||||
create_new = !f->file_exists(p);
|
||||
memdelete(f);
|
||||
|
||||
String extension=p.get_extension();
|
||||
String extension = p.get_extension();
|
||||
List<String> extensions;
|
||||
|
||||
// get all possible extensions for script
|
||||
for (int l=0;l<language_menu->get_item_count();l++) {
|
||||
ScriptServer::get_language( l )->get_recognized_extensions(&extensions);
|
||||
for (int l = 0; l < language_menu->get_item_count(); l++) {
|
||||
ScriptServer::get_language(l)->get_recognized_extensions(&extensions);
|
||||
}
|
||||
|
||||
bool found=false;
|
||||
int index=0;
|
||||
for(List<String>::Element *E=extensions.front();E;E=E->next()) {
|
||||
if (E->get().nocasecmp_to(extension)==0) {
|
||||
bool found = false;
|
||||
int index = 0;
|
||||
for (List<String>::Element *E = extensions.front(); E; E = E->next()) {
|
||||
if (E->get().nocasecmp_to(extension) == 0) {
|
||||
language_menu->select(index); // change Language option by extension
|
||||
found=true;
|
||||
found = true;
|
||||
break;
|
||||
}
|
||||
index++;
|
||||
@@ -310,16 +299,15 @@ void ScriptCreateDialog::_path_changed(const String& p_path) {
|
||||
|
||||
if (!found) {
|
||||
path_error_label->set_text(TTR("Invalid extension"));
|
||||
path_error_label->add_color_override("font_color",Color(1,0.4,0.0,0.8));
|
||||
path_error_label->add_color_override("font_color", Color(1, 0.4, 0.0, 0.8));
|
||||
return;
|
||||
}
|
||||
|
||||
_update_controls();
|
||||
|
||||
path_error_label->add_color_override("font_color",Color(0,1.0,0.8,0.8));
|
||||
|
||||
path_valid=true;
|
||||
path_error_label->add_color_override("font_color", Color(0, 1.0, 0.8, 0.8));
|
||||
|
||||
path_valid = true;
|
||||
}
|
||||
|
||||
void ScriptCreateDialog::_update_controls() {
|
||||
@@ -333,48 +321,45 @@ void ScriptCreateDialog::_update_controls() {
|
||||
}
|
||||
parent_name->set_editable(create_new);
|
||||
internal->set_disabled(!create_new);
|
||||
|
||||
}
|
||||
|
||||
|
||||
void ScriptCreateDialog::_bind_methods() {
|
||||
|
||||
ClassDB::bind_method("_class_name_changed",&ScriptCreateDialog::_class_name_changed);
|
||||
ClassDB::bind_method("_lang_changed",&ScriptCreateDialog::_lang_changed);
|
||||
ClassDB::bind_method("_built_in_pressed",&ScriptCreateDialog::_built_in_pressed);
|
||||
ClassDB::bind_method("_browse_path",&ScriptCreateDialog::_browse_path);
|
||||
ClassDB::bind_method("_file_selected",&ScriptCreateDialog::_file_selected);
|
||||
ClassDB::bind_method("_path_changed",&ScriptCreateDialog::_path_changed);
|
||||
ADD_SIGNAL(MethodInfo("script_created",PropertyInfo(Variant::OBJECT,"script",PROPERTY_HINT_RESOURCE_TYPE,"Script")));
|
||||
ClassDB::bind_method("_class_name_changed", &ScriptCreateDialog::_class_name_changed);
|
||||
ClassDB::bind_method("_lang_changed", &ScriptCreateDialog::_lang_changed);
|
||||
ClassDB::bind_method("_built_in_pressed", &ScriptCreateDialog::_built_in_pressed);
|
||||
ClassDB::bind_method("_browse_path", &ScriptCreateDialog::_browse_path);
|
||||
ClassDB::bind_method("_file_selected", &ScriptCreateDialog::_file_selected);
|
||||
ClassDB::bind_method("_path_changed", &ScriptCreateDialog::_path_changed);
|
||||
ADD_SIGNAL(MethodInfo("script_created", PropertyInfo(Variant::OBJECT, "script", PROPERTY_HINT_RESOURCE_TYPE, "Script")));
|
||||
}
|
||||
|
||||
ScriptCreateDialog::ScriptCreateDialog() {
|
||||
|
||||
/* SNAP DIALOG */
|
||||
|
||||
VBoxContainer *vb = memnew( VBoxContainer );
|
||||
VBoxContainer *vb = memnew(VBoxContainer);
|
||||
add_child(vb);
|
||||
//set_child_rect(vb);
|
||||
|
||||
|
||||
class_name = memnew( LineEdit );
|
||||
VBoxContainer *vb2 = memnew( VBoxContainer );
|
||||
class_name = memnew(LineEdit);
|
||||
VBoxContainer *vb2 = memnew(VBoxContainer);
|
||||
vb2->add_child(class_name);
|
||||
class_name->connect("text_changed", this,"_class_name_changed");
|
||||
class_name->connect("text_changed", this, "_class_name_changed");
|
||||
error_label = memnew(Label);
|
||||
error_label->set_text("valid chars: a-z A-Z 0-9 _");
|
||||
error_label->set_align(Label::ALIGN_CENTER);
|
||||
vb2->add_child(error_label);
|
||||
vb->add_margin_child(TTR("Class Name:"),vb2);
|
||||
vb->add_margin_child(TTR("Class Name:"), vb2);
|
||||
|
||||
parent_name = memnew( LineEdit );
|
||||
vb->add_margin_child(TTR("Inherits:"),parent_name);
|
||||
parent_name->connect("text_changed", this,"_class_name_changed");
|
||||
parent_name = memnew(LineEdit);
|
||||
vb->add_margin_child(TTR("Inherits:"), parent_name);
|
||||
parent_name->connect("text_changed", this, "_class_name_changed");
|
||||
|
||||
language_menu = memnew( OptionButton );
|
||||
vb->add_margin_child(TTR("Language"),language_menu);
|
||||
language_menu = memnew(OptionButton);
|
||||
vb->add_margin_child(TTR("Language"), language_menu);
|
||||
|
||||
for(int i=0;i<ScriptServer::get_language_count();i++) {
|
||||
for (int i = 0; i < ScriptServer::get_language_count(); i++) {
|
||||
|
||||
language_menu->add_item(ScriptServer::get_language(i)->get_name());
|
||||
}
|
||||
@@ -383,55 +368,53 @@ ScriptCreateDialog::ScriptCreateDialog() {
|
||||
String last_selected_language = editor_settings->get_project_metadata("script_setup", "last_selected_language", "");
|
||||
if (last_selected_language != "")
|
||||
for (int i = 0; i < language_menu->get_item_count(); i++)
|
||||
if (language_menu->get_item_text(i) == last_selected_language)
|
||||
{
|
||||
if (language_menu->get_item_text(i) == last_selected_language) {
|
||||
language_menu->select(i);
|
||||
break;
|
||||
}
|
||||
else language_menu->select(0);
|
||||
} else
|
||||
language_menu->select(0);
|
||||
|
||||
language_menu->connect("item_selected",this,"_lang_changed");
|
||||
language_menu->connect("item_selected", this, "_lang_changed");
|
||||
|
||||
//parent_name->set_text();
|
||||
|
||||
vb2 = memnew( VBoxContainer );
|
||||
path_vb = memnew( VBoxContainer );
|
||||
vb2 = memnew(VBoxContainer);
|
||||
path_vb = memnew(VBoxContainer);
|
||||
vb2->add_child(path_vb);
|
||||
|
||||
HBoxContainer *hbc = memnew( HBoxContainer );
|
||||
file_path = memnew( LineEdit );
|
||||
file_path->connect("text_changed",this,"_path_changed");
|
||||
HBoxContainer *hbc = memnew(HBoxContainer);
|
||||
file_path = memnew(LineEdit);
|
||||
file_path->connect("text_changed", this, "_path_changed");
|
||||
hbc->add_child(file_path);
|
||||
file_path->set_h_size_flags(SIZE_EXPAND_FILL);
|
||||
Button *b = memnew( Button );
|
||||
Button *b = memnew(Button);
|
||||
b->set_text(" .. ");
|
||||
b->connect("pressed",this,"_browse_path");
|
||||
b->connect("pressed", this, "_browse_path");
|
||||
hbc->add_child(b);
|
||||
path_vb->add_child(hbc);
|
||||
path_error_label = memnew( Label );
|
||||
path_vb->add_child( path_error_label );
|
||||
path_error_label = memnew(Label);
|
||||
path_vb->add_child(path_error_label);
|
||||
path_error_label->set_text(TTR("Error!"));
|
||||
path_error_label->set_align(Label::ALIGN_CENTER);
|
||||
|
||||
|
||||
internal = memnew( CheckButton );
|
||||
internal = memnew(CheckButton);
|
||||
internal->set_text(TTR("Built-In Script"));
|
||||
vb2->add_child(internal);
|
||||
internal->connect("pressed",this,"_built_in_pressed");
|
||||
internal->connect("pressed", this, "_built_in_pressed");
|
||||
|
||||
vb->add_margin_child(TTR("Path:"),vb2);
|
||||
vb->add_margin_child(TTR("Path:"), vb2);
|
||||
|
||||
set_size(Size2(200,150));
|
||||
set_size(Size2(200, 150));
|
||||
set_hide_on_ok(false);
|
||||
set_title(TTR("Attach Node Script"));
|
||||
|
||||
file_browse = memnew( EditorFileDialog );
|
||||
file_browse->connect("file_selected",this,"_file_selected");
|
||||
file_browse = memnew(EditorFileDialog);
|
||||
file_browse->connect("file_selected", this, "_file_selected");
|
||||
add_child(file_browse);
|
||||
get_ok()->set_text(TTR("Create"));
|
||||
alert = memnew( AcceptDialog );
|
||||
alert = memnew(AcceptDialog);
|
||||
add_child(alert);
|
||||
_lang_changed(0);
|
||||
|
||||
create_new=true;
|
||||
create_new = true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user