Added external tool settings and presets

Author: adriengivry

Sources/Overload/OvEditor/include/OvEditor/Settings/EditorSettings.h

@@ -6,6 +6,7 @@
 
 #pragma once
 
+#include <OvEditor/Utils/ExternalTools.h>
 #include <OvTools/Eventing/Event.h>
 
 namespace OvEditor::Settings
@@ -92,5 +93,7 @@ namespace OvEditor::Settings
 		inline static Property<float> TranslationSnapUnit = { 1.0f };
 		inline static Property<float> RotationSnapUnit = { 15.0f };
 		inline static Property<float> ScalingSnapUnit = { 1.0f };
+		inline static Property<std::string> FolderExternalToolName = std::string{ Utils::ExternalTools.front().name};
+		inline static Property<std::string> FolderExternalToolCommand = std::string{ Utils::ExternalTools.front().command};
 	};
 }

Sources/Overload/OvEditor/include/OvEditor/Utils/ExternalTools.h

@@ -0,0 +1,26 @@
+/**
+* @project: Overload
+* @author: Overload Tech.
+* @licence: MIT
+*/
+
+#pragma once
+
+#include <string>
+#include <unordered_map>
+#include <array>
+
+namespace OvEditor::Utils
+{
+	struct ExternalTool
+	{
+		const std::string_view name;
+		const std::string_view command;
+	};
+
+	constexpr auto ExternalTools = std::to_array<ExternalTool>({
+		ExternalTool{ "Visual Studio Code", "code \"{}\"" },
+		ExternalTool{ "Sublime Text", "subl {}" },
+		ExternalTool{ "Atom", "atom {}" },
+	});
+}

Sources/Overload/OvEditor/src/OvEditor/Panels/AssetBrowser.cpp

@@ -7,6 +7,8 @@
 #include <fstream>
 #include <iostream>
 
+#include <OvEditor/Settings/EditorSettings.h>
+
 #include <OvUI/Widgets/Texts/TextClickable.h>
 #include <OvUI/Widgets/Visual/Image.h>
 #include <OvUI/Widgets/Visual/Separator.h>
@@ -175,9 +177,27 @@ class BrowserItemContextualMenu : public OvUI::Plugins::ContextualMenu
 
 class FolderContextualMenu : public BrowserItemContextualMenu
 {
+private:
+	OvTools::Utils::OptRef<OvUI::Widgets::Menu::MenuItem> m_openInExternalTool;
+
 public:
 	FolderContextualMenu(const std::string& p_filePath, bool p_protected = false) : BrowserItemContextualMenu(p_filePath, p_protected) {}
 
+	auto GetOpenInExternalToolName() const
+	{
+		return std::format(
+			"Open in {}",
+			OvEditor::Settings::EditorSettings::FolderExternalToolName.Get()
+		);
+	}
+	virtual void Execute() override
+	{
+		BrowserItemContextualMenu::Execute();
+
+		// Keep the "Open In External Tool" menu item label up to date
+		m_openInExternalTool->name = GetOpenInExternalToolName();
+	}
+
 	virtual void CreateList() override
 	{
 		auto& showInExplorer = CreateWidget<OvUI::Widgets::Menu::MenuItem>("Show in explorer");
@@ -186,15 +206,23 @@ class FolderContextualMenu : public BrowserItemContextualMenu
 			OvTools::Utils::SystemCalls::ShowInExplorer(filePath);
 		};
 
-		auto& openFolderInVsCode = CreateWidget<OvUI::Widgets::Menu::MenuItem>("Open In Visual Studio Code");
-		openFolderInVsCode.ClickedEvent += [this]
+		m_openInExternalTool = CreateWidget<OvUI::Widgets::Menu::MenuItem>(GetOpenInExternalToolName());
+		m_openInExternalTool->ClickedEvent += [this]
 		{
-			const auto command = std::format("code \"{}\"", filePath);
+			const auto command = std::vformat(
+				OvEditor::Settings::EditorSettings::FolderExternalToolCommand.Get(),
+				std::make_format_args(filePath)
+			);
+
 			const auto result = std::system(command.c_str());
 
 			if (result != 0)
 			{
-				OVLOG_ERROR("Failed to open Visual Studio Code with error code: " + std::to_string(result));
+				OVLOG_ERROR(std::format(
+					"Failed to open {} with error code: {}",
+					OvEditor::Settings::EditorSettings::FolderExternalToolName.Get(),
+					std::to_string(result)
+				));
 			}
 		};
 

Sources/Overload/OvEditor/src/OvEditor/Panels/MenuBar.cpp

@@ -18,18 +18,20 @@
 #include <OvCore/ECS/Components/CAudioSource.h>
 #include <OvCore/ECS/Components/CAudioListener.h>
 
+#include <OvUI/Widgets/Buttons/Button.h>
 #include <OvUI/Widgets/Visual/Separator.h>
 #include <OvUI/Widgets/Sliders/SliderInt.h>
 #include <OvUI/Widgets/Sliders/SliderFloat.h>
 #include <OvUI/Widgets/Drags/DragFloat.h>
 #include <OvUI/Widgets/Selection/ColorEdit.h>
 
-#include "OvEditor/Panels/MenuBar.h"
-#include "OvEditor/Panels/SceneView.h"
-#include "OvEditor/Panels/AssetView.h"
-#include "OvEditor/Core/EditorActions.h"
-#include "OvEditor/Settings/EditorSettings.h"
-#include "OvEditor/Utils/ActorCreationMenu.h"
+#include <OvEditor/Core/EditorActions.h>
+#include <OvEditor/Panels/AssetView.h>
+#include <OvEditor/Panels/MenuBar.h>
+#include <OvEditor/Panels/SceneView.h>
+#include <OvEditor/Settings/EditorSettings.h>
+#include <OvEditor/Utils/ActorCreationMenu.h>
+#include <OvEditor/Utils/ExternalTools.h>
 
 using namespace OvUI::Panels;
 using namespace OvUI::Widgets;
@@ -69,6 +71,38 @@ void OvEditor::Panels::MenuBar::HandleShortcuts(float p_deltaTime)
 
 void OvEditor::Panels::MenuBar::InitializeSettingsMenu()
 {
+	using namespace OvEditor::Settings;
+
+	auto& folderInExternalToolSettings = m_settingsMenu->CreateWidget<Menu::MenuList>("Folder External Tool...");
+	auto& folderExternalToolName = folderInExternalToolSettings.CreateWidget<InputFields::InputText>("", "Name");
+	auto& folderExternalToolCommand = folderInExternalToolSettings.CreateWidget<InputFields::InputText>("", "Command");
+	folderExternalToolCommand.selectAllOnClick = true;
+	folderInExternalToolSettings.ClickedEvent += [&folderExternalToolCommand, &folderExternalToolName]
+	{
+		folderExternalToolName.content = EditorSettings::FolderExternalToolName;
+		folderExternalToolCommand.content = EditorSettings::FolderExternalToolCommand;
+	};
+	folderExternalToolName.ContentChangedEvent += [](const auto& p_content)
+	{
+		EditorSettings::FolderExternalToolName = p_content;
+	};
+	folderExternalToolCommand.ContentChangedEvent += [](const auto& p_content)
+	{
+		EditorSettings::FolderExternalToolCommand = p_content;
+	};
+	folderInExternalToolSettings.CreateWidget<Visual::Separator>();	
+	folderInExternalToolSettings.CreateWidget<Texts::Text>("Load External Tool Preset:");
+	for (auto& tool : Utils::ExternalTools)
+	{
+		folderInExternalToolSettings.CreateWidget<Buttons::Button>(std::string{ tool.name }, 300.0f).ClickedEvent += [&folderExternalToolName, &folderExternalToolCommand, &tool]
+		{
+			EditorSettings::FolderExternalToolName = std::string{ tool.name };
+			EditorSettings::FolderExternalToolCommand = std::string{ tool.command };
+			folderExternalToolName.content = tool.name;
+			folderExternalToolCommand.content = tool.command;
+		};
+	}
+
 	m_settingsMenu->CreateWidget<MenuItem>("Spawn actors at origin", "", true, true).ValueChangedEvent += EDITOR_BIND(SetActorSpawnAtOrigin, std::placeholders::_1);
 	m_settingsMenu->CreateWidget<MenuItem>("Vertical Synchronization", "", true, true).ValueChangedEvent += [this](bool p_value) { EDITOR_CONTEXT(device)->SetVsync(p_value); };
 	auto& cameraSpeedMenu = m_settingsMenu->CreateWidget<MenuList>("Camera Speed");

Sources/Overload/OvEditor/src/OvEditor/Settings/EditorSettings.cpp

@@ -42,6 +42,8 @@ void OvEditor::Settings::EditorSettings::Save()
 	iniFile.Add("translation_snap_unit", TranslationSnapUnit.Get());
 	iniFile.Add("rotation_snap_unit", RotationSnapUnit.Get());
 	iniFile.Add("scaling_snap_unit", ScalingSnapUnit.Get());
+	iniFile.Add("folder_external_tool_name", FolderExternalToolName.Get());
+	iniFile.Add("folder_external_tool_command", FolderExternalToolCommand.Get());
 	iniFile.Rewrite();
 }
 
@@ -57,4 +59,6 @@ void OvEditor::Settings::EditorSettings::Load()
 	LoadIniEntry<float>(iniFile, "translation_snap_unit", TranslationSnapUnit);
 	LoadIniEntry<float>(iniFile, "rotation_snap_unit", RotationSnapUnit);
 	LoadIniEntry<float>(iniFile, "scaling_snap_unit", ScalingSnapUnit);
+	LoadIniEntry<std::string>(iniFile, "folder_external_tool_name", FolderExternalToolName);
+	LoadIniEntry<std::string>(iniFile, "folder_external_tool_command", FolderExternalToolCommand);
 }