diff --git a/SpineViewer/Controls/SpineListView.cs b/SpineViewer/Controls/SpineListView.cs
index 1aecb5b..c0f80f1 100644
--- a/SpineViewer/Controls/SpineListView.cs
+++ b/SpineViewer/Controls/SpineListView.cs
@@ -224,7 +224,7 @@ namespace SpineViewer.Controls
{
if (validPaths.Count > 100)
{
- if (MessagePopup.Quest($"{Properties.Resources.loadAllSkeletonPrefix}{validPaths.Count}{Properties.Resources.loadAllSkeletonSuffix}") == DialogResult.Cancel)
+ if (MessagePopup.Quest($"{Properties.Resources.loadAllSkeletonPrefix}{validPaths.Count}{Properties.Resources.loadAllSkeletonSuffix}", Properties.Resources.msgBoxQuest) == DialogResult.Cancel)
return;
}
BatchAdd(new Dialogs.BatchOpenSpineDialogResult(SpineVersion.Auto, validPaths.ToArray()));
@@ -413,7 +413,7 @@ namespace SpineViewer.Controls
if (listView.SelectedIndices.Count > 1)
{
- if (MessagePopup.Quest($"{Properties.Resources.removeItemConfirmPrefix} {listView.SelectedIndices.Count} {Properties.Resources.removeItemConfirmSuffix}") != DialogResult.OK)
+ if (MessagePopup.Quest($"{Properties.Resources.removeItemConfirmPrefix} {listView.SelectedIndices.Count} {Properties.Resources.removeItemConfirmSuffix}", Properties.Resources.msgBoxQuest) != DialogResult.OK)
return;
}
@@ -513,7 +513,7 @@ namespace SpineViewer.Controls
if (listView.Items.Count <= 0)
return;
- if (MessagePopup.Quest($"{Properties.Resources.removeAllItemPrefix} {listView.Items.Count} {Properties.Resources.removeItemConfirmSuffix}") != DialogResult.OK)
+ if (MessagePopup.Quest($"{Properties.Resources.removeAllItemPrefix} {listView.Items.Count} {Properties.Resources.removeItemConfirmSuffix}", Properties.Resources.msgBoxQuest) != DialogResult.OK)
return;
listView.Items.Clear();
diff --git a/SpineViewer/Controls/SpinePreviewPanel.cs b/SpineViewer/Controls/SpinePreviewPanel.cs
index bdb9eba..1ae26eb 100644
--- a/SpineViewer/Controls/SpinePreviewPanel.cs
+++ b/SpineViewer/Controls/SpinePreviewPanel.cs
@@ -494,7 +494,7 @@ namespace SpineViewer.Controls
{
logger.Fatal(ex.ToString());
logger.Fatal("Render task stopped");
- MessagePopup.Error(ex.ToString(), "预览画面已停止渲染");
+ MessagePopup.Error(ex.ToString(), "预览画面已停止渲染", Properties.Resources.msgBoxError);
}
finally
{
diff --git a/SpineViewer/Dialogs/BatchOpenSpineDialog.cs b/SpineViewer/Dialogs/BatchOpenSpineDialog.cs
index 7b2ba0a..eeb992f 100644
--- a/SpineViewer/Dialogs/BatchOpenSpineDialog.cs
+++ b/SpineViewer/Dialogs/BatchOpenSpineDialog.cs
@@ -36,7 +36,7 @@ namespace SpineViewer.Dialogs
if (items.Count <= 0)
{
- MessagePopup.Info("未选择任何文件");
+ MessagePopup.Info("未选择任何文件", Properties.Resources.msgBoxInfo);
return;
}
@@ -44,14 +44,14 @@ namespace SpineViewer.Dialogs
{
if (!File.Exists(p))
{
- MessagePopup.Info($"{p}", "skel文件不存在");
+ MessagePopup.Info($"{p}", Properties.Resources.skelNotExist);
return;
}
}
if (version != SpineVersion.Auto && !Spine.SpineObject.HasImplementation(version))
{
- MessagePopup.Info($"{version.GetName()} 版本尚未实现（咕咕咕~）");
+ MessagePopup.Info($"{version.GetName()} 版本尚未实现（咕咕咕~）", Properties.Resources.msgBoxInfo);
return;
}
diff --git a/SpineViewer/Dialogs/ConvertFileFormatDialog.cs b/SpineViewer/Dialogs/ConvertFileFormatDialog.cs
index 239122a..8f00bec 100644
--- a/SpineViewer/Dialogs/ConvertFileFormatDialog.cs
+++ b/SpineViewer/Dialogs/ConvertFileFormatDialog.cs
@@ -59,7 +59,7 @@ namespace SpineViewer.Dialogs
if (items.Count <= 0)
{
- MessagePopup.Info("未选择任何文件");
+ MessagePopup.Info("未选择任何文件", Properties.Resources.msgBoxInfo);
return;
}
@@ -72,7 +72,7 @@ namespace SpineViewer.Dialogs
outputDir = Path.GetFullPath(outputDir);
if (!Directory.Exists(outputDir))
{
- if (MessagePopup.Quest("输出文件夹不存在，是否创建？") == DialogResult.OK)
+ if (MessagePopup.Quest("输出文件夹不存在，是否创建？", Properties.Resources.msgBoxQuest) == DialogResult.OK)
{
try
{
@@ -82,7 +82,7 @@ namespace SpineViewer.Dialogs
{
logger.Error(ex.ToString());
logger.Error("Failed to create output dir {}", outputDir);
- MessagePopup.Error(ex.ToString());
+ MessagePopup.Error(ex.ToString(), Properties.Resources.msgBoxError);
return;
}
}
@@ -97,20 +97,20 @@ namespace SpineViewer.Dialogs
{
if (!File.Exists(p))
{
- MessagePopup.Info($"{p}", "skel文件不存在");
+ MessagePopup.Info($"{p}", Properties.Resources.skelNotExist);
return;
}
}
if (sourceVersion != SpineVersion.Auto && !SkeletonConverter.HasImplementation(sourceVersion))
{
- MessagePopup.Info($"{sourceVersion.GetName()} 版本尚未实现（咕咕咕~）");
+ MessagePopup.Info($"{sourceVersion.GetName()} 版本尚未实现（咕咕咕~）", Properties.Resources.msgBoxInfo);
return;
}
if (!SkeletonConverter.HasImplementation(targetVersion))
{
- MessagePopup.Info($"{targetVersion.GetName()} 版本尚未实现（咕咕咕~）");
+ MessagePopup.Info($"{targetVersion.GetName()} 版本尚未实现（咕咕咕~）", Properties.Resources.msgBoxInfo);
return;
}
diff --git a/SpineViewer/Dialogs/DiagnosticsDialog.cs b/SpineViewer/Dialogs/DiagnosticsDialog.cs
index fb5cdbd..3a8c058 100644
--- a/SpineViewer/Dialogs/DiagnosticsDialog.cs
+++ b/SpineViewer/Dialogs/DiagnosticsDialog.cs
@@ -93,7 +93,7 @@ namespace SpineViewer.Dialogs
var properties = selectedObject.GetType().GetProperties();
var result = string.Join(Environment.NewLine, properties.Select(p => $"{p.Name}\t{p.GetValue(selectedObject)?.ToString()}"));
Clipboard.SetText(result);
- MessagePopup.Info("已复制");
+ MessagePopup.Info("已复制", Properties.Resources.msgBoxInfo);
}
}
}
diff --git a/SpineViewer/Dialogs/ExportDialog.cs b/SpineViewer/Dialogs/ExportDialog.cs
index 17248b2..390bf96 100644
--- a/SpineViewer/Dialogs/ExportDialog.cs
+++ b/SpineViewer/Dialogs/ExportDialog.cs
@@ -65,7 +65,7 @@ namespace SpineViewer.Dialogs
{
if (wrapper.Exporter.Validate() is string error)
{
- MessagePopup.Info(error, "参数错误");
+ MessagePopup.Info(error, Properties.Resources.parameterError);
return;
}
DialogResult = DialogResult.OK;
diff --git a/SpineViewer/Dialogs/OpenSpineDialog.cs b/SpineViewer/Dialogs/OpenSpineDialog.cs
index b69bae1..90b9fe2 100644
--- a/SpineViewer/Dialogs/OpenSpineDialog.cs
+++ b/SpineViewer/Dialogs/OpenSpineDialog.cs
@@ -58,7 +58,7 @@ namespace SpineViewer.Dialogs
if (!File.Exists(skelPath))
{
- MessagePopup.Info($"{skelPath}", "skel文件不存在");
+ MessagePopup.Info($"{skelPath}", Properties.Resources.skelNotExist);
return;
}
else
@@ -72,7 +72,7 @@ namespace SpineViewer.Dialogs
}
else if (!File.Exists(atlasPath))
{
- MessagePopup.Info($"{atlasPath}", "atlas文件不存在");
+ MessagePopup.Info($"{atlasPath}", Properties.Resources.atlasNotExist);
return;
}
else
@@ -82,7 +82,7 @@ namespace SpineViewer.Dialogs
if (version != SpineVersion.Auto && !Spine.SpineObject.HasImplementation(version))
{
- MessagePopup.Info($"{version.GetName()} 版本尚未实现（咕咕咕~）");
+ MessagePopup.Info($"{version.GetName()} 版本尚未实现（咕咕咕~）", Properties.Resources.msgBoxInfo);
return;
}
diff --git a/SpineViewer/Dialogs/ProgressDialog.cs b/SpineViewer/Dialogs/ProgressDialog.cs
index 3d8a8e3..9a088d7 100644
--- a/SpineViewer/Dialogs/ProgressDialog.cs
+++ b/SpineViewer/Dialogs/ProgressDialog.cs
@@ -52,7 +52,7 @@ namespace SpineViewer.Dialogs
if (e.Error != null)
{
logger.Error(e.Error.ToString());
- MessagePopup.Error(e.Error.ToString(), "执行出错");
+ MessagePopup.Error(e.Error.ToString(), "执行出错", Properties.Resources.msgBoxError);
DialogResult = DialogResult.Abort;
}
else if (e.Cancelled)
diff --git a/SpineViewer/Forms/SpineViewerForm.cs b/SpineViewer/Forms/SpineViewerForm.cs
index 9a25624..b59a751 100644
--- a/SpineViewer/Forms/SpineViewerForm.cs
+++ b/SpineViewer/Forms/SpineViewerForm.cs
@@ -30,7 +30,7 @@ namespace SpineViewer
{
logger.Error(ex.ToString());
logger.Error("Failed to load fragment shader");
- MessagePopup.Warn("Fragment shader 加载失败，预乘Alpha通道属性失效");
+ MessagePopup.Warn("Fragment shader 加载失败，预乘Alpha通道属性失效", Properties.Resources.msgBoxWarning);
}
#if DEBUG
@@ -103,7 +103,7 @@ namespace SpineViewer
private void toolStripMenuItem_ExportFrame_Click(object sender, EventArgs e)
{
- if (spinePreviewPanel.IsUpdating && MessagePopup.Quest("画面仍在更新，建议手动暂停画面后导出固定的一帧，是否继续？") != DialogResult.OK)
+ if (spinePreviewPanel.IsUpdating && MessagePopup.Quest("画面仍在更新，建议手动暂停画面后导出固定的一帧，是否继续？", Properties.Resources.msgBoxQuest) != DialogResult.OK)
return;
var k = nameof(toolStripMenuItem_ExportFrame);
diff --git a/SpineViewer/Program.cs b/SpineViewer/Program.cs
index c7fcc8b..3f11361 100644
--- a/SpineViewer/Program.cs
+++ b/SpineViewer/Program.cs
@@ -59,7 +59,7 @@ namespace SpineViewer
catch (Exception ex)
{
logger.Fatal(ex.ToString());
- MessagePopup.Error(ex.ToString(), "程序已崩溃");
+ MessagePopup.Error(ex.ToString(), "程序已崩溃", Properties.Resources.msgBoxError);
}
}
diff --git a/SpineViewer/Properties/Resources.Designer.cs b/SpineViewer/Properties/Resources.Designer.cs
index b426690..130780e 100644
--- a/SpineViewer/Properties/Resources.Designer.cs
+++ b/SpineViewer/Properties/Resources.Designer.cs
@@ -69,6 +69,15 @@ namespace SpineViewer.Properties {
}
}
+ ///
+ /// Looks up a localized string similar to atlas文件不存在.
+ ///
+ internal static string atlasNotExist {
+ get {
+ return ResourceManager.GetString("atlasNotExist", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to 自定义.
///
@@ -330,6 +339,15 @@ namespace SpineViewer.Properties {
}
}
+ ///
+ /// Looks up a localized string similar to 参数错误.
+ ///
+ internal static string parameterError {
+ get {
+ return ResourceManager.GetString("parameterError", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to 已处理 .
///
@@ -383,5 +401,14 @@ namespace SpineViewer.Properties {
return ResourceManager.GetString("restartTitle", resourceCulture);
}
}
+
+ ///
+ /// Looks up a localized string similar to skel文件不存在.
+ ///
+ internal static string skelNotExist {
+ get {
+ return ResourceManager.GetString("skelNotExist", resourceCulture);
+ }
+ }
}
}
diff --git a/SpineViewer/Properties/Resources.en-US.resx b/SpineViewer/Properties/Resources.en-US.resx
index 718c8ed..ec2224d 100644
--- a/SpineViewer/Properties/Resources.en-US.resx
+++ b/SpineViewer/Properties/Resources.en-US.resx
@@ -120,6 +120,9 @@
About
+
+ Atlas file doesn't exist.
+
Custom
@@ -207,6 +210,9 @@
Link copied to clipboard. Please open it in browser
+
+ Invalid Parameters
+
Processed
@@ -225,4 +231,7 @@
Application restart required!
+
+ Skel file doesn't exist.
+
\ No newline at end of file
diff --git a/SpineViewer/Properties/Resources.resx b/SpineViewer/Properties/Resources.resx
index dd75ce0..c7fbbd2 100644
--- a/SpineViewer/Properties/Resources.resx
+++ b/SpineViewer/Properties/Resources.resx
@@ -120,6 +120,9 @@
关于
+
+ atlas文件不存在
+
自定义
@@ -207,6 +210,9 @@
链接已复制到剪贴板，请前往浏览器进行访问
+
+ 参数错误
+
已处理
@@ -225,4 +231,7 @@
需要重新启动应用程序!
+
+ skel文件不存在
+
\ No newline at end of file