[PR #10] [MERGED] Dev #2766

Closed
opened 2026-03-01 17:23:11 +03:00 by kerem · 0 comments
Owner

📋 Pull Request Information

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

Base: masterHead: dev


📝 Commits (10+)

  • f4a0234 [WIP] Add color theme properties.
  • f9deeba 1. Rewrite ColorPick to MVVM.
  • 75b20c0 bug🐛 fix: get wrong ScaleFactor when working on a remote RDP pc with 4k screen.
  • 9357821 🔨[WIP] still working on color theme, using the new colorpicker in config page.
  • 68008a9 * bug🐛 II fix: get wrong MousePosition when working on a remote RDP pc with 4k screen.
  • 3be5ba7 UI error fix for color styling
  • 624288b * 🔨[WIP] still working on color theme, ComboBox for color theme selecting. relayout the theme config page.
  • 8e1c626 1. del border of MainWindow
  • 429affe ✔️ color theme feature add.
  • 45df768 1. change the location of language files.

📊 Changes

42 files changed (+1446 additions, -344 deletions)

View changed files

📝 PRM.Core/Languages/en-us.json (+10 -0)
📝 PRM.Core/Languages/en-us.xaml (+1 -1)
PRM.Core/Languages/netcoreapp3.1/en-us.xaml (+0 -1)
PRM.Core/Languages/netcoreapp3.1/zh-cn.xaml (+0 -1)
📝 PRM.Core/Languages/zh-cn.json (+10 -0)
📝 PRM.Core/Languages/zh-cn.xaml (+1 -1)
📝 PRM.Core/Model/SystemConfig.DataSecurity.cs (+22 -10)
📝 PRM.Core/Model/SystemConfig.Language.cs (+19 -15)
📝 PRM.Core/Model/SystemConfig.Theme.cs (+278 -7)
📝 PRM.Core/PRM.Core.csproj (+6 -14)
📝 PRM.Core/PRMVersion.cs (+2 -2)
📝 PRM.Core/Protocol/Putty/Host/PuttyHost.xaml.cs (+1 -1)
📝 PRM.Core/Protocol/Putty/PuttyColorThemes.cs (+1 -1)
📝 PRM.Core/Protocol/RDP/ProtocolServerRDP.cs (+1 -1)
📝 PRM.Core/Protocol/RDP/ProtocolServerRDPForm.xaml (+2 -4)
📝 PRM.Core/Resources/Style/GlobalStyle.xaml (+34 -26)
📝 PRM.Core/Resources/Theme/Default.xaml (+8 -5)
PRM.Core/Resources/Theme/PrmColorThemes.cs (+194 -0)
PRM.Core/Ulits/ColorAndBrushHelper.cs (+146 -0)
📝 PRM.Core/Ulits/ColorPickerWPF/ColorPickRowPopup.xaml (+12 -7)

...and 22 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/1Remote/1Remote/pull/10 **Author:** [@VShawn](https://github.com/VShawn) **Created:** 7/15/2020 **Status:** ✅ Merged **Merged:** 7/15/2020 **Merged by:** [@VShawn](https://github.com/VShawn) **Base:** `master` ← **Head:** `dev` --- ### 📝 Commits (10+) - [`f4a0234`](https://github.com/1Remote/1Remote/commit/f4a023483c1210cf0e31c2110acdb40079ff7d6b) [WIP] Add color theme properties. - [`f9deeba`](https://github.com/1Remote/1Remote/commit/f9deeba4275deed65d27d315159b00ed4ecc0f2d) 1. Rewrite ColorPick to MVVM. - [`75b20c0`](https://github.com/1Remote/1Remote/commit/75b20c0dfdef36af75e54e0a365127e3b2c197be) bug:bug: fix: get wrong ScaleFactor when working on a remote RDP pc with 4k screen. :white_check_mark: - [`9357821`](https://github.com/1Remote/1Remote/commit/935782189313446770823accaa0a7eeae756e24e) :hammer:[WIP] still working on color theme, using the new colorpicker in config page. - [`68008a9`](https://github.com/1Remote/1Remote/commit/68008a958fc7921f1b6048bffc3df00b8ea0c5e6) * bug:bug: II fix: get wrong MousePosition when working on a remote RDP pc with 4k screen. :white_check_mark: - [`3be5ba7`](https://github.com/1Remote/1Remote/commit/3be5ba77e807b61d97bcc4ddce7527247e0bba5f) UI error fix for color styling - [`624288b`](https://github.com/1Remote/1Remote/commit/624288ba09a70cc7c8a42a2d3dd0eb68fa502a06) * :hammer:[WIP] still working on color theme, ComboBox for color theme selecting. relayout the theme config page. - [`8e1c626`](https://github.com/1Remote/1Remote/commit/8e1c6264c76ba0709e37a9673a0d9fbbc02de731) 1. del border of MainWindow - [`429affe`](https://github.com/1Remote/1Remote/commit/429affe014f15aabe5f2273f9960351028b60785) :heavy_check_mark: color theme feature add. - [`45df768`](https://github.com/1Remote/1Remote/commit/45df7683cdf74358d8ed0a69e71539d2be053611) 1. change the location of language files. ### 📊 Changes **42 files changed** (+1446 additions, -344 deletions) <details> <summary>View changed files</summary> 📝 `PRM.Core/Languages/en-us.json` (+10 -0) 📝 `PRM.Core/Languages/en-us.xaml` (+1 -1) ➖ `PRM.Core/Languages/netcoreapp3.1/en-us.xaml` (+0 -1) ➖ `PRM.Core/Languages/netcoreapp3.1/zh-cn.xaml` (+0 -1) 📝 `PRM.Core/Languages/zh-cn.json` (+10 -0) 📝 `PRM.Core/Languages/zh-cn.xaml` (+1 -1) 📝 `PRM.Core/Model/SystemConfig.DataSecurity.cs` (+22 -10) 📝 `PRM.Core/Model/SystemConfig.Language.cs` (+19 -15) 📝 `PRM.Core/Model/SystemConfig.Theme.cs` (+278 -7) 📝 `PRM.Core/PRM.Core.csproj` (+6 -14) 📝 `PRM.Core/PRMVersion.cs` (+2 -2) 📝 `PRM.Core/Protocol/Putty/Host/PuttyHost.xaml.cs` (+1 -1) 📝 `PRM.Core/Protocol/Putty/PuttyColorThemes.cs` (+1 -1) 📝 `PRM.Core/Protocol/RDP/ProtocolServerRDP.cs` (+1 -1) 📝 `PRM.Core/Protocol/RDP/ProtocolServerRDPForm.xaml` (+2 -4) 📝 `PRM.Core/Resources/Style/GlobalStyle.xaml` (+34 -26) 📝 `PRM.Core/Resources/Theme/Default.xaml` (+8 -5) ➕ `PRM.Core/Resources/Theme/PrmColorThemes.cs` (+194 -0) ➕ `PRM.Core/Ulits/ColorAndBrushHelper.cs` (+146 -0) 📝 `PRM.Core/Ulits/ColorPickerWPF/ColorPickRowPopup.xaml` (+12 -7) _...and 22 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>
kerem 2026-03-01 17:23:11 +03:00
Sign in to join this conversation.
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
starred/1Remote#2766
No description provided.