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

Add VCS editor plugin UI elements to editor

Browse source
This commit is contained in:
Twarit 2019-09-03 20:12:08 +05:30
parent 97959a53df
commit d98e944a19
2 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
editor/editor_node.cpp
View file

@ -122,6 +122,7 @@
#include "editor/plugins/theme_editor_plugin.h" #include "editor/plugins/theme_editor_plugin.h"
#include "editor/plugins/tile_map_editor_plugin.h" #include "editor/plugins/tile_map_editor_plugin.h"
#include "editor/plugins/tile_set_editor_plugin.h" #include "editor/plugins/tile_set_editor_plugin.h"
#include "editor/plugins/version_control_editor_plugin.h"
#include "editor/plugins/visual_shader_editor_plugin.h" #include "editor/plugins/visual_shader_editor_plugin.h"
#include "editor/pvrtc_compress.h" #include "editor/pvrtc_compress.h"
#include "editor/register_exporters.h" #include "editor/register_exporters.h"
@ -177,6 +178,20 @@ void EditorNode::_update_scene_tabs() {
} }
} }
void EditorNode::_version_control_menu_option(int p_idx) {
switch (vcs_actions_menu->get_item_id(p_idx)) {
case RUN_VCS_SETTINGS: {
VersionControlEditorPlugin::get_singleton()->popup_vcs_set_up_dialog(gui_base);
} break;
case RUN_VCS_SHUT_DOWN: {
VersionControlEditorPlugin::get_singleton()->shut_down();
} break;
}
}
void EditorNode::_update_title() { void EditorNode::_update_title() {
String appname = ProjectSettings::get_singleton()->get("application/config/name"); String appname = ProjectSettings::get_singleton()->get("application/config/name");
@ -3518,6 +3533,7 @@ void EditorNode::register_editor_types() {
ClassDB::register_class<EditorResourcePreviewGenerator>(); ClassDB::register_class<EditorResourcePreviewGenerator>();
ClassDB::register_virtual_class<EditorFileSystem>(); ClassDB::register_virtual_class<EditorFileSystem>();
ClassDB::register_class<EditorFileSystemDirectory>(); ClassDB::register_class<EditorFileSystemDirectory>();
ClassDB::register_class<EditorVCSInterface>();
ClassDB::register_virtual_class<ScriptEditor>(); ClassDB::register_virtual_class<ScriptEditor>();
ClassDB::register_virtual_class<EditorInterface>(); ClassDB::register_virtual_class<EditorInterface>();
ClassDB::register_class<EditorExportPlugin>(); ClassDB::register_class<EditorExportPlugin>();
@ -5323,6 +5339,7 @@ void EditorNode::_bind_methods() {
ClassDB::bind_method("_clear_undo_history", &EditorNode::_clear_undo_history); ClassDB::bind_method("_clear_undo_history", &EditorNode::_clear_undo_history);
ClassDB::bind_method("_dropped_files", &EditorNode::_dropped_files); ClassDB::bind_method("_dropped_files", &EditorNode::_dropped_files);
ClassDB::bind_method("_toggle_distraction_free_mode", &EditorNode::_toggle_distraction_free_mode); ClassDB::bind_method("_toggle_distraction_free_mode", &EditorNode::_toggle_distraction_free_mode);
ClassDB::bind_method("_version_control_menu_option", &EditorNode::_version_control_menu_option);
ClassDB::bind_method("edit_item_resource", &EditorNode::edit_item_resource); ClassDB::bind_method("edit_item_resource", &EditorNode::edit_item_resource);
ClassDB::bind_method(D_METHOD("get_gui_base"), &EditorNode::get_gui_base); ClassDB::bind_method(D_METHOD("get_gui_base"), &EditorNode::get_gui_base);
@ -6007,6 +6024,15 @@ EditorNode::EditorNode() {
p->add_shortcut(ED_SHORTCUT("editor/project_settings", TTR("Project Settings...")), RUN_SETTINGS); p->add_shortcut(ED_SHORTCUT("editor/project_settings", TTR("Project Settings...")), RUN_SETTINGS);
p->connect("id_pressed", this, "_menu_option"); p->connect("id_pressed", this, "_menu_option");
vcs_actions_menu = VersionControlEditorPlugin::get_singleton()->get_version_control_actions_panel();
vcs_actions_menu->set_name("Version Control");
vcs_actions_menu->connect("index_pressed", this, "_version_control_menu_option");
p->add_separator();
p->add_child(vcs_actions_menu);
p->add_submenu_item(TTR("Version Control"), "Version Control");
vcs_actions_menu->add_item(TTR("Set Up Version Control"), RUN_VCS_SETTINGS);
vcs_actions_menu->add_item(TTR("Shut Down Version Control"), RUN_VCS_SHUT_DOWN);
p->add_separator(); p->add_separator();
p->add_shortcut(ED_SHORTCUT("editor/export", TTR("Export...")), FILE_EXPORT_PROJECT); p->add_shortcut(ED_SHORTCUT("editor/export", TTR("Export...")), FILE_EXPORT_PROJECT);
p->add_item(TTR("Install Android Build Template..."), FILE_INSTALL_ANDROID_SOURCE); p->add_item(TTR("Install Android Build Template..."), FILE_INSTALL_ANDROID_SOURCE);
@ -6016,7 +6042,6 @@ EditorNode::EditorNode() {
plugin_config_dialog->connect("plugin_ready", this, "_on_plugin_ready"); plugin_config_dialog->connect("plugin_ready", this, "_on_plugin_ready");
gui_base->add_child(plugin_config_dialog); gui_base->add_child(plugin_config_dialog);
p->add_separator();
tool_menu = memnew(PopupMenu); tool_menu = memnew(PopupMenu);
tool_menu->set_name("Tools"); tool_menu->set_name("Tools");
tool_menu->connect("index_pressed", this, "_tool_menu_option"); tool_menu->connect("index_pressed", this, "_tool_menu_option");
@ -6481,6 +6506,7 @@ EditorNode::EditorNode() {
//more visually meaningful to have this later //more visually meaningful to have this later
raise_bottom_panel_item(AnimationPlayerEditor::singleton); raise_bottom_panel_item(AnimationPlayerEditor::singleton);
add_editor_plugin(VersionControlEditorPlugin::get_singleton());
add_editor_plugin(memnew(ShaderEditorPlugin(this))); add_editor_plugin(memnew(ShaderEditorPlugin(this)));
add_editor_plugin(memnew(VisualShaderEditorPlugin(this))); add_editor_plugin(memnew(VisualShaderEditorPlugin(this)));

6
editor/editor_node.h
View file

@ -178,8 +178,12 @@ private:
RUN_DEBUG_NAVIGATION, RUN_DEBUG_NAVIGATION,
RUN_DEPLOY_REMOTE_DEBUG, RUN_DEPLOY_REMOTE_DEBUG,
RUN_RELOAD_SCRIPTS, RUN_RELOAD_SCRIPTS,
RUN_VCS_SETTINGS,
RUN_VCS_SHUT_DOWN,
SETTINGS_UPDATE_CONTINUOUSLY, SETTINGS_UPDATE_CONTINUOUSLY,
SETTINGS_UPDATE_WHEN_CHANGED, SETTINGS_UPDATE_WHEN_CHANGED,
SETTINGS_UPDATE_ALWAYS,
SETTINGS_UPDATE_CHANGES,
SETTINGS_UPDATE_SPINNER_HIDE, SETTINGS_UPDATE_SPINNER_HIDE,
SETTINGS_PREFERENCES, SETTINGS_PREFERENCES,
SETTINGS_LAYOUT_SAVE, SETTINGS_LAYOUT_SAVE,
@ -319,6 +323,7 @@ private:
EditorSettingsDialog *settings_config_dialog; EditorSettingsDialog *settings_config_dialog;
RunSettingsDialog *run_settings_dialog; RunSettingsDialog *run_settings_dialog;
ProjectSettingsEditor *project_settings; ProjectSettingsEditor *project_settings;
PopupMenu *vcs_actions_menu;
EditorFileDialog *file; EditorFileDialog *file;
ExportTemplateManager *export_template_manager; ExportTemplateManager *export_template_manager;
EditorFeatureProfileManager *feature_profile_manager; EditorFeatureProfileManager *feature_profile_manager;
@ -474,6 +479,7 @@ private:
void _get_scene_metadata(const String &p_file); void _get_scene_metadata(const String &p_file);
void _update_title(); void _update_title();
void _update_scene_tabs(); void _update_scene_tabs();
void _version_control_menu_option(int p_idx);
void _close_messages(); void _close_messages();
void _show_messages(); void _show_messages();
void _vp_resized(); void _vp_resized();