Stone_Red/DesktopMagic
1
0
Fork 0
mirror of https://github.com/Stone-Red-Code/DesktopMagic.git synced 2026-09-04 00:46:12 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

[PR #8] [MERGED] Develop #13

New Issue
Closed
opened 2026-09-04 00:46:00 +02:00 by Stone_Red · 0 comments
Stone_Red commented 2026-09-04 00:46:00 +02:00
Owner
Copy Link
Copy Source

📋 Pull Request Information

Original PR: https://github.com/Stone-Red-Code/DesktopMagic/pull/8
Author: @Stone-Red-Code
Created: 7/5/2025
Status: ✅ Merged
Merged: 7/5/2025
Merged by: @Stone-Red-Code

Base: main ← Head: develop

📝 Commits (10+)

  • f899fd3 Merge branch 'main' into develop
  • d458fec Add DesktopMagicPluginAPI.xml to .gitignore
  • e545f27 Replace Xceed.Wpf.Toolkit.IntegerUpDown with MaterialDesignThemes.Wpf.NumericUpDown
  • 7e17366 Rename BuiltInWindowElements to BuiltInPlugins
  • 3993e6d Fix multiple warnings
  • f684cdb Show error when failing to delete plugin files
  • c6e8587 Remove unnecessary files
  • e6be5c0 Replace deprecated Modio library with alternative library
  • ce1c181 Add MsixPackaging project
  • 9abfb9c Merge pull request #7 from Stone-Red-Code/main

📊 Changes

97 files changed (+1422 additions, -412 deletions)

View changed files

📝 .gitignore (+3 -0)
📝 README.md (+12 -8)
📝 installer/DesktopMagic-Installer.exe (+0 -0)
📝 src/DesktopMagic.sln (+92 -4)
📝 src/DesktopMagic/App.xaml.cs (+57 -23)
📝 src/DesktopMagic/BuiltInPlugins/CpuMonitorPlugin.cs (+1 -1)
📝 src/DesktopMagic/BuiltInPlugins/DatePlugin.cs (+6 -6)
📝 src/DesktopMagic/BuiltInPlugins/MusicVisualizerPlugin.cs (+1 -1)
📝 src/DesktopMagic/BuiltInPlugins/TimePlugin.cs (+17 -3)
📝 src/DesktopMagic/DataContexts/MainWindowDataContext.cs (+19 -1)
📝 src/DesktopMagic/DataContexts/PluginEntryDataContext.cs (+59 -6)
📝 src/DesktopMagic/DataContexts/PluginManagerDataContext.cs (+14 -0)
📝 src/DesktopMagic/DesktopMagic.csproj (+18 -6)
📝 src/DesktopMagic/Dialogs/ColorDialog.xaml (+5 -4)
📝 src/DesktopMagic/Dialogs/ColorDialog.xaml.cs (+5 -21)
📝 src/DesktopMagic/Dialogs/InputDialog.xaml (+6 -5)
📝 src/DesktopMagic/Dialogs/InputDialog.xaml.cs (+5 -21)
📝 src/DesktopMagic/GlobalSuppressions.cs (+2 -0)
➕ src/DesktopMagic/Helpers/FileUtilities.cs (+93 -0)
📝 src/DesktopMagic/Helpers/SampleAggregator.cs (+1 -1)

...and 77 more files

📄 Description

No description provided

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/Stone-Red-Code/DesktopMagic/pull/8 **Author:** [@Stone-Red-Code](https://github.com/Stone-Red-Code) **Created:** 7/5/2025 **Status:** ✅ Merged **Merged:** 7/5/2025 **Merged by:** [@Stone-Red-Code](https://github.com/Stone-Red-Code) **Base:** `main` ← **Head:** `develop` --- ### 📝 Commits (10+) - [`f899fd3`](https://github.com/Stone-Red-Code/DesktopMagic/commit/f899fd3e9b5a8f4272ae59edaa8c32c7842f2179) Merge branch 'main' into develop - [`d458fec`](https://github.com/Stone-Red-Code/DesktopMagic/commit/d458feca1ea0cd86768fa782e0d17d881851f345) Add DesktopMagicPluginAPI.xml to .gitignore - [`e545f27`](https://github.com/Stone-Red-Code/DesktopMagic/commit/e545f27461fd1f215e3b154a280d22d4655eccc7) Replace Xceed.Wpf.Toolkit.IntegerUpDown with MaterialDesignThemes.Wpf.NumericUpDown - [`7e17366`](https://github.com/Stone-Red-Code/DesktopMagic/commit/7e1736696d394b3a1f255ffaf5b6f67e0554d04e) Rename BuiltInWindowElements to BuiltInPlugins - [`3993e6d`](https://github.com/Stone-Red-Code/DesktopMagic/commit/3993e6d612b614384efce816c5cce4f16bc0adea) Fix multiple warnings - [`f684cdb`](https://github.com/Stone-Red-Code/DesktopMagic/commit/f684cdb0511e2a2e2438b9ae3bb5e432336e4dde) Show error when failing to delete plugin files - [`c6e8587`](https://github.com/Stone-Red-Code/DesktopMagic/commit/c6e858764f868442a9bddab0c4a4dbe541d07f95) Remove unnecessary files - [`e6be5c0`](https://github.com/Stone-Red-Code/DesktopMagic/commit/e6be5c011bcad11f7b1e98e43a757d896253ed4e) Replace deprecated Modio library with alternative library - [`ce1c181`](https://github.com/Stone-Red-Code/DesktopMagic/commit/ce1c181b143de08c5cfba96a8cfaa1cf93722822) Add MsixPackaging project - [`9abfb9c`](https://github.com/Stone-Red-Code/DesktopMagic/commit/9abfb9cb66cce3a7035e809578f4af124c53ab4b) Merge pull request #7 from Stone-Red-Code/main ### 📊 Changes **97 files changed** (+1422 additions, -412 deletions) <details> <summary>View changed files</summary> 📝 `.gitignore` (+3 -0) 📝 `README.md` (+12 -8) 📝 `installer/DesktopMagic-Installer.exe` (+0 -0) 📝 `src/DesktopMagic.sln` (+92 -4) 📝 `src/DesktopMagic/App.xaml.cs` (+57 -23) 📝 `src/DesktopMagic/BuiltInPlugins/CpuMonitorPlugin.cs` (+1 -1) 📝 `src/DesktopMagic/BuiltInPlugins/DatePlugin.cs` (+6 -6) 📝 `src/DesktopMagic/BuiltInPlugins/MusicVisualizerPlugin.cs` (+1 -1) 📝 `src/DesktopMagic/BuiltInPlugins/TimePlugin.cs` (+17 -3) 📝 `src/DesktopMagic/DataContexts/MainWindowDataContext.cs` (+19 -1) 📝 `src/DesktopMagic/DataContexts/PluginEntryDataContext.cs` (+59 -6) 📝 `src/DesktopMagic/DataContexts/PluginManagerDataContext.cs` (+14 -0) 📝 `src/DesktopMagic/DesktopMagic.csproj` (+18 -6) 📝 `src/DesktopMagic/Dialogs/ColorDialog.xaml` (+5 -4) 📝 `src/DesktopMagic/Dialogs/ColorDialog.xaml.cs` (+5 -21) 📝 `src/DesktopMagic/Dialogs/InputDialog.xaml` (+6 -5) 📝 `src/DesktopMagic/Dialogs/InputDialog.xaml.cs` (+5 -21) 📝 `src/DesktopMagic/GlobalSuppressions.cs` (+2 -0) ➕ `src/DesktopMagic/Helpers/FileUtilities.cs` (+93 -0) 📝 `src/DesktopMagic/Helpers/SampleAggregator.cs` (+1 -1) _...and 77 more files_ </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
Stone_Red added the pull-request label 2026-09-04 00:46:00 +02:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
bug
enhancement
enhancement
pull-request
Mirrored from GitHub Pull Request
 wontfix
No labels pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
Stone_Red
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Stone_Red/DesktopMagic#13