improve:PPT模块
This commit is contained in:
@@ -1476,30 +1476,8 @@ namespace Ink_Canvas {
|
|||||||
|
|
||||||
if (!allSaved)
|
if (!allSaved)
|
||||||
{
|
{
|
||||||
// 弹窗提示用户(只弹一次)
|
// 直接跳过弹窗,自动继续
|
||||||
if (!hasShownWpsForceCloseWarning)
|
LogHelper.WriteLogToFile("检测到有未保存的WPS文档,但已取消弹窗提示,自动继续。", LogHelper.LogType.Trace);
|
||||||
{
|
|
||||||
hasShownWpsForceCloseWarning = true;
|
|
||||||
bool userContinue = false;
|
|
||||||
Application.Current.Dispatcher.Invoke(() =>
|
|
||||||
{
|
|
||||||
var result = MessageBox.Show(
|
|
||||||
"检测到有未保存的WPS文档,强制关闭可能导致数据丢失。是否继续?",
|
|
||||||
"警告", MessageBoxButton.YesNo, MessageBoxImage.Warning);
|
|
||||||
userContinue = (result == MessageBoxResult.Yes);
|
|
||||||
});
|
|
||||||
if (!userContinue)
|
|
||||||
{
|
|
||||||
LogHelper.WriteLogToFile("用户取消了强制关闭WPS进程", LogHelper.LogType.Trace);
|
|
||||||
StopWppProcessCheckTimer();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// 已弹过,直接跳过或默认继续
|
|
||||||
LogHelper.WriteLogToFile("WPS强制关闭提示已弹出,自动继续。", LogHelper.LogType.Trace);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 立即结束WPP进程
|
// 立即结束WPP进程
|
||||||
@@ -1543,7 +1521,6 @@ namespace Ink_Canvas {
|
|||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
hasShownWpsForceCloseWarning = false; // 复位,便于下次检测
|
|
||||||
StopWppProcessCheckTimer();
|
StopWppProcessCheckTimer();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,5 +16,5 @@ E:\ICC CE\ICC CE main\community\Ink Canvas\App.xaml
|
|||||||
471037513499
|
471037513499
|
||||||
Helpers\Plugins\BuiltIn\SuperLauncher\LauncherSettingsControl.xaml;Helpers\Plugins\BuiltIn\SuperLauncher\LauncherWindow.xaml;MainWindow.xaml;MainWindow_cs\MW_Eraser.xaml;Resources\DrawShapeImageDictionary.xaml;Resources\IconImageDictionary.xaml;Resources\SeewoImageDictionary.xaml;Resources\Styles\Dark.xaml;Resources\Styles\Light.xaml;Windows\AddCustomIconWindow.xaml;Windows\AddPickNameBackgroundWindow.xaml;Windows\CountdownTimerWindow.xaml;Windows\CustomIconWindow.xaml;Windows\CycleProcessBar.xaml;Windows\HasNewUpdateWindow.xaml;Windows\HistoryRollbackWindow.xaml;Windows\ManagePickNameBackgroundsWindow.xaml;Windows\NamesInputWindow.xaml;Windows\OperatingGuideWindow.xaml;Windows\PluginSettingsWindow.xaml;Windows\RandWindow.xaml;Windows\YesOrNoNotificationWindow.xaml;
|
Helpers\Plugins\BuiltIn\SuperLauncher\LauncherSettingsControl.xaml;Helpers\Plugins\BuiltIn\SuperLauncher\LauncherWindow.xaml;MainWindow.xaml;MainWindow_cs\MW_Eraser.xaml;Resources\DrawShapeImageDictionary.xaml;Resources\IconImageDictionary.xaml;Resources\SeewoImageDictionary.xaml;Resources\Styles\Dark.xaml;Resources\Styles\Light.xaml;Windows\AddCustomIconWindow.xaml;Windows\AddPickNameBackgroundWindow.xaml;Windows\CountdownTimerWindow.xaml;Windows\CustomIconWindow.xaml;Windows\CycleProcessBar.xaml;Windows\HasNewUpdateWindow.xaml;Windows\HistoryRollbackWindow.xaml;Windows\ManagePickNameBackgroundsWindow.xaml;Windows\NamesInputWindow.xaml;Windows\OperatingGuideWindow.xaml;Windows\PluginSettingsWindow.xaml;Windows\RandWindow.xaml;Windows\YesOrNoNotificationWindow.xaml;
|
||||||
|
|
||||||
False
|
True
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user