Skip to content

Commit

Permalink
Update 1.28
Browse files Browse the repository at this point in the history
  • Loading branch information
XyLe-GBP committed Aug 18, 2023
1 parent 6124210 commit 35d66bb
Show file tree
Hide file tree
Showing 27 changed files with 3,707 additions and 1,227 deletions.
8 changes: 4 additions & 4 deletions ATRACTool-Reloaded.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<RootNamespace>ATRACTool_Reloaded</RootNamespace>
<Nullable>enable</Nullable>
<UseWindowsForms>true</UseWindowsForms>
<ImplicitUsings>enable</ImplicitUsings>
<AssemblyVersion>1.27.2220.1109</AssemblyVersion>
<FileVersion>1.27.2220.1109</FileVersion>
<AssemblyVersion>1.28.2320.818</AssemblyVersion>
<FileVersion>1.28.2320.818</FileVersion>
<RepositoryType>git</RepositoryType>
<Company>XyLe</Company>
<Description>Open source ATRAC conversion utility</Description>
<Copyright>Copyright © 2022 - XyLe. All Rights Reserved.</Copyright>
<Copyright>Copyright © 2023 - XyLe. All Rights Reserved.</Copyright>
<PackageTags>ATRAC, ATRAC3, ATRAC9, at3, at9, Converter, GUI</PackageTags>
<ApplicationIcon>Properties\ATRACTool.ico</ApplicationIcon>
</PropertyGroup>
Expand Down
18 changes: 18 additions & 0 deletions Localizable/Localization.ja.resx
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,15 @@
<data name="CurrentCaption" xml:space="preserve">
<value>現在のバージョン:</value>
</data>
<data name="CustomSplashCaption" xml:space="preserve">
<value>独自のスプラッシュスクリーン画像はアプリケーションを再起動すると反映されます。</value>
</data>
<data name="CustomSplashSizeErrorCaption" xml:space="preserve">
<value>画像ファイルの解像度が不正です。
縦:800 または 400px
横:480 または 240px
上記の要件を満たしたファイル以外は設定できません。</value>
</data>
<data name="DecodeErrorCaption" xml:space="preserve">
<value>ATRACのデコードに失敗しました。</value>
</data>
Expand Down Expand Up @@ -294,6 +303,12 @@
<value>アプリケーションのアップデートが可能です。
GitHubリポジトリのページを開きますか?</value>
</data>
<data name="SpecificPathErrorCaption" xml:space="preserve">
<value>保存先のパスが指定されていません。</value>
</data>
<data name="SpecificSubfolderErrorCaption" xml:space="preserve">
<value>サブフォルダ名が指定されていません。</value>
</data>
<data name="SplashFormConfigCaption" xml:space="preserve">
<value>アプリケーションの設定情報を取得中…</value>
</data>
Expand All @@ -309,6 +324,9 @@ GitHubリポジトリのページを開きますか?</value>
<data name="SplashFormUpdatingCaption" xml:space="preserve">
<value>アップデート中...</value>
</data>
<data name="SplashPathErrorCaption" xml:space="preserve">
<value>スプラッシュスクリーン画像のパスが指定されていません。</value>
</data>
<data name="StatusCaption" xml:space="preserve">
<value>{0} / {1} ファイルを変換済み</value>
</data>
Expand Down
18 changes: 18 additions & 0 deletions Localizable/Localization.resx
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,15 @@ Do you want to continue?</value>
<data name="CurrentCaption" xml:space="preserve">
<value>Current version:</value>
</data>
<data name="CustomSplashCaption" xml:space="preserve">
<value>Unique splash screen images are reflected when the application is restarted.</value>
</data>
<data name="CustomSplashSizeErrorCaption" xml:space="preserve">
<value>Image size is incorrect.
Width: 800 or 400px
Height: 480 or 240px
Only files that meet the above criteria can be specified.</value>
</data>
<data name="DecodeErrorCaption" xml:space="preserve">
<value>Failed to decode the ATRAC file.</value>
</data>
Expand Down Expand Up @@ -292,6 +301,12 @@ Please make appropriate settings from the menu 'Conversion Settings'.</value>
<value>The application can be updated.
Do you want to open the GitHub?</value>
</data>
<data name="SpecificPathErrorCaption" xml:space="preserve">
<value>Path not specified.</value>
</data>
<data name="SpecificSubfolderErrorCaption" xml:space="preserve">
<value>suffix is not specified.</value>
</data>
<data name="SplashFormConfigCaption" xml:space="preserve">
<value>Getting application configuration information...</value>
</data>
Expand All @@ -307,6 +322,9 @@ Do you want to open the GitHub?</value>
<data name="SplashFormUpdatingCaption" xml:space="preserve">
<value>Updating...</value>
</data>
<data name="SplashPathErrorCaption" xml:space="preserve">
<value>The path to the splash screen image is not specified.</value>
</data>
<data name="StatusCaption" xml:space="preserve">
<value>Converting {0} of {1} files</value>
</data>
Expand Down
48 changes: 48 additions & 0 deletions Localizable/localization.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 12 additions & 3 deletions Properties/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -112,16 +112,25 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="IMG_1540" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>IMG_1540.JPG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="SIE" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>SIE.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="SIEv2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>SIEv2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Splash" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Splash.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Splash_SIE_Default" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Splash_SIE_Default.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
Binary file added Properties/SIEv2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Properties/Splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Properties/Splash_SIE_Default.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion VERSIONINFO
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version:1.27.2220.1109
version:1.28.2320.818
37 changes: 37 additions & 0 deletions src/Common.cs
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ public class Generic
public static string EncodeParamAT9 = "";

public static StreamReader Log = null!;
public static Exception GlobalException = null!;

/// <summary>
/// ダウンロード機能用変数
Expand Down Expand Up @@ -416,6 +417,42 @@ public static void InitConfig()
{
Config.Entry["ATRAC9_Params"].Value = "at9tool -e -br 168 -fs 48000 $InFile $OutFile";
}

// 設定ダイアログ

if (Config.Entry["Check_Update"].Value == null) // アップデートを確認 (bool)
{
Config.Entry["Check_Update"].Value = "true";
}
if (Config.Entry["SplashImage"].Value == null) // スプラッシュスクリーン画像 (bool)
{
Config.Entry["SplashImage"].Value = "false";
}
if (Config.Entry["SplashImage_Path"].Value == null) // スプラッシュスクリーン画像パス (string)
{
Config.Entry["SplashImage_Path"].Value = "";
}
if (Config.Entry["Oldmode"].Value == null) // 従来のモード (bool)
{
Config.Entry["Oldmode"].Value = "false";
}
if (Config.Entry["HideSplash"].Value == null) // スプラッシュスクリーンを無効化 (bool)
{
Config.Entry["HideSplash"].Value = "false";
}
if (Config.Entry["FasterATRAC"].Value == null) // ATRAC即時変換 (bool)
{
Config.Entry["FasterATRAC"].Value = "false";
}
if (Config.Entry["FixedConvert"].Value == null) // 形式固定 (bool)
{
Config.Entry["FixedConvert"].Value = "false";
}
if (Config.Entry["ConvertType"].Value == null) // 形式固定有効化時の形式 (int)
{
Config.Entry["ConvertType"].Value = "";
}

if (Config.Entry["Save_IsManual"].Value == null) // ファイル保存方法 (bool)
{
Config.Entry["Save_IsManual"].Value = "false";
Expand Down
Loading

0 comments on commit 35d66bb

Please sign in to comment.