diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 1ff0c42..0000000 --- a/.gitattributes +++ /dev/null @@ -1,63 +0,0 @@ -############################################################################### -# Set default behavior to automatically normalize line endings. -############################################################################### -* text=auto - -############################################################################### -# Set default behavior for command prompt diff. -# -# This is need for earlier builds of msysgit that does not have it on by -# default for csharp files. -# Note: This is only used by command line -############################################################################### -#*.cs diff=csharp - -############################################################################### -# Set the merge driver for project and solution files -# -# Merging from the command prompt will add diff markers to the files if there -# are conflicts (Merging from VS is not affected by the settings below, in VS -# the diff markers are never inserted). Diff markers may cause the following -# file extensions to fail to load in VS. An alternative would be to treat -# these files as binary and thus will always conflict and require user -# intervention with every merge. To do so, just uncomment the entries below -############################################################################### -#*.sln merge=binary -#*.csproj merge=binary -#*.vbproj merge=binary -#*.vcxproj merge=binary -#*.vcproj merge=binary -#*.dbproj merge=binary -#*.fsproj merge=binary -#*.lsproj merge=binary -#*.wixproj merge=binary -#*.modelproj merge=binary -#*.sqlproj merge=binary -#*.wwaproj merge=binary - -############################################################################### -# behavior for image files -# -# image files are treated as binary by default. -############################################################################### -#*.jpg binary -#*.png binary -#*.gif binary - -############################################################################### -# diff behavior for common document formats -# -# Convert binary document formats to text before diffing them. This feature -# is only available from the command line. Turn it on by uncommenting the -# entries below. -############################################################################### -#*.doc diff=astextplain -#*.DOC diff=astextplain -#*.docx diff=astextplain -#*.DOCX diff=astextplain -#*.dot diff=astextplain -#*.DOT diff=astextplain -#*.pdf diff=astextplain -#*.PDF diff=astextplain -#*.rtf diff=astextplain -#*.RTF diff=astextplain diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..27d4f74 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,22 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: bug +assignees: '' + +--- + +## Description + + +## Reproduction + + +## Expected behavior + + +## Screenshots + + +## Additional context diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..f909f8a --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,10 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: enhancement +assignees: '' + +--- + +## Description diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d33dcdf..fe3e96e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,9 +2,9 @@ name: .NET Build on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] jobs: @@ -63,17 +63,17 @@ jobs: - name: Upload to artifact uses: actions/upload-artifact@main with: - name: Ink-Canvas - path: Ink Canvas/bin/Release + name: Ink Canvas Annotation + path: Ink-Canvas-For-Annotation/bin/Release - name: Upload to artifact (x64) uses: actions/upload-artifact@main with: - name: Ink-Canvas-x64 - path: Ink Canvas/bin/x64/Release + name: Ink Canvas Annotation-x64 + path: Ink-Canvas-For-Annotation/bin/x64/Release - name: Upload to artifact (ARM64) uses: actions/upload-artifact@main with: - name: Ink-Canvas-ARM64 - path: Ink Canvas/bin/ARM64/Release + name: Ink Canvas Annotation-ARM64 + path: Ink-Canvas-For-Annotation/bin/ARM64/Release diff --git a/.gitignore b/.gitignore index 4845444..cdf3a4f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,349 +1,3 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore - -# Other Projects -Other Projects/ - -# History Versions -History Versions/ - -#Installer -Installer/ - -# User-specific files -*.rsuser -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -[Aa][Rr][Mm]/ -[Aa][Rr][Mm]64/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_h.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*_wpftmp.csproj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!?*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser -*- Backup*.rdl - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# JetBrains Rider -.idea/ -*.sln.iml - -# CodeRush personal settings -.cr/personal - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -# Local History for Visual Studio -.localhistory/ - -# BeatPulse healthcheck temp database -healthchecksdb \ No newline at end of file +/Ink Canvas/obj +/Ink Canvas/bin +/.vs \ No newline at end of file diff --git a/AutomaticUpdateVersionControl.txt b/AutomaticUpdateVersionControl.txt new file mode 100644 index 0000000..64b5ae3 --- /dev/null +++ b/AutomaticUpdateVersionControl.txt @@ -0,0 +1 @@ +4.4.0 \ No newline at end of file diff --git a/Images/Ink-Canvas-For-Annotation Blackboard Screenshot.png b/Images/Ink-Canvas-For-Annotation Blackboard Screenshot.png new file mode 100644 index 0000000..15d9c34 Binary files /dev/null and b/Images/Ink-Canvas-For-Annotation Blackboard Screenshot.png differ diff --git a/Images/Ink-Canvas-For-Annotation Screenshot.png b/Images/Ink-Canvas-For-Annotation Screenshot.png new file mode 100644 index 0000000..cfb3240 Binary files /dev/null and b/Images/Ink-Canvas-For-Annotation Screenshot.png differ diff --git a/Ink Canvas Packaging/Images/LargeTile.scale-100.png b/Ink Canvas Packaging/Images/LargeTile.scale-100.png deleted file mode 100644 index 57d92cd..0000000 Binary files a/Ink Canvas Packaging/Images/LargeTile.scale-100.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/LargeTile.scale-125.png b/Ink Canvas Packaging/Images/LargeTile.scale-125.png deleted file mode 100644 index 3705e67..0000000 Binary files a/Ink Canvas Packaging/Images/LargeTile.scale-125.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/LargeTile.scale-150.png b/Ink Canvas Packaging/Images/LargeTile.scale-150.png deleted file mode 100644 index 3ae5181..0000000 Binary files a/Ink Canvas Packaging/Images/LargeTile.scale-150.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/LargeTile.scale-200.png b/Ink Canvas Packaging/Images/LargeTile.scale-200.png deleted file mode 100644 index 3eb0077..0000000 Binary files a/Ink Canvas Packaging/Images/LargeTile.scale-200.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/LargeTile.scale-400.png b/Ink Canvas Packaging/Images/LargeTile.scale-400.png deleted file mode 100644 index e00992f..0000000 Binary files a/Ink Canvas Packaging/Images/LargeTile.scale-400.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/LockScreenLogo.scale-200.png b/Ink Canvas Packaging/Images/LockScreenLogo.scale-200.png deleted file mode 100644 index 735f57a..0000000 Binary files a/Ink Canvas Packaging/Images/LockScreenLogo.scale-200.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/SmallTile.scale-100.png b/Ink Canvas Packaging/Images/SmallTile.scale-100.png deleted file mode 100644 index f242004..0000000 Binary files a/Ink Canvas Packaging/Images/SmallTile.scale-100.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/SmallTile.scale-125.png b/Ink Canvas Packaging/Images/SmallTile.scale-125.png deleted file mode 100644 index 7d6bbb5..0000000 Binary files a/Ink Canvas Packaging/Images/SmallTile.scale-125.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/SmallTile.scale-150.png b/Ink Canvas Packaging/Images/SmallTile.scale-150.png deleted file mode 100644 index b406d99..0000000 Binary files a/Ink Canvas Packaging/Images/SmallTile.scale-150.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/SmallTile.scale-200.png b/Ink Canvas Packaging/Images/SmallTile.scale-200.png deleted file mode 100644 index 33e46b0..0000000 Binary files a/Ink Canvas Packaging/Images/SmallTile.scale-200.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/SmallTile.scale-400.png b/Ink Canvas Packaging/Images/SmallTile.scale-400.png deleted file mode 100644 index 03b79df..0000000 Binary files a/Ink Canvas Packaging/Images/SmallTile.scale-400.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/SplashScreen.scale-100.png b/Ink Canvas Packaging/Images/SplashScreen.scale-100.png deleted file mode 100644 index a809f16..0000000 Binary files a/Ink Canvas Packaging/Images/SplashScreen.scale-100.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/SplashScreen.scale-125.png b/Ink Canvas Packaging/Images/SplashScreen.scale-125.png deleted file mode 100644 index da79e2d..0000000 Binary files a/Ink Canvas Packaging/Images/SplashScreen.scale-125.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/SplashScreen.scale-150.png b/Ink Canvas Packaging/Images/SplashScreen.scale-150.png deleted file mode 100644 index 2e9431c..0000000 Binary files a/Ink Canvas Packaging/Images/SplashScreen.scale-150.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/SplashScreen.scale-200.png b/Ink Canvas Packaging/Images/SplashScreen.scale-200.png deleted file mode 100644 index c9e444f..0000000 Binary files a/Ink Canvas Packaging/Images/SplashScreen.scale-200.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/SplashScreen.scale-400.png b/Ink Canvas Packaging/Images/SplashScreen.scale-400.png deleted file mode 100644 index 71d8715..0000000 Binary files a/Ink Canvas Packaging/Images/SplashScreen.scale-400.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/Square150x150Logo.scale-100.png b/Ink Canvas Packaging/Images/Square150x150Logo.scale-100.png deleted file mode 100644 index d1befe5..0000000 Binary files a/Ink Canvas Packaging/Images/Square150x150Logo.scale-100.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/Square150x150Logo.scale-125.png b/Ink Canvas Packaging/Images/Square150x150Logo.scale-125.png deleted file mode 100644 index 017c322..0000000 Binary files a/Ink Canvas Packaging/Images/Square150x150Logo.scale-125.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/Square150x150Logo.scale-150.png b/Ink Canvas Packaging/Images/Square150x150Logo.scale-150.png deleted file mode 100644 index 3612ecb..0000000 Binary files a/Ink Canvas Packaging/Images/Square150x150Logo.scale-150.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/Square150x150Logo.scale-200.png b/Ink Canvas Packaging/Images/Square150x150Logo.scale-200.png deleted file mode 100644 index 1ec211b..0000000 Binary files a/Ink Canvas Packaging/Images/Square150x150Logo.scale-200.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/Square150x150Logo.scale-400.png b/Ink Canvas Packaging/Images/Square150x150Logo.scale-400.png deleted file mode 100644 index e487e12..0000000 Binary files a/Ink Canvas Packaging/Images/Square150x150Logo.scale-400.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-16.png b/Ink Canvas Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-16.png deleted file mode 100644 index c0ebe6d..0000000 Binary files a/Ink Canvas Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-16.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-24.png b/Ink Canvas Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-24.png deleted file mode 100644 index 3d6050f..0000000 Binary files a/Ink Canvas Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-24.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-256.png b/Ink Canvas Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-256.png deleted file mode 100644 index 1639d1d..0000000 Binary files a/Ink Canvas Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-256.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-32.png b/Ink Canvas Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-32.png deleted file mode 100644 index 56b8d64..0000000 Binary files a/Ink Canvas Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-32.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-48.png b/Ink Canvas Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-48.png deleted file mode 100644 index 57d5536..0000000 Binary files a/Ink Canvas Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-48.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/Square44x44Logo.altform-unplated_targetsize-16.png b/Ink Canvas Packaging/Images/Square44x44Logo.altform-unplated_targetsize-16.png deleted file mode 100644 index c0ebe6d..0000000 Binary files a/Ink Canvas Packaging/Images/Square44x44Logo.altform-unplated_targetsize-16.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/Square44x44Logo.altform-unplated_targetsize-256.png b/Ink Canvas Packaging/Images/Square44x44Logo.altform-unplated_targetsize-256.png deleted file mode 100644 index 1639d1d..0000000 Binary files a/Ink Canvas Packaging/Images/Square44x44Logo.altform-unplated_targetsize-256.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/Square44x44Logo.altform-unplated_targetsize-32.png b/Ink Canvas Packaging/Images/Square44x44Logo.altform-unplated_targetsize-32.png deleted file mode 100644 index 56b8d64..0000000 Binary files a/Ink Canvas Packaging/Images/Square44x44Logo.altform-unplated_targetsize-32.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/Square44x44Logo.altform-unplated_targetsize-48.png b/Ink Canvas Packaging/Images/Square44x44Logo.altform-unplated_targetsize-48.png deleted file mode 100644 index 57d5536..0000000 Binary files a/Ink Canvas Packaging/Images/Square44x44Logo.altform-unplated_targetsize-48.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/Square44x44Logo.scale-100.png b/Ink Canvas Packaging/Images/Square44x44Logo.scale-100.png deleted file mode 100644 index a5ccbe9..0000000 Binary files a/Ink Canvas Packaging/Images/Square44x44Logo.scale-100.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/Square44x44Logo.scale-125.png b/Ink Canvas Packaging/Images/Square44x44Logo.scale-125.png deleted file mode 100644 index d03c17f..0000000 Binary files a/Ink Canvas Packaging/Images/Square44x44Logo.scale-125.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/Square44x44Logo.scale-150.png b/Ink Canvas Packaging/Images/Square44x44Logo.scale-150.png deleted file mode 100644 index dda9b07..0000000 Binary files a/Ink Canvas Packaging/Images/Square44x44Logo.scale-150.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/Square44x44Logo.scale-200.png b/Ink Canvas Packaging/Images/Square44x44Logo.scale-200.png deleted file mode 100644 index 74e3e99..0000000 Binary files a/Ink Canvas Packaging/Images/Square44x44Logo.scale-200.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/Square44x44Logo.scale-400.png b/Ink Canvas Packaging/Images/Square44x44Logo.scale-400.png deleted file mode 100644 index fd8ebbf..0000000 Binary files a/Ink Canvas Packaging/Images/Square44x44Logo.scale-400.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/Square44x44Logo.targetsize-16.png b/Ink Canvas Packaging/Images/Square44x44Logo.targetsize-16.png deleted file mode 100644 index 067a3f4..0000000 Binary files a/Ink Canvas Packaging/Images/Square44x44Logo.targetsize-16.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/Square44x44Logo.targetsize-24.png b/Ink Canvas Packaging/Images/Square44x44Logo.targetsize-24.png deleted file mode 100644 index b6e339d..0000000 Binary files a/Ink Canvas Packaging/Images/Square44x44Logo.targetsize-24.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/Square44x44Logo.targetsize-24_altform-unplated.png b/Ink Canvas Packaging/Images/Square44x44Logo.targetsize-24_altform-unplated.png deleted file mode 100644 index 3d6050f..0000000 Binary files a/Ink Canvas Packaging/Images/Square44x44Logo.targetsize-24_altform-unplated.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/Square44x44Logo.targetsize-256.png b/Ink Canvas Packaging/Images/Square44x44Logo.targetsize-256.png deleted file mode 100644 index 915659f..0000000 Binary files a/Ink Canvas Packaging/Images/Square44x44Logo.targetsize-256.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/Square44x44Logo.targetsize-32.png b/Ink Canvas Packaging/Images/Square44x44Logo.targetsize-32.png deleted file mode 100644 index 914b81f..0000000 Binary files a/Ink Canvas Packaging/Images/Square44x44Logo.targetsize-32.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/Square44x44Logo.targetsize-48.png b/Ink Canvas Packaging/Images/Square44x44Logo.targetsize-48.png deleted file mode 100644 index 678c128..0000000 Binary files a/Ink Canvas Packaging/Images/Square44x44Logo.targetsize-48.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/StoreLogo.backup.png b/Ink Canvas Packaging/Images/StoreLogo.backup.png deleted file mode 100644 index 7385b56..0000000 Binary files a/Ink Canvas Packaging/Images/StoreLogo.backup.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/StoreLogo.scale-100.png b/Ink Canvas Packaging/Images/StoreLogo.scale-100.png deleted file mode 100644 index 83a5696..0000000 Binary files a/Ink Canvas Packaging/Images/StoreLogo.scale-100.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/StoreLogo.scale-125.png b/Ink Canvas Packaging/Images/StoreLogo.scale-125.png deleted file mode 100644 index 9a897e3..0000000 Binary files a/Ink Canvas Packaging/Images/StoreLogo.scale-125.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/StoreLogo.scale-150.png b/Ink Canvas Packaging/Images/StoreLogo.scale-150.png deleted file mode 100644 index 99b5669..0000000 Binary files a/Ink Canvas Packaging/Images/StoreLogo.scale-150.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/StoreLogo.scale-200.png b/Ink Canvas Packaging/Images/StoreLogo.scale-200.png deleted file mode 100644 index 0e6b83c..0000000 Binary files a/Ink Canvas Packaging/Images/StoreLogo.scale-200.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/StoreLogo.scale-400.png b/Ink Canvas Packaging/Images/StoreLogo.scale-400.png deleted file mode 100644 index 38c9d2f..0000000 Binary files a/Ink Canvas Packaging/Images/StoreLogo.scale-400.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/Wide310x150Logo.scale-100.png b/Ink Canvas Packaging/Images/Wide310x150Logo.scale-100.png deleted file mode 100644 index d1ce1f2..0000000 Binary files a/Ink Canvas Packaging/Images/Wide310x150Logo.scale-100.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/Wide310x150Logo.scale-125.png b/Ink Canvas Packaging/Images/Wide310x150Logo.scale-125.png deleted file mode 100644 index d80c5ea..0000000 Binary files a/Ink Canvas Packaging/Images/Wide310x150Logo.scale-125.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/Wide310x150Logo.scale-150.png b/Ink Canvas Packaging/Images/Wide310x150Logo.scale-150.png deleted file mode 100644 index 749bc3c..0000000 Binary files a/Ink Canvas Packaging/Images/Wide310x150Logo.scale-150.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/Wide310x150Logo.scale-200.png b/Ink Canvas Packaging/Images/Wide310x150Logo.scale-200.png deleted file mode 100644 index a809f16..0000000 Binary files a/Ink Canvas Packaging/Images/Wide310x150Logo.scale-200.png and /dev/null differ diff --git a/Ink Canvas Packaging/Images/Wide310x150Logo.scale-400.png b/Ink Canvas Packaging/Images/Wide310x150Logo.scale-400.png deleted file mode 100644 index c9e444f..0000000 Binary files a/Ink Canvas Packaging/Images/Wide310x150Logo.scale-400.png and /dev/null differ diff --git a/Ink Canvas Packaging/Ink Canvas Packaging.wapproj b/Ink Canvas Packaging/Ink Canvas Packaging.wapproj deleted file mode 100644 index 7ffbd19..0000000 --- a/Ink Canvas Packaging/Ink Canvas Packaging.wapproj +++ /dev/null @@ -1,176 +0,0 @@ - - - - 15.0 - - - - Debug - x86 - - - Release - x86 - - - Debug - x64 - - - Release - x64 - - - Debug - ARM - - - Release - ARM - - - Debug - ARM64 - - - Release - ARM64 - - - Debug - AnyCPU - - - Release - AnyCPU - - - - $(MSBuildExtensionsPath)\Microsoft\DesktopBridge\ - - - - 225ef170-60e5-471a-86ea-bdca1e6e1a97 - 10.0.22621.0 - 10.0.14393.0 - en-US - True - $(NoWarn);NU1702 - False - 057530C6878434072B55038A689D18EEF5E50F04 - SHA256 - False - True - neutral - 0 - ..\Ink Canvas\Ink Canvas.csproj - True - - - Always - zh-cn - - - Always - zh-cn - - - Always - zh-cn - - - Always - zh-cn - - - Always - zh-cn - - - Always - zh-cn - - - Always - zh-cn - - - Always - zh-cn - - - Always - zh-cn - - - Always - zh-cn - - - - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Ink Canvas Packaging/Package.appxmanifest b/Ink Canvas Packaging/Package.appxmanifest deleted file mode 100644 index f59e2f9..0000000 --- a/Ink Canvas Packaging/Package.appxmanifest +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - Ink Canvas - WXRIW - Images\StoreLogo.png - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Ink Canvas for ARM Packaging/Images/LargeTile.scale-100.png b/Ink Canvas for ARM Packaging/Images/LargeTile.scale-100.png deleted file mode 100644 index 57d92cd..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/LargeTile.scale-100.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/LargeTile.scale-125.png b/Ink Canvas for ARM Packaging/Images/LargeTile.scale-125.png deleted file mode 100644 index 3705e67..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/LargeTile.scale-125.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/LargeTile.scale-150.png b/Ink Canvas for ARM Packaging/Images/LargeTile.scale-150.png deleted file mode 100644 index 3ae5181..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/LargeTile.scale-150.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/LargeTile.scale-200.png b/Ink Canvas for ARM Packaging/Images/LargeTile.scale-200.png deleted file mode 100644 index 3eb0077..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/LargeTile.scale-200.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/LargeTile.scale-400.png b/Ink Canvas for ARM Packaging/Images/LargeTile.scale-400.png deleted file mode 100644 index e00992f..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/LargeTile.scale-400.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/LockScreenLogo.scale-200.png b/Ink Canvas for ARM Packaging/Images/LockScreenLogo.scale-200.png deleted file mode 100644 index 735f57a..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/LockScreenLogo.scale-200.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/SmallTile.scale-100.png b/Ink Canvas for ARM Packaging/Images/SmallTile.scale-100.png deleted file mode 100644 index f242004..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/SmallTile.scale-100.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/SmallTile.scale-125.png b/Ink Canvas for ARM Packaging/Images/SmallTile.scale-125.png deleted file mode 100644 index 7d6bbb5..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/SmallTile.scale-125.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/SmallTile.scale-150.png b/Ink Canvas for ARM Packaging/Images/SmallTile.scale-150.png deleted file mode 100644 index b406d99..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/SmallTile.scale-150.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/SmallTile.scale-200.png b/Ink Canvas for ARM Packaging/Images/SmallTile.scale-200.png deleted file mode 100644 index 33e46b0..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/SmallTile.scale-200.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/SmallTile.scale-400.png b/Ink Canvas for ARM Packaging/Images/SmallTile.scale-400.png deleted file mode 100644 index 03b79df..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/SmallTile.scale-400.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/SplashScreen.scale-100.png b/Ink Canvas for ARM Packaging/Images/SplashScreen.scale-100.png deleted file mode 100644 index a809f16..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/SplashScreen.scale-100.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/SplashScreen.scale-125.png b/Ink Canvas for ARM Packaging/Images/SplashScreen.scale-125.png deleted file mode 100644 index da79e2d..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/SplashScreen.scale-125.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/SplashScreen.scale-150.png b/Ink Canvas for ARM Packaging/Images/SplashScreen.scale-150.png deleted file mode 100644 index 2e9431c..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/SplashScreen.scale-150.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/SplashScreen.scale-200.png b/Ink Canvas for ARM Packaging/Images/SplashScreen.scale-200.png deleted file mode 100644 index c9e444f..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/SplashScreen.scale-200.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/SplashScreen.scale-400.png b/Ink Canvas for ARM Packaging/Images/SplashScreen.scale-400.png deleted file mode 100644 index 71d8715..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/SplashScreen.scale-400.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/Square150x150Logo.scale-100.png b/Ink Canvas for ARM Packaging/Images/Square150x150Logo.scale-100.png deleted file mode 100644 index d1befe5..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/Square150x150Logo.scale-100.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/Square150x150Logo.scale-125.png b/Ink Canvas for ARM Packaging/Images/Square150x150Logo.scale-125.png deleted file mode 100644 index 017c322..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/Square150x150Logo.scale-125.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/Square150x150Logo.scale-150.png b/Ink Canvas for ARM Packaging/Images/Square150x150Logo.scale-150.png deleted file mode 100644 index 3612ecb..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/Square150x150Logo.scale-150.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/Square150x150Logo.scale-200.png b/Ink Canvas for ARM Packaging/Images/Square150x150Logo.scale-200.png deleted file mode 100644 index 1ec211b..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/Square150x150Logo.scale-200.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/Square150x150Logo.scale-400.png b/Ink Canvas for ARM Packaging/Images/Square150x150Logo.scale-400.png deleted file mode 100644 index e487e12..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/Square150x150Logo.scale-400.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-16.png b/Ink Canvas for ARM Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-16.png deleted file mode 100644 index c0ebe6d..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-16.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-24.png b/Ink Canvas for ARM Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-24.png deleted file mode 100644 index 3d6050f..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-24.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-256.png b/Ink Canvas for ARM Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-256.png deleted file mode 100644 index 1639d1d..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-256.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-32.png b/Ink Canvas for ARM Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-32.png deleted file mode 100644 index 56b8d64..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-32.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-48.png b/Ink Canvas for ARM Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-48.png deleted file mode 100644 index 57d5536..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-48.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.altform-unplated_targetsize-16.png b/Ink Canvas for ARM Packaging/Images/Square44x44Logo.altform-unplated_targetsize-16.png deleted file mode 100644 index c0ebe6d..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.altform-unplated_targetsize-16.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.altform-unplated_targetsize-256.png b/Ink Canvas for ARM Packaging/Images/Square44x44Logo.altform-unplated_targetsize-256.png deleted file mode 100644 index 1639d1d..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.altform-unplated_targetsize-256.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.altform-unplated_targetsize-32.png b/Ink Canvas for ARM Packaging/Images/Square44x44Logo.altform-unplated_targetsize-32.png deleted file mode 100644 index 56b8d64..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.altform-unplated_targetsize-32.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.altform-unplated_targetsize-48.png b/Ink Canvas for ARM Packaging/Images/Square44x44Logo.altform-unplated_targetsize-48.png deleted file mode 100644 index 57d5536..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.altform-unplated_targetsize-48.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.scale-100.png b/Ink Canvas for ARM Packaging/Images/Square44x44Logo.scale-100.png deleted file mode 100644 index a5ccbe9..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.scale-100.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.scale-125.png b/Ink Canvas for ARM Packaging/Images/Square44x44Logo.scale-125.png deleted file mode 100644 index d03c17f..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.scale-125.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.scale-150.png b/Ink Canvas for ARM Packaging/Images/Square44x44Logo.scale-150.png deleted file mode 100644 index dda9b07..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.scale-150.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.scale-200.png b/Ink Canvas for ARM Packaging/Images/Square44x44Logo.scale-200.png deleted file mode 100644 index 74e3e99..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.scale-200.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.scale-400.png b/Ink Canvas for ARM Packaging/Images/Square44x44Logo.scale-400.png deleted file mode 100644 index fd8ebbf..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.scale-400.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.targetsize-16.png b/Ink Canvas for ARM Packaging/Images/Square44x44Logo.targetsize-16.png deleted file mode 100644 index 067a3f4..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.targetsize-16.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.targetsize-24.png b/Ink Canvas for ARM Packaging/Images/Square44x44Logo.targetsize-24.png deleted file mode 100644 index b6e339d..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.targetsize-24.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.targetsize-24_altform-unplated.png b/Ink Canvas for ARM Packaging/Images/Square44x44Logo.targetsize-24_altform-unplated.png deleted file mode 100644 index 3d6050f..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.targetsize-24_altform-unplated.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.targetsize-256.png b/Ink Canvas for ARM Packaging/Images/Square44x44Logo.targetsize-256.png deleted file mode 100644 index 915659f..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.targetsize-256.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.targetsize-32.png b/Ink Canvas for ARM Packaging/Images/Square44x44Logo.targetsize-32.png deleted file mode 100644 index 914b81f..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.targetsize-32.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.targetsize-48.png b/Ink Canvas for ARM Packaging/Images/Square44x44Logo.targetsize-48.png deleted file mode 100644 index 678c128..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/Square44x44Logo.targetsize-48.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/StoreLogo.backup.png b/Ink Canvas for ARM Packaging/Images/StoreLogo.backup.png deleted file mode 100644 index 7385b56..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/StoreLogo.backup.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/StoreLogo.scale-100.png b/Ink Canvas for ARM Packaging/Images/StoreLogo.scale-100.png deleted file mode 100644 index 83a5696..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/StoreLogo.scale-100.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/StoreLogo.scale-125.png b/Ink Canvas for ARM Packaging/Images/StoreLogo.scale-125.png deleted file mode 100644 index 9a897e3..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/StoreLogo.scale-125.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/StoreLogo.scale-150.png b/Ink Canvas for ARM Packaging/Images/StoreLogo.scale-150.png deleted file mode 100644 index 99b5669..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/StoreLogo.scale-150.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/StoreLogo.scale-200.png b/Ink Canvas for ARM Packaging/Images/StoreLogo.scale-200.png deleted file mode 100644 index 0e6b83c..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/StoreLogo.scale-200.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/StoreLogo.scale-400.png b/Ink Canvas for ARM Packaging/Images/StoreLogo.scale-400.png deleted file mode 100644 index 38c9d2f..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/StoreLogo.scale-400.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/Wide310x150Logo.scale-100.png b/Ink Canvas for ARM Packaging/Images/Wide310x150Logo.scale-100.png deleted file mode 100644 index d1ce1f2..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/Wide310x150Logo.scale-100.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/Wide310x150Logo.scale-125.png b/Ink Canvas for ARM Packaging/Images/Wide310x150Logo.scale-125.png deleted file mode 100644 index d80c5ea..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/Wide310x150Logo.scale-125.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/Wide310x150Logo.scale-150.png b/Ink Canvas for ARM Packaging/Images/Wide310x150Logo.scale-150.png deleted file mode 100644 index 749bc3c..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/Wide310x150Logo.scale-150.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/Wide310x150Logo.scale-200.png b/Ink Canvas for ARM Packaging/Images/Wide310x150Logo.scale-200.png deleted file mode 100644 index a809f16..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/Wide310x150Logo.scale-200.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Images/Wide310x150Logo.scale-400.png b/Ink Canvas for ARM Packaging/Images/Wide310x150Logo.scale-400.png deleted file mode 100644 index c9e444f..0000000 Binary files a/Ink Canvas for ARM Packaging/Images/Wide310x150Logo.scale-400.png and /dev/null differ diff --git a/Ink Canvas for ARM Packaging/Ink Canvas for ARM Packaging.wapproj b/Ink Canvas for ARM Packaging/Ink Canvas for ARM Packaging.wapproj deleted file mode 100644 index 5d43db9..0000000 --- a/Ink Canvas for ARM Packaging/Ink Canvas for ARM Packaging.wapproj +++ /dev/null @@ -1,173 +0,0 @@ - - - - 15.0 - - - - Debug - x86 - - - Release - x86 - - - Debug - x64 - - - Release - x64 - - - Debug - ARM - - - Release - ARM - - - Debug - ARM64 - - - Release - ARM64 - - - Debug - AnyCPU - - - Release - AnyCPU - - - - $(MSBuildExtensionsPath)\Microsoft\DesktopBridge\ - - - - c3f9b481-9ff7-4443-af1e-ee7758843089 - 10.0.22621.0 - 10.0.14393.0 - en-US - false - $(NoWarn);NU1702 - True - False - False - False - arm64 - 0 - ..\Ink Canvas\Ink Canvas.csproj - - - zh-cn - Always - - - zh-cn - Always - - - zh-cn - Always - - - zh-cn - Always - - - zh-cn - Always - - - zh-cn - Always - - - zh-cn - Always - - - zh-cn - Always - - - zh-cn - Always - - - zh-cn - Always - - - - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Ink Canvas for ARM Packaging/Package.appxmanifest b/Ink Canvas for ARM Packaging/Package.appxmanifest deleted file mode 100644 index 6672e88..0000000 --- a/Ink Canvas for ARM Packaging/Package.appxmanifest +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - Ink Canvas for ARM - WXRIW - Images\StoreLogo.png - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Ink Canvas.sln b/Ink Canvas.sln index a58eed1..4c84bc7 100644 --- a/Ink Canvas.sln +++ b/Ink Canvas.sln @@ -5,10 +5,6 @@ VisualStudioVersion = 17.5.33530.505 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ink Canvas", "Ink Canvas\Ink Canvas.csproj", "{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}" EndProject -Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "Ink Canvas Packaging", "Ink Canvas Packaging\Ink Canvas Packaging.wapproj", "{225EF170-60E5-471A-86EA-BDCA1E6E1A97}" -EndProject -Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "Ink Canvas for ARM Packaging", "Ink Canvas for ARM Packaging\Ink Canvas for ARM Packaging.wapproj", "{C3F9B481-9FF7-4443-AF1E-EE7758843089}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -43,66 +39,6 @@ Global {8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|x64.Build.0 = Release|x64 {8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|x86.ActiveCfg = Release|x86 {8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|x86.Build.0 = Release|x86 - {225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Debug|Any CPU.Build.0 = Debug|Any CPU - {225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Debug|ARM.ActiveCfg = Debug|ARM - {225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Debug|ARM.Build.0 = Debug|ARM - {225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Debug|ARM.Deploy.0 = Debug|ARM - {225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Debug|ARM64.Build.0 = Debug|ARM64 - {225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Debug|ARM64.Deploy.0 = Debug|ARM64 - {225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Debug|x64.ActiveCfg = Debug|x64 - {225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Debug|x64.Build.0 = Debug|x64 - {225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Debug|x64.Deploy.0 = Debug|x64 - {225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Debug|x86.ActiveCfg = Debug|x86 - {225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Debug|x86.Build.0 = Debug|x86 - {225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Debug|x86.Deploy.0 = Debug|x86 - {225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Release|Any CPU.ActiveCfg = Release|Any CPU - {225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Release|Any CPU.Build.0 = Release|Any CPU - {225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Release|Any CPU.Deploy.0 = Release|Any CPU - {225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Release|ARM.ActiveCfg = Release|ARM - {225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Release|ARM.Build.0 = Release|ARM - {225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Release|ARM.Deploy.0 = Release|ARM - {225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Release|ARM64.ActiveCfg = Release|ARM64 - {225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Release|ARM64.Build.0 = Release|ARM64 - {225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Release|ARM64.Deploy.0 = Release|ARM64 - {225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Release|x64.ActiveCfg = Release|x64 - {225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Release|x64.Build.0 = Release|x64 - {225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Release|x64.Deploy.0 = Release|x64 - {225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Release|x86.ActiveCfg = Release|x86 - {225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Release|x86.Build.0 = Release|x86 - {225EF170-60E5-471A-86EA-BDCA1E6E1A97}.Release|x86.Deploy.0 = Release|x86 - {C3F9B481-9FF7-4443-AF1E-EE7758843089}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C3F9B481-9FF7-4443-AF1E-EE7758843089}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C3F9B481-9FF7-4443-AF1E-EE7758843089}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {C3F9B481-9FF7-4443-AF1E-EE7758843089}.Debug|ARM.ActiveCfg = Debug|ARM - {C3F9B481-9FF7-4443-AF1E-EE7758843089}.Debug|ARM.Build.0 = Debug|ARM - {C3F9B481-9FF7-4443-AF1E-EE7758843089}.Debug|ARM.Deploy.0 = Debug|ARM - {C3F9B481-9FF7-4443-AF1E-EE7758843089}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {C3F9B481-9FF7-4443-AF1E-EE7758843089}.Debug|ARM64.Build.0 = Debug|ARM64 - {C3F9B481-9FF7-4443-AF1E-EE7758843089}.Debug|ARM64.Deploy.0 = Debug|ARM64 - {C3F9B481-9FF7-4443-AF1E-EE7758843089}.Debug|x64.ActiveCfg = Debug|x64 - {C3F9B481-9FF7-4443-AF1E-EE7758843089}.Debug|x64.Build.0 = Debug|x64 - {C3F9B481-9FF7-4443-AF1E-EE7758843089}.Debug|x64.Deploy.0 = Debug|x64 - {C3F9B481-9FF7-4443-AF1E-EE7758843089}.Debug|x86.ActiveCfg = Debug|x86 - {C3F9B481-9FF7-4443-AF1E-EE7758843089}.Debug|x86.Build.0 = Debug|x86 - {C3F9B481-9FF7-4443-AF1E-EE7758843089}.Debug|x86.Deploy.0 = Debug|x86 - {C3F9B481-9FF7-4443-AF1E-EE7758843089}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C3F9B481-9FF7-4443-AF1E-EE7758843089}.Release|Any CPU.Build.0 = Release|Any CPU - {C3F9B481-9FF7-4443-AF1E-EE7758843089}.Release|Any CPU.Deploy.0 = Release|Any CPU - {C3F9B481-9FF7-4443-AF1E-EE7758843089}.Release|ARM.ActiveCfg = Release|ARM - {C3F9B481-9FF7-4443-AF1E-EE7758843089}.Release|ARM.Build.0 = Release|ARM - {C3F9B481-9FF7-4443-AF1E-EE7758843089}.Release|ARM.Deploy.0 = Release|ARM - {C3F9B481-9FF7-4443-AF1E-EE7758843089}.Release|ARM64.ActiveCfg = Release|ARM64 - {C3F9B481-9FF7-4443-AF1E-EE7758843089}.Release|ARM64.Build.0 = Release|ARM64 - {C3F9B481-9FF7-4443-AF1E-EE7758843089}.Release|ARM64.Deploy.0 = Release|ARM64 - {C3F9B481-9FF7-4443-AF1E-EE7758843089}.Release|x64.ActiveCfg = Release|x64 - {C3F9B481-9FF7-4443-AF1E-EE7758843089}.Release|x64.Build.0 = Release|x64 - {C3F9B481-9FF7-4443-AF1E-EE7758843089}.Release|x64.Deploy.0 = Release|x64 - {C3F9B481-9FF7-4443-AF1E-EE7758843089}.Release|x86.ActiveCfg = Release|x86 - {C3F9B481-9FF7-4443-AF1E-EE7758843089}.Release|x86.Build.0 = Release|x86 - {C3F9B481-9FF7-4443-AF1E-EE7758843089}.Release|x86.Deploy.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Ink Canvas/App.xaml b/Ink Canvas/App.xaml index 270a08c..97a0d21 100644 --- a/Ink Canvas/App.xaml +++ b/Ink Canvas/App.xaml @@ -7,9 +7,7 @@ diff --git a/Ink Canvas/App.xaml.cs b/Ink Canvas/App.xaml.cs index 097ab68..b33fad3 100644 --- a/Ink Canvas/App.xaml.cs +++ b/Ink Canvas/App.xaml.cs @@ -1,5 +1,4 @@ -using AutoUpdaterDotNET; -using Ink_Canvas.Helpers; +using Ink_Canvas.Helpers; using System; using System.Linq; using System.Reflection; @@ -32,7 +31,7 @@ namespace Ink_Canvas void App_Startup(object sender, StartupEventArgs e) { - if (!StoreHelper.IsStoreApp) RootPath = AppDomain.CurrentDomain.SetupInformation.ApplicationBase; + /*if (!StoreHelper.IsStoreApp) */RootPath = AppDomain.CurrentDomain.SetupInformation.ApplicationBase; LogHelper.NewLog(string.Format("Ink Canvas Starting (Version: {0})", Assembly.GetExecutingAssembly().GetName().Version.ToString())); @@ -48,15 +47,6 @@ namespace Ink_Canvas } StartArgs = e.Args; - - if (!StoreHelper.IsStoreApp) - { - AutoUpdater.Start($"http://ink.wxriw.cn:1957/update"); - AutoUpdater.ApplicationExitEvent += () => - { - Environment.Exit(0); - }; - } } private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e) @@ -72,13 +62,9 @@ namespace Ink_Canvas SenderScrollViewer.ScrollToVerticalOffset(SenderScrollViewer.VerticalOffset - e.Delta * 10 * System.Windows.Forms.SystemInformation.MouseWheelScrollLines / (double)120); e.Handled = true; } - catch - { - } - } - catch - { + catch { } } + catch { } } } } diff --git a/Ink Canvas/Controls/ClickSensitiveGrid.xaml b/Ink Canvas/Controls/ClickSensitiveGrid.xaml deleted file mode 100644 index 20c6c41..0000000 --- a/Ink Canvas/Controls/ClickSensitiveGrid.xaml +++ /dev/null @@ -1,8 +0,0 @@ - - diff --git a/Ink Canvas/Controls/ClickSensitiveGrid.xaml.cs b/Ink Canvas/Controls/ClickSensitiveGrid.xaml.cs deleted file mode 100644 index 9c95ab8..0000000 --- a/Ink Canvas/Controls/ClickSensitiveGrid.xaml.cs +++ /dev/null @@ -1,47 +0,0 @@ -using System.Windows; -using System.Windows.Controls; -using System.Windows.Input; - -namespace Ink_Canvas -{ - /// - /// Interaction logic for ClickSensitiveGrid.xaml - /// - public partial class ClickSensitiveGrid : Grid - { - public ClickSensitiveGrid() - { - InitializeComponent(); - } - - public event RoutedEventHandler Click - { - add { AddHandler(ClickRoutedEvent, value); } - remove { RemoveHandler(ClickRoutedEvent, value); } - } - public static readonly RoutedEvent ClickRoutedEvent = EventManager.RegisterRoutedEvent("Click", RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(ClickSensitiveGrid)); - - bool isMouseDown = false; - - private void Grid_MouseDown(object sender, MouseButtonEventArgs e) - { - isMouseDown = true; - } - - private void Grid_MouseUp(object sender, MouseButtonEventArgs e) - { - if (isMouseDown) - { - try - { - RoutedEventArgs _e = new RoutedEventArgs(); - _e.RoutedEvent = ClickRoutedEvent; - _e.Source = this; - this.RaiseEvent(_e); - } - catch { } - } - isMouseDown = false; - } - } -} diff --git a/Ink Canvas/CountdownTimerWindow.xaml b/Ink Canvas/CountdownTimerWindow.xaml index 2a4f244..12c841d 100644 --- a/Ink Canvas/CountdownTimerWindow.xaml +++ b/Ink Canvas/CountdownTimerWindow.xaml @@ -170,21 +170,9 @@ - - - - - - - - - - - - - - - + + + diff --git a/Ink Canvas/CountdownTimerWindow.xaml.cs b/Ink Canvas/CountdownTimerWindow.xaml.cs index 72ceaa0..ed5755f 100644 --- a/Ink Canvas/CountdownTimerWindow.xaml.cs +++ b/Ink Canvas/CountdownTimerWindow.xaml.cs @@ -1,4 +1,5 @@ -using System; +using Ink_Canvas.Helpers; +using System; using System.Media; using System.Timers; using System.Windows; @@ -15,6 +16,7 @@ namespace Ink_Canvas public CountdownTimerWindow() { InitializeComponent(); + AnimationHelper.ShowWithSlideFromBottomAndFade(this, 0.25); timer.Elapsed += Timer_Elapsed; timer.Interval = 50; diff --git a/Ink Canvas/Helpers/AnimationHelper.cs b/Ink Canvas/Helpers/AnimationHelper.cs new file mode 100644 index 0000000..084a7d3 --- /dev/null +++ b/Ink Canvas/Helpers/AnimationHelper.cs @@ -0,0 +1,196 @@ +using System; +using System.Windows; +using System.Windows.Media; +using System.Windows.Media.Animation; + +namespace Ink_Canvas.Helpers +{ + internal class AnimationHelper + { + public static void ShowWithSlideFromBottomAndFade(UIElement element, double duration = 0.15) + { + if (element.Visibility == Visibility.Visible) return; + + if (element == null) + throw new ArgumentNullException(nameof(element)); + + var sb = new Storyboard(); + + // 渐变动画 + var fadeInAnimation = new DoubleAnimation + { + From = 0.5, + To = 1, + Duration = TimeSpan.FromSeconds(duration) + }; + Storyboard.SetTargetProperty(fadeInAnimation, new PropertyPath(UIElement.OpacityProperty)); + + // 滑动动画 + var slideAnimation = new DoubleAnimation + { + From = element.RenderTransform.Value.OffsetY + 10, // 滑动距离 + To = 0, + Duration = TimeSpan.FromSeconds(duration) + }; + Storyboard.SetTargetProperty(slideAnimation, new PropertyPath("(UIElement.RenderTransform).(TranslateTransform.Y)")); + + sb.Children.Add(fadeInAnimation); + sb.Children.Add(slideAnimation); + + element.Visibility = Visibility.Visible; + element.RenderTransform = new TranslateTransform(); + + sb.Begin((FrameworkElement)element); + } + + public static void ShowWithSlideFromLeftAndFade(UIElement element, double duration = 0.25) + { + if (element.Visibility == Visibility.Visible) return; + + if (element == null) + throw new ArgumentNullException(nameof(element)); + + var sb = new Storyboard(); + + // 渐变动画 + var fadeInAnimation = new DoubleAnimation + { + From = 0.5, + To = 1, + Duration = TimeSpan.FromSeconds(duration) + }; + Storyboard.SetTargetProperty(fadeInAnimation, new PropertyPath(UIElement.OpacityProperty)); + + // 滑动动画 + var slideAnimation = new DoubleAnimation + { + From = element.RenderTransform.Value.OffsetX - 20, // 滑动距离 + To = 0, + Duration = TimeSpan.FromSeconds(duration) + }; + Storyboard.SetTargetProperty(slideAnimation, new PropertyPath("(UIElement.RenderTransform).(TranslateTransform.X)")); + + sb.Children.Add(fadeInAnimation); + sb.Children.Add(slideAnimation); + + element.Visibility = Visibility.Visible; + element.RenderTransform = new TranslateTransform(); + + sb.Begin((FrameworkElement)element); + } + + public static void ShowWithScaleFromLeft(UIElement element, double duration = 0.5) + { + if (element.Visibility == Visibility.Visible) return; + + if (element == null) + throw new ArgumentNullException(nameof(element)); + + var sb = new Storyboard(); + + // 水平方向的缩放动画 + var scaleXAnimation = new DoubleAnimation + { + From = 0, + To = 1, + Duration = TimeSpan.FromSeconds(duration) + }; + Storyboard.SetTargetProperty(scaleXAnimation, new PropertyPath("(UIElement.RenderTransform).(ScaleTransform.ScaleX)")); + + // 垂直方向的缩放动画 + var scaleYAnimation = new DoubleAnimation + { + From = 0, + To = 1, + Duration = TimeSpan.FromSeconds(duration) + }; + Storyboard.SetTargetProperty(scaleYAnimation, new PropertyPath("(UIElement.RenderTransform).(ScaleTransform.ScaleY)")); + + sb.Children.Add(scaleXAnimation); + sb.Children.Add(scaleYAnimation); + + element.Visibility = Visibility.Visible; + element.RenderTransformOrigin = new Point(0, 0.5); // 左侧中心点为基准 + element.RenderTransform = new ScaleTransform(0, 0); + + sb.Begin((FrameworkElement)element); + } + + public static void ShowWithScaleFromRight(UIElement element, double duration = 0.5) + { + if (element.Visibility == Visibility.Visible) return; + + if (element == null) + throw new ArgumentNullException(nameof(element)); + + var sb = new Storyboard(); + + // 水平方向的缩放动画 + var scaleXAnimation = new DoubleAnimation + { + From = 0, + To = 1, + Duration = TimeSpan.FromSeconds(duration) + }; + Storyboard.SetTargetProperty(scaleXAnimation, new PropertyPath("(UIElement.RenderTransform).(ScaleTransform.ScaleX)")); + + // 垂直方向的缩放动画 + var scaleYAnimation = new DoubleAnimation + { + From = 0, + To = 1, + Duration = TimeSpan.FromSeconds(duration) + }; + Storyboard.SetTargetProperty(scaleYAnimation, new PropertyPath("(UIElement.RenderTransform).(ScaleTransform.ScaleY)")); + + sb.Children.Add(scaleXAnimation); + sb.Children.Add(scaleYAnimation); + + element.Visibility = Visibility.Visible; + element.RenderTransformOrigin = new Point(1, 0.5); // 右侧中心点为基准 + element.RenderTransform = new ScaleTransform(0, 0); + + sb.Begin((FrameworkElement)element); + } + + public static void HideWithSlideAndFade(UIElement element, double duration = 0.15) + { + if (element.Visibility == Visibility.Collapsed) return; + + if (element == null) + throw new ArgumentNullException(nameof(element)); + + var sb = new Storyboard(); + + // 渐变动画 + var fadeOutAnimation = new DoubleAnimation + { + From = 1, + To = 0, + Duration = TimeSpan.FromSeconds(duration) + }; + Storyboard.SetTargetProperty(fadeOutAnimation, new PropertyPath(UIElement.OpacityProperty)); + + // 滑动动画 + var slideAnimation = new DoubleAnimation + { + From = 0, + To = element.RenderTransform.Value.OffsetY + 10, // 滑动距离 + Duration = TimeSpan.FromSeconds(duration) + }; + Storyboard.SetTargetProperty(slideAnimation, new PropertyPath("(UIElement.RenderTransform).(TranslateTransform.Y)")); + + sb.Children.Add(fadeOutAnimation); + sb.Children.Add(slideAnimation); + + sb.Completed += (s, e) => + { + element.Visibility = Visibility.Collapsed; + }; + + element.RenderTransform = new TranslateTransform(); + sb.Begin((FrameworkElement)element); + } + + } +} diff --git a/Ink Canvas/Helpers/AutoUpdateHelper.cs b/Ink Canvas/Helpers/AutoUpdateHelper.cs new file mode 100644 index 0000000..bc1e1ba --- /dev/null +++ b/Ink Canvas/Helpers/AutoUpdateHelper.cs @@ -0,0 +1,258 @@ +using System; +using System.Diagnostics; +using System.IO; +using System.Net.Http; +using System.Threading.Tasks; +using System.Reflection; +using System.Windows; +using System.Collections.ObjectModel; +using System.Linq; +using System.Windows.Controls; + +namespace Ink_Canvas.Helpers +{ + internal class AutoUpdateHelper + { + public static async Task CheckForUpdates(string proxy = null) + { + try + { + string localVersion = Assembly.GetExecutingAssembly().GetName().Version.ToString(); + string remoteAddress = proxy; + remoteAddress += "https://raw.githubusercontent.com/ChangSakura/Ink-Canvas/main/AutomaticUpdateVersionControl.txt"; + string remoteVersion = await GetRemoteVersion(remoteAddress); + + if (remoteVersion != null) + { + Version local = new Version(localVersion); + Version remote = new Version(remoteVersion); + if (remote > local) + { + LogHelper.WriteLogToFile("AutoUpdate | New version Availble: " + remoteVersion); + return remoteVersion; + } + else return null; + } + else + { + LogHelper.WriteLogToFile("Failed to retrieve remote version.", LogHelper.LogType.Error); + return null; + } + } + catch (Exception ex) + { + Console.WriteLine($"AutoUpdate | Error: {ex.Message}"); + return null; + } + } + + public static async Task GetRemoteVersion(string fileUrl) + { + using (HttpClient client = new HttpClient()) + { + try + { + HttpResponseMessage response = await client.GetAsync(fileUrl); + response.EnsureSuccessStatusCode(); + + return await response.Content.ReadAsStringAsync(); + } + catch (HttpRequestException ex) + { + LogHelper.WriteLogToFile($"AutoUpdate | HTTP request error: {ex.Message}", LogHelper.LogType.Error); + } + catch (Exception ex) + { + LogHelper.WriteLogToFile($"AutoUpdate | Error: {ex.Message}", LogHelper.LogType.Error); + } + + return null; + } + } + + private static string updatesFolderPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Ink Canvas Annotation", "AutoUpdate"); + private static string statusFilePath = null; + + public static async Task DownloadSetupFileAndSaveStatus(string version, string proxy = "") + { + try + { + statusFilePath = Path.Combine(updatesFolderPath, $"DownloadV{version}Status.txt"); + + if (File.Exists(statusFilePath) && File.ReadAllText(statusFilePath).Trim().ToLower() == "true") + { + LogHelper.WriteLogToFile("AutoUpdate | Setup file already downloaded."); + return true; + } + + string downloadUrl = $"{proxy}https://github.com/ChangSakura/Ink-Canvas/releases/download/v{version}/Ink.Canvas.Annotation.V{version}.Setup.exe"; + + SaveDownloadStatus(false); + await DownloadFile(downloadUrl, $"{updatesFolderPath}\\Ink.Canvas.Annotation.V{version}.Setup.exe"); + SaveDownloadStatus(true); + + LogHelper.WriteLogToFile("AutoUpdate | Setup file successfully downloaded."); + return true; + } + catch (Exception ex) + { + LogHelper.WriteLogToFile($"AutoUpdate | Error downloading and installing update: {ex.Message}", LogHelper.LogType.Error); + + SaveDownloadStatus(false); + return false; + } + } + + private static async Task DownloadFile(string fileUrl, string destinationPath) + { + using (HttpClient client = new HttpClient()) + { + try + { + HttpResponseMessage response = await client.GetAsync(fileUrl); + response.EnsureSuccessStatusCode(); + + using (FileStream fileStream = File.Create(destinationPath)) + { + await response.Content.CopyToAsync(fileStream); + fileStream.Close(); + } + } + catch (HttpRequestException ex) + { + Console.WriteLine($"AutoUpdate | HTTP request error: {ex.Message}"); + throw; + } + catch (Exception ex) + { + Console.WriteLine($"AutoUpdate | Error: {ex.Message}"); + throw; + } + } + } + + private static void SaveDownloadStatus(bool isSuccess) + { + try + { + if (statusFilePath == null) return; + + string directory = Path.GetDirectoryName(statusFilePath); + if (!Directory.Exists(directory)) + { + Directory.CreateDirectory(directory); + } + + File.WriteAllText(statusFilePath, isSuccess.ToString()); + } + catch (Exception ex) + { + LogHelper.WriteLogToFile($"AutoUpdate | Error saving download status: {ex.Message}", LogHelper.LogType.Error); + } + } + + public static void InstallNewVersionApp(string version, bool isInSilence) + { + try + { + string setupFilePath = Path.Combine(updatesFolderPath, $"Ink.Canvas.Annotation.V{version}.Setup.exe"); + + if (!File.Exists(setupFilePath)) + { + LogHelper.WriteLogToFile($"AutoUpdate | Setup file not found: {setupFilePath}", LogHelper.LogType.Error); + return; + } + + string InstallCommand = $"\"{setupFilePath}\" /SILENT"; + if (isInSilence) InstallCommand += " /VERYSILENT"; + ExecuteCommandLine(InstallCommand); + Application.Current.Dispatcher.Invoke(() => + { + Application.Current.Shutdown(); + }); + } + catch (Exception ex) + { + LogHelper.WriteLogToFile($"AutoUpdate | Error installing update: {ex.Message}", LogHelper.LogType.Error); + } + } + + + private static void ExecuteCommandLine(string command) + { + try + { + ProcessStartInfo processStartInfo = new ProcessStartInfo + { + FileName = "cmd.exe", + Arguments = $"/c {command}", + RedirectStandardOutput = true, + RedirectStandardError = true, + UseShellExecute = false, + CreateNoWindow = true + }; + + using (Process process = new Process { StartInfo = processStartInfo }) + { + process.Start(); + Application.Current.Shutdown(); + /*process.WaitForExit(); + int exitCode = process.ExitCode;*/ + } + } + catch { } + } + + public static void DeleteUpdatesFolder() + { + try + { + if (Directory.Exists(updatesFolderPath)) + { + Directory.Delete(updatesFolderPath, true); + } + } + catch (Exception ex) + { + LogHelper.WriteLogToFile($"AutoUpdate clearing| Error deleting updates folder: {ex.Message}", LogHelper.LogType.Error); + } + } + } + + internal class AutoUpdateWithSilenceTimeComboBox + { + public static ObservableCollection Hours { get; set; } = new ObservableCollection(); + public static ObservableCollection Minutes { get; set; } = new ObservableCollection(); + + public static void InitializeAutoUpdateWithSilenceTimeComboBoxOptions(ComboBox startTimeComboBox, ComboBox endTimeComboBox) + { + for (int hour = 0; hour <= 23; ++hour) + { + Hours.Add(hour.ToString("00")); + } + for (int minute = 0; minute <= 59; minute += 20) + { + Minutes.Add(minute.ToString("00")); + } + startTimeComboBox.ItemsSource = Hours.SelectMany(h => Minutes.Select(m => $"{h}:{m}")); + endTimeComboBox.ItemsSource = Hours.SelectMany(h => Minutes.Select(m => $"{h}:{m}")); + } + + public static bool CheckIsInSilencePeriod(string startTime, string endTime) + { + if (startTime == endTime) return true; + DateTime currentTime = DateTime.Now; + + DateTime StartTime = DateTime.ParseExact(startTime, "HH:mm", null); + DateTime EndTime = DateTime.ParseExact(endTime, "HH:mm", null); + if (StartTime <= EndTime) + { // 单日时间段 + return currentTime >= StartTime && currentTime <= EndTime; + } + else + { // 跨越两天的时间段 + return currentTime >= StartTime || currentTime <= EndTime; + } + } + } +} diff --git a/Ink Canvas/Helpers/ForegroundWindowInfo.cs b/Ink Canvas/Helpers/ForegroundWindowInfo.cs new file mode 100644 index 0000000..39c8590 --- /dev/null +++ b/Ink Canvas/Helpers/ForegroundWindowInfo.cs @@ -0,0 +1,77 @@ +using System; +using System.Diagnostics; +using System.Runtime.InteropServices; +using System.Text; + +namespace Ink_Canvas.Helpers +{ + internal class ForegroundWindowInfo + { + [DllImport("user32.dll")] + private static extern IntPtr GetForegroundWindow(); + + [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)] + private static extern int GetWindowText(IntPtr hWnd, StringBuilder lpString, int nMaxCount); + + [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)] + private static extern int GetClassName(IntPtr hWnd, StringBuilder lpClassName, int nMaxCount); + + [DllImport("user32.dll")] + [return: MarshalAs(UnmanagedType.Bool)] + private static extern bool GetWindowRect(IntPtr hWnd, out RECT lpRect); + + [DllImport("user32.dll")] + private static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId); + + [StructLayout(LayoutKind.Sequential)] + public struct RECT { + public int Left; + public int Top; + public int Right; + public int Bottom; + } + + public static string WindowTitle() { + IntPtr foregroundWindowHandle = GetForegroundWindow(); + + const int nChars = 256; + StringBuilder windowTitle = new StringBuilder(nChars); + GetWindowText(foregroundWindowHandle, windowTitle, nChars); + + return windowTitle.ToString(); + } + + public static string WindowClassName() { + IntPtr foregroundWindowHandle = GetForegroundWindow(); + + const int nChars = 256; + StringBuilder className = new StringBuilder(nChars); + GetClassName(foregroundWindowHandle, className, nChars); + + return className.ToString(); + } + + public static RECT WindowRect() { + IntPtr foregroundWindowHandle = GetForegroundWindow(); + + RECT windowRect; + GetWindowRect(foregroundWindowHandle, out windowRect); + + return windowRect; + } + + public static string ProcessName() { + IntPtr foregroundWindowHandle = GetForegroundWindow(); + uint processId; + GetWindowThreadProcessId(foregroundWindowHandle, out processId); + + try { + Process process = Process.GetProcessById((int)processId); + return process.ProcessName; + } catch (ArgumentException) { + // Process with the given ID not found + return "Unknown"; + } + } + } +} \ No newline at end of file diff --git a/Ink Canvas/Helpers/SoftwareLauncher.cs b/Ink Canvas/Helpers/SoftwareLauncher.cs new file mode 100644 index 0000000..54fd107 --- /dev/null +++ b/Ink Canvas/Helpers/SoftwareLauncher.cs @@ -0,0 +1,74 @@ +using Microsoft.Win32; +using System; +using System.Diagnostics; +using System.Runtime.InteropServices; + +namespace Ink_Canvas.Helpers +{ + internal class SoftwareLauncher + { + [DllImport("user32.dll")] + private static extern bool ShowWindow(IntPtr hWnd, int nCmdShow); + + public static void LaunchEasiCamera(string softwareName) + { + string executablePath = FindEasiCameraExecutablePath(softwareName); + + if (!string.IsNullOrEmpty(executablePath)) + { + try + { + Process.Start(executablePath); + //Console.WriteLine(softwareName + " 启动成功！"); + } + catch (Exception ex) + { + Console.WriteLine("启动失败: " + ex.Message); + //MessageBox.Show("启动失败: " + ex.Message); + } + } + else + { + //Console.WriteLine(softwareName + " 未找到可执行文件路径。"); + } + } + + private static string FindEasiCameraExecutablePath(string softwareName) + { + string executablePath = null; + + using (RegistryKey key = Registry.LocalMachine.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Uninstall")) + { + foreach (string subkeyName in key.GetSubKeyNames()) + { + using (RegistryKey subkey = key.OpenSubKey(subkeyName)) + { + string displayName = subkey.GetValue("DisplayName") as string; + string installLocation = subkey.GetValue("InstallLocation") as string; + string uninstallString = subkey.GetValue("UninstallString") as string; + + if (!string.IsNullOrEmpty(displayName) && displayName.Contains(softwareName)) + { + if (!string.IsNullOrEmpty(installLocation)) + { + executablePath = System.IO.Path.Combine(installLocation, "sweclauncher.exe"); + } + else if (!string.IsNullOrEmpty(uninstallString)) + { + int lastSlashIndex = uninstallString.LastIndexOf("\\"); + if (lastSlashIndex >= 0) + { + string folderPath = uninstallString.Substring(0, lastSlashIndex); + executablePath = System.IO.Path.Combine(folderPath, "sweclauncher", "sweclauncher.exe"); + } + } + break; + } + } + } + } + + return executablePath; + } + } +} diff --git a/Ink Canvas/Helpers/StoreHelper.cs b/Ink Canvas/Helpers/StoreHelper.cs deleted file mode 100644 index 04065e4..0000000 --- a/Ink Canvas/Helpers/StoreHelper.cs +++ /dev/null @@ -1,29 +0,0 @@ -namespace Ink_Canvas.Helpers -{ - public static class StoreHelper - { - public static bool IsStoreApp - { - get - { - try - { - object GetCurrentPackage() - { - return Windows.ApplicationModel.Package.Current; - } - - if (GetCurrentPackage() != null) - { - return true; - } - return false; - } - catch - { - return false; - } - } - } - } -} diff --git a/Ink Canvas/Helpers/WinTabWindowsChecker.cs b/Ink Canvas/Helpers/WinTabWindowsChecker.cs new file mode 100644 index 0000000..e97e58d --- /dev/null +++ b/Ink Canvas/Helpers/WinTabWindowsChecker.cs @@ -0,0 +1,73 @@ +using System.Windows.Automation; + +namespace Ink_Canvas.Helpers { + internal class WinTabWindowsChecker { + /* + public static bool IsWindowMinimized(string windowName, bool matchFullName = true) { + // 获取Win+Tab预览中的窗口 + AutomationElementCollection windows = AutomationElement.RootElement.FindAll( + TreeScope.Children, new PropertyCondition(AutomationElement.ControlTypeProperty, ControlType.Window)); + + foreach (AutomationElement window in windows) { + //LogHelper.WriteLogToFile("" + window.Current.Name); + + string windowTitle = window.Current.Name; + + // 如果窗口标题包含 windowName，则进行检查 + if (!string.IsNullOrEmpty(windowTitle) && windowTitle.Contains(windowName)) { + if (matchFullName) { + if (windowTitle.Length == windowName.Length) { + // 检查窗口是否最小化 + WindowPattern windowPattern = window.GetCurrentPattern(WindowPattern.Pattern) as WindowPattern; + if (windowPattern != null) { + bool isMinimized = windowPattern.Current.WindowVisualState == WindowVisualState.Minimized; + //LogHelper.WriteLogToFile("" + windowTitle + isMinimized); + return isMinimized; + } + } + } else { + // 检查窗口是否最小化 + WindowPattern windowPattern = window.GetCurrentPattern(WindowPattern.Pattern) as WindowPattern; + if (windowPattern != null) { + bool isMinimized = windowPattern.Current.WindowVisualState == WindowVisualState.Minimized; + return isMinimized; + } + } + } + } + // 未找到软件白板窗口 + return true; + } + */ + + public static bool IsWindowExisted(string windowName, bool matchFullName = true) { + // 获取Win+Tab预览中的窗口 + AutomationElementCollection windows = AutomationElement.RootElement.FindAll( + TreeScope.Children, new PropertyCondition(AutomationElement.ControlTypeProperty, ControlType.Window)); + + foreach (AutomationElement window in windows) { + //LogHelper.WriteLogToFile("" + window.Current.Name); + + string windowTitle = window.Current.Name; + + // 如果窗口标题包含 windowName，则进行检查 + if (!string.IsNullOrEmpty(windowTitle) && windowTitle.Contains(windowName)) { + if (matchFullName) { + if (windowTitle.Length == windowName.Length) { + WindowPattern windowPattern = window.GetCurrentPattern(WindowPattern.Pattern) as WindowPattern; + if (windowPattern != null) { + return true; + } + } + } else { + WindowPattern windowPattern = window.GetCurrentPattern(WindowPattern.Pattern) as WindowPattern; + if (windowPattern != null) { + return true; + } + } + } + } + return false; + } + } +} diff --git a/Ink Canvas/Ink Canvas Annotation.ico b/Ink Canvas/Ink Canvas Annotation.ico new file mode 100644 index 0000000..72a67fe Binary files /dev/null and b/Ink Canvas/Ink Canvas Annotation.ico differ diff --git a/Ink Canvas/Ink Canvas.csproj b/Ink Canvas/Ink Canvas.csproj index 7f42274..d041ea4 100644 --- a/Ink Canvas/Ink Canvas.csproj +++ b/Ink Canvas/Ink Canvas.csproj @@ -8,7 +8,7 @@ {8D0EDFC7-F974-4571-BC49-6F3A6653FE81} WinExe Ink_Canvas - Ink Canvas + Ink Canvas Annotation v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -54,7 +54,7 @@ 4 - Resources\InkCanvas.ico + Ink Canvas Annotation.ico true @@ -144,6 +144,8 @@ 4.0 + + @@ -154,21 +156,25 @@ MSBuild:Compile Designer + + ChangeLogWindow.xaml - - ClickSensitiveGrid.xaml + + OperatingGuideWindow.xaml CycleProcessBar.xaml + - + + NamesInputWindow.xaml @@ -185,16 +191,13 @@ CountdownTimerWindow.xaml - - WelcomeWindow.xaml - Designer MSBuild:Compile - - Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -253,10 +256,6 @@ Designer MSBuild:Compile - - Designer - MSBuild:Compile - @@ -287,9 +286,6 @@ - - 1.8.1 - 15.0.4420.1018 @@ -358,19 +354,6 @@ - - - - - - - - - - - - - False @@ -386,5 +369,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml index 95f7ffc..a81d463 100644 --- a/Ink Canvas/MainWindow.xaml +++ b/Ink Canvas/MainWindow.xaml @@ -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" - xmlns:c="clr-namespace:Ink_Canvas.Converter" + xmlns:c="clr-namespace:Ink_Canvas.Converter" xmlns:Controls="http://schemas.microsoft.com/netfx/2009/xaml/presentation" mc:Ignorable="d" AllowsTransparency="True" WindowStyle="None" @@ -20,7 +20,7 @@ Closing="Window_Closing" Closed="Window_Closed" PreviewKeyDown="Main_Grid_PreviewKeyDown" - Height="10000" Width="1000" + Height="6000" Width="1440" FontFamily="Microsoft YaHei UI" MouseWheel="Window_MouseWheel" Foreground="Black" @@ -30,12 +30,16 @@ - + + + + + @@ -46,36 +50,52 @@ - + + + + + + - + - - + CanExecute="CommandBinding_CanExecute" + Executed="KeyExit"/> + + + + + @@ -86,10 +106,13 @@ CanExecute="CommandBinding_CanExecute" Executed="KeyDrawLine"/> + + + - + + + + + + + + + + + + + + + - - - - - - - - -