diff options
Diffstat (limited to 'editor/settings_config_dialog.cpp')
-rw-r--r-- | editor/settings_config_dialog.cpp | 229 |
1 files changed, 105 insertions, 124 deletions
diff --git a/editor/settings_config_dialog.cpp b/editor/settings_config_dialog.cpp index 7d8d6ffcec..909ed99da6 100644 --- a/editor/settings_config_dialog.cpp +++ b/editor/settings_config_dialog.cpp @@ -28,12 +28,12 @@ /*************************************************************************/ #include "settings_config_dialog.h" -#include "editor_settings.h" -#include "scene/gui/margin_container.h" -#include "global_config.h" #include "editor_file_system.h" #include "editor_node.h" +#include "editor_settings.h" +#include "global_config.h" #include "os/keyboard.h" +#include "scene/gui/margin_container.h" void EditorSettingsDialog::ok_pressed() { @@ -42,7 +42,6 @@ void EditorSettingsDialog::ok_pressed() { _settings_save(); timer->stop(); - } void EditorSettingsDialog::_settings_changed() { @@ -50,7 +49,7 @@ void EditorSettingsDialog::_settings_changed() { timer->start(); } -void EditorSettingsDialog::_settings_property_edited(const String& p_name) { +void EditorSettingsDialog::_settings_property_edited(const String &p_name) { String full_name = property_editor->get_full_item_path(p_name); @@ -63,10 +62,8 @@ void EditorSettingsDialog::_settings_property_edited(const String& p_name) { void EditorSettingsDialog::_settings_save() { - EditorSettings::get_singleton()->notify_changes(); EditorSettings::get_singleton()->save(); - } void EditorSettingsDialog::cancel_pressed() { @@ -75,10 +72,8 @@ void EditorSettingsDialog::cancel_pressed() { return; EditorSettings::get_singleton()->notify_changes(); - } - void EditorSettingsDialog::popup_edit_settings() { if (!EditorSettings::get_singleton()) @@ -104,7 +99,7 @@ void EditorSettingsDialog::popup_edit_settings() { void EditorSettingsDialog::_clear_search_box() { - if (search_box->get_text()=="") + if (search_box->get_text() == "") return; search_box->clear(); @@ -112,13 +107,13 @@ void EditorSettingsDialog::_clear_search_box() { } void EditorSettingsDialog::_clear_shortcut_search_box() { - if (shortcut_search_box->get_text()=="") + if (shortcut_search_box->get_text() == "") return; shortcut_search_box->clear(); } -void EditorSettingsDialog::_filter_shortcuts(const String& p_filter) { +void EditorSettingsDialog::_filter_shortcuts(const String &p_filter) { shortcut_filter = p_filter; _update_shortcuts(); } @@ -136,7 +131,6 @@ void EditorSettingsDialog::_notification(int p_what) { } } - void EditorSettingsDialog::_update_shortcuts() { shortcuts->clear(); @@ -145,9 +139,9 @@ void EditorSettingsDialog::_update_shortcuts() { EditorSettings::get_singleton()->get_shortcut_list(&slist); TreeItem *root = shortcuts->create_item(); - Map<String,TreeItem*> sections; + Map<String, TreeItem *> sections; - for(List<String>::Element *E=slist.front();E;E=E->next()) { + for (List<String>::Element *E = slist.front(); E; E = E->next()) { Ref<ShortCut> sc = EditorSettings::get_singleton()->get_shortcut(E->get()); if (!sc->has_meta("original")) @@ -155,38 +149,38 @@ void EditorSettingsDialog::_update_shortcuts() { InputEvent original = sc->get_meta("original"); - String section_name = E->get().get_slice("/",0); + String section_name = E->get().get_slice("/", 0); TreeItem *section; if (sections.has(section_name)) { - section=sections[section_name]; + section = sections[section_name]; } else { section = shortcuts->create_item(root); - section->set_text(0,section_name.capitalize()); + section->set_text(0, section_name.capitalize()); - sections[section_name]=section; - section->set_custom_bg_color(0,get_color("prop_subsection","Editor")); - section->set_custom_bg_color(1,get_color("prop_subsection","Editor")); + sections[section_name] = section; + section->set_custom_bg_color(0, get_color("prop_subsection", "Editor")); + section->set_custom_bg_color(1, get_color("prop_subsection", "Editor")); } if (shortcut_filter.is_subsequence_ofi(sc->get_name())) { TreeItem *item = shortcuts->create_item(section); - item->set_text(0,sc->get_name()); - item->set_text(1,sc->get_as_text()); - if (!sc->is_shortcut(original) && !(sc->get_shortcut().type==InputEvent::NONE && original.type==InputEvent::NONE)) { - item->add_button(1,get_icon("Reload","EditorIcons"),2); + item->set_text(0, sc->get_name()); + item->set_text(1, sc->get_as_text()); + if (!sc->is_shortcut(original) && !(sc->get_shortcut().type == InputEvent::NONE && original.type == InputEvent::NONE)) { + item->add_button(1, get_icon("Reload", "EditorIcons"), 2); } - item->add_button(1,get_icon("Edit","EditorIcons"),0); - item->add_button(1,get_icon("Close","EditorIcons"),1); - item->set_tooltip(0,E->get()); - item->set_metadata(0,E->get()); + item->add_button(1, get_icon("Edit", "EditorIcons"), 0); + item->add_button(1, get_icon("Close", "EditorIcons"), 1); + item->set_tooltip(0, E->get()); + item->set_metadata(0, E->get()); } } // remove sections with no shortcuts - for(Map<String,TreeItem*>::Element *E=sections.front();E;E=E->next()) { + for (Map<String, TreeItem *>::Element *E = sections.front(); E; E = E->next()) { TreeItem *section = E->get(); if (section->get_children() == NULL) { root->remove_child(section); @@ -194,37 +188,37 @@ void EditorSettingsDialog::_update_shortcuts() { } } -void EditorSettingsDialog::_shortcut_button_pressed(Object* p_item,int p_column,int p_idx) { +void EditorSettingsDialog::_shortcut_button_pressed(Object *p_item, int p_column, int p_idx) { - TreeItem *ti=p_item->cast_to<TreeItem>(); + TreeItem *ti = p_item->cast_to<TreeItem>(); ERR_FAIL_COND(!ti); String item = ti->get_metadata(0); Ref<ShortCut> sc = EditorSettings::get_singleton()->get_shortcut(item); - if (p_idx==0) { + if (p_idx == 0) { press_a_key_label->set_text(TTR("Press a Key..")); - last_wait_for_key=InputEvent(); - press_a_key->popup_centered(Size2(250,80)*EDSCALE); + last_wait_for_key = InputEvent(); + press_a_key->popup_centered(Size2(250, 80) * EDSCALE); press_a_key->grab_focus(); press_a_key->get_ok()->set_focus_mode(FOCUS_NONE); press_a_key->get_cancel()->set_focus_mode(FOCUS_NONE); - shortcut_configured=item; + shortcut_configured = item; - } else if (p_idx==1) {//erase + } else if (p_idx == 1) { //erase if (!sc.is_valid()) return; //pointless, there is nothing UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo(); ur->create_action("Erase Shortcut"); - ur->add_do_method(sc.ptr(),"set_shortcut",InputEvent()); - ur->add_undo_method(sc.ptr(),"set_shortcut",sc->get_shortcut()); - ur->add_do_method(this,"_update_shortcuts"); - ur->add_undo_method(this,"_update_shortcuts"); - ur->add_do_method(this,"_settings_changed"); - ur->add_undo_method(this,"_settings_changed"); + ur->add_do_method(sc.ptr(), "set_shortcut", InputEvent()); + ur->add_undo_method(sc.ptr(), "set_shortcut", sc->get_shortcut()); + ur->add_do_method(this, "_update_shortcuts"); + ur->add_undo_method(this, "_update_shortcuts"); + ur->add_do_method(this, "_settings_changed"); + ur->add_undo_method(this, "_settings_changed"); ur->commit_action(); - } else if (p_idx==2) {//revert to original + } else if (p_idx == 2) { //revert to original if (!sc.is_valid()) return; //pointless, there is nothing @@ -232,82 +226,71 @@ void EditorSettingsDialog::_shortcut_button_pressed(Object* p_item,int p_column, UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo(); ur->create_action("Restore Shortcut"); - ur->add_do_method(sc.ptr(),"set_shortcut",original); - ur->add_undo_method(sc.ptr(),"set_shortcut",sc->get_shortcut()); - ur->add_do_method(this,"_update_shortcuts"); - ur->add_undo_method(this,"_update_shortcuts"); - ur->add_do_method(this,"_settings_changed"); - ur->add_undo_method(this,"_settings_changed"); + ur->add_do_method(sc.ptr(), "set_shortcut", original); + ur->add_undo_method(sc.ptr(), "set_shortcut", sc->get_shortcut()); + ur->add_do_method(this, "_update_shortcuts"); + ur->add_undo_method(this, "_update_shortcuts"); + ur->add_do_method(this, "_settings_changed"); + ur->add_undo_method(this, "_settings_changed"); ur->commit_action(); } } +void EditorSettingsDialog::_wait_for_key(const InputEvent &p_event) { -void EditorSettingsDialog::_wait_for_key(const InputEvent& p_event) { - + if (p_event.type == InputEvent::KEY && p_event.key.pressed && p_event.key.scancode != 0) { - if (p_event.type==InputEvent::KEY && p_event.key.pressed && p_event.key.scancode!=0) { - - last_wait_for_key=p_event; - String str=keycode_get_string(p_event.key.scancode).capitalize(); + last_wait_for_key = p_event; + String str = keycode_get_string(p_event.key.scancode).capitalize(); if (p_event.key.mod.meta) - str=TTR("Meta+")+str; + str = TTR("Meta+") + str; if (p_event.key.mod.shift) - str=TTR("Shift+")+str; + str = TTR("Shift+") + str; if (p_event.key.mod.alt) - str=TTR("Alt+")+str; + str = TTR("Alt+") + str; if (p_event.key.mod.control) - str=TTR("Control+")+str; - + str = TTR("Control+") + str; press_a_key_label->set_text(str); press_a_key->accept_event(); - } } - - - void EditorSettingsDialog::_press_a_key_confirm() { - if (last_wait_for_key.type!=InputEvent::KEY) + if (last_wait_for_key.type != InputEvent::KEY) return; InputEvent ie; - ie.type=InputEvent::KEY; - ie.key.scancode=last_wait_for_key.key.scancode; - ie.key.mod=last_wait_for_key.key.mod; + ie.type = InputEvent::KEY; + ie.key.scancode = last_wait_for_key.key.scancode; + ie.key.mod = last_wait_for_key.key.mod; Ref<ShortCut> sc = EditorSettings::get_singleton()->get_shortcut(shortcut_configured); UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo(); - ur->create_action("Change Shortcut '"+shortcut_configured+"'"); - ur->add_do_method(sc.ptr(),"set_shortcut",ie); - ur->add_undo_method(sc.ptr(),"set_shortcut",sc->get_shortcut()); - ur->add_do_method(this,"_update_shortcuts"); - ur->add_undo_method(this,"_update_shortcuts"); - ur->add_do_method(this,"_settings_changed"); - ur->add_undo_method(this,"_settings_changed"); + ur->create_action("Change Shortcut '" + shortcut_configured + "'"); + ur->add_do_method(sc.ptr(), "set_shortcut", ie); + ur->add_undo_method(sc.ptr(), "set_shortcut", sc->get_shortcut()); + ur->add_do_method(this, "_update_shortcuts"); + ur->add_undo_method(this, "_update_shortcuts"); + ur->add_do_method(this, "_settings_changed"); + ur->add_undo_method(this, "_settings_changed"); ur->commit_action(); - - - } void EditorSettingsDialog::_bind_methods() { - ClassDB::bind_method(D_METHOD("_settings_save"),&EditorSettingsDialog::_settings_save); - ClassDB::bind_method(D_METHOD("_settings_changed"),&EditorSettingsDialog::_settings_changed); - ClassDB::bind_method(D_METHOD("_settings_property_edited"),&EditorSettingsDialog::_settings_property_edited); - ClassDB::bind_method(D_METHOD("_clear_search_box"),&EditorSettingsDialog::_clear_search_box); - ClassDB::bind_method(D_METHOD("_clear_shortcut_search_box"),&EditorSettingsDialog::_clear_shortcut_search_box); - ClassDB::bind_method(D_METHOD("_shortcut_button_pressed"),&EditorSettingsDialog::_shortcut_button_pressed); - ClassDB::bind_method(D_METHOD("_filter_shortcuts"),&EditorSettingsDialog::_filter_shortcuts); - ClassDB::bind_method(D_METHOD("_update_shortcuts"),&EditorSettingsDialog::_update_shortcuts); - ClassDB::bind_method(D_METHOD("_press_a_key_confirm"),&EditorSettingsDialog::_press_a_key_confirm); - ClassDB::bind_method(D_METHOD("_wait_for_key"),&EditorSettingsDialog::_wait_for_key); - + ClassDB::bind_method(D_METHOD("_settings_save"), &EditorSettingsDialog::_settings_save); + ClassDB::bind_method(D_METHOD("_settings_changed"), &EditorSettingsDialog::_settings_changed); + ClassDB::bind_method(D_METHOD("_settings_property_edited"), &EditorSettingsDialog::_settings_property_edited); + ClassDB::bind_method(D_METHOD("_clear_search_box"), &EditorSettingsDialog::_clear_search_box); + ClassDB::bind_method(D_METHOD("_clear_shortcut_search_box"), &EditorSettingsDialog::_clear_shortcut_search_box); + ClassDB::bind_method(D_METHOD("_shortcut_button_pressed"), &EditorSettingsDialog::_shortcut_button_pressed); + ClassDB::bind_method(D_METHOD("_filter_shortcuts"), &EditorSettingsDialog::_filter_shortcuts); + ClassDB::bind_method(D_METHOD("_update_shortcuts"), &EditorSettingsDialog::_update_shortcuts); + ClassDB::bind_method(D_METHOD("_press_a_key_confirm"), &EditorSettingsDialog::_press_a_key_confirm); + ClassDB::bind_method(D_METHOD("_wait_for_key"), &EditorSettingsDialog::_wait_for_key); } EditorSettingsDialog::EditorSettingsDialog() { @@ -315,31 +298,31 @@ EditorSettingsDialog::EditorSettingsDialog() { set_title(TTR("Editor Settings")); set_resizable(true); - tabs = memnew( TabContainer ); + tabs = memnew(TabContainer); add_child(tabs); //set_child_rect(tabs); - VBoxContainer *vbc = memnew( VBoxContainer ); + VBoxContainer *vbc = memnew(VBoxContainer); tabs->add_child(vbc); vbc->set_name(TTR("General")); - HBoxContainer *hbc = memnew( HBoxContainer ); + HBoxContainer *hbc = memnew(HBoxContainer); hbc->set_h_size_flags(Control::SIZE_EXPAND_FILL); vbc->add_child(hbc); - Label *l = memnew( Label ); - l->set_text(TTR("Search:")+" "); + Label *l = memnew(Label); + l->set_text(TTR("Search:") + " "); hbc->add_child(l); - search_box = memnew( LineEdit ); + search_box = memnew(LineEdit); search_box->set_h_size_flags(Control::SIZE_EXPAND_FILL); hbc->add_child(search_box); - clear_button = memnew( ToolButton ); + clear_button = memnew(ToolButton); hbc->add_child(clear_button); - clear_button->connect("pressed",this,"_clear_search_box"); + clear_button->connect("pressed", this, "_clear_search_box"); - property_editor = memnew( SectionedPropertyEditor ); + property_editor = memnew(SectionedPropertyEditor); //property_editor->hide_top_label(); property_editor->get_property_editor()->set_use_filter(true); property_editor->get_property_editor()->register_text_enter(search_box); @@ -347,69 +330,67 @@ EditorSettingsDialog::EditorSettingsDialog() { vbc->add_child(property_editor); property_editor->get_property_editor()->connect("property_edited", this, "_settings_property_edited"); - vbc = memnew( VBoxContainer ); + vbc = memnew(VBoxContainer); tabs->add_child(vbc); vbc->set_name(TTR("Shortcuts")); - hbc = memnew( HBoxContainer ); + hbc = memnew(HBoxContainer); hbc->set_h_size_flags(Control::SIZE_EXPAND_FILL); vbc->add_child(hbc); - l = memnew( Label ); - l->set_text(TTR("Search:")+" "); + l = memnew(Label); + l->set_text(TTR("Search:") + " "); hbc->add_child(l); - shortcut_search_box = memnew( LineEdit ); + shortcut_search_box = memnew(LineEdit); shortcut_search_box->set_h_size_flags(Control::SIZE_EXPAND_FILL); hbc->add_child(shortcut_search_box); shortcut_search_box->connect("text_changed", this, "_filter_shortcuts"); - shortcut_clear_button = memnew( ToolButton ); + shortcut_clear_button = memnew(ToolButton); hbc->add_child(shortcut_clear_button); - shortcut_clear_button->connect("pressed",this,"_clear_shortcut_search_box"); + shortcut_clear_button->connect("pressed", this, "_clear_shortcut_search_box"); - shortcuts = memnew( Tree ); - vbc->add_margin_child("Shortcut List:",shortcuts,true); + shortcuts = memnew(Tree); + vbc->add_margin_child("Shortcut List:", shortcuts, true); shortcuts->set_columns(2); shortcuts->set_hide_root(true); //shortcuts->set_hide_folding(true); shortcuts->set_column_titles_visible(true); - shortcuts->set_column_title(0,"Name"); - shortcuts->set_column_title(1,"Binding"); - shortcuts->connect("button_pressed",this,"_shortcut_button_pressed"); + shortcuts->set_column_title(0, "Name"); + shortcuts->set_column_title(1, "Binding"); + shortcuts->connect("button_pressed", this, "_shortcut_button_pressed"); - press_a_key = memnew( ConfirmationDialog ); + press_a_key = memnew(ConfirmationDialog); press_a_key->set_focus_mode(FOCUS_ALL); add_child(press_a_key); - l = memnew( Label ); + l = memnew(Label); l->set_text(TTR("Press a Key..")); l->set_area_as_parent_rect(); l->set_align(Label::ALIGN_CENTER); - l->set_margin(MARGIN_TOP,20); - l->set_anchor_and_margin(MARGIN_BOTTOM,ANCHOR_BEGIN,30); - press_a_key_label=l; + l->set_margin(MARGIN_TOP, 20); + l->set_anchor_and_margin(MARGIN_BOTTOM, ANCHOR_BEGIN, 30); + press_a_key_label = l; press_a_key->add_child(l); - press_a_key->connect("gui_input",this,"_wait_for_key"); - press_a_key->connect("confirmed",this,"_press_a_key_confirm"); + press_a_key->connect("gui_input", this, "_wait_for_key"); + press_a_key->connect("confirmed", this, "_press_a_key_confirm"); //Button *load = memnew( Button ); //load->set_text("Load.."); //hbc->add_child(load); - //get_ok()->set_text("Apply"); set_hide_on_ok(true); //get_cancel()->set_text("Close"); - timer = memnew( Timer ); + timer = memnew(Timer); timer->set_wait_time(1.5); - timer->connect("timeout",this,"_settings_save"); + timer->connect("timeout", this, "_settings_save"); timer->set_one_shot(true); add_child(timer); - EditorSettings::get_singleton()->connect("settings_changed",this,"_settings_changed"); + EditorSettings::get_singleton()->connect("settings_changed", this, "_settings_changed"); get_ok()->set_text(TTR("Close")); - updating=false; - + updating = false; } |