improve:联动模块
This commit is contained in:
@@ -178,7 +178,40 @@
|
|||||||
</Window.CommandBindings>
|
</Window.CommandBindings>
|
||||||
|
|
||||||
<Grid x:Name="Main_Grid">
|
<Grid x:Name="Main_Grid">
|
||||||
|
<!-- 等待COM组件加载动画 -->
|
||||||
|
<Grid x:Name="LoadingMask" Background="#80000000" Visibility="Collapsed" Panel.ZIndex="10000">
|
||||||
|
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" >
|
||||||
|
<!-- 圆形旋转动画 -->
|
||||||
|
<Grid Width="60" Height="60">
|
||||||
|
<Ellipse Width="60" Height="60" Stroke="#40FFFFFF" StrokeThickness="6"/>
|
||||||
|
<Ellipse Width="60" Height="60" Stroke="White" StrokeThickness="6"
|
||||||
|
StrokeDashArray="0,1.5"
|
||||||
|
RenderTransformOrigin="0.5,0.5">
|
||||||
|
<Ellipse.RenderTransform>
|
||||||
|
<RotateTransform x:Name="SpinnerRotate"/>
|
||||||
|
</Ellipse.RenderTransform>
|
||||||
|
<Ellipse.Triggers>
|
||||||
|
<EventTrigger RoutedEvent="FrameworkElement.Loaded">
|
||||||
|
<BeginStoryboard>
|
||||||
|
<Storyboard RepeatBehavior="Forever">
|
||||||
|
<DoubleAnimation
|
||||||
|
Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
|
||||||
|
From="0" To="360" Duration="0:0:1"/>
|
||||||
|
</Storyboard>
|
||||||
|
</BeginStoryboard>
|
||||||
|
</EventTrigger>
|
||||||
|
</Ellipse.Triggers>
|
||||||
|
</Ellipse>
|
||||||
|
</Grid>
|
||||||
|
<TextBlock Text="正在连接 PowerPoint..."
|
||||||
|
Foreground="White"
|
||||||
|
Margin="0,20,0,0"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
FontSize="18"
|
||||||
|
FontWeight="Bold"
|
||||||
|
Opacity="0.9"/>
|
||||||
|
</StackPanel>
|
||||||
|
</Grid>
|
||||||
<!--// 设置界面 //-->
|
<!--// 设置界面 //-->
|
||||||
<Grid Panel.ZIndex="999" x:Name="BorderSettingsMask" MouseDown="SettingsOverlayClick" IsHitTestVisible="True"
|
<Grid Panel.ZIndex="999" x:Name="BorderSettingsMask" MouseDown="SettingsOverlayClick" IsHitTestVisible="True"
|
||||||
Margin="0,0,0,0">
|
Margin="0,0,0,0">
|
||||||
|
|||||||
@@ -28,6 +28,8 @@ namespace Ink_Canvas {
|
|||||||
|
|
||||||
private void BtnCheckPPT_Click(object sender, RoutedEventArgs e) {
|
private void BtnCheckPPT_Click(object sender, RoutedEventArgs e) {
|
||||||
try {
|
try {
|
||||||
|
// 显示加载动画
|
||||||
|
Application.Current.Dispatcher.Invoke(() => { LoadingMask.Visibility = Visibility.Visible; });
|
||||||
pptApplication =
|
pptApplication =
|
||||||
(Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("kwpp.Application");
|
(Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("kwpp.Application");
|
||||||
//pptApplication.SlideShowWindows[1].View.Next();
|
//pptApplication.SlideShowWindows[1].View.Next();
|
||||||
@@ -67,6 +69,10 @@ namespace Ink_Canvas {
|
|||||||
RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
|
RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
|
||||||
MessageBox.Show("未找到幻灯片");
|
MessageBox.Show("未找到幻灯片");
|
||||||
}
|
}
|
||||||
|
finally {
|
||||||
|
// 隐藏加载动画
|
||||||
|
Application.Current.Dispatcher.Invoke(() => { LoadingMask.Visibility = Visibility.Collapsed; });
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ToggleSwitchSupportWPS_Toggled(object sender, RoutedEventArgs e) {
|
private void ToggleSwitchSupportWPS_Toggled(object sender, RoutedEventArgs e) {
|
||||||
@@ -85,16 +91,8 @@ namespace Ink_Canvas {
|
|||||||
private void TimerCheckPPT_Elapsed(object sender, ElapsedEventArgs e) {
|
private void TimerCheckPPT_Elapsed(object sender, ElapsedEventArgs e) {
|
||||||
if (IsShowingRestoreHiddenSlidesWindow || IsShowingAutoplaySlidesWindow) return;
|
if (IsShowingRestoreHiddenSlidesWindow || IsShowingAutoplaySlidesWindow) return;
|
||||||
try {
|
try {
|
||||||
//var processes = Process.GetProcessesByName("wpp");
|
// 显示加载动画
|
||||||
//if (processes.Length > 0 && !isWPSSupportOn) return;
|
Application.Current.Dispatcher.Invoke(() => { LoadingMask.Visibility = Visibility.Visible; });
|
||||||
|
|
||||||
//使用下方提前创建 PowerPoint 实例,将导致 PowerPoint 不再有启动界面
|
|
||||||
//pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Activator.CreateInstance(Marshal.GetTypeFromCLSID(new Guid("91493441-5A91-11CF-8700-00AA0060263B")));
|
|
||||||
//new ComAwareEventInfo(typeof(EApplication_Event), "SlideShowBegin").AddEventHandler(pptApplication, new EApplication_SlideShowBeginEventHandler(this.PptApplication_SlideShowBegin));
|
|
||||||
//new ComAwareEventInfo(typeof(EApplication_Event), "SlideShowEnd").AddEventHandler(pptApplication, new EApplication_SlideShowEndEventHandler(this.PptApplication_SlideShowEnd));
|
|
||||||
//new ComAwareEventInfo(typeof(EApplication_Event), "SlideShowNextSlide").AddEventHandler(pptApplication, new EApplication_SlideShowNextSlideEventHandler(this.PptApplication_SlideShowNextSlide));
|
|
||||||
//ConfigHelper.Instance.IsInitApplicationSuccessful = true;
|
|
||||||
|
|
||||||
pptApplication =
|
pptApplication =
|
||||||
(Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("PowerPoint.Application");
|
(Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("PowerPoint.Application");
|
||||||
|
|
||||||
@@ -142,6 +140,10 @@ namespace Ink_Canvas {
|
|||||||
Application.Current.Dispatcher.Invoke(() => { BtnPPTSlideShow.Visibility = Visibility.Collapsed; });
|
Application.Current.Dispatcher.Invoke(() => { BtnPPTSlideShow.Visibility = Visibility.Collapsed; });
|
||||||
timerCheckPPT.Start();
|
timerCheckPPT.Start();
|
||||||
}
|
}
|
||||||
|
finally {
|
||||||
|
// 隐藏加载动画
|
||||||
|
Application.Current.Dispatcher.Invoke(() => { LoadingMask.Visibility = Visibility.Collapsed; });
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void PptApplication_PresentationOpen(Presentation Pres) {
|
private void PptApplication_PresentationOpen(Presentation Pres) {
|
||||||
|
|||||||
Reference in New Issue
Block a user