Skip to content

Commit

Permalink
Add stuffs and new release
Browse files Browse the repository at this point in the history
  • Loading branch information
@WXRIW
WXRIW committed Oct 13, 2021
1 parent e03fd70 commit 2c5cc04
Show file tree
Hide file tree
Showing 8 changed files with 540 additions and 181 deletions.
8 changes: 4 additions & 4 deletions Ink Canvas/ChangeLogWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ private void Window_Loaded(object sender, RoutedEventArgs e)

//Version 2.1.2-release
TextBlockChangeLog.Text = "" +
"1. 支持多页白板/黑板\n" +
"2. 支持撤销\n" +
"3. 双击清屏即可在清屏的同时隐藏画板\n" +
"1. 支持模拟笔锋，字迹更美观\n" +
"2. 支持自动查杀希沃部分软件\n" +
"3. 检测到有隐藏幻灯片时可一键取消隐藏\n" +
"4. 对深浅主题下墨迹颜色的优化\n" +
"\n" +
"目前基本可以取代“希沃白板”";
"目前非联网功能可以完全取代“希沃白板 5”";
TextBlockSuggestionTitle.Visibility = Visibility.Collapsed;
//TextBlockSuggestion.Text = "老师讲评试卷可以点击右侧的背景和深色按钮，即可启动黑板功能（同样支持用笔来擦除），\n双指可以缩放和拖动，左边也会有工具栏方便画图形。";

Expand Down
7 changes: 7 additions & 0 deletions Ink Canvas/Ink Canvas.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@
<Compile Include="SettingsPage.xaml.cs">
<DependentUpon>SettingsPage.xaml</DependentUpon>
</Compile>
<Compile Include="WelcomeWindow.xaml.cs">
<DependentUpon>WelcomeWindow.xaml</DependentUpon>
</Compile>
<Page Include="ChangeLogWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
Expand All @@ -119,6 +122,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="WelcomeWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs">
Expand Down
75 changes: 57 additions & 18 deletions Ink Canvas/MainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,13 @@
FontSize="14"/>
</StackPanel>
<ui:ToggleSwitch Name="ToggleSwitchShowCursor" Header="显示画笔光标" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchShowCursor_Toggled"/>
<ui:ToggleSwitch Name="ToggleSwitchSimulatePressure" Header="模拟压感（笔锋）(Beta)" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchSimulatePressure_Toggled"/>
<ui:ToggleSwitch Name="ToggleSwitchSimulatePressure" Visibility="Collapsed" Header="模拟压感（笔锋）(Beta)" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchSimulatePressure_Toggled"/>
<TextBlock Text="画笔样式" FontFamily="Microsoft YaHei UI" FontSize="14"/>
<ComboBox Name="ComboBoxPenStyle" FontFamily="Microsoft YaHei UI" SelectedIndex="0" SelectionChanged="ComboBoxPenStyle_SelectionChanged">
<ComboBoxItem Content="模拟笔锋（仿希沃算法）" FontFamily="Microsoft YaHei UI"/>
<ComboBoxItem Content="模拟笔锋（根据速度计算）" FontFamily="Microsoft YaHei UI"/>
<ComboBoxItem Content="无笔锋" FontFamily="Microsoft YaHei UI"/>
</ComboBox>
</ui:SimpleStackPanel>
</GroupBox>
<GroupBox Header="手势">
Expand Down Expand Up @@ -193,6 +199,12 @@
</StackPanel>
</ui:SimpleStackPanel>
</GroupBox>
<GroupBox Header="自动">
<ui:SimpleStackPanel Spacing="12">
<ui:ToggleSwitch Name="ToggleSwitchAutoKillPptService" Header="自动查杀“PPT 小工具”" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoKillPptService_Toggled"/>
<ui:ToggleSwitch Name="ToggleSwitchAutoKillEasiNote" Header="自动查杀“希沃白板 5”" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoKillEasiNote_Toggled"/>
</ui:SimpleStackPanel>
</GroupBox>
<GroupBox Header="关于">
<ui:SimpleStackPanel Spacing="12">
<ui:SimpleStackPanel Orientation="Horizontal" Spacing="4">
Expand Down Expand Up @@ -297,21 +309,46 @@
Margin="0,10,0,0" Width="{Binding ElementName=StackPanelMain, Path=ActualWidth}"
Click="BtnSwitch_Click" Foreground="{Binding ElementName=BtnExit, Path=Foreground}" Background="{Binding ElementName=BtnExit, Path=Background}"/>
<StackPanel Name="StackPanelColors" Margin="7,0,7,0">
<Button Name="BtnColorBlack" Content="" FontFamily="Microsoft YaHei UI" Background="Black"
Margin="0,10,0,0" Width="{Binding ElementName=StackPanelColors, Path=ActualWidth}"
Click="BtnColorBlack_Click" Foreground="{Binding ElementName=BtnExit, Path=Foreground}"/>
<Button Name="BtnColorRed" Content="" FontFamily="Microsoft YaHei UI" Background="Red"
Margin="0,10,0,0" Width="{Binding ElementName=StackPanelColors, Path=ActualWidth}"
Click="BtnColorRed_Click" Foreground="{Binding ElementName=BtnExit, Path=Foreground}"/>
<Button Name="BtnColorGreen" Content="" FontFamily="Microsoft YaHei UI" Background="#169141"
Margin="0,10,0,0" Width="{Binding ElementName=StackPanelColors, Path=ActualWidth}"
Click="BtnColorGreen_Click" Foreground="{Binding ElementName=BtnExit, Path=Foreground}"/>
<Button Name="BtnColorBlue" Content="" FontFamily="Microsoft YaHei UI" Background="#239AD6"
Margin="0,10,0,0" Width="{Binding ElementName=StackPanelColors, Path=ActualWidth}"
Click="BtnColorBlue_Click" Foreground="{Binding ElementName=BtnExit, Path=Foreground}"/>
<Button Name="BtnColorYellow" Content="" FontFamily="Microsoft YaHei UI" Background="#F38B00"
Margin="0,10,0,0" Width="{Binding ElementName=StackPanelColors, Path=ActualWidth}"
Click="BtnColorYellow_Click" Foreground="{Binding ElementName=BtnExit, Path=Foreground}"/>
<Button Name="BtnColorBlack" FontFamily="Microsoft YaHei UI" Background="Black"
Margin="0,10,0,0" Width="{Binding ElementName=StackPanelColors, Path=ActualWidth}"
Height="{Binding ElementName=StackPanelColors, Path=ActualWidth}"
Click="BtnColorBlack_Click">
<Viewbox Name="ViewboxBtnColorBlackContent" Visibility="Collapsed">
<ui:SymbolIcon Symbol="Accept" Name="SymbolIconBtnColorBlackContent" Foreground="White"/>
</Viewbox>
</Button>
<Button Name="BtnColorRed" FontFamily="Microsoft YaHei UI" Background="Red"
Margin="0,10,0,0" Width="{Binding ElementName=StackPanelColors, Path=ActualWidth}"
Height="{Binding ElementName=StackPanelColors, Path=ActualWidth}"
Click="BtnColorRed_Click" Foreground="{Binding ElementName=BtnExit, Path=Foreground}">
<Viewbox Name="ViewboxBtnColorRedContent">
<ui:SymbolIcon Symbol="Accept" Foreground="{Binding ElementName=SymbolIconBtnColorBlackContent, Path=Foreground}"/>
</Viewbox>
</Button>
<Button Name="BtnColorGreen" FontFamily="Microsoft YaHei UI" Background="#169141"
Margin="0,10,0,0" Width="{Binding ElementName=StackPanelColors, Path=ActualWidth}"
Height="{Binding ElementName=StackPanelColors, Path=ActualWidth}"
Click="BtnColorGreen_Click" Foreground="{Binding ElementName=BtnExit, Path=Foreground}">
<Viewbox Name="ViewboxBtnColorGreenContent" Visibility="Collapsed">
<ui:SymbolIcon Symbol="Accept" Foreground="{Binding ElementName=SymbolIconBtnColorBlackContent, Path=Foreground}"/>
</Viewbox>
</Button>
<Button Name="BtnColorBlue" FontFamily="Microsoft YaHei UI" Background="#239AD6"
Margin="0,10,0,0" Width="{Binding ElementName=StackPanelColors, Path=ActualWidth}"
Height="{Binding ElementName=StackPanelColors, Path=ActualWidth}"
Click="BtnColorBlue_Click" Foreground="{Binding ElementName=BtnExit, Path=Foreground}">
<Viewbox Name="ViewboxBtnColorBlueContent" Visibility="Collapsed">
<ui:SymbolIcon Symbol="Accept" Foreground="{Binding ElementName=SymbolIconBtnColorBlackContent, Path=Foreground}"/>
</Viewbox>
</Button>
<Button Name="BtnColorYellow" FontFamily="Microsoft YaHei UI" Background="#F38B00"
Margin="0,10,0,0" Width="{Binding ElementName=StackPanelColors, Path=ActualWidth}"
Height="{Binding ElementName=StackPanelColors, Path=ActualWidth}"
Click="BtnColorYellow_Click" Foreground="{Binding ElementName=BtnExit, Path=Foreground}">
<Viewbox Name="ViewboxBtnColorYellowContent" Visibility="Collapsed">
<ui:SymbolIcon Symbol="Accept" Foreground="{Binding ElementName=SymbolIconBtnColorBlackContent, Path=Foreground}"/>
</Viewbox>
</Button>
</StackPanel>
<Button Name="BtnClear" Content="清屏" FontFamily="Microsoft YaHei UI"
Margin="0,10,0,0" Width="{Binding ElementName=StackPanelMain, Path=ActualWidth}"
Expand Down Expand Up @@ -402,9 +439,11 @@
<Button Name="BtnSelect" Content="选择&#x000A;墨迹" Visibility="Visible" FontFamily="Microsoft YaHei UI"
Margin="0,10,0,0" Width="{Binding ElementName=StackPanelMain, Path=ActualWidth}"
Click="BtnSelect_Click" Foreground="{Binding ElementName=BtnExit, Path=Foreground}" Background="{Binding ElementName=BtnExit, Path=Background}"/>
<Button Name="BtnPen" Content="笔" Visibility="Visible" FontFamily="Microsoft YaHei UI"
<Button Name="BtnPen" Visibility="Visible" FontFamily="Microsoft YaHei UI"
Margin="0,10,0,0" Width="{Binding ElementName=StackPanelMain, Path=ActualWidth}"
Click="BtnPen_Click" Foreground="{Binding ElementName=BtnExit, Path=Foreground}" Background="{Binding ElementName=BtnExit, Path=Background}"/>
Click="BtnPen_Click" Foreground="{Binding ElementName=BtnExit, Path=Foreground}" Background="{Binding ElementName=BtnExit, Path=Background}">
<ui:SymbolIcon Symbol="Edit"/>
</Button>
<Button Name="BtnErase" Content="橡皮" Visibility="Visible" FontFamily="Microsoft YaHei UI"
Margin="0,10,0,0" Width="{Binding ElementName=StackPanelMain, Path=ActualWidth}"
Click="BtnErase_Click" Foreground="{Binding ElementName=BtnExit, Path=Foreground}" Background="{Binding ElementName=BtnExit, Path=Background}"/>
Expand Down
Loading

0 comments on commit 2c5cc04

Please sign in to comment.