Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ProjectSettings: show error msg in a label instead #12449

Merged
merged 1 commit into from Oct 28, 2017
Merged

ProjectSettings: show error msg in a label instead #12449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions editor/project_settings_editor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ void ProjectSettingsEditor::_notification(int p_what) {
search_button->set_icon(get_icon("Search", "EditorIcons"));
clear_button->set_icon(get_icon("Close", "EditorIcons"));

action_add_error->add_color_override("font_color", get_color("error_color", "Editor"));

translation_list->connect("button_pressed", this, "_translation_delete");
_update_actions();
popup_add->add_icon_item(get_icon("Keyboard", "EditorIcons"), TTR("Key "), INPUT_KEY); //"Key " - because the word 'key' has already been used as a key animation
Expand Down Expand Up @@ -819,20 +821,24 @@ void ProjectSettingsEditor::_action_check(String p_action) {
} else {

if (p_action.find("/") != -1 || p_action.find(":") != -1) {
action_add->set_text(TTR("Can't contain '/' or ':'"));

action_add_error->set_text(TTR("Can't contain '/' or ':'"));
action_add_error->show();
action_add->set_disabled(true);
return;
}
if (ProjectSettings::get_singleton()->has_setting("input/" + p_action)) {
action_add->set_text(TTR("Already existing"));

action_add_error->set_text(TTR("Already existing"));
action_add_error->show();
action_add->set_disabled(true);
return;
}

action_add->set_disabled(false);
}

action_add->set_text(TTR("Add"));
action_add_error->hide();
}

void ProjectSettingsEditor::_action_adds(String) {
Expand Down Expand Up @@ -869,7 +875,7 @@ void ProjectSettingsEditor::_action_add() {
return;
r->select(0);
input_editor->ensure_cursor_is_visible();
action_add->set_text(TTR("Add"));
action_add_error->hide();
}

void ProjectSettingsEditor::_item_checked(const String &p_item, bool p_check) {
Expand Down Expand Up @@ -1696,6 +1702,10 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) {
action_name->connect("text_entered", this, "_action_adds");
action_name->connect("text_changed", this, "_action_check");

action_add_error = memnew(Label);
hbc->add_child(action_add_error);
action_add_error->hide();

add = memnew(Button);
hbc->add_child(add);
add->set_custom_minimum_size(Size2(150, 0) * EDSCALE);
Expand Down
1 change: 1 addition & 0 deletions editor/project_settings_editor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ class ProjectSettingsEditor : public AcceptDialog {

LineEdit *action_name;
Button *action_add;
Label *action_add_error;
Tree *input_editor;
bool setting;
bool updating_translations;
Expand Down