godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-17 14:11:06 +00:00
Code Releases Wiki Activity

Bring that Whole New World to the Old Continent too

Browse Source 
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde
2017-03-19 00:36:26 +01:00
parent 1d418afe86
commit f8db8a3faa
1308 changed files with 147754 additions and 174357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
editor/editor_autoload_settings.cpp
View File

@@ -29,8 +29,8 @@
#include "editor_autoload_settings.h"
#include "globals.h"
#include "global_constants.h"
#include "globals.h"
#include "editor_node.h"
@@ -53,11 +53,11 @@ void EditorAutoloadSettings::_notification(int p_what) {
}
}
bool EditorAutoloadSettings::_autoload_name_is_valid(const String& p_name, String* r_error) {
bool EditorAutoloadSettings::_autoload_name_is_valid(const String &p_name, String *r_error) {
if (!p_name.is_valid_identifier()) {
if (r_error)
*r_error = TTR("Invalid name.") + "\n" + TTR("Valid characters:")+" a-z, A-Z, 0-9 or _";
*r_error = TTR("Invalid name.") + "\n" + TTR("Valid characters:") + " a-z, A-Z, 0-9 or _";
return false;
}
@@ -70,7 +70,7 @@ bool EditorAutoloadSettings::_autoload_name_is_valid(const String& p_name, Strin
}
for (int i = 0; i < Variant::VARIANT_MAX; i++) {
if (Variant::get_type_name( Variant::Type(i) ) == p_name) {
if (Variant::get_type_name(Variant::Type(i)) == p_name) {
if (r_error)
*r_error = TTR("Invalid name. Must not collide with an existing buit-in type name.");
@@ -107,13 +107,13 @@ void EditorAutoloadSettings::_autoload_add() {
}
if (!path.begins_with("res://")) {
EditorNode::get_singleton()->show_warning(TTR("Invalid Path.") + "\n"+ TTR("Not in resource path."));
EditorNode::get_singleton()->show_warning(TTR("Invalid Path.") + "\n" + TTR("Not in resource path."));
return;
}
name = "autoload/" + name;
UndoRedo* undo_redo = EditorNode::get_singleton()->get_undo_redo();
UndoRedo *undo_redo = EditorNode::get_singleton()->get_undo_redo();
undo_redo->create_action(TTR("Add AutoLoad"));
undo_redo->add_do_property(Globals::get_singleton(), name, "*" + path);
@@ -226,8 +226,8 @@ void EditorAutoloadSettings::_autoload_edited() {
undo_redo->add_do_property(Globals::get_singleton(), base, path);
undo_redo->add_undo_property(Globals::get_singleton(), base, Globals::get_singleton()->get(base));
undo_redo->add_do_method(Globals::get_singleton(),"set_order", base, order);
undo_redo->add_undo_method(Globals::get_singleton(),"set_order", base, order);
undo_redo->add_do_method(Globals::get_singleton(), "set_order", base, order);
undo_redo->add_undo_method(Globals::get_singleton(), "set_order", base, order);
undo_redo->add_do_method(this, "update_autoload");
undo_redo->add_undo_method(this, "update_autoload");
@@ -251,7 +251,7 @@ void EditorAutoloadSettings::_autoload_button_pressed(Object *p_item, int p_colu
switch (p_button) {
case BUTTON_MOVE_UP:
case BUTTON_MOVE_UP:
case BUTTON_MOVE_DOWN: {
TreeItem *swap = NULL;
@@ -309,7 +309,7 @@ void EditorAutoloadSettings::_autoload_button_pressed(Object *p_item, int p_colu
}
}
void EditorAutoloadSettings::_autoload_file_callback(const String& p_path) {
void EditorAutoloadSettings::_autoload_file_callback(const String &p_path) {
autoload_add_name->set_text(p_path.get_file().basename());
}
@@ -367,16 +367,16 @@ void EditorAutoloadSettings::update_autoload() {
item->set_text(2, TTR("Enable"));
item->set_checked(2, global);
item->add_button(3, get_icon("MoveUp","EditorIcons"), BUTTON_MOVE_UP);
item->add_button(3, get_icon("MoveDown","EditorIcons"), BUTTON_MOVE_DOWN);
item->add_button(3, get_icon("Del","EditorIcons"), BUTTON_DELETE);
item->add_button(3, get_icon("MoveUp", "EditorIcons"), BUTTON_MOVE_UP);
item->add_button(3, get_icon("MoveDown", "EditorIcons"), BUTTON_MOVE_DOWN);
item->add_button(3, get_icon("Del", "EditorIcons"), BUTTON_DELETE);
item->set_selectable(3, false);
}
updating_autoload = false;
}
Variant EditorAutoloadSettings::get_drag_data_fw(const Point2& p_point, Control *p_control) {
Variant EditorAutoloadSettings::get_drag_data_fw(const Point2 &p_point, Control *p_control) {
if (autoload_cache.size() <= 1)
return false;
@@ -393,13 +393,13 @@ Variant EditorAutoloadSettings::get_drag_data_fw(const Point2& p_point, Control
if (autoloads.size() == 0 || autoloads.size() == autoload_cache.size())
return Variant();
VBoxContainer *preview = memnew( VBoxContainer );
VBoxContainer *preview = memnew(VBoxContainer);
int max_size = MIN(PREVIEW_LIST_MAX_SIZE, autoloads.size());
for (int i = 0; i < max_size; i++) {
Label *label = memnew( Label(autoloads[i]) );
label->set_self_opacity(Math::lerp(1, 0, float(i)/PREVIEW_LIST_MAX_SIZE));
Label *label = memnew(Label(autoloads[i]));
label->set_self_opacity(Math::lerp(1, 0, float(i) / PREVIEW_LIST_MAX_SIZE));
preview->add_child(label);
}
@@ -414,7 +414,7 @@ Variant EditorAutoloadSettings::get_drag_data_fw(const Point2& p_point, Control
return drop_data;
}
bool EditorAutoloadSettings::can_drop_data_fw(const Point2& p_point, const Variant& p_data, Control *p_control) const {
bool EditorAutoloadSettings::can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_control) const {
if (updating_autoload)
return false;
@@ -440,7 +440,7 @@ bool EditorAutoloadSettings::can_drop_data_fw(const Point2& p_point, const Varia
return false;
}
void EditorAutoloadSettings::drop_data_fw(const Point2& p_point, const Variant& p_data, Control *p_control) {
void EditorAutoloadSettings::drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_control) {
TreeItem *ti = tree->get_item_at_pos(p_point);
@@ -550,13 +550,13 @@ EditorAutoloadSettings::EditorAutoloadSettings() {
updating_autoload = false;
selected_autoload = "";
HBoxContainer *hbc = memnew( HBoxContainer );
HBoxContainer *hbc = memnew(HBoxContainer);
add_child(hbc);
VBoxContainer *vbc_path = memnew( VBoxContainer );
VBoxContainer *vbc_path = memnew(VBoxContainer);
vbc_path->set_h_size_flags(SIZE_EXPAND_FILL);
autoload_add_path = memnew( EditorLineEditFileChooser );
autoload_add_path = memnew(EditorLineEditFileChooser);
autoload_add_path->set_h_size_flags(SIZE_EXPAND_FILL);
autoload_add_path->get_file_dialog()->set_mode(EditorFileDialog::MODE_OPEN_FILE);
@@ -565,16 +565,16 @@ EditorAutoloadSettings::EditorAutoloadSettings() {
vbc_path->add_margin_child(TTR("Path:"), autoload_add_path);
hbc->add_child(vbc_path);
VBoxContainer *vbc_name = memnew( VBoxContainer );
VBoxContainer *vbc_name = memnew(VBoxContainer);
vbc_name->set_h_size_flags(SIZE_EXPAND_FILL);
HBoxContainer *hbc_name = memnew( HBoxContainer );
HBoxContainer *hbc_name = memnew(HBoxContainer);
autoload_add_name = memnew( LineEdit );
autoload_add_name = memnew(LineEdit);
autoload_add_name->set_h_size_flags(SIZE_EXPAND_FILL);
hbc_name->add_child(autoload_add_name);
Button *add_autoload = memnew( Button );
Button *add_autoload = memnew(Button);
add_autoload->set_text(TTR("Add"));
hbc_name->add_child(add_autoload);
add_autoload->connect("pressed", this, "_autoload_add");
@@ -582,7 +582,7 @@ EditorAutoloadSettings::EditorAutoloadSettings() {
vbc_name->add_margin_child(TTR("Node Name:"), hbc_name);
hbc->add_child(vbc_name);
tree = memnew( Tree );
tree = memnew(Tree);
tree->set_hide_root(true);
tree->set_select_mode(Tree::SELECT_MULTI);
tree->set_single_select_cell_editing_only_when_already_selected(true);
@@ -592,20 +592,20 @@ EditorAutoloadSettings::EditorAutoloadSettings() {
tree->set_columns(4);
tree->set_column_titles_visible(true);
tree->set_column_title(0,TTR("Name"));
tree->set_column_expand(0,true);
tree->set_column_min_width(0,100);
tree->set_column_title(0, TTR("Name"));
tree->set_column_expand(0, true);
tree->set_column_min_width(0, 100);
tree->set_column_title(1,TTR("Path"));
tree->set_column_expand(1,true);
tree->set_column_min_width(1,100);
tree->set_column_title(1, TTR("Path"));
tree->set_column_expand(1, true);
tree->set_column_min_width(1, 100);
tree->set_column_title(2,TTR("Singleton"));
tree->set_column_expand(2,false);
tree->set_column_min_width(2,80);
tree->set_column_title(2, TTR("Singleton"));
tree->set_column_expand(2, false);
tree->set_column_min_width(2, 80);
tree->set_column_expand(3,false);
tree->set_column_min_width(3,80);
tree->set_column_expand(3, false);
tree->set_column_min_width(3, 80);
tree->connect("cell_selected", this, "_autoload_selected");
tree->connect("item_edited", this, "_autoload_edited");
@@ -613,4 +613,3 @@ EditorAutoloadSettings::EditorAutoloadSettings() {
add_margin_child(TTR("List:"), tree, true);
}