From 4c57fe5fd368d93cc8ddac04377612573a67394d Mon Sep 17 00:00:00 2001 From: kriastans Date: Fri, 9 Aug 2024 21:52:27 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E7=99=BD=E6=9D=BF=E7=BF=BB=E9=A1=B5?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- InkCanvasForClass/FodyWeavers.xsd | 141 ------------------ InkCanvasForClass/MainWindow.xaml | 22 +++ .../MainWindow_cs/MW_BoardControls.cs | 10 +- .../Properties/launchSettings.json | 4 - InkCanvasForClass/README.md | 55 ++----- 5 files changed, 40 insertions(+), 192 deletions(-) delete mode 100644 InkCanvasForClass/FodyWeavers.xsd diff --git a/InkCanvasForClass/FodyWeavers.xsd b/InkCanvasForClass/FodyWeavers.xsd deleted file mode 100644 index 05e92c1..0000000 --- a/InkCanvasForClass/FodyWeavers.xsd +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks - - - - - A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks. - - - - - A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks - - - - - A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks. - - - - - A list of unmanaged 32 bit assembly names to include, delimited with line breaks. - - - - - A list of unmanaged 64 bit assembly names to include, delimited with line breaks. - - - - - The order of preloaded assemblies, delimited with line breaks. - - - - - - This will copy embedded files to disk before loading them into memory. This is helpful for some scenarios that expected an assembly to be loaded from a physical file. - - - - - Controls if .pdbs for reference assemblies are also embedded. - - - - - Controls if runtime assemblies are also embedded. - - - - - Controls whether the runtime assemblies are embedded with their full path or only with their assembly name. - - - - - Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option. - - - - - As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off. - - - - - Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code. - - - - - Costura will by default use assemblies with a name like 'resources.dll' as a satellite resource and prepend the output path. This flag disables that behavior. - - - - - A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with | - - - - - A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |. - - - - - A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with | - - - - - A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |. - - - - - A list of unmanaged 32 bit assembly names to include, delimited with |. - - - - - A list of unmanaged 64 bit assembly names to include, delimited with |. - - - - - The order of preloaded assemblies, delimited with |. - - - - - - - - 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. - - - - - A comma-separated list of error codes that can be safely ignored in assembly verification. - - - - - 'false' to turn off automatic generation of the XML Schema file. - - - - - \ No newline at end of file diff --git a/InkCanvasForClass/MainWindow.xaml b/InkCanvasForClass/MainWindow.xaml index 4c836b1..7710c6d 100644 --- a/InkCanvasForClass/MainWindow.xaml +++ b/InkCanvasForClass/MainWindow.xaml @@ -2898,6 +2898,28 @@ + + + + + + + + + + + + + + + + diff --git a/InkCanvasForClass/MainWindow_cs/MW_BoardControls.cs b/InkCanvasForClass/MainWindow_cs/MW_BoardControls.cs index d7b2254..86b97d8 100644 --- a/InkCanvasForClass/MainWindow_cs/MW_BoardControls.cs +++ b/InkCanvasForClass/MainWindow_cs/MW_BoardControls.cs @@ -299,11 +299,11 @@ namespace Ink_Canvas { set { _whiteboardModeNewPageButtonEnabled = value; var geo = new GeometryDrawing[] - { BtnWhiteboardAddGeometryLeft, BtnWhiteboardAddGeometryRight }; + { BtnWhiteboardAddGeometryLeft, BtnWhiteboardAddGeometryRight, BtnWhiteboardAddGeometryRightSecondary }; var label = new TextBlock[] - { BtnWhiteboardAddTextBlockLeft, BtnWhiteboardAddTextBlockRight }; + { BtnWhiteboardAddTextBlockLeft, BtnWhiteboardAddTextBlockRight, BtnWhiteboardAddTextBlockRightSecondary }; var border = new Border[] - { BtnWhiteboardAddLeft, BtnWhiteboardAddRight }; + { BtnWhiteboardAddLeft, BtnWhiteboardAddRight, BtnWhiteboardAddRightSecondary }; foreach (var gd in geo) gd.Brush = new SolidColorBrush(Color.FromArgb((byte)(value ? 255 : 127), 24, 24, 27)); foreach (var tb in label) tb.Opacity = value ? 1 : 0.5; @@ -317,6 +317,10 @@ namespace Ink_Canvas { _whiteboardModeNewPageButtonMerged = value; BtnWhiteBoardSwitchNextL.Visibility = value ? Visibility.Collapsed : Visibility.Visible; BtnLeftPageListWB.CornerRadius = value ? new CornerRadius(0, 5, 5, 0) : new CornerRadius(0); + BtnWhiteBoardSwitchNextR.Visibility = value ? Visibility.Collapsed : Visibility.Visible; + BtnRightPageListWB.CornerRadius = value ? new CornerRadius(0, 5, 5, 0) : new CornerRadius(0); + BtnWhiteboardAddRightSecondary.Visibility = value ? Visibility.Visible : Visibility.Collapsed; + BtnWhiteboardAddRight.Visibility = value ? Visibility.Collapsed : Visibility.Visible; } } diff --git a/InkCanvasForClass/Properties/launchSettings.json b/InkCanvasForClass/Properties/launchSettings.json index b6425a9..525abc7 100644 --- a/InkCanvasForClass/Properties/launchSettings.json +++ b/InkCanvasForClass/Properties/launchSettings.json @@ -2,10 +2,6 @@ "profiles": { "InkCanvasForClass": { "commandName": "Project" - }, - "ICC v6": { - "commandName": "Project", - "commandLineArgs": "--v6" } } } \ No newline at end of file diff --git a/InkCanvasForClass/README.md b/InkCanvasForClass/README.md index e08572b..4f87ee3 100644 --- a/InkCanvasForClass/README.md +++ b/InkCanvasForClass/README.md @@ -8,23 +8,21 @@ Elegant by Default. Based on `ChangSakura/InkCanvas` . **這將會是最後一次基於InkCanvas控件的倔強** -[![UPSTREAM](https://img.shields.io/badge/UpStream-ChangSakura%2FInk--Canvas-red.svg "LICENSE")](https://github.com/ChangSakura/Ink-Canvas) +[![UPSTREAM](https://img.shields.io/badge/UpStream-InkCanvas%2FInk--Canvas--Artistry-purple.svg "LICENSE")](https://github.com/InkCanvas/Ink-Canvas-Artistry) ![Gitea Last Commit](https://img.shields.io/gitea/last-commit/kriastans/InkCanvasForClass?gitea_url=https%3A%2F%2Fgitea.bliemhax.com%2F) [![LICENSE](https://img.shields.io/badge/License-GPL--3.0-red.svg "LICENSE")](https://gitea.bliemhax.com/kriastans/InkCanvasForClass/src/branch/master/LICENSE) [![交流群](https://img.shields.io/badge/-%E4%BA%A4%E6%B5%81%E7%BE%A4%20825759306-blue?style=flat&logo=TencentQQ)]() [![Telegram](https://img.shields.io/badge/-Telegram%20@InkCanvasForClass-blue?style=flat&logo=Telegram)](https://t.me/InkCanvasForClass) -![Screenshot-1](./Images/icc1.png) -![Screenshot-2](./Images/icc2.png) - -## 贊助支持 - -我已註冊愛發電，感謝各位對icc的支持！[https://afdian.net/a/dubi906w](https://afdian.net/a/dubi906w) +## Links +- 愛發電：[https://afdian.net/a/dubi906w/](https://afdian.net/a/dubi906w/)
+- 新網站：[https://icc.bliemhax.com/](https://icc.bliemhax.com/) +- QQ群聊：[https://qm.qq.com/q/ptrGkAcqMo/](https://qm.qq.com/q/ptrGkAcqMo/) +- Telegram頻道：[https://t.me/InkCanvasForClass/](https://t.me/InkCanvasForClass/) ## 新網站即將上線！ -新網站即將上線，快來一起和InkCanvasForClass見證美好時刻吧！[點我訪問](https://icc.bliemhax.com/) ## 嚴正聲明 本產品與peppy的osu!以及其周邊項目和產品無任何關聯，該Logo僅供娛樂用，若有侵權，請聯繫Dev協商解決。 @@ -35,17 +33,8 @@ Elegant by Default. Based on `ChangSakura/InkCanvas` . ## 前言 使用和分發本軟體前，請您應當且務必知曉相關開源協議，本軟體基於 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") -——以壓縮檔案形式存儲，便攜版可直接啟動，默認配置適配絕大多數紅外觸摸框的設置。 - > ⚠️注意：此項目仍在開發中，只會在發佈正式發行版時提供Release。您可以自行使用VS2022編譯打包後自行使用 -## 特性 -1. Support Active Pen (支持壓感) -2. 工具欄顯示了每個功能的文字描述 -3. 添加了調色盤的顏色 -4. 添加了熒光筆支持 - ## 提示 - 對新功能的有效意見和合理建議，開發者會適時回復並進行開發。本軟體並非商業性質軟體，請勿催促開發者，耐心才能讓功能更少 BUG、更加穩定。 - 此軟體僅用於私人使用，請勿商用。更新也不會很快，如果有能力請PR貢獻程式碼而不是在Issue裡面提問題。 @@ -56,13 +45,7 @@ Elegant by Default. Based on `ChangSakura/InkCanvas` . ### 點擊放映後一翻頁就閃退？ 考慮是由於`Microsoft Office`未啟用導致的，請自行啟用 -### 放映後畫板程序不會切換到PPT模式？ -如果你曾經安裝過`WPS`且在卸載後發現此問題則是由於暫時未確定的問題所導致，可以嘗試重新安裝WPS -> “您好，關於您回饋的情況我們已經回饋技術同學進一步分析哈，辛苦您可以留意後續WPS版本更新哈~” --回復自WPS客服 - -另外，處在保護（只讀）模式的PPT不會被識別 - -若因安裝了最新版本的 WPS 而導致無法在 WPS 軟體內進入 PPT 模式，可以嘗試卸載 WPS 後，並清除電腦垃圾、註冊表垃圾、刪除電腦上所有帶 "kingsoft" 名稱的文件夾，重新安裝 WPS 後，（以上步驟可能有多餘步驟），經測試在 WPS 內可以正常進入 PPT 模式。 +### ICC对PPT的相容性如何呢？ ICC 可以支持 WPS，但目前無法同時支持 MSOffice 和 WPS。若要啟用 WPS 支持，請確保 WPS 是否在 “配置工具” 中開啟了 “WPS Office 相容第三方系統和軟體” 選項，該項目勾選並應用後，將無法檢測到 MS Office 的COM接口。 @@ -71,28 +54,12 @@ ICC 可以支持 WPS，但目前無法同時支持 MSOffice 和 WPS。若要啟 若要將 ICC 配合 WPS 使用，可打開“WPS 示範”後，前往“文件” - “選項” ，取消勾選“單螢幕幻燈片放映時，顯示放映工具欄”該項，獲得更好的體驗。若要將 ICC 配合 MS Office 使用，可以打開 Powerpoint，前往“選項” ，“高級”，取消勾選“顯示快捷工具欄”，獲得更好的體驗。 ### **安裝後**程序無法正常啟動？ -請檢查你的電腦上是否安裝了 `.Net Framework 4.7.2` 或更高版本。若沒有，請前往官網下載 +請檢查你的電腦上是否安裝了 `.Net Framework 4.7.2` 或更高版本。若沒有，請前往官網下載。 + +如果程序在啓動後黑屏閃退，請打開“事件查看器”搜尋有關 InkCanvasForClass 的錯誤信息並上報給開發者（可以在 GitHub 上提交 Issue，或者和開發者單獨溝通） > 遇到各種奇葩逗比問題請重啟應用程式，如果不行請反饋給Dev解決！ ## 如何聯繫我 1. QQ群聊：825759306 -2. Telegram頻道：@InkCanvasForClass - -## 特別鳴謝 - - - - - - - - - -
HelloWRC
ChangSakura		Doctor-yoi
WXRIW		姜胤
Alan-CRL
\ No newline at end of file +2. Telegram頻道：@InkCanvasForClass \ No newline at end of file