[PR #9] [MERGED] Dev routine merge #842

New issue

Closed

opened 2026-02-26 12:00:07 +03:00 by kerem · 0 comments

kerem commented

2026-02-26 12:00:07 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/1Remote/1Remote/pull/9
Author: @VShawn
Created: 7/6/2020
Status: ✅ Merged
Merged: 7/6/2020
Merged by: @VShawn

Base: master ← Head: dev

📝 Commits (5)

d3a4c56 some fix
886a5ea create ButtonEx to handle Button hover click style.
5488115 ButtonEx apply on ServerEditorPage.xaml SystemConfigPage.xaml.
ad91844 ButtonEx apply on MainWindow.xaml AboutPage.xaml LogoSelector.
342adb9 Set TextElement's default Foreground to MainBgColorForegroundBrush

📊 Changes

23 files changed (+614 additions, -698 deletions)

View changed files

📝 PRM.Core/Model/SystemConfig.DataSecurity.cs (+4 -4)
📝 PRM.Core/PRM.Core.csproj (+1 -4)
📝 PRM.Core/PRMVersion.cs (+2 -2)
📝 PRM.Core/Protocol/Putty/ProtocolPuttyForm.xaml (+9 -36)
📝 PRM.Core/Protocol/Putty/PuttyColorThemes.cs (+4 -1)
📝 PRM.Core/Protocol/RDP/ProtocolServerRDPForm.xaml (+0 -1)
➕ PRM.Core/Resources/Controls/ButtonEx.cs (+153 -0)
📝 PRM.Core/Resources/Style/GlobalStyle.xaml (+186 -2)
➖ PRM.Core/Resources/Style/ServerEditorStyle.xaml (+0 -75)
📝 PRemoteM/Controls/LogoSelector.xaml (+3 -24)
📝 PRemoteM/Controls/ServerCard.xaml (+40 -54)
📝 PRemoteM/MainWindow.xaml (+54 -94)
📝 PRemoteM/Styles/MinHorizontalScrollViewerStyle.xaml (+1 -1)
📝 PRemoteM/Styles/PRM_ScrollViewerControlTemplate.xaml (+17 -16)
📝 PRemoteM/View/AboutPage.xaml (+14 -35)
📝 PRemoteM/View/DesktopWindow.xaml (+0 -7)
📝 PRemoteM/View/SearchBoxWindow.xaml (+6 -11)
📝 PRemoteM/View/SearchBoxWindow.xaml.cs (+3 -3)
📝 PRemoteM/View/ServerEditorPage.xaml (+15 -148)
📝 PRemoteM/View/ServerListPage.xaml (+18 -9)

...and 3 more files

📄 Description

routine merge

_{🔄 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/1Remote/1Remote/pull/9 **Author:** [@VShawn](https://github.com/VShawn) **Created:** 7/6/2020 **Status:** ✅ Merged **Merged:** 7/6/2020 **Merged by:** [@VShawn](https://github.com/VShawn) **Base:** `master` ← **Head:** `dev` --- ### 📝 Commits (5) - [`d3a4c56`](https://github.com/1Remote/1Remote/commit/d3a4c562da9bba445cc27a8242ad5cbca49e3b67) some fix - [`886a5ea`](https://github.com/1Remote/1Remote/commit/886a5ea4788d8b57d919d5678d828f6a71bd1811) create ButtonEx to handle Button hover click style. - [`5488115`](https://github.com/1Remote/1Remote/commit/5488115d537039fb0e52d018279f0d9bb71f05d5) ButtonEx apply on ServerEditorPage.xaml SystemConfigPage.xaml. - [`ad91844`](https://github.com/1Remote/1Remote/commit/ad918441a8973ee265f53edc8535690d2f354def) ButtonEx apply on MainWindow.xaml AboutPage.xaml LogoSelector. - [`342adb9`](https://github.com/1Remote/1Remote/commit/342adb996944ecbbfcb69c5d5ecc79950dad7426) Set TextElement's default Foreground to MainBgColorForegroundBrush ### 📊 Changes **23 files changed** (+614 additions, -698 deletions) <details> <summary>View changed files</summary> 📝 `PRM.Core/Model/SystemConfig.DataSecurity.cs` (+4 -4) 📝 `PRM.Core/PRM.Core.csproj` (+1 -4) 📝 `PRM.Core/PRMVersion.cs` (+2 -2) 📝 `PRM.Core/Protocol/Putty/ProtocolPuttyForm.xaml` (+9 -36) 📝 `PRM.Core/Protocol/Putty/PuttyColorThemes.cs` (+4 -1) 📝 `PRM.Core/Protocol/RDP/ProtocolServerRDPForm.xaml` (+0 -1) ➕ `PRM.Core/Resources/Controls/ButtonEx.cs` (+153 -0) 📝 `PRM.Core/Resources/Style/GlobalStyle.xaml` (+186 -2) ➖ `PRM.Core/Resources/Style/ServerEditorStyle.xaml` (+0 -75) 📝 `PRemoteM/Controls/LogoSelector.xaml` (+3 -24) 📝 `PRemoteM/Controls/ServerCard.xaml` (+40 -54) 📝 `PRemoteM/MainWindow.xaml` (+54 -94) 📝 `PRemoteM/Styles/MinHorizontalScrollViewerStyle.xaml` (+1 -1) 📝 `PRemoteM/Styles/PRM_ScrollViewerControlTemplate.xaml` (+17 -16) 📝 `PRemoteM/View/AboutPage.xaml` (+14 -35) 📝 `PRemoteM/View/DesktopWindow.xaml` (+0 -7) 📝 `PRemoteM/View/SearchBoxWindow.xaml` (+6 -11) 📝 `PRemoteM/View/SearchBoxWindow.xaml.cs` (+3 -3) 📝 `PRemoteM/View/ServerEditorPage.xaml` (+15 -148) 📝 `PRemoteM/View/ServerListPage.xaml` (+18 -9) _...and 3 more files_ </details> ### 📄 Description routine merge --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>