[update]先更新再說，詐尸上傳到Github。
This commit is contained in:
parent
ebc015d3b7
commit
832c04eae0
@ -179,6 +179,8 @@
|
||||
<None Include="Resources\TimerDownNotice.wav" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\Cursors\Cursor.cur" />
|
||||
<Resource Include="Resources\Cursors\Pen.cur" />
|
||||
<Resource Include="Resources\Icons-png\check-box-background.png" />
|
||||
<Resource Include="Resources\Icons-png\eraser-line.png" />
|
||||
<Resource Include="Resources\Icons-png\eraser-outline.png" />
|
||||
@ -452,6 +454,8 @@
|
||||
<Compile Remove="AssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Remove="Resources\Cursors\Cursor.cur" />
|
||||
<None Remove="Resources\Cursors\Pen.cur" />
|
||||
<None Remove="Resources\Icons-png\HiteAnnotation.png" />
|
||||
<None Remove="Resources\Icons-png\HiteLightBoard.png" />
|
||||
<None Remove="Resources\Icons-png\icc-transparent-dark.png" />
|
||||
|
||||
@ -97,7 +97,7 @@
|
||||
Executed="KeyDrawLine" />
|
||||
</Window.CommandBindings>
|
||||
|
||||
<Grid x:Name="Main_Grid">
|
||||
<Grid x:Name="Main_Grid" >
|
||||
|
||||
<!--// 设置界面 //-->
|
||||
<Grid Panel.ZIndex="999" x:Name="BorderSettingsMask" MouseDown="SettingsOverlayClick" IsHitTestVisible="False"
|
||||
@ -1235,7 +1235,7 @@
|
||||
</Grid>
|
||||
<Grid Name="GridTransparencyFakeBackground" Opacity="0" />
|
||||
<Label Name="Label" Visibility="Collapsed" Foreground="Gray" Content="0" />
|
||||
<InkCanvas x:Name="inkCanvas" Cursor="Pen" ForceCursor="False"
|
||||
<InkCanvas x:Name="inkCanvas" ForceCursor="False"
|
||||
TouchUp="Main_Grid_TouchUp" TouchDown="Main_Grid_TouchDown"
|
||||
TouchMove="inkCanvas_TouchMove"
|
||||
ManipulationDelta="Main_Grid_ManipulationDelta"
|
||||
|
||||
@ -26,8 +26,11 @@ using System.Xml.Linq;
|
||||
|
||||
namespace Ink_Canvas {
|
||||
public partial class MainWindow : Window {
|
||||
#region TwoFingZoomBtn
|
||||
#region “手勢”按鈕
|
||||
|
||||
/// <summary>
|
||||
/// 用於浮動工具欄的“手勢”按鈕和白板工具欄的“手勢”按鈕的點擊事件
|
||||
/// </summary>
|
||||
private void TwoFingerGestureBorder_MouseUp(object sender, RoutedEventArgs e) {
|
||||
if (TwoFingerGestureBorder.Visibility == Visibility.Visible) {
|
||||
AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder);
|
||||
@ -39,6 +42,9 @@ namespace Ink_Canvas {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 用於更新浮動工具欄的“手勢”按鈕和白板工具欄的“手勢”按鈕的樣式（開啟和關閉狀態）
|
||||
/// </summary>
|
||||
private void CheckEnableTwoFingerGestureBtnColorPrompt() {
|
||||
if (ToggleSwitchEnableMultiTouchMode.IsOn) {
|
||||
TwoFingerGestureSimpleStackPanel.Opacity = 0.5;
|
||||
@ -84,6 +90,9 @@ namespace Ink_Canvas {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 控制是否顯示浮動工具欄的“手勢”按鈕
|
||||
/// </summary>
|
||||
private void CheckEnableTwoFingerGestureBtnVisibility(bool isVisible) {
|
||||
if (StackPanelCanvasControls.Visibility != Visibility.Visible
|
||||
|| BorderFloatingBarMainControls.Visibility != Visibility.Visible) {
|
||||
@ -99,9 +108,9 @@ namespace Ink_Canvas {
|
||||
}
|
||||
}
|
||||
|
||||
#endregion TwoFingZoomBtn
|
||||
#endregion “手勢”按鈕
|
||||
|
||||
#region Drag
|
||||
#region 浮動工具欄的拖動實現
|
||||
|
||||
private bool isDragDropInEffect = false;
|
||||
private Point pos = new Point();
|
||||
@ -153,9 +162,15 @@ namespace Ink_Canvas {
|
||||
GridForFloatingBarDraging.Visibility = Visibility.Collapsed;
|
||||
}
|
||||
|
||||
#endregion
|
||||
#endregion 浮動工具欄的拖動實現
|
||||
|
||||
private void HideSubPanelsImmediately() {
|
||||
#region 隱藏子面板和按鈕背景高亮
|
||||
|
||||
/// <summary>
|
||||
/// <c>HideSubPanels</c>的青春版。目前需要修改<c>BorderSettings</c>的關閉機制（改為動畫關閉）。
|
||||
/// </summary>
|
||||
private void HideSubPanelsImmediately()
|
||||
{
|
||||
BorderTools.Visibility = Visibility.Collapsed;
|
||||
BorderTools.Visibility = Visibility.Collapsed;
|
||||
BoardBorderTools.Visibility = Visibility.Collapsed;
|
||||
@ -165,10 +180,66 @@ namespace Ink_Canvas {
|
||||
BorderSettings.Visibility = Visibility.Collapsed;
|
||||
}
|
||||
|
||||
#region 按鈕高亮背景
|
||||
|
||||
private async void HideSubPanels(string mode = null, bool autoAlignCenter = false,
|
||||
bool isAutoUpdateToolbarSelection = true) {
|
||||
/// <summary>
|
||||
/// <para>
|
||||
/// 易嚴定真，這個多功能函數包括了以下的內容：
|
||||
/// </para>
|
||||
/// <list type="number">
|
||||
/// <item>
|
||||
/// 隱藏浮動工具欄和白板模式下的“更多功能”面板
|
||||
/// </item>
|
||||
/// <item>
|
||||
/// 隱藏白板模式下和浮動工具欄的畫筆調色盤
|
||||
/// </item>
|
||||
/// <item>
|
||||
/// 隱藏白板模式下的“清屏”按鈕（已作廢）
|
||||
/// </item>
|
||||
/// <item>
|
||||
/// 負責給Settings設置面板做隱藏動畫
|
||||
/// </item>
|
||||
/// <item>
|
||||
/// 隱藏白板模式下和浮動工具欄的“手勢”面板
|
||||
/// </item>
|
||||
/// <item>
|
||||
/// 當<c>ToggleSwitchDrawShapeBorderAutoHide</c>開啟時，會自動隱藏白板模式下和浮動工具欄的“形狀”面板
|
||||
/// </item>
|
||||
/// <item>
|
||||
/// 按需高亮指定的浮動工具欄和白板工具欄中的按鈕，通過param：<paramref name="mode"/> 來指定
|
||||
/// </item>
|
||||
/// <item>
|
||||
/// 將浮動工具欄自動居中，通過param：<paramref name="autoAlignCenter"/>
|
||||
/// </item>
|
||||
/// </list>
|
||||
/// </summary>
|
||||
/// <param name="mode">
|
||||
/// <para>
|
||||
/// 按需高亮指定的浮動工具欄和白板工具欄中的按鈕，有下面幾種情況：
|
||||
/// </para>
|
||||
/// <list type="number">
|
||||
/// <item>
|
||||
/// 當<c><paramref name="mode"/>==null</c>時，不會執行任何有關操作
|
||||
/// </item>
|
||||
/// <item>
|
||||
/// 當<c><paramref name="mode"/>!="clear"</c>時，會先取消高亮所有工具欄按鈕，然後根據下面的情況進行高亮處理
|
||||
/// </item>
|
||||
/// <item>
|
||||
/// 當<c><paramref name="mode"/>=="color" || <paramref name="mode"/>=="pen"</c>時，會高亮浮動工具欄和白板工具欄中的“批註”，“筆”按鈕
|
||||
/// </item>
|
||||
/// <item>
|
||||
/// 當<c><paramref name="mode"/>=="eraser"</c>時，會高亮白板工具欄中的“橡皮”和浮動工具欄中的“面積擦”按鈕
|
||||
/// </item>
|
||||
/// <item>
|
||||
/// 當<c><paramref name="mode"/>=="eraserByStrokes"</c>時，會高亮白板工具欄中的“橡皮”和浮動工具欄中的“墨跡擦”按鈕
|
||||
/// </item>
|
||||
/// <item>
|
||||
/// 當<c><paramref name="mode"/>=="select"</c>時，會高亮浮動工具欄和白板工具欄中的“選擇”，“套索選”按鈕
|
||||
/// </item>
|
||||
/// </list>
|
||||
/// </param>
|
||||
/// <param name="autoAlignCenter">
|
||||
/// 是否自動居中浮動工具欄
|
||||
/// </param>
|
||||
private async void HideSubPanels(string mode = null, bool autoAlignCenter = false) {
|
||||
AnimationsHelper.HideWithSlideAndFade(BorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(PenPalette);
|
||||
@ -212,7 +283,7 @@ namespace Ink_Canvas {
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardBorderDrawShape);
|
||||
}
|
||||
|
||||
if (mode != null && isAutoUpdateToolbarSelection == true) {
|
||||
if (mode != null) {
|
||||
if (mode != "clear") {
|
||||
CursorIconGeometry.Brush = new SolidColorBrush(Color.FromRgb(27, 27, 27));
|
||||
CursorIconGeometry.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.LinedCursorIcon);
|
||||
@ -310,23 +381,6 @@ namespace Ink_Canvas {
|
||||
|
||||
#endregion
|
||||
|
||||
private void BorderPenColorBlack_MouseUp(object sender, MouseButtonEventArgs e) {
|
||||
BtnColorBlack_Click(null, null);
|
||||
HideSubPanels();
|
||||
}
|
||||
|
||||
private void BorderPenColorRed_MouseUp(object sender, MouseButtonEventArgs e) {
|
||||
BtnColorRed_Click(null, null);
|
||||
HideSubPanels();
|
||||
}
|
||||
|
||||
private void BorderPenColorWhite_MouseUp(object sender, MouseButtonEventArgs e) {
|
||||
inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FFFEFEFE");
|
||||
inkColor = 5;
|
||||
ColorSwitchCheck();
|
||||
HideSubPanels();
|
||||
}
|
||||
|
||||
private void SymbolIconUndo_MouseUp(object sender, MouseButtonEventArgs e) {
|
||||
//if (lastBorderMouseDownObject != sender) return;
|
||||
|
||||
@ -394,9 +448,12 @@ namespace Ink_Canvas {
|
||||
SaveScreenShotToDesktop();
|
||||
}
|
||||
|
||||
private bool Not_Enter_Blackboard_fir_Mouse_Click = true;
|
||||
//private bool Not_Enter_Blackboard_fir_Mouse_Click = true;
|
||||
private bool isDisplayingOrHidingBlackboard = false;
|
||||
|
||||
|
||||
|
||||
|
||||
private void ImageBlackboard_MouseUp(object sender, MouseButtonEventArgs e) {
|
||||
LeftUnFoldButtonQuickPanel.Visibility = Visibility.Collapsed;
|
||||
RightUnFoldButtonQuickPanel.Visibility = Visibility.Collapsed;
|
||||
@ -1308,7 +1365,7 @@ namespace Ink_Canvas {
|
||||
Settings.Automation.MinimumAutomationStrokeNumber)
|
||||
SaveScreenShot(true);
|
||||
|
||||
BtnClear_Click(null, null);
|
||||
//BtnClear_Click(null, null);
|
||||
}
|
||||
|
||||
inkCanvas.IsHitTestVisible = true;
|
||||
@ -1322,7 +1379,7 @@ namespace Ink_Canvas {
|
||||
Settings.Automation.MinimumAutomationStrokeNumber)
|
||||
SaveScreenShot(true);
|
||||
|
||||
BtnClear_Click(null, null);
|
||||
//BtnClear_Click(null, null);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -339,7 +339,7 @@ namespace Ink_Canvas {
|
||||
BorderFloatingBarMainControls.Visibility = Visibility.Visible;
|
||||
|
||||
if (Settings.PowerPointSettings.IsShowCanvasAtNewSlideShow)
|
||||
BorderPenColorRed_MouseUp(BorderPenColorRed, null);
|
||||
BtnColorRed_Click(null, null);
|
||||
|
||||
isEnteredSlideShowEndEvent = false;
|
||||
PptNavigationTextBlock.Text = $"{Wn.View.CurrentShowPosition}/{Wn.Presentation.Slides.Count}";
|
||||
|
||||
BIN
Ink Canvas/Resources/Cursors/Cursor.cur
Normal file
BIN
Ink Canvas/Resources/Cursors/Cursor.cur
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.2 KiB |
BIN
Ink Canvas/Resources/Cursors/Pen.cur
Normal file
BIN
Ink Canvas/Resources/Cursors/Pen.cur
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.2 KiB |
23
README.md
23
README.md
@ -19,14 +19,17 @@ Elegant by Default. Based on `ChangSakura/InkCanvas` .
|
||||
|
||||
</div>
|
||||
|
||||
## 嚴正聲明
|
||||
本產品與peppy的osu!以及其周邊項目和產品無任何關聯，該Logo僅供娛樂用，若有侵權，請聯繫Dev協商解決。
|
||||
|
||||
## 公告
|
||||
该项目旨在为ICA提供更加舒适和易于使用的UI和用户体验，对于任何墨迹书写方面的Bug如果本人无法修复将不会被修复。本人因为最近忙于开发InkCanvasForClass X导致本项目开发进度最近比较缓慢，请多一份理解，谢谢！
|
||||
该项目旨在为ICA提供更加舒适和易于使用的UI和用户体验，对于任何墨迹书写方面的Bug如果本人无法修复将不会被修复。
|
||||
|
||||
## 前言
|
||||
使用和分發本軟體前，請您應當且務必知曉相關開源協議，本軟體基於 https://github.com/ChangSakura/Ink-Canvas 修改而成，而ICA又基於 https://github.com/WXRIW/Ink-Canvas 修改而成，增添了包括但不限於隱藏到側邊欄等功能，更改了相關UI和軟體操作邏輯。對於墨跡書寫功能以及ICA獨有功能的相關 issue 提出，應優先查閱 https://github.com/WXRIW/Ink-Canvas/issues 。
|
||||
|
||||
[直接下載](https://gitea.bliemhax.com/kriastans/InkCanvasForClass/releases "Latest Releases")
|
||||
——該安裝包使用 NodeJs+NodeGUI打包，默認配置適配絕大多數紅外觸摸框的設置。
|
||||
——以壓縮檔案形式存儲，便攜版可直接啟動，默認配置適配絕大多數紅外觸摸框的設置。
|
||||
|
||||
> ⚠️注意：此項目仍在開發中，只會在發佈正式發行版時提供Release。您可以自行使用VS2022編譯打包後自行使用
|
||||
|
||||
@ -52,13 +55,23 @@ Elegant by Default. Based on `ChangSakura/InkCanvas` .
|
||||
|
||||
另外，處在保護（只讀）模式的PPT不會被識別
|
||||
|
||||
若因安裝了最新版本的 WPS 而導致無法在 WPS 軟體內進入 PPT 模式，可以嘗試卸載 WPS 後，並清除電腦垃圾、註冊表垃圾、刪除電腦上所有帶 "kingsoft" 名稱的文件夾，重新安裝 WPS 2021 後，（以上步驟可能有多餘步驟），經測試在 WPS 內可以正常進入 PPT 模式。
|
||||
若因安裝了最新版本的 WPS 而導致無法在 WPS 軟體內進入 PPT 模式，可以嘗試卸載 WPS 後，並清除電腦垃圾、註冊表垃圾、刪除電腦上所有帶 "kingsoft" 名稱的文件夾，重新安裝 WPS 後，（以上步驟可能有多餘步驟），經測試在 WPS 內可以正常進入 PPT 模式。
|
||||
|
||||
不支援WPS純淨版！
|
||||
ICC 可以支持 WPS，但目前無法同時支持 MSOffice 和 WPS。若要啟用 WPS 支持，請確保 WPS 是否在 “配置工具” 中開啟了 “WPS Office 相容第三方系統和軟體” 選項，該項目勾選並應用後，將無法檢測到 MS Office 的COM接口。
|
||||
|
||||
如果您安裝了“贛教通”、“暢言智慧課堂”等應用程式，可能會安裝“暢言備課精靈”，可能會導致遺失64為Office COM組建的註冊且目前似乎無法修復（可以切換到新用戶正常使用）。但 WPS Office 可以正常使用。
|
||||
|
||||
若要將 ICC 配合 WPS 使用，可打開“WPS 示範”後，前往“文件” - “選項” ，取消勾選“單螢幕幻燈片放映時，顯示放映工具欄”該項，獲得更好的體驗。若要將 ICC 配合 MS Office 使用，可以打開 Powerpoint，前往“選項” ，“高級”，取消勾選“顯示快捷工具欄”，獲得更好的體驗。
|
||||
|
||||
### **安裝後**程序無法正常啟動？
|
||||
請檢查你的電腦上是否安裝了 `.Net Framework 4.7.2` 或更高版本。若沒有，請前往官網下載
|
||||
如果仍無法運行，請檢查你的電腦上是否安裝了 `Microsoft Office`。若沒有，請安裝後重試
|
||||
|
||||
> 遇到各種奇葩逗比問題請重啟應用程式，如果不行請反饋給Dev解決！
|
||||
|
||||
## 如何聯繫我
|
||||
1. QQ群聊：825759306
|
||||
2. 客服QQ：1612446451
|
||||
3. Telegram頻道：@InkCanvasForClass
|
||||
|
||||
## 特別鳴謝
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user