ファイルリストからアンパックを実装

処理中はプログレスリングが表示されるようにデザインを修正
logue · Oct 9, 2021 · d0c2c24 · d0c2c24
1 parent 56e195a
commit d0c2c24
Show file tree

Hide file tree

Showing 20 changed files with 285 additions and 130 deletions.
diff --git a/NgsPacker (Package)/NgsPacker (Package).wapproj b/NgsPacker (Package)/NgsPacker (Package).wapproj
@@ -45,54 +45,62 @@
       <Platform>AnyCPU</Platform>
     </ProjectConfiguration>
   </ItemGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <OutputPath>bin\AnyCPU\Debug\</OutputPath>
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
   <PropertyGroup>
     <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
   </PropertyGroup>
   <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
   <PropertyGroup>
-    <ProjectGuid>65fae3e8-f0eb-4f60-a6d2-d2f2dbbbdab5</ProjectGuid>
+    <ProjectGuid>9b4f198f-785a-4203-ac41-ce8aa6c28217</ProjectGuid>
     <TargetPlatformVersion>10.0.20348.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <DefaultLanguage>ja-JP</DefaultLanguage>
-    <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
+    <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
+    <NoWarn>$(NoWarn);NU1702</NoWarn>
     <EntryPointProjectUniqueName>..\NgsPacker\NgsPacker.csproj</EntryPointProjectUniqueName>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
-    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
-    <AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
+    <AppxBundlePlatforms>x64</AppxBundlePlatforms>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
-    <PackageCertificateThumbprint>8616CBCE40C15B2316729D3165331EE73E26CB5D</PackageCertificateThumbprint>
-    <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <DefaultLanguage>en</DefaultLanguage>
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <DefaultLanguage>en</DefaultLanguage>
     <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <DefaultLanguage>en</DefaultLanguage>
     <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <DefaultLanguage>en</DefaultLanguage>
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefaultLanguage>en</DefaultLanguage>
     <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <DefaultLanguage>en</DefaultLanguage>
     <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DefaultLanguage>en</DefaultLanguage>
     <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
+    <DefaultLanguage>en</DefaultLanguage>
     <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <DefaultLanguage>en</DefaultLanguage>
     <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <DefaultLanguage>en</DefaultLanguage>
     <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
   <ItemGroup>

diff --git a/NgsPacker (Package)/Package.appxmanifest b/NgsPacker (Package)/Package.appxmanifest
@@ -7,20 +7,25 @@
   IgnorableNamespaces="uap rescap">
 
   <Identity
-    Name="191d3797-c540-45a7-9961-b4ce0a68cf1d"
-    Publisher="CN=Logue"
-    Version="1.0.2.0" />
+    Name="afcfe12b-ae80-4b8e-84c2-e6fd58edfaf6"
+    Publisher="CN=logue"
+    Version="1.2.0.0" />
 
   <Properties>
     <DisplayName>NgsPacker (Package)</DisplayName>
-    <PublisherDisplayName>Logue</PublisherDisplayName>
+    <PublisherDisplayName>logue</PublisherDisplayName>
     <Logo>Images\StoreLogo.png</Logo>
   </Properties>
 
   <Dependencies>
     <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
     <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14393.0" MaxVersionTested="10.0.14393.0" />
   </Dependencies>
+
+  <Resources>
+    <Resource Language="x-generate"/>
+  </Resources>
+
   <Applications>
     <Application Id="App"
       Executable="$targetnametoken$.exe"
@@ -38,6 +43,6 @@
   </Applications>
 
   <Capabilities>
-    <Capability Name="internetClient" />
+    <rescap:Capability Name="runFullTrust" />
   </Capabilities>
 </Package>
diff --git a/NgsPacker.sln b/NgsPacker.sln
@@ -18,10 +18,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZamboniLib", "ZamboniLib\ZamboniLib\ZamboniLib.csproj", "{38B71E78-7E24-4D28-92CD-2F12204D2B33}"
 EndProject
-Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "NgsPacker (Package)", "NgsPacker (Package)\NgsPacker (Package).wapproj", "{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ooz", "ZamboniLib\ooz-sys\ooz.vcxproj", "{B6748219-A0E7-46BB-AE38-5343961CB36A}"
 EndProject
+Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "NgsPacker (Package)", "NgsPacker (Package)\NgsPacker (Package).wapproj", "{9B4F198F-785A-4203-AC41-CE8AA6C28217}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -101,51 +101,6 @@ Global
 		{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Release|x64.Build.0 = Release|Any CPU
 		{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Release|x86.ActiveCfg = Release|Any CPU
 		{38B71E78-7E24-4D28-92CD-2F12204D2B33}.Release|x86.Build.0 = Release|Any CPU
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Debug|ARM.ActiveCfg = Debug|ARM
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Debug|ARM.Build.0 = Debug|ARM
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Debug|ARM.Deploy.0 = Debug|ARM
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Debug|arm64.ActiveCfg = Debug|ARM64
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Debug|arm64.Build.0 = Debug|ARM64
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Debug|arm64.Deploy.0 = Debug|ARM64
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Debug|x64.ActiveCfg = Debug|x64
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Debug|x64.Build.0 = Debug|x64
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Debug|x64.Deploy.0 = Debug|x64
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Debug|x86.ActiveCfg = Debug|x86
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Debug|x86.Build.0 = Debug|x86
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Debug|x86.Deploy.0 = Debug|x86
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Experimental|Any CPU.ActiveCfg = Release|Any CPU
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Experimental|Any CPU.Build.0 = Release|Any CPU
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Experimental|Any CPU.Deploy.0 = Release|Any CPU
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Experimental|ARM.ActiveCfg = Debug|ARM
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Experimental|ARM.Build.0 = Debug|ARM
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Experimental|ARM.Deploy.0 = Debug|ARM
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Experimental|arm64.ActiveCfg = Debug|ARM64
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Experimental|arm64.Build.0 = Debug|ARM64
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Experimental|arm64.Deploy.0 = Debug|ARM64
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Experimental|x64.ActiveCfg = Debug|x64
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Experimental|x64.Build.0 = Debug|x64
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Experimental|x64.Deploy.0 = Debug|x64
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Experimental|x86.ActiveCfg = Debug|x86
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Experimental|x86.Build.0 = Debug|x86
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Experimental|x86.Deploy.0 = Debug|x86
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Release|ARM.ActiveCfg = Release|ARM
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Release|ARM.Build.0 = Release|ARM
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Release|ARM.Deploy.0 = Release|ARM
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Release|arm64.ActiveCfg = Release|ARM64
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Release|arm64.Build.0 = Release|ARM64
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Release|arm64.Deploy.0 = Release|ARM64
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Release|x64.ActiveCfg = Release|x64
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Release|x64.Build.0 = Release|x64
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Release|x64.Deploy.0 = Release|x64
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Release|x86.ActiveCfg = Release|x86
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Release|x86.Build.0 = Release|x86
-		{65FAE3E8-F0EB-4F60-A6D2-D2F2DBBBDAB5}.Release|x86.Deploy.0 = Release|x86
 		{B6748219-A0E7-46BB-AE38-5343961CB36A}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{B6748219-A0E7-46BB-AE38-5343961CB36A}.Debug|ARM.ActiveCfg = Debug|Win32
 		{B6748219-A0E7-46BB-AE38-5343961CB36A}.Debug|arm64.ActiveCfg = Debug|Win32
@@ -170,6 +125,51 @@ Global
 		{B6748219-A0E7-46BB-AE38-5343961CB36A}.Release|x64.Build.0 = Release|x64
 		{B6748219-A0E7-46BB-AE38-5343961CB36A}.Release|x86.ActiveCfg = Release|Win32
 		{B6748219-A0E7-46BB-AE38-5343961CB36A}.Release|x86.Build.0 = Release|Win32
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Debug|ARM.ActiveCfg = Debug|ARM
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Debug|ARM.Build.0 = Debug|ARM
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Debug|ARM.Deploy.0 = Debug|ARM
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Debug|arm64.ActiveCfg = Debug|ARM64
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Debug|arm64.Build.0 = Debug|ARM64
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Debug|arm64.Deploy.0 = Debug|ARM64
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Debug|x64.ActiveCfg = Debug|x64
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Debug|x64.Build.0 = Debug|x64
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Debug|x64.Deploy.0 = Debug|x64
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Debug|x86.ActiveCfg = Debug|x86
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Debug|x86.Build.0 = Debug|x86
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Debug|x86.Deploy.0 = Debug|x86
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Experimental|Any CPU.ActiveCfg = Release|Any CPU
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Experimental|Any CPU.Build.0 = Release|Any CPU
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Experimental|Any CPU.Deploy.0 = Release|Any CPU
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Experimental|ARM.ActiveCfg = Debug|ARM
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Experimental|ARM.Build.0 = Debug|ARM
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Experimental|ARM.Deploy.0 = Debug|ARM
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Experimental|arm64.ActiveCfg = Debug|ARM64
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Experimental|arm64.Build.0 = Debug|ARM64
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Experimental|arm64.Deploy.0 = Debug|ARM64
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Experimental|x64.ActiveCfg = Debug|x64
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Experimental|x64.Build.0 = Debug|x64
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Experimental|x64.Deploy.0 = Debug|x64
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Experimental|x86.ActiveCfg = Debug|x86
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Experimental|x86.Build.0 = Debug|x86
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Experimental|x86.Deploy.0 = Debug|x86
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Release|ARM.ActiveCfg = Release|ARM
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Release|ARM.Build.0 = Release|ARM
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Release|ARM.Deploy.0 = Release|ARM
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Release|arm64.ActiveCfg = Release|ARM64
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Release|arm64.Build.0 = Release|ARM64
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Release|arm64.Deploy.0 = Release|ARM64
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Release|x64.ActiveCfg = Release|x64
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Release|x64.Build.0 = Release|x64
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Release|x64.Deploy.0 = Release|x64
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Release|x86.ActiveCfg = Release|x86
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Release|x86.Build.0 = Release|x86
+		{9B4F198F-785A-4203-AC41-CE8AA6C28217}.Release|x86.Deploy.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/NgsPacker/App.xaml.cs b/NgsPacker/App.xaml.cs
@@ -119,8 +119,6 @@ protected override void RegisterTypes(IContainerRegistry containerRegistry)
         /// <param name="moduleCatalog"></param>
         protected override void ConfigureModuleCatalog(IModuleCatalog moduleCatalog)
         {
-            // 進捗ダイアログモジュール
-            _ = moduleCatalog.AddModule<ProgressDialog.Module>();
         }
     }
 }
diff --git a/NgsPacker/Interfaces/IZamboniService.cs b/NgsPacker/Interfaces/IZamboniService.cs
@@ -27,10 +27,9 @@ public interface IZamboniService
         /// 指定されたファイルをアンパックする
         /// </summary>
         /// <param name="inputPath">入力ファイルのパス</param>
-        /// <param name="outputPath">出力先のパス</param>
+        /// <param name="subdir">サブディレクトリを作成する</param>
         /// <param name="sepalate">グループ1と2で分ける</param>
-        /// <returns>解凍したファイルのバイナリ</returns>
-        public Task Unpack(string inputPath, string outputPath = null, bool sepalate = false);
+        public void Unpack(string inputPath, string outputPath = null, bool subdir = true, bool sepalate = false);
 
         /// <summary>
         /// ファイル一覧を取得

diff --git a/NgsPacker/Models/AppAssemblyModel.cs b/NgsPacker/Models/AppAssemblyModel.cs
@@ -4,6 +4,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // </copyright>
 // -----------------------------------------------------------------------
+
 using System.Reflection;
 
 namespace NgsPacker.Models

diff --git a/NgsPacker/Models/IceEntryModel.cs b/NgsPacker/Models/IceEntryModel.cs
@@ -1,3 +1,10 @@
+// -----------------------------------------------------------------------
+// <copyright file="IceEntryModel.cs" company="Logue">
+// Copyright (c) 2021 Masashi Yoshikawa All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// </copyright>
+// -----------------------------------------------------------------------
+
 namespace NgsPacker.Models
 {
     /// <summary>

diff --git a/NgsPacker/NgsPacker.csproj b/NgsPacker/NgsPacker.csproj
@@ -40,7 +40,6 @@
     <PackageReference Include="WPFLocalizeExtension" Version="3.9.0" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\ProgressDialogModule\ProgressDialog.csproj" />
     <ProjectReference Include="..\ZamboniLib\ZamboniLib\ZamboniLib.csproj" />
   </ItemGroup>
   <ItemGroup>

diff --git a/NgsPacker/Properties/Resources.Designer.cs b/NgsPacker/Properties/Resources.Designer.cs
diff --git a/NgsPacker/Properties/Resources.ja.resx b/NgsPacker/Properties/Resources.ja.resx
@@ -237,4 +237,13 @@
   <data name="SaveText" xml:space="preserve">
     <value>保存</value>
   </data>
+  <data name="UnpackByFileListDialogText" xml:space="preserve">
+    <value>アンパックしたいファイルの一覧の入ったリストファイルを選択してください。</value>
+  </data>
+  <data name="UnpackDirectoryDialogText" xml:space="preserve">
+    <value>PSO2のデータファイルのディレクトリ（win32かwin32_reboot）を選択してください。</value>
+  </data>
+  <data name="ProgressDialogText" xml:space="preserve">
+    <value>しばらくお待ち下さい…</value>
+  </data>
 </root>
diff --git a/NgsPacker/Properties/Resources.resx b/NgsPacker/Properties/Resources.resx
@@ -241,4 +241,13 @@ Please select the correct directory.</value>
   <data name="SaveText" xml:space="preserve">
     <value>Save</value>
   </data>
+  <data name="UnpackByFileListDialogText" xml:space="preserve">
+    <value>Select the list file that contains the list of files you want to unpack.</value>
+  </data>
+  <data name="UnpackDirectoryDialogText" xml:space="preserve">
+    <value>Select the PSO2 data file directory (win32 or win32_reboot).</value>
+  </data>
+  <data name="ProgressDialogText" xml:space="preserve">
+    <value>Please wait for a while ...</value>
+  </data>
 </root>