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

Merge pull request #3076 from neikeq/rename_actions

Browse source 
Option to rename input actions
This commit is contained in:
Rémi Verschelde 2015-12-14 23:33:06 +01:00
commit 69c79c0d4a
8 changed files with 140 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/globals.cpp
View file

@ -1414,6 +1414,7 @@ Globals::Globals() {
joyb.joy_button.button_index=JOY_BUTTON_0;
va.push_back(joyb);
set("input/ui_accept",va);
input_presets.push_back("input/ui_accept");
va=Array();
key.key.scancode=KEY_SPACE;
@ -1421,6 +1422,7 @@ Globals::Globals() {
joyb.joy_button.button_index=JOY_BUTTON_3;
va.push_back(joyb);
set("input/ui_select",va);
input_presets.push_back("input/ui_select");
va=Array();
key.key.scancode=KEY_ESCAPE;
@ -1428,17 +1430,20 @@ Globals::Globals() {
joyb.joy_button.button_index=JOY_BUTTON_1;
va.push_back(joyb);
set("input/ui_cancel",va);
input_presets.push_back("input/ui_cancel");
va=Array();
key.key.scancode=KEY_TAB;
va.push_back(key);
set("input/ui_focus_next",va);
input_presets.push_back("input/ui_focus_next");
va=Array();
key.key.scancode=KEY_TAB;
key.key.mod.shift=true;
va.push_back(key);
set("input/ui_focus_prev",va);
input_presets.push_back("input/ui_focus_prev");
key.key.mod.shift=false;
va=Array();
@ -1447,6 +1452,7 @@ Globals::Globals() {
joyb.joy_button.button_index=JOY_DPAD_LEFT;
va.push_back(joyb);
set("input/ui_left",va);
input_presets.push_back("input/ui_left");
va=Array();
key.key.scancode=KEY_RIGHT;
@ -1454,6 +1460,7 @@ Globals::Globals() {
joyb.joy_button.button_index=JOY_DPAD_RIGHT;
va.push_back(joyb);
set("input/ui_right",va);
input_presets.push_back("input/ui_right");
va=Array();
key.key.scancode=KEY_UP;
@ -1461,6 +1468,7 @@ Globals::Globals() {
joyb.joy_button.button_index=JOY_DPAD_UP;
va.push_back(joyb);
set("input/ui_up",va);
input_presets.push_back("input/ui_up");
va=Array();
key.key.scancode=KEY_DOWN;
@ -1468,17 +1476,20 @@ Globals::Globals() {
joyb.joy_button.button_index=JOY_DPAD_DOWN;
va.push_back(joyb);
set("input/ui_down",va);
input_presets.push_back("input/ui_down");
va=Array();
key.key.scancode=KEY_PAGEUP;
va.push_back(key);
set("input/ui_page_up",va);
input_presets.push_back("input/ui_page_up");
va=Array();
key.key.scancode=KEY_PAGEDOWN;
va.push_back(key);
set("input/ui_page_down",va);
input_presets.push_back("input/ui_page_down");
// set("display/orientation", "landscape");

3
core/globals.h
View file

@ -70,6 +70,7 @@ protected:
Map<StringName,PropertyInfo> custom_prop_info;
bool disable_platform_override;
bool using_datapack;
List<String> input_presets;
bool _set(const StringName& p_name, const Variant& p_value);
@ -124,6 +125,8 @@ public:
Vector<String> get_optimizer_presets() const;
List<String> get_input_presets() const { return input_presets; }
void set_disable_platform_override(bool p_disable);
Object* get_singleton_object(const String& p_name) const;

68
tools/editor/editor_layout_dialog.cpp → tools/editor/editor_name_dialog.cpp
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* editor_layout_dialog.cpp */
/* editor_name_dialog.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -27,39 +27,63 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "editor_layout_dialog.h"
#include "editor_name_dialog.h"
#include "object_type_db.h"
#include "os/keyboard.h"
void EditorLayoutDialog::clear_layout_name() {
void EditorNameDialog::_line_input_event(const InputEvent& p_event) {
layout_name->clear();
}
if (p_event.type == InputEvent::KEY) {
void EditorLayoutDialog::_post_popup() {
if (!p_event.key.pressed)
return;
ConfirmationDialog::_post_popup();
layout_name->grab_focus();
}
switch (p_event.key.scancode) {
case KEY_ENTER:
case KEY_RETURN: {
void EditorLayoutDialog::ok_pressed() {
if (get_hide_on_ok())
hide();
ok_pressed();
accept_event();
} break;
case KEY_ESCAPE: {
if (layout_name->get_text()!="") {
emit_signal("layout_selected", layout_name->get_text());
hide();
accept_event();
} break;
}
}
}
void EditorLayoutDialog::_bind_methods() {
void EditorNameDialog::_post_popup() {
ADD_SIGNAL(MethodInfo("layout_selected",PropertyInfo( Variant::STRING,"layout_name")));
ConfirmationDialog::_post_popup();
name->clear();
name->grab_focus();
}
EditorLayoutDialog::EditorLayoutDialog()
void EditorNameDialog::ok_pressed() {
if (name->get_text()!="") {
emit_signal("name_confirmed", name->get_text());
}
}
void EditorNameDialog::_bind_methods() {
ObjectTypeDB::bind_method("_line_input_event",&EditorNameDialog::_line_input_event);
ADD_SIGNAL(MethodInfo("name_confirmed",PropertyInfo( Variant::STRING,"name")));
}
EditorNameDialog::EditorNameDialog()
{
layout_name = memnew( LineEdit );
layout_name->set_margin(MARGIN_TOP,5);
layout_name->set_anchor_and_margin(MARGIN_LEFT,ANCHOR_BEGIN,5);
layout_name->set_anchor_and_margin(MARGIN_RIGHT,ANCHOR_END,5);
add_child(layout_name);
move_child(layout_name, get_label()->get_index()+1);
name = memnew( LineEdit );
add_child(name);
move_child(name, get_label()->get_index()+1);
name->set_margin(MARGIN_TOP,5);
name->set_anchor_and_margin(MARGIN_LEFT,ANCHOR_BEGIN,5);
name->set_anchor_and_margin(MARGIN_RIGHT,ANCHOR_END,5);
name->connect("input_event", this, "_line_input_event");
}

21
tools/editor/editor_layout_dialog.h → tools/editor/editor_name_dialog.h
View file

@ -1,5 +1,5 @@
/*************************************************************************/
/* editor_layout_dialog.h */
/* editor_name_dialog.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -27,17 +27,19 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef EDITOR_LAYOUT_DIALOG_H
#define EDITOR_LAYOUT_DIALOG_H
#ifndef EDITOR_NAME_DIALOG_H
#define EDITOR_NAME_DIALOG_H
#include "scene/gui/dialogs.h"
#include "scene/gui/line_edit.h"
class EditorLayoutDialog : public ConfirmationDialog {
class EditorNameDialog : public ConfirmationDialog {
OBJ_TYPE( EditorLayoutDialog, ConfirmationDialog );
OBJ_TYPE( EditorNameDialog, ConfirmationDialog );
LineEdit *layout_name;
LineEdit *name;
void _line_input_event(const InputEvent& p_event);
protected:
@ -46,9 +48,10 @@ protected:
virtual void _post_popup();
public:
void clear_layout_name();
EditorLayoutDialog();
LineEdit* get_line_edit() { return name; }
EditorNameDialog();
};
#endif // EDITOR_LAYOUT_DIALOG_H
#endif // EDITOR_NAME_DIALOG_H

7
tools/editor/editor_node.cpp
View file

@ -4124,7 +4124,6 @@ void EditorNode::_bind_methods() {
ObjectTypeDB::bind_method("_dock_move_right",&EditorNode::_dock_move_right);
ObjectTypeDB::bind_method("_layout_menu_option",&EditorNode::_layout_menu_option);
ObjectTypeDB::bind_method("_layout_dialog_action",&EditorNode::_dialog_action);
ObjectTypeDB::bind_method("set_current_scene",&EditorNode::set_current_scene);
ObjectTypeDB::bind_method("set_current_version",&EditorNode::set_current_version);
@ -4624,7 +4623,6 @@ void EditorNode::_layout_menu_option(int p_id) {
case SETTINGS_LAYOUT_SAVE: {
current_option=p_id;
layout_dialog->clear_layout_name();
layout_dialog->set_title("Save Layout");
layout_dialog->get_ok()->set_text("Save");
layout_dialog->popup_centered();
@ -4632,7 +4630,6 @@ void EditorNode::_layout_menu_option(int p_id) {
case SETTINGS_LAYOUT_DELETE: {
current_option=p_id;
layout_dialog->clear_layout_name();
layout_dialog->set_title("Delete Layout");
layout_dialog->get_ok()->set_text("Delete");
layout_dialog->popup_centered();
@ -5427,13 +5424,13 @@ EditorNode::EditorNode() {
p->add_separator();
p->add_item("About",SETTINGS_ABOUT);
layout_dialog = memnew( EditorLayoutDialog );
layout_dialog = memnew( EditorNameDialog );
gui_base->add_child(layout_dialog);
layout_dialog->set_hide_on_ok(false);
layout_dialog->set_size(Size2(175, 70));
confirm_error = memnew( AcceptDialog );
layout_dialog->add_child(confirm_error);
layout_dialog->connect("layout_selected", this,"_layout_dialog_action");
layout_dialog->connect("name_confirmed", this,"_dialog_action");
sources_button = memnew( ToolButton );
right_menu_hb->add_child(sources_button);

4
tools/editor/editor_node.h
View file

@ -76,7 +76,7 @@
#include "editor_reimport_dialog.h"
#include "import_settings.h"
#include "tools/editor/editor_plugin.h"
#include "tools/editor/editor_layout_dialog.h"
#include "tools/editor/editor_name_dialog.h"
#include "fileserver/editor_file_server.h"
#include "editor_resource_preview.h"
@ -290,7 +290,7 @@ class EditorNode : public Node {
Ref<ConfigFile> default_theme;
PopupMenu *editor_layouts;
EditorLayoutDialog *layout_dialog;
EditorNameDialog *layout_dialog;
AcceptDialog *confirm_error;
//OptimizedPresetsDialog *optimized_presets;

64
tools/editor/project_settings.cpp
View file

@ -338,6 +338,15 @@ void ProjectSettings::_action_button_pressed(Object* p_obj, int p_column,int p_i
add_at="input/"+ti->get_text(0);
} else if (p_id==2) {
//rename
add_at="input/"+ti->get_text(0);
rename_action->popup_centered();
rename_action->get_line_edit()->set_text(ti->get_text(0));
rename_action->get_line_edit()->set_cursor_pos(ti->get_text(0).length());
rename_action->get_line_edit()->select_all();
} else if (p_id==3) {
//remove
if (ti->get_parent()==input_editor->get_root()) {
@ -418,7 +427,9 @@ void ProjectSettings::_update_actions() {
item->set_cell_mode(0,TreeItem::CELL_MODE_CHECK);
item->set_text(0,name);
item->add_button(0,get_icon("Add","EditorIcons"),1);
item->add_button(0,get_icon("Remove","EditorIcons"),2);
if (!Globals::get_singleton()->get_input_presets().find(pi.name))
item->add_button(0,get_icon("Rename","EditorIcons"),2);
item->add_button(0,get_icon("Remove","EditorIcons"),3);
item->set_custom_bg_color(0,get_color("prop_subsection","Editor"));
item->set_editable(0,true);
item->set_checked(0,pi.usage&PROPERTY_USAGE_CHECKED);
@ -486,7 +497,7 @@ void ProjectSettings::_update_actions() {
action->set_icon(0,get_icon("JoyAxis","EditorIcons"));
} break;
}
action->add_button(0,get_icon("Remove","EditorIcons"),2);
action->add_button(0,get_icon("Remove","EditorIcons"),3);
action->set_metadata(0,i);
}
}
@ -616,6 +627,45 @@ void ProjectSettings::_action_add() {
}
void ProjectSettings::_action_rename(const String &p_name) {
if (p_name.find("/")!=-1 || p_name.find(":")!=-1 || p_name=="") {
message->set_text("Invalid Action (Anything goes but / or :).");
message->popup_centered(Size2(300,100));
return;
}
String new_name = "input/"+p_name;
if (Globals::get_singleton()->has(new_name)) {
message->set_text("Action '"+p_name+"' already exists!.");
message->popup_centered(Size2(300,100));
return;
}
int order = Globals::get_singleton()->get_order(add_at);
Array va = Globals::get_singleton()->get(add_at);
bool persisting = Globals::get_singleton()->is_persisting(add_at);
undo_redo->create_action("Rename Input Action Event");
undo_redo->add_do_method(Globals::get_singleton(),"clear",add_at);
undo_redo->add_do_method(Globals::get_singleton(),"set",new_name,va);
undo_redo->add_do_method(Globals::get_singleton(),"set_persisting",new_name,persisting);
undo_redo->add_do_method(Globals::get_singleton(),"set_order",new_name,order);
undo_redo->add_undo_method(Globals::get_singleton(),"clear",new_name);
undo_redo->add_undo_method(Globals::get_singleton(),"set",add_at,va);
undo_redo->add_undo_method(Globals::get_singleton(),"set_persisting",add_at,persisting);
undo_redo->add_undo_method(Globals::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();
rename_action->hide();
}
void ProjectSettings::_item_checked(const String& p_item, bool p_check) {
@ -1219,6 +1269,7 @@ void ProjectSettings::_bind_methods() {
ObjectTypeDB::bind_method(_MD("_action_adds"),&ProjectSettings::_action_adds);
ObjectTypeDB::bind_method(_MD("_action_persist_toggle"),&ProjectSettings::_action_persist_toggle);
ObjectTypeDB::bind_method(_MD("_action_button_pressed"),&ProjectSettings::_action_button_pressed);
ObjectTypeDB::bind_method(_MD("_action_rename"),&ProjectSettings::_action_rename);
ObjectTypeDB::bind_method(_MD("_update_actions"),&ProjectSettings::_update_actions);
ObjectTypeDB::bind_method(_MD("_wait_for_key"),&ProjectSettings::_wait_for_key);
ObjectTypeDB::bind_method(_MD("_add_item"),&ProjectSettings::_add_item);
@ -1438,12 +1489,17 @@ ProjectSettings::ProjectSettings(EditorData *p_data) {
add_child(popup_add);
popup_add->connect("item_pressed",this,"_add_item");
rename_action = memnew( EditorNameDialog );
add_child(rename_action);
rename_action->set_hide_on_ok(false);
rename_action->set_size(Size2(200, 70));
rename_action->set_title("Rename Input Action");
rename_action->connect("name_confirmed", this,"_action_rename");
press_a_key = memnew( ConfirmationDialog );
press_a_key->set_focus_mode(FOCUS_ALL);
add_child(press_a_key);
l = memnew( Label );
l->set_text("Press a Key..");
l->set_area_as_parent_rect();

4
tools/editor/project_settings.h
View file

@ -34,6 +34,7 @@
#include "optimized_save_dialog.h"
#include "undo_redo.h"
#include "editor_data.h"
#include "editor_name_dialog.h"
//#include "project_export_settings.h"
class ProjectSettings : public AcceptDialog {
@ -66,6 +67,8 @@ class ProjectSettings : public AcceptDialog {
Label *device_index_label;
MenuButton *popup_platform;
EditorNameDialog *rename_action;
LineEdit *action_name;
Tree *input_editor;
bool setting;
@ -106,6 +109,7 @@ class ProjectSettings : public AcceptDialog {
void _action_adds(String);
void _action_add();
void _action_rename(const String& p_name);
void _device_input_add();
void _item_checked(const String& p_item, bool p_check);