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

40
editor/node_dock.cpp
View File

@@ -9,7 +9,7 @@ void NodeDock::show_groups() {
connections->hide();
}
void NodeDock::show_connections(){
void NodeDock::show_connections() {
groups_button->set_pressed(false);
connections_button->set_pressed(true);
@@ -17,24 +17,23 @@ void NodeDock::show_connections(){
connections->show();
}
void NodeDock::_bind_methods() {
ObjectTypeDB::bind_method(_MD("show_groups"),&NodeDock::show_groups);
ObjectTypeDB::bind_method(_MD("show_connections"),&NodeDock::show_connections);
ObjectTypeDB::bind_method(_MD("show_groups"), &NodeDock::show_groups);
ObjectTypeDB::bind_method(_MD("show_connections"), &NodeDock::show_connections);
}
void NodeDock::_notification(int p_what) {
if (p_what==NOTIFICATION_ENTER_TREE) {
connections_button->set_icon(get_icon("Connect","EditorIcons"));
groups_button->set_icon(get_icon("Groups","EditorIcons"));
if (p_what == NOTIFICATION_ENTER_TREE) {
connections_button->set_icon(get_icon("Connect", "EditorIcons"));
groups_button->set_icon(get_icon("Groups", "EditorIcons"));
}
}
NodeDock *NodeDock::singleton=NULL;
NodeDock *NodeDock::singleton = NULL;
void NodeDock::set_node(Node* p_node) {
void NodeDock::set_node(Node *p_node) {
connections->set_node(p_node);
groups->set_current(p_node);
@@ -55,50 +54,47 @@ void NodeDock::set_node(Node* p_node) {
}
}
NodeDock::NodeDock()
{
singleton=this;
NodeDock::NodeDock() {
singleton = this;
set_name(TTR("Node"));
mode_hb = memnew( HBoxContainer );
mode_hb = memnew(HBoxContainer);
add_child(mode_hb);
mode_hb->hide();
connections_button = memnew( ToolButton );
connections_button = memnew(ToolButton);
connections_button->set_text(TTR("Signals"));
connections_button->set_toggle_mode(true);
connections_button->set_pressed(true);
connections_button->set_h_size_flags(SIZE_EXPAND_FILL);
mode_hb->add_child(connections_button);
connections_button->connect("pressed",this,"show_connections");
connections_button->connect("pressed", this, "show_connections");
groups_button = memnew( ToolButton );
groups_button = memnew(ToolButton);
groups_button->set_text(TTR("Groups"));
groups_button->set_toggle_mode(true);
groups_button->set_pressed(false);
groups_button->set_h_size_flags(SIZE_EXPAND_FILL);
mode_hb->add_child(groups_button);
groups_button->connect("pressed",this,"show_groups");
groups_button->connect("pressed", this, "show_groups");
connections = memnew( ConnectionsDock(EditorNode::get_singleton()) );
connections = memnew(ConnectionsDock(EditorNode::get_singleton()));
connections->set_undoredo(EditorNode::get_singleton()->get_undo_redo());
add_child(connections);
connections->set_v_size_flags(SIZE_EXPAND_FILL);
connections->hide();
groups = memnew( GroupsEditor );
groups = memnew(GroupsEditor);
groups->set_undo_redo(EditorNode::get_singleton()->get_undo_redo());
add_child(groups);
groups->set_v_size_flags(SIZE_EXPAND_FILL);
groups->hide();
select_a_node = memnew( Label );
select_a_node = memnew(Label);
select_a_node->set_text(TTR("Select a Node to edit Signals and Groups."));
select_a_node->set_v_size_flags(SIZE_EXPAND_FILL);
select_a_node->set_valign(Label::VALIGN_CENTER);
select_a_node->set_align(Label::ALIGN_CENTER);
select_a_node->set_autowrap(true);
add_child(select_a_node);
}