ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-23 16:27:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of https://github.com/goatcorp/Dalamud

Browse source
This commit is contained in:
goaaats 2022-01-12 18:19:36 +01:00
commit af4a25c74b
No known key found for this signature in database
GPG key ID: F18F057873895461
6 changed files with 38 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs
View file

@ -63,6 +63,7 @@ namespace Dalamud.Interface.Internal.Windows
private string feedbackModalContact = string.Empty;
private bool feedbackModalIncludeException = false;
private PluginManifest? feedbackPlugin = null;
private bool feedbackIsTesting = false;
private int updatePluginCount = 0;
private List<PluginUpdateStatus>? updatedPlugins;
@ -424,7 +425,7 @@ namespace Dalamud.Interface.Internal.Windows
{
if (this.feedbackPlugin != null)
{
Task.Run(async () => await BugBait.SendFeedback(this.feedbackPlugin, this.feedbackModalBody, this.feedbackModalContact, this.feedbackModalIncludeException))
Task.Run(async () => await BugBait.SendFeedback(this.feedbackPlugin, this.feedbackIsTesting, this.feedbackModalBody, this.feedbackModalContact, this.feedbackModalIncludeException))
.ContinueWith(
t =>
{
@ -1237,7 +1238,7 @@ namespace Dalamud.Interface.Internal.Windows
if (!manifest.SourceRepo.IsThirdParty && manifest.AcceptsFeedback)
{
this.DrawSendFeedbackButton(manifest);
this.DrawSendFeedbackButton(manifest, false);
}
ImGuiHelpers.ScaledDummy(5);
@ -1455,14 +1456,18 @@ namespace Dalamud.Interface.Internal.Windows
if (canFeedback)
{
this.DrawSendFeedbackButton(plugin.Manifest);
this.DrawSendFeedbackButton(plugin.Manifest, plugin.IsTesting);
}
if (availablePluginUpdate != default)
this.DrawUpdateSinglePluginButton(availablePluginUpdate);
ImGui.SameLine();
ImGui.TextColored(ImGuiColors.DalamudGrey3, $" v{plugin.Manifest.AssemblyVersion}");
var version = plugin.AssemblyName?.Version;
version ??= plugin.Manifest.Testing
? plugin.Manifest.TestingAssemblyVersion
: plugin.Manifest.AssemblyVersion;
ImGui.TextColored(ImGuiColors.DalamudGrey3, $" v{version}");
if (plugin.IsDev)
{
@ -1684,13 +1689,14 @@ namespace Dalamud.Interface.Internal.Windows
}
}
private void DrawSendFeedbackButton(PluginManifest manifest)
private void DrawSendFeedbackButton(PluginManifest manifest, bool isTesting)
{
ImGui.SameLine();
if (ImGuiComponents.IconButton(FontAwesomeIcon.Comment))
{
this.feedbackPlugin = manifest;
this.feedbackModalOnNextFrame = true;
this.feedbackIsTesting = isTesting;
}
if (ImGui.IsItemHovered())