godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-15 13:51:40 +00:00
Code Releases Wiki Activity

-Changed most project settings in the engine, so they have major and minor categories.

Browse Source 
-Changed SectionedPropertyEditor to support this
-Renamed Globals singleton to GlobalConfig, makes more sense.
-Changed the logic behind persisten global settings, instead of the persist checkbox, a revert button is now available
This commit is contained in:
Juan Linietsky
2017-01-05 09:16:00 -03:00
parent 9e477babb3
commit 0f7af4ea51
109 changed files with 847 additions and 789 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
tools/editor/editor_autoload_settings.cpp
View File

@@ -116,13 +116,12 @@ void EditorAutoloadSettings::_autoload_add() {
UndoRedo* undo_redo = EditorNode::get_singleton()->get_undo_redo();
undo_redo->create_action(TTR("Add AutoLoad"));
undo_redo->add_do_property(Globals::get_singleton(), name, "*" + path);
undo_redo->add_do_method(Globals::get_singleton(), "set_persisting", name, true);
undo_redo->add_do_property(GlobalConfig::get_singleton(), name, "*" + path);
if (Globals::get_singleton()->has(name)) {
undo_redo->add_undo_property(Globals::get_singleton(), name, Globals::get_singleton()->get(name));
if (GlobalConfig::get_singleton()->has(name)) {
undo_redo->add_undo_property(GlobalConfig::get_singleton(), name, GlobalConfig::get_singleton()->get(name));
} else {
undo_redo->add_undo_property(Globals::get_singleton(), name, Variant());
undo_redo->add_undo_property(GlobalConfig::get_singleton(), name, Variant());
}
undo_redo->add_do_method(this, "update_autoload");
@@ -171,7 +170,7 @@ void EditorAutoloadSettings::_autoload_edited() {
return;
}
if (Globals::get_singleton()->has("autoload/" + name)) {
if (GlobalConfig::get_singleton()->has("autoload/" + name)) {
ti->set_text(0, old_name);
EditorNode::get_singleton()->show_warning(vformat(TTR("Autoload '%s' already exists!"), name));
return;
@@ -181,21 +180,18 @@ void EditorAutoloadSettings::_autoload_edited() {
name = "autoload/" + name;
bool persisting = Globals::get_singleton()->get(selected_autoload);
int order = Globals::get_singleton()->get(selected_autoload);
String path = Globals::get_singleton()->get(selected_autoload);
int order = GlobalConfig::get_singleton()->get_order(selected_autoload);
String path = GlobalConfig::get_singleton()->get(selected_autoload);
undo_redo->create_action(TTR("Rename Autoload"));
undo_redo->add_do_property(Globals::get_singleton(), name, path);
undo_redo->add_do_method(Globals::get_singleton(), "set_persisting", name, persisting);
undo_redo->add_do_method(Globals::get_singleton(), "set_order", name, order);
undo_redo->add_do_method(Globals::get_singleton(), "clear", selected_autoload);
undo_redo->add_do_property(GlobalConfig::get_singleton(), name, path);
undo_redo->add_do_method(GlobalConfig::get_singleton(), "set_order", name, order);
undo_redo->add_do_method(GlobalConfig::get_singleton(), "clear", selected_autoload);
undo_redo->add_undo_property(Globals::get_singleton(), selected_autoload, path);
undo_redo->add_undo_method(Globals::get_singleton(), "set_persisting", selected_autoload, persisting);
undo_redo->add_undo_method(Globals::get_singleton(), "set_order", selected_autoload, order);
undo_redo->add_undo_method(Globals::get_singleton(), "clear", name);
undo_redo->add_undo_property(GlobalConfig::get_singleton(), selected_autoload, path);
undo_redo->add_undo_method(GlobalConfig::get_singleton(), "set_order", selected_autoload, order);
undo_redo->add_undo_method(GlobalConfig::get_singleton(), "clear", name);
undo_redo->add_do_method(this, "update_autoload");
undo_redo->add_undo_method(this, "update_autoload");
@@ -212,8 +208,8 @@ void EditorAutoloadSettings::_autoload_edited() {
bool checked = ti->is_checked(2);
String base = "autoload/" + ti->get_text(0);
int order = Globals::get_singleton()->get_order(base);
String path = Globals::get_singleton()->get(base);
int order = GlobalConfig::get_singleton()->get_order(base);
String path = GlobalConfig::get_singleton()->get(base);
if (path.begins_with("*"))
path = path.substr(1, path.length());
@@ -223,11 +219,11 @@ void EditorAutoloadSettings::_autoload_edited() {
undo_redo->create_action(TTR("Toggle AutoLoad Globals"));
undo_redo->add_do_property(Globals::get_singleton(), base, path);
undo_redo->add_undo_property(Globals::get_singleton(), base, Globals::get_singleton()->get(base));
undo_redo->add_do_property(GlobalConfig::get_singleton(), base, path);
undo_redo->add_undo_property(GlobalConfig::get_singleton(), base, GlobalConfig::get_singleton()->get(base));
undo_redo->add_do_method(Globals::get_singleton(),"set_order", base, order);
undo_redo->add_undo_method(Globals::get_singleton(),"set_order", base, order);
undo_redo->add_do_method(GlobalConfig::get_singleton(),"set_order", base, order);
undo_redo->add_undo_method(GlobalConfig::get_singleton(),"set_order", base, order);
undo_redo->add_do_method(this, "update_autoload");
undo_redo->add_undo_method(this, "update_autoload");
@@ -267,16 +263,16 @@ void EditorAutoloadSettings::_autoload_button_pressed(Object *p_item, int p_colu
String swap_name = "autoload/" + swap->get_text(0);
int order = Globals::get_singleton()->get_order(name);
int swap_order = Globals::get_singleton()->get_order(swap_name);
int order = GlobalConfig::get_singleton()->get_order(name);
int swap_order = GlobalConfig::get_singleton()->get_order(swap_name);
undo_redo->create_action(TTR("Move Autoload"));
undo_redo->add_do_method(Globals::get_singleton(), "set_order", name, swap_order);
undo_redo->add_undo_method(Globals::get_singleton(), "set_order", name, order);
undo_redo->add_do_method(GlobalConfig::get_singleton(), "set_order", name, swap_order);
undo_redo->add_undo_method(GlobalConfig::get_singleton(), "set_order", name, order);
undo_redo->add_do_method(Globals::get_singleton(), "set_order", swap_name, order);
undo_redo->add_undo_method(Globals::get_singleton(), "set_order", swap_name, swap_order);
undo_redo->add_do_method(GlobalConfig::get_singleton(), "set_order", swap_name, order);
undo_redo->add_undo_method(GlobalConfig::get_singleton(), "set_order", swap_name, swap_order);
undo_redo->add_do_method(this, "update_autoload");
undo_redo->add_undo_method(this, "update_autoload");
@@ -288,15 +284,15 @@ void EditorAutoloadSettings::_autoload_button_pressed(Object *p_item, int p_colu
} break;
case BUTTON_DELETE: {
int order = Globals::get_singleton()->get_order(name);
int order = GlobalConfig::get_singleton()->get_order(name);
undo_redo->create_action(TTR("Remove Autoload"));
undo_redo->add_do_property(Globals::get_singleton(), name, Variant());
undo_redo->add_do_property(GlobalConfig::get_singleton(), name, Variant());
undo_redo->add_undo_property(Globals::get_singleton(), name, Globals::get_singleton()->get(name));
undo_redo->add_undo_method(Globals::get_singleton(), "set_persisting", name, true);
undo_redo->add_undo_method(Globals::get_singleton(), "set_order", order);
undo_redo->add_undo_property(GlobalConfig::get_singleton(), name, GlobalConfig::get_singleton()->get(name));
undo_redo->add_undo_method(GlobalConfig::get_singleton(), "set_persisting", name, true);
undo_redo->add_undo_method(GlobalConfig::get_singleton(), "set_order", order);
undo_redo->add_do_method(this, "update_autoload");
undo_redo->add_undo_method(this, "update_autoload");
@@ -327,7 +323,7 @@ void EditorAutoloadSettings::update_autoload() {
TreeItem *root = tree->create_item();
List<PropertyInfo> props;
Globals::get_singleton()->get_property_list(&props);
GlobalConfig::get_singleton()->get_property_list(&props);
for (List<PropertyInfo>::Element *E = props.front(); E; E = E->next()) {
@@ -337,14 +333,14 @@ void EditorAutoloadSettings::update_autoload() {
continue;
String name = pi.name.get_slice("/", 1);
String path = Globals::get_singleton()->get(pi.name);
String path = GlobalConfig::get_singleton()->get(pi.name);
if (name.empty())
continue;
AutoLoadInfo info;
info.name = pi.name;
info.order = Globals::get_singleton()->get_order(pi.name);
info.order = GlobalConfig::get_singleton()->get_order(pi.name);
autoload_cache.push_back(info);
@@ -464,7 +460,7 @@ void EditorAutoloadSettings::drop_data_fw(const Point2& p_point, const Variant&
move_to_back = true;
}
int order = Globals::get_singleton()->get_order("autoload/" + name);
int order = GlobalConfig::get_singleton()->get_order("autoload/" + name);
AutoLoadInfo aux;
List<AutoLoadInfo>::Element *E = NULL;
@@ -481,7 +477,7 @@ void EditorAutoloadSettings::drop_data_fw(const Point2& p_point, const Variant&
orders.resize(autoload_cache.size());
for (int i = 0; i < autoloads.size(); i++) {
aux.order = Globals::get_singleton()->get_order("autoload/" + autoloads[i]);
aux.order = GlobalConfig::get_singleton()->get_order("autoload/" + autoloads[i]);
List<AutoLoadInfo>::Element *I = autoload_cache.find(aux);
@@ -511,8 +507,8 @@ void EditorAutoloadSettings::drop_data_fw(const Point2& p_point, const Variant&
i = 0;
for (List<AutoLoadInfo>::Element *E = autoload_cache.front(); E; E = E->next()) {
undo_redo->add_do_method(Globals::get_singleton(), "set_order", E->get().name, orders[i++]);
undo_redo->add_undo_method(Globals::get_singleton(), "set_order", E->get().name, E->get().order);
undo_redo->add_do_method(GlobalConfig::get_singleton(), "set_order", E->get().name, orders[i++]);
undo_redo->add_undo_method(GlobalConfig::get_singleton(), "set_order", E->get().name, E->get().order);
}
orders.clear();