Skip to content

Commit

Permalink
Fix for PowerPoint stuffs
Browse files Browse the repository at this point in the history
  • Loading branch information
@WXRIW
WXRIW committed Oct 12, 2021
1 parent d1fe3d4 commit e03fd70
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 20 deletions.
36 changes: 19 additions & 17 deletions Ink Canvas/MainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@
<StackPanel Name="StackPanelControl">
<Button Name="BtnExit" Content="退出" FontFamily="Microsoft YaHei UI"
Margin="0,10,0,0" Width="{Binding ElementName=StackPanelMain, Path=ActualWidth}"
Click="BtnExit_Click" Foreground="{Binding ElementName=BtnExit, Path=Foreground}" Background="#7F909090"/>
Click="BtnExit_Click" Background="#7F909090"/>
<Button Name="BtnSettings" Content="设置" FontFamily="Microsoft YaHei UI"
Margin="0,10,0,0" Width="{Binding ElementName=StackPanelMain, Path=ActualWidth}"
Click="BtnSettings_Click" Foreground="{Binding ElementName=BtnExit, Path=Foreground}" Background="{Binding ElementName=BtnExit, Path=Background}"/>
Expand Down Expand Up @@ -345,11 +345,13 @@
<Button x:Name="BtnHideControl" Content="⇅" FontFamily="Microsoft YaHei UI"
Margin="0,10,0,0" Width="{Binding ElementName=StackPanelMain, Path=ActualWidth}"
Click="BtnHideControl_Click" Foreground="{Binding ElementName=BtnExit, Path=Foreground}" Background="{Binding ElementName=BtnExit, Path=Background}"/>
<StackPanel x:Name="StackPanelInfo">
<StackPanel>
<TextBlock Visibility="{Binding ElementName=GroupBoxMASEZVersion, Path=Visibility}" Text="二中专版" FontSize="11" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,10,0,0" Foreground="{Binding ElementName=BtnExit, Path=Foreground}"/>
<Image Visibility="{Binding ElementName=GroupBoxMASEZVersion, Path=Visibility}" Source="logo2.png" Margin="0,-5,0,-15"/>
<TextBlock Text="Developer" FontSize="8.5" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,10,0,0" Foreground="{Binding ElementName=BtnExit, Path=Foreground}"/>
<TextBlock Text="XY Wang" FontSize="9" HorizontalAlignment="Center" Margin="0,3,0,0" Foreground="{Binding ElementName=BtnExit, Path=Foreground}"/>
<StackPanel x:Name="StackPanelInfo">
<TextBlock Text="Developer" FontSize="8.5" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,10,0,0" Foreground="{Binding ElementName=BtnExit, Path=Foreground}"/>
<TextBlock Text="XY Wang" FontSize="9" HorizontalAlignment="Center" Margin="0,3,0,0" Foreground="{Binding ElementName=BtnExit, Path=Foreground}"/>
</StackPanel>
</StackPanel>
</StackPanel>
</Viewbox>
Expand Down Expand Up @@ -418,6 +420,19 @@
<Button Name="BtnDrawEllipse" Content="椭圆" Visibility="Visible" FontFamily="Microsoft YaHei UI"
Margin="0,10,0,15" Width="{Binding ElementName=StackPanelMain, Path=ActualWidth}"
Click="BtnDrawEllipse_Click" Foreground="{Binding ElementName=BtnExit, Path=Foreground}" Background="{Binding ElementName=BtnExit, Path=Background}"/>
<StackPanel Visibility="{Binding ElementName=StackPanelPPTButtons, Path=Visibility}">
<StackPanel Visibility="{Binding ElementName=StackPanelPPTControls, Path=Visibility}">
<Button Content="↑" FontFamily="Microsoft YaHei UI"
Margin="0,10,0,0" Width="{Binding ElementName=StackPanelMain, Path=ActualWidth}"
Click="BtnPPTSlidesUp_Click" Foreground="{Binding ElementName=BtnExit, Path=Foreground}" Background="{Binding ElementName=BtnExit, Path=Background}"/>
<Button Content="↓" FontFamily="Microsoft YaHei UI"
Margin="0,10,0,15" Width="{Binding ElementName=StackPanelMain, Path=ActualWidth}"
Click="BtnPPTSlidesDown_Click" Foreground="{Binding ElementName=BtnExit, Path=Foreground}" Background="{Binding ElementName=BtnExit, Path=Background}"/>
</StackPanel>
</StackPanel>
<Button Content="清屏" FontFamily="Microsoft YaHei UI"
Margin="0,10,0,0" Width="{Binding ElementName=StackPanelMain, Path=ActualWidth}"
Click="BtnClear_Click" MouseDoubleClick="BtnClear_MouseDoubleClick" Foreground="{Binding ElementName=BtnExit, Path=Foreground}" Background="{Binding ElementName=BtnExit, Path=Background}"/>
<Button x:Name="BtnUndo" FontFamily="Microsoft YaHei UI"
Margin="0,10,0,0" Width="{Binding ElementName=StackPanelMain, Path=ActualWidth}"
Click="BtnUndo_Click" Foreground="{Binding ElementName=BtnExit, Path=Foreground}"
Expand All @@ -438,22 +453,9 @@
<TextBlock Text="恢复" Margin="0,4,0,0"/>
</StackPanel>
</Button>
<Button Content="清屏" FontFamily="Microsoft YaHei UI"
Margin="0,10,0,0" Width="{Binding ElementName=StackPanelMain, Path=ActualWidth}"
Click="BtnClear_Click" MouseDoubleClick="BtnClear_MouseDoubleClick" Foreground="{Binding ElementName=BtnExit, Path=Foreground}" Background="{Binding ElementName=BtnExit, Path=Background}"/>
<Button Name="BtnClearAndHideCanvas" Content="清屏&#x000A;&amp;&#x000A;隐藏" Visibility="Collapsed" FontFamily="Microsoft YaHei UI"
Margin="0,10,0,0" Width="{Binding ElementName=StackPanelMain, Path=ActualWidth}" Block.TextAlignment="Center"
Click="BtnSelect_Click" Foreground="{Binding ElementName=BtnExit, Path=Foreground}" Background="{Binding ElementName=BtnExit, Path=Background}"/>
<StackPanel Visibility="{Binding ElementName=StackPanelPPTButtons, Path=Visibility}">
<StackPanel Visibility="{Binding ElementName=StackPanelPPTControls, Path=Visibility}">
<Button Content="↑" FontFamily="Microsoft YaHei UI"
Margin="0,25,0,0" Width="{Binding ElementName=StackPanelMain, Path=ActualWidth}"
Click="BtnPPTSlidesUp_Click" Foreground="{Binding ElementName=BtnExit, Path=Foreground}" Background="{Binding ElementName=BtnExit, Path=Background}"/>
<Button Content="↓" FontFamily="Microsoft YaHei UI"
Margin="0,10,0,0" Width="{Binding ElementName=StackPanelMain, Path=ActualWidth}"
Click="BtnPPTSlidesDown_Click" Foreground="{Binding ElementName=BtnExit, Path=Foreground}" Background="{Binding ElementName=BtnExit, Path=Background}"/>
</StackPanel>
</StackPanel>
<Grid Height="{Binding ElementName=StackPanelInfo, Path=ActualHeight}"/>
</StackPanel>
</Viewbox>
Expand Down
7 changes: 5 additions & 2 deletions Ink Canvas/MainWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1073,9 +1073,10 @@ private void BtnCheckPPT_Click(object sender, RoutedEventArgs e)
MessageBox.Show("未找到幻灯片");
}
}

public static bool IsShowingRestoreHiddenSlidesWindow = false;
private void TimerCheckPPT_Elapsed(object sender, ElapsedEventArgs e)
{
if (IsShowingRestoreHiddenSlidesWindow) return;
try
{
Process[] processes = Process.GetProcessesByName("wpp");
Expand Down Expand Up @@ -1104,6 +1105,7 @@ private void TimerCheckPPT_Elapsed(object sender, ElapsedEventArgs e)
pptApplication.SlideShowEnd += PptApplication_SlideShowEnd;
// 获得幻灯片对象集合
slides = presentation.Slides;

// 获得幻灯片的数量
slidescount = slides.Count;
memoryStreams = new MemoryStream[slidescount + 2];
Expand Down Expand Up @@ -1137,8 +1139,9 @@ private void TimerCheckPPT_Elapsed(object sender, ElapsedEventArgs e)

Application.Current.Dispatcher.Invoke(() =>
{
if (isHaveHiddenSlide)
if (isHaveHiddenSlide && !IsShowingRestoreHiddenSlidesWindow)
{
IsShowingRestoreHiddenSlidesWindow = true;
new RestoreHiddenSlidesWindow().ShowDialog();
}
Expand Down
2 changes: 1 addition & 1 deletion Ink Canvas/RestoreHiddenSlidesWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Ink_Canvas" xmlns:ui="http://schemas.modernwpf.com/2019"
mc:Ignorable="d" Topmost="True" WindowStartupLocation="CenterScreen" ui:WindowHelper.UseModernWindowStyle="True"
ResizeMode="NoResize"
ResizeMode="NoResize" Closed="Window_Closed"
Title="演示文档设置 - Ink Canvas 画板" Height="160" Width="450" FontFamily="Microsoft YaHei UI">
<Grid>
<Grid Margin="10">
Expand Down
5 changes: 5 additions & 0 deletions Ink Canvas/RestoreHiddenSlidesWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,10 @@ private void ButtonNo_Click(object sender, RoutedEventArgs e)
{
Close();
}

private void Window_Closed(object sender, EventArgs e)
{
MainWindow.IsShowingRestoreHiddenSlidesWindow = false;
}
}
}

0 comments on commit e03fd70

Please sign in to comment.