diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2017-05-02 11:25:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-02 11:25:27 +0200 |
commit | 82fa41bce3ec7fdd59cfc10f57d72fa092f48b27 (patch) | |
tree | d9f025aaa4a2ae32c5dc98b2936c0704a12e9e53 | |
parent | 28173ad35d72fad12b2810133a3c3d1827bdeeec (diff) | |
parent | 7b315dc666a7b03a9622e10fb79446b58170fba5 (diff) |
Merge pull request #8541 from RandomShaper/opt-out-capitalization
Add setting to opt-out of capitalization in property inspectors
-rw-r--r-- | editor/editor_node.cpp | 2 | ||||
-rw-r--r-- | editor/project_settings.cpp | 2 | ||||
-rw-r--r-- | editor/property_editor.cpp | 13 | ||||
-rw-r--r-- | editor/property_editor.h | 3 | ||||
-rw-r--r-- | editor/script_editor_debugger.cpp | 2 |
5 files changed, 14 insertions, 8 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index bff22655ff..60925cb365 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -360,6 +360,7 @@ void EditorNode::_notification(int p_what) { if (p_what == EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED) { scene_tabs->set_tab_close_display_policy((bool(EDITOR_DEF("interface/always_show_close_button_in_scene_tabs", false)) ? Tabs::CLOSE_BUTTON_SHOW_ALWAYS : Tabs::CLOSE_BUTTON_SHOW_ACTIVE_ONLY)); + property_editor->set_enable_capitalize_paths(bool(EDITOR_DEF("interface/capitalize_properties", true))); } } @@ -5638,6 +5639,7 @@ EditorNode::EditorNode() { property_editor->set_show_categories(true); property_editor->set_v_size_flags(Control::SIZE_EXPAND_FILL); property_editor->set_use_doc_hints(true); + property_editor->set_enable_capitalize_paths(bool(EDITOR_DEF("interface/capitalize_properties", true))); property_editor->hide_top_label(); property_editor->register_text_enter(search_box); diff --git a/editor/project_settings.cpp b/editor/project_settings.cpp index 858b9403a7..8ae2d680d2 100644 --- a/editor/project_settings.cpp +++ b/editor/project_settings.cpp @@ -1265,7 +1265,7 @@ ProjectSettings::ProjectSettings(EditorData *p_data) { //globals_editor->hide_top_label(); globals_editor->set_v_size_flags(Control::SIZE_EXPAND_FILL); globals_editor->get_property_editor()->register_text_enter(search_box); - globals_editor->get_property_editor()->set_capitalize_paths(false); + globals_editor->get_property_editor()->set_enable_capitalize_paths(false); globals_editor->get_property_editor()->get_scene_tree()->connect("cell_selected", this, "_item_selected"); globals_editor->get_property_editor()->connect("property_toggled", this, "_item_checked", varray(), CONNECT_DEFERRED); globals_editor->get_property_editor()->connect("property_edited", this, "_settings_prop_edited"); diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp index f0717f1e6b..e2733037a9 100644 --- a/editor/property_editor.cpp +++ b/editor/property_editor.cpp @@ -2769,10 +2769,7 @@ TreeItem *PropertyEditor::get_parent_node(String p_path, HashMap<String, TreeIte item = tree->create_item(parent); String name = (p_path.find("/") != -1) ? p_path.right(p_path.find_last("/") + 1) : p_path; - if (capitalize_paths) - item->set_text(0, name.capitalize()); - else - item->set_text(0, name); + item->set_text(0, capitalize_paths ? name.capitalize() : name); item->set_tooltip(0, p_path); if (item->get_parent() != root) { item->set_icon(0, get_icon("Folder", "EditorIcons")); @@ -4298,9 +4295,15 @@ String PropertyEditor::get_selected_path() const { return ""; } -void PropertyEditor::set_capitalize_paths(bool p_capitalize) { +bool PropertyEditor::is_capitalize_paths_enabled() const { + + return capitalize_paths; +} + +void PropertyEditor::set_enable_capitalize_paths(bool p_capitalize) { capitalize_paths = p_capitalize; + update_tree_pending = true; } void PropertyEditor::set_autoclear(bool p_enable) { diff --git a/editor/property_editor.h b/editor/property_editor.h index 3b68e80ac3..b88ba38e19 100644 --- a/editor/property_editor.h +++ b/editor/property_editor.h @@ -272,7 +272,8 @@ public: custom_editor->set_read_only(p_read_only); } - void set_capitalize_paths(bool p_capitalize); + bool is_capitalize_paths_enabled() const; + void set_enable_capitalize_paths(bool p_capitalize); void set_autoclear(bool p_enable); void set_show_categories(bool p_show); diff --git a/editor/script_editor_debugger.cpp b/editor/script_editor_debugger.cpp index a5cee0c907..2bc00c62fb 100644 --- a/editor/script_editor_debugger.cpp +++ b/editor/script_editor_debugger.cpp @@ -1634,7 +1634,7 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor) { inspector->set_h_size_flags(SIZE_EXPAND_FILL); inspector->hide_top_label(); inspector->get_scene_tree()->set_column_title(0, TTR("Variable")); - inspector->set_capitalize_paths(false); + inspector->set_enable_capitalize_paths(false); inspector->set_read_only(true); sc->add_child(inspector); |