liza/PalacePal
liza/PalacePal
1
0
Fork 0
Code Issues 9 Pull Requests Projects 1 Releases 47 Activity

Add LLib, remove outdated info, add config window constraints

Browse Source
This commit is contained in:
Liza 2023-10-11 03:56:18 +02:00
parent 5c4e9f30e0
commit a866d21556
Signed by: liza
GPG Key ID: 7199F8D727D55F67
8 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -7,3 +7,6 @@
[submodule "Pal.Server.Tests"]
path = Pal.Server.Tests
url = git@git.carvel.li:liza/PalacePal.Server.Tests.git
[submodule "vendor/LLib"]
path = vendor/LLib
url = git@git.carvel.li:liza/LLib.git

1
Pal.Client/Pal.Client.csproj
View File

@ -60,6 +60,7 @@
<ItemGroup>
<ProjectReference Include="..\Pal.Common\Pal.Common.csproj"/>
<ProjectReference Include="..\vendor\ECommons\ECommons\ECommons.csproj"/>
<ProjectReference Include="..\vendor\LLib\LLib.csproj" />
</ItemGroup>
<ItemGroup>

2
Pal.Client/Windows/AgreementWindow.cs
View File

@ -99,6 +99,6 @@ internal sealed class AgreementWindow : Window, IDisposable, ILanguageChanged
ImGui.Separator();
if (ImGui.Button(Localization.Agreement_ViewPluginAndServerSourceCode))
GenericHelpers.ShellStart("https://github.com/carvelli/PalPalace");
GenericHelpers.ShellStart("https://git.carvel.li/liza/PalacePal");
}
}

15
Pal.Client/Windows/ConfigWindow.cs
View File

@ -8,10 +8,12 @@ using Dalamud.Interface;
using Dalamud.Interface.Components;
using Dalamud.Interface.ImGuiFileDialog;
using Dalamud.Interface.Windowing;
using Dalamud.Plugin;
using ECommons;
using Export;
using Google.Protobuf;
using ImGuiNET;
using LLib;
using Microsoft.Extensions.Logging;
using Pal.Client.Configuration;
using Pal.Client.Database;
@ -30,6 +32,7 @@ internal sealed class ConfigWindow : Window, ILanguageChanged, IDisposable
private const string WindowId = "###PalPalaceConfig";
private readonly ILogger<ConfigWindow> _logger;
private readonly DalamudPluginInterface _pluginInterface;
private readonly WindowSystem _windowSystem;
private readonly ConfigurationManager _configurationManager;
private readonly IPalacePalConfiguration _configuration;
@ -64,6 +67,7 @@ internal sealed class ConfigWindow : Window, ILanguageChanged, IDisposable
public ConfigWindow(
ILogger<ConfigWindow> logger,
DalamudPluginInterface pluginInterface,
WindowSystem windowSystem,
ConfigurationManager configurationManager,
IPalacePalConfiguration configuration,
@ -78,6 +82,7 @@ internal sealed class ConfigWindow : Window, ILanguageChanged, IDisposable
: base(WindowId)
{
_logger = logger;
_pluginInterface = pluginInterface;
_windowSystem = windowSystem;
_configurationManager = configurationManager;
_configuration = configuration;
@ -97,6 +102,12 @@ internal sealed class ConfigWindow : Window, ILanguageChanged, IDisposable
Position = new Vector2(300, 300);
PositionCondition = ImGuiCond.FirstUseEver;
SizeConstraints = new WindowSizeConstraints
{
MinimumSize = new Vector2(300, 300),
MaximumSize = new Vector2(9999, 9999),
};
_importDialog = new FileDialogManager
{ AddedWindowFlags = ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoDocking };
_exportDialog = new FileDialogManager
@ -141,6 +152,8 @@ internal sealed class ConfigWindow : Window, ILanguageChanged, IDisposable
public override void Draw()
{
LImGui.AddPatreonIcon(_pluginInterface);
bool save = false;
bool saveAndClose = false;
if (ImGui.BeginTabBar("PalTabs"))
@ -284,11 +297,13 @@ internal sealed class ConfigWindow : Window, ILanguageChanged, IDisposable
ImGui.TextWrapped(Localization.Config_ImportExplanation1);
ImGui.TextWrapped(Localization.Config_ImportExplanation2);
ImGui.TextWrapped(Localization.Config_ImportExplanation3);
/* FIXME
ImGui.Separator();
ImGui.TextWrapped(string.Format(Localization.Config_ImportDownloadLocation,
"https://github.com/carvelli/PalacePal/releases/"));
if (ImGui.Button(Localization.Config_Import_VisitGitHub))
GenericHelpers.ShellStart("https://github.com/carvelli/PalacePal/releases/latest");
*/
ImGui.Separator();
ImGui.Text(Localization.Config_SelectImportFile);
ImGui.SameLine();

3
Pal.Client/packages.lock.json
View File

@ -293,6 +293,9 @@
"ecommons": {
"type": "Project"
},
"llib": {
"type": "Project"
},
"pal.common": {
"type": "Project"
}

10
Pal.sln
View File

@ -27,6 +27,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "github-workflows", "github-
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pal.Server.Tests", "Pal.Server.Tests\Pal.Server.Tests.csproj", "{AEC052FA-F178-492C-9A09-ED28DBE1EF5E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LLib", "vendor\LLib\LLib.csproj", "{B1321FD5-7BBF-4C9D-83C1-F8D7C394F32A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -75,6 +77,14 @@ Global
{AEC052FA-F178-492C-9A09-ED28DBE1EF5E}.Release|Any CPU.Build.0 = Release|Any CPU
{AEC052FA-F178-492C-9A09-ED28DBE1EF5E}.Release|x64.ActiveCfg = Release|Any CPU
{AEC052FA-F178-492C-9A09-ED28DBE1EF5E}.Release|x64.Build.0 = Release|Any CPU
{B1321FD5-7BBF-4C9D-83C1-F8D7C394F32A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B1321FD5-7BBF-4C9D-83C1-F8D7C394F32A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B1321FD5-7BBF-4C9D-83C1-F8D7C394F32A}.Debug|x64.ActiveCfg = Debug|Any CPU
{B1321FD5-7BBF-4C9D-83C1-F8D7C394F32A}.Debug|x64.Build.0 = Debug|Any CPU
{B1321FD5-7BBF-4C9D-83C1-F8D7C394F32A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B1321FD5-7BBF-4C9D-83C1-F8D7C394F32A}.Release|Any CPU.Build.0 = Release|Any CPU
{B1321FD5-7BBF-4C9D-83C1-F8D7C394F32A}.Release|x64.ActiveCfg = Release|Any CPU
{B1321FD5-7BBF-4C9D-83C1-F8D7C394F32A}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

2
README.md
View File

@ -15,4 +15,4 @@ Please check [Splatoon's Installation Instructions](https://github.com/Nightmare
Please feel free to help by [translating this plugin into your language](https://crowdin.com/project/palace-pal).
If you want to translate the plugin into a language that is currently not enabled,
[please create a new issue](https://github.com/carvelli/PalacePal/issues/new).
[please create a new issue](https://git.carvel.li/liza/PalacePal/issues/new).

1
vendor/LLib vendored Submodule

@ -0,0 +1 @@
Subproject commit abbbec4f26b1a8903b0cd7aa04f00d557602eaf3