asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
virtualx-engine/editor/plugins/version_control_editor_plugin.cpp

520 lines
21 KiB
C++
Raw Normal View History

Add copyright headers to vcs integration
2019-09-04 13:17:26 +02:00
/*************************************************************************/
/* version_control_editor_plugin.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
Update copyright statements to 2021 Happy new year to the wonderful Godot community! 2020 has been a tough year for most of us personally, but a good year for Godot development nonetheless with a huge amount of work done towards Godot 4.0 and great improvements backported to the long-lived 3.2 branch. We've had close to 400 contributors to engine code this year, authoring near 7,000 commit! (And that's only for the `master` branch and for the engine code, there's a lot more when counting docs, demos and other first-party repos.) Here's to a great year 2021 for all Godot users 🎆
2021-01-01 20:13:46 +01:00
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */
Add copyright headers to vcs integration
2019-09-04 13:17:26 +02:00
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
#include "version_control_editor_plugin.h"
Editor: fix typo in VCS plugin method names
2019-11-19 15:11:03 +01:00
Reorganized core/ directory, it was too fatty already -Removed FuncRef, since Callable makes it obsolete -Removed int_types.h as its obsolete in c++11+ -Changed color names code
2020-11-07 23:33:38 +01:00
#include "core/object/script_language.h"
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
#include "editor/editor_file_system.h"
#include "editor/editor_node.h"
Cleans up headers included in editor_node.h
2019-12-24 08:17:23 +01:00
#include "editor/editor_scale.h"
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
Replace NULL with nullptr
2020-04-02 01:20:12 +02:00
VersionControlEditorPlugin *VersionControlEditorPlugin::singleton = nullptr;
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
void VersionControlEditorPlugin::_bind_methods() {
ClassDB::bind_method(D_METHOD("popup_vcs_set_up_dialog"), &VersionControlEditorPlugin::popup_vcs_set_up_dialog);
// Used to track the status of files in the staging area
BIND_ENUM_CONSTANT(CHANGE_TYPE_NEW);
BIND_ENUM_CONSTANT(CHANGE_TYPE_MODIFIED);
BIND_ENUM_CONSTANT(CHANGE_TYPE_RENAMED);
BIND_ENUM_CONSTANT(CHANGE_TYPE_DELETED);
BIND_ENUM_CONSTANT(CHANGE_TYPE_TYPECHANGE);
}
void VersionControlEditorPlugin::_selected_a_vcs(int p_id) {
List<StringName> available_addons = get_available_vcs_names();
const StringName selected_vcs = set_up_choice->get_item_text(p_id);
}
void VersionControlEditorPlugin::_populate_available_vcs_names() {
static bool called = false;
if (!called) {
List<StringName> available_addons = get_available_vcs_names();
for (int i = 0; i < available_addons.size(); i++) {
set_up_choice->add_item(available_addons[i]);
}
called = true;
}
}
VersionControlEditorPlugin *VersionControlEditorPlugin::get_singleton() {
return singleton ? singleton : memnew(VersionControlEditorPlugin);
}
void VersionControlEditorPlugin::popup_vcs_set_up_dialog(const Control *p_gui_base) {
Display an error message if no version control systems are available This removes the need for a dedicated placeholder entry. This closes #32135.
2019-09-14 19:40:15 +02:00
fetch_available_vcs_addon_names();
List<StringName> available_addons = get_available_vcs_names();
if (available_addons.size() >= 1) {
Size2 popup_size = Size2(400, 100);
Size2 window_size = p_gui_base->get_viewport_rect().size;
popup_size.x = MIN(window_size.x * 0.5, popup_size.x);
popup_size.y = MIN(window_size.y * 0.5, popup_size.y);
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
Display an error message if no version control systems are available This removes the need for a dedicated placeholder entry. This closes #32135.
2019-09-14 19:40:15 +02:00
_populate_available_vcs_names();
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
Display an error message if no version control systems are available This removes the need for a dedicated placeholder entry. This closes #32135.
2019-09-14 19:40:15 +02:00
set_up_dialog->popup_centered_clamped(popup_size * EDSCALE);
} else {
EditorNode::get_singleton()->show_warning(TTR("No VCS addons are available."), TTR("Error"));
}
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
}
void VersionControlEditorPlugin::_initialize_vcs() {
register_editor();
Remove all uses of ERR_EXPLAIN macros.
2019-11-11 10:24:04 +01:00
ERR_FAIL_COND_MSG(EditorVCSInterface::get_singleton(), EditorVCSInterface::get_singleton()->get_vcs_name() + " is already active");
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
Display an error message if no version control systems are available This removes the need for a dedicated placeholder entry. This closes #32135.
2019-09-14 19:40:15 +02:00
const int id = set_up_choice->get_selected_id();
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
String selected_addon = set_up_choice->get_item_text(id);
String path = ScriptServer::get_global_class_path(selected_addon);
Ref<Script> script = ResourceLoader::load(path);
Remove all uses of ERR_EXPLAIN macros.
2019-11-11 10:24:04 +01:00
ERR_FAIL_COND_MSG(!script.is_valid(), "VCS Addon path is invalid");
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
EditorVCSInterface *vcs_interface = memnew(EditorVCSInterface);
ScriptInstance *addon_script_instance = script->instance_create(vcs_interface);
Remove all uses of ERR_EXPLAIN macros.
2019-11-11 10:24:04 +01:00
ERR_FAIL_COND_MSG(!addon_script_instance, "Failed to create addon script instance.");
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
// The addon is attached as a script to the VCS interface as a proxy end-point
Changed logic and optimized ObjectID in ObjectDB and Variant, removed RefPtr.
2020-02-13 20:03:10 +01:00
vcs_interface->set_script_and_instance(script, addon_script_instance);
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
EditorVCSInterface::set_singleton(vcs_interface);
Signals: Port connect calls to use callable_mp Remove now unnecessary bindings of signal callbacks in the public API. There might be some false positives that need rebinding if they were meant to be public. No regular expressions were harmed in the making of this commit. (Nah, just kidding.)
2020-02-21 18:28:45 +01:00
EditorFileSystem::get_singleton()->connect("filesystem_changed", callable_mp(this, &VersionControlEditorPlugin::_refresh_stage_area));
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
String res_dir = OS::get_singleton()->get_resource_dir();
Remove all uses of ERR_EXPLAIN macros.
2019-11-11 10:24:04 +01:00
ERR_FAIL_COND_MSG(!EditorVCSInterface::get_singleton()->initialize(res_dir), "VCS was not initialized");
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
_refresh_stage_area();
}
void VersionControlEditorPlugin::_send_commit_msg() {
if (EditorVCSInterface::get_singleton()) {
if (staged_files_count == 0) {
commit_status->set_text(TTR("No files added to stage"));
return;
}
Disable "Commit" button in VCS plugin if there's no commit message
2020-12-20 17:43:50 +01:00
EditorVCSInterface::get_singleton()->commit(commit_message->get_text());
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
commit_message->set_text("");
version_control_dock_button->set_pressed(false);
} else {
WARN_PRINT("No VCS addon is initialized. Select a Version Control Addon from Project menu");
}
_update_commit_status();
_refresh_stage_area();
_clear_file_diff();
}
void VersionControlEditorPlugin::_refresh_stage_area() {
if (EditorVCSInterface::get_singleton()) {
staged_files_count = 0;
clear_stage_area();
Dictionary modified_file_paths = EditorVCSInterface::get_singleton()->get_modified_files_data();
String file_path;
for (int i = 0; i < modified_file_paths.size(); i++) {
file_path = modified_file_paths.get_key_at_index(i);
Replace NULL with nullptr
2020-04-02 01:20:12 +02:00
TreeItem *found = stage_files->search_item_text(file_path, nullptr, true);
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
if (!found) {
ChangeType change_index = (ChangeType)(int)modified_file_paths.get_value_at_index(i);
String change_text = file_path + " (" + change_type_to_strings[change_index] + ")";
Color &change_color = change_type_to_color[change_index];
TreeItem *new_item = stage_files->create_item(stage_files->get_root());
new_item->set_cell_mode(0, TreeItem::CELL_MODE_CHECK);
new_item->set_text(0, change_text);
new_item->set_metadata(0, file_path);
new_item->set_custom_color(0, change_color);
new_item->set_checked(0, true);
new_item->set_editable(0, true);
} else {
if (found->get_metadata(0) == diff_file_name->get_text()) {
_refresh_file_diff();
}
}
commit_status->set_text("New changes detected");
}
} else {
Add do..while(0) wrappers to macros without one. - Add do..while(0) wrapper to ERR_FAIL_NULL macros. - Add do..while(0) wrapper to ERR_FAIL_COND macros. - Add do..while(0) wrapper to ERR_CONTINUE macros. - Add do..while(0) wrapper to ERR_BREAK macros. - Add do..while(0) wrapper to CRASH_COND macros. - Add do..while(0) wrapper to ERR_FAIL macros. - Add do..while(0) wrapper to ERR_PRINT macros. - Add do..while(0) wrapper to WARN_PRINT macros. - Add do..while(0) wrapper to WARN_DEPRECATED macros. - Add do..while(0) wrapper to CRASH_NOW macros.
2019-11-07 10:37:44 +01:00
WARN_PRINT("No VCS addon is initialized. Select a Version Control Addon from Project menu.");
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
}
}
void VersionControlEditorPlugin::_stage_selected() {
if (!EditorVCSInterface::get_singleton()) {
WARN_PRINT("No VCS addon is initialized. Select a Version Control Addon from Project menu");
return;
}
staged_files_count = 0;
TreeItem *root = stage_files->get_root();
if (root) {
Improve TreeItem API and allow to move nodes
2021-03-07 21:07:30 +01:00
TreeItem *file_entry = root->get_first_child();
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
while (file_entry) {
if (file_entry->is_checked(0)) {
EditorVCSInterface::get_singleton()->stage_file(file_entry->get_metadata(0));
Popups are now windows also (broken!)
2020-03-12 13:37:40 +01:00
file_entry->set_icon_modulate(0, EditorNode::get_singleton()->get_gui_base()->get_theme_color("success_color", "Editor"));
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
staged_files_count++;
} else {
EditorVCSInterface::get_singleton()->unstage_file(file_entry->get_metadata(0));
Popups are now windows also (broken!)
2020-03-12 13:37:40 +01:00
file_entry->set_icon_modulate(0, EditorNode::get_singleton()->get_gui_base()->get_theme_color("error_color", "Editor"));
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
}
file_entry = file_entry->get_next();
}
}
_update_stage_status();
}
void VersionControlEditorPlugin::_stage_all() {
if (!EditorVCSInterface::get_singleton()) {
WARN_PRINT("No VCS addon is initialized. Select a Version Control Addon from Project menu");
return;
}
staged_files_count = 0;
TreeItem *root = stage_files->get_root();
if (root) {
Improve TreeItem API and allow to move nodes
2021-03-07 21:07:30 +01:00
TreeItem *file_entry = root->get_first_child();
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
while (file_entry) {
EditorVCSInterface::get_singleton()->stage_file(file_entry->get_metadata(0));
Popups are now windows also (broken!)
2020-03-12 13:37:40 +01:00
file_entry->set_icon_modulate(0, EditorNode::get_singleton()->get_gui_base()->get_theme_color("success_color", "Editor"));
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
file_entry->set_checked(0, true);
staged_files_count++;
file_entry = file_entry->get_next();
}
}
_update_stage_status();
}
void VersionControlEditorPlugin::_view_file_diff() {
version_control_dock_button->set_pressed(true);
String file_path = stage_files->get_selected()->get_metadata(0);
_display_file_diff(file_path);
}
void VersionControlEditorPlugin::_display_file_diff(String p_file_path) {
Array diff_content = EditorVCSInterface::get_singleton()->get_file_diff(p_file_path);
diff_file_name->set_text(p_file_path);
diff->clear();
Popups are now windows also (broken!)
2020-03-12 13:37:40 +01:00
diff->push_font(EditorNode::get_singleton()->get_gui_base()->get_theme_font("source", "EditorFonts"));
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
for (int i = 0; i < diff_content.size(); i++) {
Dictionary line_result = diff_content[i];
if (line_result["status"] == "+") {
Popups are now windows also (broken!)
2020-03-12 13:37:40 +01:00
diff->push_color(EditorNode::get_singleton()->get_gui_base()->get_theme_color("success_color", "Editor"));
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
} else if (line_result["status"] == "-") {
Popups are now windows also (broken!)
2020-03-12 13:37:40 +01:00
diff->push_color(EditorNode::get_singleton()->get_gui_base()->get_theme_color("error_color", "Editor"));
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
} else {
Popups are now windows also (broken!)
2020-03-12 13:37:40 +01:00
diff->push_color(EditorNode::get_singleton()->get_gui_base()->get_theme_color("font_color", "Label"));
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
}
diff->add_text((String)line_result["content"]);
diff->pop();
}
diff->pop();
}
void VersionControlEditorPlugin::_refresh_file_diff() {
String open_file = diff_file_name->get_text();
if (open_file != "") {
_display_file_diff(diff_file_name->get_text());
}
}
void VersionControlEditorPlugin::_clear_file_diff() {
diff->clear();
diff_file_name->set_text("");
version_control_dock_button->set_pressed(false);
}
void VersionControlEditorPlugin::_update_stage_status() {
String status;
if (staged_files_count == 1) {
status = "Stage contains 1 file";
} else {
status = "Stage contains " + String::num_int64(staged_files_count) + " files";
}
commit_status->set_text(status);
}
void VersionControlEditorPlugin::_update_commit_status() {
String status;
if (staged_files_count == 1) {
status = "Committed 1 file";
} else {
status = "Committed " + String::num_int64(staged_files_count) + " files ";
}
commit_status->set_text(status);
staged_files_count = 0;
}
Disable "Commit" button in VCS plugin if there's no commit message
2020-12-20 17:43:50 +01:00
void VersionControlEditorPlugin::_update_commit_button() {
commit_button->set_disabled(commit_message->get_text().strip_edges() == "");
}
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
void VersionControlEditorPlugin::register_editor() {
if (!EditorVCSInterface::get_singleton()) {
EditorNode::get_singleton()->add_control_to_dock(EditorNode::DOCK_SLOT_RIGHT_UL, version_commit_dock);
TabContainer *dock_vbc = (TabContainer *)version_commit_dock->get_parent_control();
dock_vbc->set_tab_title(version_commit_dock->get_index(), TTR("Commit"));
Remove ToolButton in favor of Button ToolButton has no redeeming differences with Button; it's just a Button with the Flat property enabled by default. Removing it avoids some confusion when creating GUIs. Existing ToolButtons will be converted to Buttons, but the Flat property won't be enabled automatically. This closes https://github.com/godotengine/godot-proposals/issues/1081.
2020-06-19 20:49:04 +02:00
Button *vc = EditorNode::get_singleton()->add_bottom_panel_item(TTR("Version Control"), version_control_dock);
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
set_version_control_tool_button(vc);
}
}
void VersionControlEditorPlugin::fetch_available_vcs_addon_names() {
Add correct class selection in Select VCS menu
2019-09-14 17:36:52 +02:00
List<StringName> global_classes;
ScriptServer::get_global_class_list(&global_classes);
for (int i = 0; i != global_classes.size(); i++) {
String path = ScriptServer::get_global_class_path(global_classes[i]);
Ref<Script> script = ResourceLoader::load(path);
Add checks after ResourceLoader::load()
2019-09-29 14:17:42 +02:00
ERR_FAIL_COND(script.is_null());
Add correct class selection in Select VCS menu
2019-09-14 17:36:52 +02:00
if (script->get_instance_base_type() == "EditorVCSInterface") {
available_addons.push_back(global_classes[i]);
}
}
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
}
void VersionControlEditorPlugin::clear_stage_area() {
stage_files->get_root()->clear_children();
}
void VersionControlEditorPlugin::shut_down() {
if (EditorVCSInterface::get_singleton()) {
Signals: Port connect calls to use callable_mp Remove now unnecessary bindings of signal callbacks in the public API. There might be some false positives that need rebinding if they were meant to be public. No regular expressions were harmed in the making of this commit. (Nah, just kidding.)
2020-02-21 18:28:45 +01:00
if (EditorFileSystem::get_singleton()->is_connected("filesystem_changed", callable_mp(this, &VersionControlEditorPlugin::_refresh_stage_area))) {
EditorFileSystem::get_singleton()->disconnect("filesystem_changed", callable_mp(this, &VersionControlEditorPlugin::_refresh_stage_area));
Fixed disconnecting not connected signal
2019-10-29 00:40:36 +01:00
}
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
EditorVCSInterface::get_singleton()->shut_down();
memdelete(EditorVCSInterface::get_singleton());
Replace NULL with nullptr
2020-04-02 01:20:12 +02:00
EditorVCSInterface::set_singleton(nullptr);
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
EditorNode::get_singleton()->remove_control_from_dock(version_commit_dock);
EditorNode::get_singleton()->remove_bottom_panel_item(version_control_dock);
}
}
Editor: fix typo in VCS plugin method names
2019-11-19 15:11:03 +01:00
bool VersionControlEditorPlugin::is_vcs_initialized() const {
return EditorVCSInterface::get_singleton() ? EditorVCSInterface::get_singleton()->is_vcs_initialized() : false;
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
}
const String VersionControlEditorPlugin::get_vcs_name() const {
return EditorVCSInterface::get_singleton() ? EditorVCSInterface::get_singleton()->get_vcs_name() : "";
}
VersionControlEditorPlugin::VersionControlEditorPlugin() {
singleton = this;
staged_files_count = 0;
version_control_actions = memnew(PopupMenu);
set_up_dialog = memnew(AcceptDialog);
set_up_dialog->set_title(TTR("Set Up Version Control"));
Working multiple window support, including editor
2020-03-06 18:00:16 +01:00
set_up_dialog->set_min_size(Size2(400, 100));
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
version_control_actions->add_child(set_up_dialog);
Rename AcceptDialog get_ok() to get_ok_button() Also renames: - AcceptDialog add_cancel() to add_cancel_button() - ConfirmationDiaglog get_cancel() to get_cancel_button()
2020-12-14 19:37:30 +01:00
set_up_ok_button = set_up_dialog->get_ok_button();
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
set_up_ok_button->set_text(TTR("Close"));
set_up_vbc = memnew(VBoxContainer);
set_up_vbc->set_alignment(VBoxContainer::ALIGN_CENTER);
set_up_dialog->add_child(set_up_vbc);
set_up_hbc = memnew(HBoxContainer);
set_up_hbc->set_h_size_flags(HBoxContainer::SIZE_EXPAND_FILL);
set_up_vbc->add_child(set_up_hbc);
set_up_vcs_status = memnew(RichTextLabel);
set_up_vcs_status->set_text(TTR("VCS Addon is not initialized"));
set_up_vbc->add_child(set_up_vcs_status);
set_up_vcs_label = memnew(Label);
set_up_vcs_label->set_text(TTR("Version Control System"));
set_up_hbc->add_child(set_up_vcs_label);
set_up_choice = memnew(OptionButton);
set_up_choice->set_h_size_flags(HBoxContainer::SIZE_EXPAND_FILL);
Signals: Port connect calls to use callable_mp Remove now unnecessary bindings of signal callbacks in the public API. There might be some false positives that need rebinding if they were meant to be public. No regular expressions were harmed in the making of this commit. (Nah, just kidding.)
2020-02-21 18:28:45 +01:00
set_up_choice->connect("item_selected", callable_mp(this, &VersionControlEditorPlugin::_selected_a_vcs));
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
set_up_hbc->add_child(set_up_choice);
Replace NULL with nullptr
2020-04-02 01:20:12 +02:00
set_up_init_settings = nullptr;
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
set_up_init_button = memnew(Button);
set_up_init_button->set_text(TTR("Initialize"));
Signals: Port connect calls to use callable_mp Remove now unnecessary bindings of signal callbacks in the public API. There might be some false positives that need rebinding if they were meant to be public. No regular expressions were harmed in the making of this commit. (Nah, just kidding.)
2020-02-21 18:28:45 +01:00
set_up_init_button->connect("pressed", callable_mp(this, &VersionControlEditorPlugin::_initialize_vcs));
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
set_up_vbc->add_child(set_up_init_button);
version_commit_dock = memnew(VBoxContainer);
version_commit_dock->set_visible(false);
commit_box_vbc = memnew(VBoxContainer);
commit_box_vbc->set_alignment(VBoxContainer::ALIGN_BEGIN);
commit_box_vbc->set_h_size_flags(VBoxContainer::SIZE_EXPAND_FILL);
commit_box_vbc->set_v_size_flags(VBoxContainer::SIZE_EXPAND_FILL);
version_commit_dock->add_child(commit_box_vbc);
stage_tools = memnew(HSplitContainer);
stage_tools->set_dragger_visibility(SplitContainer::DRAGGER_HIDDEN_COLLAPSED);
commit_box_vbc->add_child(stage_tools);
staging_area_label = memnew(Label);
staging_area_label->set_h_size_flags(Label::SIZE_EXPAND_FILL);
staging_area_label->set_text(TTR("Staging area"));
stage_tools->add_child(staging_area_label);
refresh_button = memnew(Button);
refresh_button->set_tooltip(TTR("Detect new changes"));
refresh_button->set_text(TTR("Refresh"));
Popups are now windows also (broken!)
2020-03-12 13:37:40 +01:00
refresh_button->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon("Reload", "EditorIcons"));
Signals: Port connect calls to use callable_mp Remove now unnecessary bindings of signal callbacks in the public API. There might be some false positives that need rebinding if they were meant to be public. No regular expressions were harmed in the making of this commit. (Nah, just kidding.)
2020-02-21 18:28:45 +01:00
refresh_button->connect("pressed", callable_mp(this, &VersionControlEditorPlugin::_refresh_stage_area));
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
stage_tools->add_child(refresh_button);
stage_files = memnew(Tree);
stage_files->set_h_size_flags(Tree::SIZE_EXPAND_FILL);
stage_files->set_v_size_flags(Tree::SIZE_EXPAND_FILL);
stage_files->set_columns(1);
stage_files->set_column_title(0, TTR("Changes"));
stage_files->set_column_titles_visible(true);
stage_files->set_allow_reselect(true);
stage_files->set_allow_rmb_select(true);
stage_files->set_select_mode(Tree::SelectMode::SELECT_MULTI);
stage_files->set_edit_checkbox_cell_only_when_checkbox_is_pressed(true);
Signals: Port connect calls to use callable_mp Remove now unnecessary bindings of signal callbacks in the public API. There might be some false positives that need rebinding if they were meant to be public. No regular expressions were harmed in the making of this commit. (Nah, just kidding.)
2020-02-21 18:28:45 +01:00
stage_files->connect("cell_selected", callable_mp(this, &VersionControlEditorPlugin::_view_file_diff));
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
stage_files->create_item();
stage_files->set_hide_root(true);
commit_box_vbc->add_child(stage_files);
change_type_to_strings[CHANGE_TYPE_NEW] = TTR("New");
change_type_to_strings[CHANGE_TYPE_MODIFIED] = TTR("Modified");
change_type_to_strings[CHANGE_TYPE_RENAMED] = TTR("Renamed");
change_type_to_strings[CHANGE_TYPE_DELETED] = TTR("Deleted");
change_type_to_strings[CHANGE_TYPE_TYPECHANGE] = TTR("Typechange");
Popups are now windows also (broken!)
2020-03-12 13:37:40 +01:00
change_type_to_color[CHANGE_TYPE_NEW] = EditorNode::get_singleton()->get_gui_base()->get_theme_color("success_color", "Editor");
change_type_to_color[CHANGE_TYPE_MODIFIED] = EditorNode::get_singleton()->get_gui_base()->get_theme_color("warning_color", "Editor");
change_type_to_color[CHANGE_TYPE_RENAMED] = EditorNode::get_singleton()->get_gui_base()->get_theme_color("disabled_font_color", "Editor");
change_type_to_color[CHANGE_TYPE_DELETED] = EditorNode::get_singleton()->get_gui_base()->get_theme_color("error_color", "Editor");
change_type_to_color[CHANGE_TYPE_TYPECHANGE] = EditorNode::get_singleton()->get_gui_base()->get_theme_color("font_color", "Editor");
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
stage_buttons = memnew(HSplitContainer);
stage_buttons->set_dragger_visibility(SplitContainer::DRAGGER_HIDDEN_COLLAPSED);
commit_box_vbc->add_child(stage_buttons);
stage_selected_button = memnew(Button);
stage_selected_button->set_h_size_flags(Button::SIZE_EXPAND_FILL);
stage_selected_button->set_text(TTR("Stage Selected"));
Signals: Port connect calls to use callable_mp Remove now unnecessary bindings of signal callbacks in the public API. There might be some false positives that need rebinding if they were meant to be public. No regular expressions were harmed in the making of this commit. (Nah, just kidding.)
2020-02-21 18:28:45 +01:00
stage_selected_button->connect("pressed", callable_mp(this, &VersionControlEditorPlugin::_stage_selected));
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
stage_buttons->add_child(stage_selected_button);
stage_all_button = memnew(Button);
stage_all_button->set_text(TTR("Stage All"));
Signals: Port connect calls to use callable_mp Remove now unnecessary bindings of signal callbacks in the public API. There might be some false positives that need rebinding if they were meant to be public. No regular expressions were harmed in the making of this commit. (Nah, just kidding.)
2020-02-21 18:28:45 +01:00
stage_all_button->connect("pressed", callable_mp(this, &VersionControlEditorPlugin::_stage_all));
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
stage_buttons->add_child(stage_all_button);
commit_box_vbc->add_child(memnew(HSeparator));
commit_message = memnew(TextEdit);
commit_message->set_h_size_flags(Control::SIZE_EXPAND_FILL);
commit_message->set_h_grow_direction(Control::GrowDirection::GROW_DIRECTION_BEGIN);
commit_message->set_v_grow_direction(Control::GrowDirection::GROW_DIRECTION_END);
commit_message->set_custom_minimum_size(Size2(200, 100));
commit_message->set_wrap_enabled(true);
Disable "Commit" button in VCS plugin if there's no commit message
2020-12-20 17:43:50 +01:00
commit_message->connect("text_changed", callable_mp(this, &VersionControlEditorPlugin::_update_commit_button));
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
commit_box_vbc->add_child(commit_message);
commit_button = memnew(Button);
commit_button->set_text(TTR("Commit Changes"));
Disable "Commit" button in VCS plugin if there's no commit message
2020-12-20 17:43:50 +01:00
commit_button->set_disabled(true);
Signals: Port connect calls to use callable_mp Remove now unnecessary bindings of signal callbacks in the public API. There might be some false positives that need rebinding if they were meant to be public. No regular expressions were harmed in the making of this commit. (Nah, just kidding.)
2020-02-21 18:28:45 +01:00
commit_button->connect("pressed", callable_mp(this, &VersionControlEditorPlugin::_send_commit_msg));
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
commit_box_vbc->add_child(commit_button);
commit_status = memnew(Label);
commit_status->set_align(Label::ALIGN_CENTER);
commit_box_vbc->add_child(commit_status);
version_control_dock = memnew(PanelContainer);
version_control_dock->set_v_size_flags(Control::SIZE_EXPAND_FILL);
version_control_dock->hide();
diff_vbc = memnew(VBoxContainer);
diff_vbc->set_h_size_flags(HBoxContainer::SIZE_FILL);
diff_vbc->set_v_size_flags(HBoxContainer::SIZE_FILL);
version_control_dock->add_child(diff_vbc);
diff_hbc = memnew(HBoxContainer);
diff_hbc->set_h_size_flags(HBoxContainer::SIZE_FILL);
diff_vbc->add_child(diff_hbc);
diff_heading = memnew(Label);
diff_heading->set_text(TTR("Status"));
Fix misc. source comment typos Found using `codespell -q 3 -S ./thirdparty,*.po -L ang,ba,cas,dof,doubleclick,fave,hist,leapyear,lod,nd,numer,ois,paket,seeked,sinc,switchs,te,uint -D ~/Projects/codespell/codespell_lib/data/dictionary.txt `
2019-09-19 20:36:39 +02:00
diff_heading->set_tooltip(TTR("View file diffs before committing them to the latest version"));
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
diff_hbc->add_child(diff_heading);
diff_file_name = memnew(Label);
diff_file_name->set_text(TTR("No file diff is active"));
diff_file_name->set_h_size_flags(Label::SIZE_EXPAND_FILL);
diff_file_name->set_align(Label::ALIGN_RIGHT);
diff_hbc->add_child(diff_file_name);
diff_refresh_button = memnew(Button);
diff_refresh_button->set_tooltip(TTR("Detect changes in file diff"));
Popups are now windows also (broken!)
2020-03-12 13:37:40 +01:00
diff_refresh_button->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon("Reload", "EditorIcons"));
Signals: Port connect calls to use callable_mp Remove now unnecessary bindings of signal callbacks in the public API. There might be some false positives that need rebinding if they were meant to be public. No regular expressions were harmed in the making of this commit. (Nah, just kidding.)
2020-02-21 18:28:45 +01:00
diff_refresh_button->connect("pressed", callable_mp(this, &VersionControlEditorPlugin::_refresh_file_diff));
Add version control editor plugin Provides the editor with all the VCS GUI and extracts the data from the upcoming VCS API to cater to the project with VCS interaction.
2019-09-03 16:28:32 +02:00
diff_hbc->add_child(diff_refresh_button);
diff = memnew(RichTextLabel);
diff->set_h_size_flags(TextEdit::SIZE_EXPAND_FILL);
diff->set_v_size_flags(TextEdit::SIZE_EXPAND_FILL);
diff->set_selection_enabled(true);
diff_vbc->add_child(diff);
}
VersionControlEditorPlugin::~VersionControlEditorPlugin() {
shut_down();
memdelete(version_control_dock);
memdelete(version_commit_dock);
memdelete(version_control_actions);
}
Reference in a new issue Copy permalink