asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #29493 from YeldhamDev/enhance_fix_feature_profile

Browse source 
Enhancements and fixes for the editor feature profile
This commit is contained in:
Rémi Verschelde 2019-06-19 00:14:05 +02:00 committed by GitHub
commit d2e8b5bd18
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
editor/editor_feature_profile.cpp
View file

@ -42,7 +42,7 @@ const char *EditorFeatureProfile::feature_names[FEATURE_MAX] = {
TTRC("Scene Tree Editing"), TTRC("Scene Tree Editing"),
TTRC("Import Dock"), TTRC("Import Dock"),
TTRC("Node Dock"), TTRC("Node Dock"),
TTRC("Filesystem Dock") TTRC("FileSystem and Import Docks")
}; };
const char *EditorFeatureProfile::feature_identifiers[FEATURE_MAX] = { const char *EditorFeatureProfile::feature_identifiers[FEATURE_MAX] = {
@ -378,18 +378,21 @@ void EditorFeatureProfileManager::_profile_action(int p_action) {
switch (p_action) { switch (p_action) {
case PROFILE_CLEAR: { case PROFILE_CLEAR: {
EditorSettings::get_singleton()->set("_default_feature_profile", ""); EditorSettings::get_singleton()->set("_default_feature_profile", "");
EditorSettings::get_singleton()->save(); EditorSettings::get_singleton()->save();
current_profile = ""; current_profile = "";
current.unref(); current.unref();
_update_profile_list(); _update_profile_list();
_emit_current_profile_changed();
} break; } break;
case PROFILE_SET: { case PROFILE_SET: {
String selected = _get_selected_profile(); String selected = _get_selected_profile();
ERR_FAIL_COND(selected == String()); ERR_FAIL_COND(selected == String());
if (selected == current_profile) { if (selected == current_profile) {
return; //nothing to do here return; // Nothing to do here.
} }
EditorSettings::get_singleton()->set("_default_feature_profile", selected); EditorSettings::get_singleton()->set("_default_feature_profile", selected);
EditorSettings::get_singleton()->save(); EditorSettings::get_singleton()->save();
@ -397,7 +400,7 @@ void EditorFeatureProfileManager::_profile_action(int p_action) {
current = edited; current = edited;
_update_profile_list(); _update_profile_list();
_emit_current_profile_changed();
} break; } break;
case PROFILE_IMPORT: { case PROFILE_IMPORT: {
@ -415,6 +418,7 @@ void EditorFeatureProfileManager::_profile_action(int p_action) {
new_profile_name->grab_focus(); new_profile_name->grab_focus();
} break; } break;
case PROFILE_ERASE: { case PROFILE_ERASE: {
String selected = _get_selected_profile(); String selected = _get_selected_profile();
ERR_FAIL_COND(selected == String()); ERR_FAIL_COND(selected == String());
@ -809,7 +813,7 @@ EditorFeatureProfileManager::EditorFeatureProfileManager() {
profile_actions[PROFILE_CLEAR]->set_disabled(true); profile_actions[PROFILE_CLEAR]->set_disabled(true);
profile_actions[PROFILE_CLEAR]->connect("pressed", this, "_profile_action", varray(PROFILE_CLEAR)); profile_actions[PROFILE_CLEAR]->connect("pressed", this, "_profile_action", varray(PROFILE_CLEAR));
main_vbc->add_margin_child(TTR("Current Profile"), name_hbc); main_vbc->add_margin_child(TTR("Current Profile:"), name_hbc);
HBoxContainer *profiles_hbc = memnew(HBoxContainer); HBoxContainer *profiles_hbc = memnew(HBoxContainer);
profile_list = memnew(OptionButton); profile_list = memnew(OptionButton);
@ -844,7 +848,7 @@ EditorFeatureProfileManager::EditorFeatureProfileManager() {
profile_actions[PROFILE_EXPORT]->set_disabled(true); profile_actions[PROFILE_EXPORT]->set_disabled(true);
profile_actions[PROFILE_EXPORT]->connect("pressed", this, "_profile_action", varray(PROFILE_EXPORT)); profile_actions[PROFILE_EXPORT]->connect("pressed", this, "_profile_action", varray(PROFILE_EXPORT));
main_vbc->add_margin_child(TTR("Available Profiles"), profiles_hbc); main_vbc->add_margin_child(TTR("Available Profiles:"), profiles_hbc);
h_split = memnew(HSplitContainer); h_split = memnew(HSplitContainer);
h_split->set_v_size_flags(SIZE_EXPAND_FILL); h_split->set_v_size_flags(SIZE_EXPAND_FILL);
@ -855,9 +859,8 @@ EditorFeatureProfileManager::EditorFeatureProfileManager() {
class_list_vbc->set_h_size_flags(SIZE_EXPAND_FILL); class_list_vbc->set_h_size_flags(SIZE_EXPAND_FILL);
class_list = memnew(Tree); class_list = memnew(Tree);
class_list_vbc->add_margin_child(TTR("Enabled Classes"), class_list, true); class_list_vbc->add_margin_child(TTR("Enabled Classes:"), class_list, true);
class_list->set_hide_root(true); class_list->set_hide_root(true);
class_list->set_hide_folding(true);
class_list->set_edit_checkbox_cell_only_when_checkbox_is_pressed(true); class_list->set_edit_checkbox_cell_only_when_checkbox_is_pressed(true);
class_list->connect("cell_selected", this, "_class_list_item_selected"); class_list->connect("cell_selected", this, "_class_list_item_selected");
class_list->connect("item_edited", this, "_class_list_item_edited", varray(), CONNECT_DEFERRED); class_list->connect("item_edited", this, "_class_list_item_edited", varray(), CONNECT_DEFERRED);

5
editor/editor_node.cpp
View file

@ -5044,7 +5044,9 @@ void EditorNode::_feature_profile_changed() {
main_editor_buttons[EDITOR_3D]->set_visible(!profile->is_feature_disabled(EditorFeatureProfile::FEATURE_3D)); main_editor_buttons[EDITOR_3D]->set_visible(!profile->is_feature_disabled(EditorFeatureProfile::FEATURE_3D));
main_editor_buttons[EDITOR_SCRIPT]->set_visible(!profile->is_feature_disabled(EditorFeatureProfile::FEATURE_SCRIPT)); main_editor_buttons[EDITOR_SCRIPT]->set_visible(!profile->is_feature_disabled(EditorFeatureProfile::FEATURE_SCRIPT));
main_editor_buttons[EDITOR_ASSETLIB]->set_visible(!profile->is_feature_disabled(EditorFeatureProfile::FEATURE_ASSET_LIB)); main_editor_buttons[EDITOR_ASSETLIB]->set_visible(!profile->is_feature_disabled(EditorFeatureProfile::FEATURE_ASSET_LIB));
if (profile->is_feature_disabled(EditorFeatureProfile::FEATURE_3D) || profile->is_feature_disabled(EditorFeatureProfile::FEATURE_SCRIPT) || profile->is_feature_disabled(EditorFeatureProfile::FEATURE_ASSET_LIB)) { if ((profile->is_feature_disabled(EditorFeatureProfile::FEATURE_3D) && singleton->main_editor_buttons[EDITOR_3D]->is_pressed()) ||
(profile->is_feature_disabled(EditorFeatureProfile::FEATURE_SCRIPT) && singleton->main_editor_buttons[EDITOR_SCRIPT]->is_pressed()) ||
(profile->is_feature_disabled(EditorFeatureProfile::FEATURE_ASSET_LIB) && singleton->main_editor_buttons[EDITOR_ASSETLIB]->is_pressed())) {
_editor_select(EDITOR_2D); _editor_select(EDITOR_2D);
} }
} else { } else {
@ -5056,6 +5058,7 @@ void EditorNode::_feature_profile_changed() {
node_dock->set_visible(true); node_dock->set_visible(true);
filesystem_dock->set_visible(true); filesystem_dock->set_visible(true);
main_editor_buttons[EDITOR_3D]->set_visible(true); main_editor_buttons[EDITOR_3D]->set_visible(true);
main_editor_buttons[EDITOR_SCRIPT]->set_visible(true);
main_editor_buttons[EDITOR_ASSETLIB]->set_visible(true); main_editor_buttons[EDITOR_ASSETLIB]->set_visible(true);
} }