maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #32357 from YeldhamDev/connections_dialog_format

Browse source 
Format arguments in connections dialog in GDScript style
This commit is contained in:
Rémi Verschelde 2019-09-26 07:39:17 +02:00 committed by GitHub
commit 15a377f6e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
editor/connections_dialog.cpp
View file

@ -108,8 +108,8 @@ public:
}; };
/* /*
Signal automatically called by parent dialog. * Signal automatically called by parent dialog.
*/ */
void ConnectDialog::ok_pressed() { void ConnectDialog::ok_pressed() {
if (dst_method->get_text() == "") { if (dst_method->get_text() == "") {
@ -134,8 +134,8 @@ void ConnectDialog::_cancel_pressed() {
} }
/* /*
Called each time a target node is selected within the target node tree. * Called each time a target node is selected within the target node tree.
*/ */
void ConnectDialog::_tree_node_selected() { void ConnectDialog::_tree_node_selected() {
Node *current = tree->get_selected(); Node *current = tree->get_selected();
@ -148,8 +148,8 @@ void ConnectDialog::_tree_node_selected() {
} }
/* /*
Adds a new parameter bind to connection. * Adds a new parameter bind to connection.
*/ */
void ConnectDialog::_add_bind() { void ConnectDialog::_add_bind() {
if (cdbinds->params.size() >= VARIANT_ARG_MAX) if (cdbinds->params.size() >= VARIANT_ARG_MAX)
@ -184,8 +184,8 @@ void ConnectDialog::_add_bind() {
} }
/* /*
Remove parameter bind from connection. * Remove parameter bind from connection.
*/ */
void ConnectDialog::_remove_bind() { void ConnectDialog::_remove_bind() {
String st = bind_editor->get_selected_path(); String st = bind_editor->get_selected_path();
@ -265,18 +265,18 @@ bool ConnectDialog::get_oneshot() const {
} }
/* /*
Returns true if ConnectDialog is being used to edit an existing connection. * Returns true if ConnectDialog is being used to edit an existing connection.
*/ */
bool ConnectDialog::is_editing() const { bool ConnectDialog::is_editing() const {
return bEditMode; return bEditMode;
} }
/* /*
Initialize ConnectDialog and populate fields with expected data. * Initialize ConnectDialog and populate fields with expected data.
If creating a connection from scratch, sensible defaults are used. * If creating a connection from scratch, sensible defaults are used.
If editing an existing connection, previous data is retained. * If editing an existing connection, previous data is retained.
*/ */
void ConnectDialog::init(Connection c, bool bEdit) { void ConnectDialog::init(Connection c, bool bEdit) {
source = static_cast<Node *>(c.source); source = static_cast<Node *>(c.source);
@ -482,9 +482,9 @@ struct _ConnectionsDockMethodInfoSort {
}; };
/* /*
Post-ConnectDialog callback for creating/editing connections. * Post-ConnectDialog callback for creating/editing connections.
Creates or edits connections based on state of the ConnectDialog when "Connect" is pressed. * Creates or edits connections based on state of the ConnectDialog when "Connect" is pressed.
*/ */
void ConnectionsDock::_make_or_edit_connection() { void ConnectionsDock::_make_or_edit_connection() {
TreeItem *it = tree->get_selected(); TreeItem *it = tree->get_selected();
@ -552,8 +552,8 @@ void ConnectionsDock::_make_or_edit_connection() {
} }
/* /*
Creates single connection w/ undo-redo functionality. * Creates single connection w/ undo-redo functionality.
*/ */
void ConnectionsDock::_connect(Connection cToMake) { void ConnectionsDock::_connect(Connection cToMake) {
Node *source = static_cast<Node *>(cToMake.source); Node *source = static_cast<Node *>(cToMake.source);
@ -575,8 +575,8 @@ void ConnectionsDock::_connect(Connection cToMake) {
} }
/* /*
Break single connection w/ undo-redo functionality. * Break single connection w/ undo-redo functionality.
*/ */
void ConnectionsDock::_disconnect(TreeItem &item) { void ConnectionsDock::_disconnect(TreeItem &item) {
Connection c = item.get_metadata(0); Connection c = item.get_metadata(0);
@ -595,9 +595,9 @@ void ConnectionsDock::_disconnect(TreeItem &item) {
} }
/* /*
Break all connections of currently selected signal. * Break all connections of currently selected signal.
Can undo-redo as a single action. * Can undo-redo as a single action.
*/ */
void ConnectionsDock::_disconnect_all() { void ConnectionsDock::_disconnect_all() {
TreeItem *item = tree->get_selected(); TreeItem *item = tree->get_selected();
@ -659,8 +659,8 @@ bool ConnectionsDock::_is_item_signal(TreeItem &item) {
} }
/* /*
Open connection dialog with TreeItem data to CREATE a brand-new connection. * Open connection dialog with TreeItem data to CREATE a brand-new connection.
*/ */
void ConnectionsDock::_open_connection_dialog(TreeItem &item) { void ConnectionsDock::_open_connection_dialog(TreeItem &item) {
String signal = item.get_metadata(0).operator Dictionary()["name"]; String signal = item.get_metadata(0).operator Dictionary()["name"];
@ -700,8 +700,8 @@ void ConnectionsDock::_open_connection_dialog(TreeItem &item) {
} }
/* /*
Open connection dialog with Connection data to EDIT an existing connection. * Open connection dialog with Connection data to EDIT an existing connection.
*/ */
void ConnectionsDock::_open_connection_dialog(Connection cToEdit) { void ConnectionsDock::_open_connection_dialog(Connection cToEdit) {
Node *src = static_cast<Node *>(cToEdit.source); Node *src = static_cast<Node *>(cToEdit.source);
@ -715,8 +715,8 @@ void ConnectionsDock::_open_connection_dialog(Connection cToEdit) {
} }
/* /*
Open slot method location in script editor. * Open slot method location in script editor.
*/ */
void ConnectionsDock::_go_to_script(TreeItem &item) { void ConnectionsDock::_go_to_script(TreeItem &item) {
if (_is_item_signal(item)) if (_is_item_signal(item))
@ -914,7 +914,6 @@ void ConnectionsDock::update_tree() {
String signaldesc = "("; String signaldesc = "(";
PoolStringArray argnames; PoolStringArray argnames;
if (mi.arguments.size()) { if (mi.arguments.size()) {
signaldesc += " ";
for (int i = 0; i < mi.arguments.size(); i++) { for (int i = 0; i < mi.arguments.size(); i++) {
PropertyInfo &pi = mi.arguments[i]; PropertyInfo &pi = mi.arguments[i];
@ -927,10 +926,9 @@ void ConnectionsDock::update_tree() {
} else if (pi.type != Variant::NIL) { } else if (pi.type != Variant::NIL) {
tname = Variant::get_type_name(pi.type); tname = Variant::get_type_name(pi.type);
} }
signaldesc += tname + " " + (pi.name == "" ? String("arg " + itos(i)) : pi.name); signaldesc += (pi.name == "" ? String("arg " + itos(i)) : pi.name) + ": " + tname;
argnames.push_back(pi.name + ":" + tname); argnames.push_back(pi.name + ":" + tname);
} }
signaldesc += " ";
} }
signaldesc += ")"; signaldesc += ")";
@ -1000,14 +998,14 @@ void ConnectionsDock::update_tree() {
path += " (oneshot)"; path += " (oneshot)";
if (c.binds.size()) { if (c.binds.size()) {
path += " binds( "; path += " binds(";
for (int i = 0; i < c.binds.size(); i++) { for (int i = 0; i < c.binds.size(); i++) {
if (i > 0) if (i > 0)
path += ", "; path += ", ";
path += c.binds[i].operator String(); path += c.binds[i].operator String();
} }
path += " )"; path += ")";
} }
TreeItem *item2 = tree->create_item(item); TreeItem *item2 = tree->create_item(item);