ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-22 16:39:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: use another directory for testing plugins

Browse source
This commit is contained in:
goat 2020-06-08 20:51:16 +02:00
parent a7687287fa
commit 015562d422
2 changed files with 23 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Dalamud/Dalamud.cs
View file

@ -138,12 +138,15 @@ namespace Dalamud {
this.BotManager = new DiscordBotManager(this, this.Configuration.DiscordFeatureConfig); this.BotManager = new DiscordBotManager(this, this.Configuration.DiscordFeatureConfig);
this.BotManager.Start(); this.BotManager.Start();
try try {
{ var pluginDir = this.StartInfo.PluginDirectory;
this.PluginManager = new PluginManager(this, this.StartInfo.PluginDirectory, this.StartInfo.DefaultPluginDirectory); if (this.Configuration.DoPluginTest)
pluginDir = Path.Combine(pluginDir, "..", "testPlugins");
this.PluginManager = new PluginManager(this, pluginDir, this.StartInfo.DefaultPluginDirectory);
this.PluginManager.LoadPlugins(); this.PluginManager.LoadPlugins();
this.PluginRepository = new PluginRepository(this, this.StartInfo.PluginDirectory, this.StartInfo.GameVersion); this.PluginRepository = new PluginRepository(this, pluginDir, this.StartInfo.GameVersion);
} }
catch (Exception ex) catch (Exception ex)
{ {

32
Dalamud/Interface/DalamudSettingsWindow.cs
View file

@ -58,7 +58,7 @@ namespace Dalamud.Interface
var isOpen = true; var isOpen = true;
if (!ImGui.Begin("Dalamud Settings", ref isOpen, ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoResize)) { if (!ImGui.Begin(Loc.Localize("DalamudSettingsHeader", "Dalamud Settings") + "###XlSettings", ref isOpen, ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoResize)) {
ImGui.End(); ImGui.End();
return false; return false;
} }
@ -66,38 +66,38 @@ namespace Dalamud.Interface
ImGui.BeginChild("scrolling", new Vector2(499, 430), false, ImGuiWindowFlags.HorizontalScrollbar); ImGui.BeginChild("scrolling", new Vector2(499, 430), false, ImGuiWindowFlags.HorizontalScrollbar);
if (ImGui.BeginTabBar("SetTabBar")) { if (ImGui.BeginTabBar("SetTabBar")) {
if (ImGui.BeginTabItem("General")) { if (ImGui.BeginTabItem(Loc.Localize("DalamudSettingsGeneral", "General"))) {
ImGui.Text("Language"); ImGui.Text(Loc.Localize("DalamudSettingsLanguage","Language"));
ImGui.Combo("##XlLangCombo", ref this.langIndex, this.languages, ImGui.Combo("##XlLangCombo", ref this.langIndex, this.languages,
this.languages.Length); this.languages.Length);
ImGui.TextColored(this.hintTextColor, "Select the language Dalamud will be displayed in."); ImGui.TextColored(this.hintTextColor, Loc.Localize("DalamudSettingsLanguageHint", "Select the language Dalamud will be displayed in."));
ImGui.Dummy(new Vector2(5f, 5f)); ImGui.Dummy(new Vector2(5f, 5f));
ImGui.Text("General Chat Channel"); ImGui.Text(Loc.Localize("DalamudSettingsChannel", "General Chat Channel"));
ImGui.Combo("##XlChatTypeCombo", ref this.dalamudMessagesChatType, this.chatTypes, ImGui.Combo("##XlChatTypeCombo", ref this.dalamudMessagesChatType, this.chatTypes,
this.chatTypes.Length); this.chatTypes.Length);
ImGui.TextColored(this.hintTextColor, "Select the chat channel that is to be used for general XIVLauncher messages."); ImGui.TextColored(this.hintTextColor, Loc.Localize("DalamudSettingsChannelHint", "Select the chat channel that is to be used for general XIVLauncher messages."));
ImGui.Dummy(new Vector2(5f, 5f)); ImGui.Dummy(new Vector2(5f, 5f));
ImGui.Checkbox("Flash FFXIV window on duty pop", ref this.doCfTaskBarFlash); ImGui.Checkbox(Loc.Localize("DalamudSettingsFlash", "Flash FFXIV window on duty pop"), ref this.doCfTaskBarFlash);
ImGui.TextColored(this.hintTextColor, "Select, if the FFXIV window should be flashed in your task bar when a duty is ready."); ImGui.TextColored(this.hintTextColor, Loc.Localize("DalamudSettingsFlashHint", "Select, if the FFXIV window should be flashed in your task bar when a duty is ready."));
ImGui.EndTabItem(); ImGui.EndTabItem();
} }
if (ImGui.BeginTabItem("Experimental")) if (ImGui.BeginTabItem(Loc.Localize("DalamudSettingsExperimental", "Experimental")))
{ {
ImGui.Text("All of these settings require a restart of the game to take effect."); ImGui.Text(Loc.Localize("DalamudSettingsRestartHint", "You need to restart your game after changing these settings."));
ImGui.Dummy(new Vector2(10f, 10f)); ImGui.Dummy(new Vector2(10f, 10f));
ImGui.Checkbox("Get plugin testing builds", ref this.doPluginTest); ImGui.Checkbox(Loc.Localize("DalamudSettingsPluginTest", "Get plugin testing builds"), ref this.doPluginTest);
ImGui.TextColored(this.hintTextColor, "Check this box to receive testing prereleases for plugins."); ImGui.TextColored(this.hintTextColor, Loc.Localize("DalamudSettingsPluginTestHint", "Check this box to receive testing prereleases for plugins."));
ImGui.Checkbox("Get Dalamud testing builds", ref this.doDalamudTest); ImGui.Checkbox(Loc.Localize("DalamudSettingDalamudTest", "Get Dalamud testing builds"), ref this.doDalamudTest);
ImGui.TextColored(this.hintTextColor, "Check this box to receive testing prereleases for Dalamud."); ImGui.TextColored(this.hintTextColor, Loc.Localize("DalamudSettingDalamudTestHint", "Check this box to receive testing prereleases for Dalamud."));
ImGui.EndTabItem(); ImGui.EndTabItem();
} }
@ -108,11 +108,11 @@ namespace Dalamud.Interface
ImGui.EndChild(); ImGui.EndChild();
if (ImGui.Button("Save")) { if (ImGui.Button(Loc.Localize("Save", "Save"))) {
Save(); Save();
} }
ImGui.SameLine(); ImGui.SameLine();
if (ImGui.Button("Save and Close")) { if (ImGui.Button(Loc.Localize("SaveAndClose", "Save and Close"))) {
Save(); Save();
isOpen = false; isOpen = false;
} }