mirror of
https://github.com/Relintai/ui_extensions.git
synced 2024-11-14 10:27:48 +01:00
Cleanups.
This commit is contained in:
parent
634f27219e
commit
6f07f31ff5
@ -147,19 +147,6 @@ void InputMapEditor::_action_edited() {
|
|||||||
Dictionary action = ProjectSettings::get_singleton()->get(add_at);
|
Dictionary action = ProjectSettings::get_singleton()->get(add_at);
|
||||||
|
|
||||||
setting = true;
|
setting = true;
|
||||||
/*
|
|
||||||
undo_redo->create_action(TTR("Rename Input Action Event"));
|
|
||||||
undo_redo->add_do_method(ProjectSettings::get_singleton(), "clear", add_at);
|
|
||||||
undo_redo->add_do_method(ProjectSettings::get_singleton(), "set", action_prop, action);
|
|
||||||
undo_redo->add_do_method(ProjectSettings::get_singleton(), "set_order", action_prop, order);
|
|
||||||
undo_redo->add_undo_method(ProjectSettings::get_singleton(), "clear", action_prop);
|
|
||||||
undo_redo->add_undo_method(ProjectSettings::get_singleton(), "set", add_at, action);
|
|
||||||
undo_redo->add_undo_method(ProjectSettings::get_singleton(), "set_order", add_at, order);
|
|
||||||
undo_redo->add_do_method(this, "_update_actions");
|
|
||||||
undo_redo->add_undo_method(this, "_update_actions");
|
|
||||||
undo_redo->add_do_method(this, "_settings_changed");
|
|
||||||
undo_redo->add_undo_method(this, "_settings_changed");
|
|
||||||
undo_redo->commit_action();*/
|
|
||||||
|
|
||||||
ProjectSettings::get_singleton()->clear(add_at);
|
ProjectSettings::get_singleton()->clear(add_at);
|
||||||
ProjectSettings::get_singleton()->set(action_prop, action);
|
ProjectSettings::get_singleton()->set(action_prop, action);
|
||||||
@ -177,14 +164,6 @@ void InputMapEditor::_action_edited() {
|
|||||||
Dictionary new_action = old_action.duplicate();
|
Dictionary new_action = old_action.duplicate();
|
||||||
new_action["deadzone"] = ti->get_range(1);
|
new_action["deadzone"] = ti->get_range(1);
|
||||||
|
|
||||||
/*
|
|
||||||
undo_redo->create_action(TTR("Change Action deadzone"));
|
|
||||||
undo_redo->add_do_method(ProjectSettings::get_singleton(), "set", name, new_action);
|
|
||||||
undo_redo->add_do_method(this, "_settings_changed");
|
|
||||||
undo_redo->add_undo_method(ProjectSettings::get_singleton(), "set", name, old_action);
|
|
||||||
undo_redo->add_undo_method(this, "_settings_changed");
|
|
||||||
undo_redo->commit_action();*/
|
|
||||||
|
|
||||||
ProjectSettings::get_singleton()->set(name, new_action);
|
ProjectSettings::get_singleton()->set(name, new_action);
|
||||||
_settings_changed();
|
_settings_changed();
|
||||||
}
|
}
|
||||||
@ -274,16 +253,6 @@ void InputMapEditor::_device_input_add() {
|
|||||||
}
|
}
|
||||||
action["events"] = events;
|
action["events"] = events;
|
||||||
|
|
||||||
/*
|
|
||||||
undo_redo->create_action(TTR("Add Input Action Event"));
|
|
||||||
undo_redo->add_do_method(ProjectSettings::get_singleton(), "set", name, action);
|
|
||||||
undo_redo->add_undo_method(ProjectSettings::get_singleton(), "set", name, old_val);
|
|
||||||
undo_redo->add_do_method(this, "_update_actions");
|
|
||||||
undo_redo->add_undo_method(this, "_update_actions");
|
|
||||||
undo_redo->add_do_method(this, "_settings_changed");
|
|
||||||
undo_redo->add_undo_method(this, "_settings_changed");
|
|
||||||
undo_redo->commit_action();*/
|
|
||||||
|
|
||||||
ProjectSettings::get_singleton()->set(name, action);
|
ProjectSettings::get_singleton()->set(name, action);
|
||||||
_update_actions();
|
_update_actions();
|
||||||
_settings_changed();
|
_settings_changed();
|
||||||
@ -343,16 +312,6 @@ void InputMapEditor::_press_a_key_confirm() {
|
|||||||
}
|
}
|
||||||
action["events"] = events;
|
action["events"] = events;
|
||||||
|
|
||||||
/*
|
|
||||||
undo_redo->create_action(TTR("Add Input Action Event"));
|
|
||||||
undo_redo->add_do_method(ProjectSettings::get_singleton(), "set", name, action);
|
|
||||||
undo_redo->add_undo_method(ProjectSettings::get_singleton(), "set", name, old_val);
|
|
||||||
undo_redo->add_do_method(this, "_update_actions");
|
|
||||||
undo_redo->add_undo_method(this, "_update_actions");
|
|
||||||
undo_redo->add_do_method(this, "_settings_changed");
|
|
||||||
undo_redo->add_undo_method(this, "_settings_changed");
|
|
||||||
undo_redo->commit_action();*/
|
|
||||||
|
|
||||||
ProjectSettings::get_singleton()->set(name, action);
|
ProjectSettings::get_singleton()->set(name, action);
|
||||||
_update_actions();
|
_update_actions();
|
||||||
_settings_changed();
|
_settings_changed();
|
||||||
@ -570,17 +529,6 @@ void InputMapEditor::_action_button_pressed(Object *p_obj, int p_column, int p_i
|
|||||||
Dictionary old_val = ProjectSettings::get_singleton()->get(name);
|
Dictionary old_val = ProjectSettings::get_singleton()->get(name);
|
||||||
//int order = ProjectSettings::get_singleton()->get_order(name);
|
//int order = ProjectSettings::get_singleton()->get_order(name);
|
||||||
|
|
||||||
/*
|
|
||||||
undo_redo->create_action(TTR("Erase Input Action"));
|
|
||||||
undo_redo->add_do_method(ProjectSettings::get_singleton(), "clear", name);
|
|
||||||
undo_redo->add_undo_method(ProjectSettings::get_singleton(), "set", name, old_val);
|
|
||||||
undo_redo->add_undo_method(ProjectSettings::get_singleton(), "set_order", name, order);
|
|
||||||
undo_redo->add_do_method(this, "_update_actions");
|
|
||||||
undo_redo->add_undo_method(this, "_update_actions");
|
|
||||||
undo_redo->add_do_method(this, "_settings_changed");
|
|
||||||
undo_redo->add_undo_method(this, "_settings_changed");
|
|
||||||
undo_redo->commit_action();*/
|
|
||||||
|
|
||||||
ProjectSettings::get_singleton()->clear(name);
|
ProjectSettings::get_singleton()->clear(name);
|
||||||
_update_actions();
|
_update_actions();
|
||||||
_settings_changed();
|
_settings_changed();
|
||||||
@ -597,16 +545,6 @@ void InputMapEditor::_action_button_pressed(Object *p_obj, int p_column, int p_i
|
|||||||
events.remove(idx);
|
events.remove(idx);
|
||||||
action["events"] = events;
|
action["events"] = events;
|
||||||
|
|
||||||
/*
|
|
||||||
undo_redo->create_action(TTR("Erase Input Action Event"));
|
|
||||||
undo_redo->add_do_method(ProjectSettings::get_singleton(), "set", name, action);
|
|
||||||
undo_redo->add_undo_method(ProjectSettings::get_singleton(), "set", name, old_val);
|
|
||||||
undo_redo->add_do_method(this, "_update_actions");
|
|
||||||
undo_redo->add_undo_method(this, "_update_actions");
|
|
||||||
undo_redo->add_do_method(this, "_settings_changed");
|
|
||||||
undo_redo->add_undo_method(this, "_settings_changed");
|
|
||||||
undo_redo->commit_action();*/
|
|
||||||
|
|
||||||
ProjectSettings::get_singleton()->set(name, action);
|
ProjectSettings::get_singleton()->set(name, action);
|
||||||
_update_actions();
|
_update_actions();
|
||||||
_settings_changed();
|
_settings_changed();
|
||||||
@ -902,17 +840,6 @@ void InputMapEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data,
|
|||||||
order = iterator_order;
|
order = iterator_order;
|
||||||
iterator = is_below ? iterator->get_next() : iterator->get_prev();
|
iterator = is_below ? iterator->get_next() : iterator->get_prev();
|
||||||
}
|
}
|
||||||
/*
|
|
||||||
undo_redo->add_do_method(ProjectSettings::get_singleton(), "set_order", target_name, order);
|
|
||||||
undo_redo->add_do_method(ProjectSettings::get_singleton(), "set_order", selected_name, target_order);
|
|
||||||
undo_redo->add_undo_method(ProjectSettings::get_singleton(), "set_order", target_name, target_order);
|
|
||||||
undo_redo->add_undo_method(ProjectSettings::get_singleton(), "set_order", selected_name, old_order);
|
|
||||||
|
|
||||||
undo_redo->add_do_method(this, "_update_actions");
|
|
||||||
undo_redo->add_undo_method(this, "_update_actions");
|
|
||||||
undo_redo->add_do_method(this, "_settings_changed");
|
|
||||||
undo_redo->add_undo_method(this, "_settings_changed");
|
|
||||||
undo_redo->commit_action();*/
|
|
||||||
|
|
||||||
ProjectSettings::get_singleton()->set_order(target_name, order);
|
ProjectSettings::get_singleton()->set_order(target_name, order);
|
||||||
ProjectSettings::get_singleton()->set_order(selected_name, target_order);
|
ProjectSettings::get_singleton()->set_order(selected_name, target_order);
|
||||||
|
Loading…
Reference in New Issue
Block a user