Skip to content

Commit 06a6cd3

Browse files
authored
Update DesktopClient with connections view and navigation. (#61)
1 parent 720397b commit 06a6cd3

File tree

137 files changed

+3410
-955
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+3410
-955
lines changed

.github/workflows/auto-close-external-prs.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,12 @@ jobs:
3030
With Remotely, I found out that there are legal impliciations to accepting external contributions. Since I'm now depending on ControlR to be my primary source of income, it's less complicated and risky if I avoid external contributions for now.
3131
3232
**Personal Working Style**
33-
During these early stages of the project, working solo will bring me the most amount of happiness and sense of accomplishment. It will allow me to move quickly and maintain a clear vision. I hope you understand!
33+
During these early stages of the project, working solo will bring me the most amount of happiness and sense of accomplishment. It will allow me to move quickly and maintain a clear vision.
3434
35-
I will begin accepting external contributions once ControlR reaches a more mature state and is financially self-sustaining.
35+
**Reviewing AI Code**
36+
In my opinion, reviewing code consumes about 4 times as many "mental calories" compared to writing it. With the rise of AI, I'm worried that I'd spend the vast majority of my time reviewing AI-generated PRs, which would detract from my ability to keep the project moving forward.
37+
38+
I will begin accepting external contributions once ControlR reaches a more mature state and is financially self-sustaining. Thank you for understanding!
3639
3740
If you have ideas, suggestions, or found a bug, please feel free to open an issue instead. I'd love to hear your feedback!
3841

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,7 @@ FodyWeavers.xsd
364364

365365
# ControlR-specific negations
366366
!ControlR.ApiClient/Output/**
367+
!ControlR.Agent/Properties/PublishProfiles/**
367368

368369
# ControlR-specific ignores
369370
.plans/*

.vscode/tasks.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"isDefault": true
1111
},
1212
"presentation": {
13-
"showReuseMessage": false
13+
"clear": true
1414
},
1515
"problemMatcher": [],
1616
"options": {

ControlR.Agent/Properties/PublishProfiles/linux-x64.pubxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
99
<PublishDir>..\ControlR.Web.Server\wwwroot\downloads\linux-x64</PublishDir>
1010
<PublishProtocol>FileSystem</PublishProtocol>
1111
<_TargetId>Folder</_TargetId>
12-
<TargetFramework>net9.0</TargetFramework>
12+
<TargetFramework>net10.0</TargetFramework>
1313
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
1414
<SelfContained>true</SelfContained>
1515
<PublishSingleFile>true</PublishSingleFile>
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
https://go.microsoft.com/fwlink/?LinkID=208121.
4+
-->
5+
<Project>
6+
<PropertyGroup>
7+
<Configuration>Release</Configuration>
8+
<Platform>Any CPU</Platform>
9+
<PublishDir>bin/publish</PublishDir>
10+
<PublishProtocol>FileSystem</PublishProtocol>
11+
<_TargetId>Folder</_TargetId>
12+
<TargetFramework>net10.0</TargetFramework>
13+
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
14+
<SelfContained>true</SelfContained>
15+
<PublishSingleFile>true</PublishSingleFile>
16+
<PublishReadyToRun>false</PublishReadyToRun>
17+
<IncludeAllContentForSelfExtract>true</IncludeAllContentForSelfExtract>
18+
<EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
19+
<PublishTrimmed>false</PublishTrimmed>
20+
</PropertyGroup>
21+
</Project>

ControlR.Agent/Properties/PublishProfiles/osx-arm64.pubxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
99
<PublishDir>..\ControlR.Web.Server\wwwroot\downloads\osx-arm64</PublishDir>
1010
<PublishProtocol>FileSystem</PublishProtocol>
1111
<_TargetId>Folder</_TargetId>
12-
<TargetFramework>net9.0</TargetFramework>
12+
<TargetFramework>net10.0</TargetFramework>
1313
<RuntimeIdentifier>osx-arm64</RuntimeIdentifier>
1414
<SelfContained>true</SelfContained>
1515
<PublishSingleFile>true</PublishSingleFile>

ControlR.Agent/Properties/PublishProfiles/osx-x64.pubxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
99
<PublishDir>..\ControlR.Web.Server\wwwroot\downloads\osx-x64</PublishDir>
1010
<PublishProtocol>FileSystem</PublishProtocol>
1111
<_TargetId>Folder</_TargetId>
12-
<TargetFramework>net9.0</TargetFramework>
12+
<TargetFramework>net10.0</TargetFramework>
1313
<RuntimeIdentifier>osx-x64</RuntimeIdentifier>
1414
<SelfContained>true</SelfContained>
1515
<PublishSingleFile>true</PublishSingleFile>
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
https://go.microsoft.com/fwlink/?LinkID=208121.
4+
-->
5+
<Project>
6+
<PropertyGroup>
7+
<Configuration>Release</Configuration>
8+
<Platform>Any CPU</Platform>
9+
<PublishDir>..\ControlR.Web.Server\wwwroot\downloads\win-x64</PublishDir>
10+
<PublishProtocol>FileSystem</PublishProtocol>
11+
<_TargetId>Folder</_TargetId>
12+
<TargetFramework>net10.0</TargetFramework>
13+
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
14+
<SelfContained>true</SelfContained>
15+
<PublishSingleFile>true</PublishSingleFile>
16+
<PublishReadyToRun>false</PublishReadyToRun>
17+
<IncludeAllContentForSelfExtract>true</IncludeAllContentForSelfExtract>
18+
<EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
19+
<PublishTrimmed>false</PublishTrimmed>
20+
</PropertyGroup>
21+
</Project>

ControlR.Agent/Properties/PublishProfiles/win-x86.pubxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
99
<PublishDir>..\ControlR.Web.Server\wwwroot\downloads\win-x86</PublishDir>
1010
<PublishProtocol>FileSystem</PublishProtocol>
1111
<_TargetId>Folder</_TargetId>
12-
<TargetFramework>net9.0</TargetFramework>
12+
<TargetFramework>net10.0</TargetFramework>
1313
<RuntimeIdentifier>win-x86</RuntimeIdentifier>
1414
<SelfContained>true</SelfContained>
1515
<PublishSingleFile>true</PublishSingleFile>

ControlR.DesktopClient.Common/Localization.cs

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,14 @@ public static class Localization
1818
private static Dictionary<string, string> _localizationStrings = GetLocalizationStrings();
1919

2020
public static string ADeviceAdministrator => GetString();
21+
public static string About => GetString();
2122
public static string Accessibility => GetString();
2223
public static string AccessibilityPermissionDescription => GetString();
24+
public static string ActiveConnections => GetString();
25+
public static string AgentConnectedTooltip => GetString();
26+
public static string AgentDisconnectedTooltip => GetString();
27+
public static string AgentStatus => GetString();
28+
public static string Auto => GetString();
2329
public static string CancelText => GetString();
2430
public static string ChatMessageSendFailureMessage => GetString();
2531
public static string ChatMessageSendFailureTitle => GetString();
@@ -29,26 +35,38 @@ public static class Localization
2935
public static string ChatWindowDefaultTitle => GetString();
3036
public static string ChatWindowTitle => GetString();
3137
public static string CloseText => GetString();
38+
public static string ConfirmDisconnect => GetString();
39+
public static string ConfirmDisconnectTitle => GetString();
40+
public static string Connected => GetString();
41+
public static string Connections => GetString();
42+
public static string Dark => GetString();
43+
public static string Disconnect => GetString();
44+
public static string Disconnected => GetString();
3245
public static string EnterCodePlaceholder => GetString();
3346
public static string EnterMessagePlaceholder => GetString();
3447
public static string GetSupportDescription => GetString();
3548
public static string GetTechSupportTitle => GetString();
3649
public static string GrantPermission => GetString();
3750
public static string Granted => GetString();
3851
public static string LearnMore => GetString();
39-
public static string MacOsPermissions => GetString();
52+
public static string Light => GetString();
53+
public static string MacAccessibilityPermissionRestartRequired => GetString();
4054
public static string MacPermissionStaleHint => GetString();
55+
public static string MacScreenCapturePermissionRestartRequired => GetString();
4156
public static string ManagedDeviceMessage => GetString();
4257
public static string ManagedDeviceTitle => GetString();
4358
public static string NewChatMessageToastMessage => GetString();
4459
public static string NewChatMessageToastTitle => GetString();
60+
public static string NoActiveConnections => GetString();
4561
public static string NoMessagesText => GetString();
62+
public static string NoPermissionsRequired => GetString();
4663
public static string NoText => GetString();
4764
public static string NotGranted => GetString();
4865
public static string NotificationPermissionDescription => GetString();
4966
public static string Notifications => GetString();
5067
public static string OkText => GetString();
5168
public static string OpenSettings => GetString();
69+
public static string Permissions => GetString();
5270
public static string PermissionsMissingToastMessage => GetString();
5371
public static string PermissionsMissingToastTitle => GetString();
5472
public static string RemoteControlPermission => GetString();
@@ -64,14 +82,14 @@ public static class Localization
6482
public static string ScreenRecording => GetString();
6583
public static string SendMessageText => GetString();
6684
public static string SendText => GetString();
85+
public static string Settings => GetString();
6786
public static string ShareScreenSecurityWarning => GetString();
6887
public static string Status => GetString();
6988
public static string SubmitText => GetString();
70-
public static string ThemeAuto => GetString();
71-
public static string ThemeDark => GetString();
72-
public static string ThemeLight => GetString();
89+
public static string Theme => GetString();
90+
public static string UnhandledExceptionMessage => GetString();
91+
public static string UnhandledExceptionTitle => GetString();
7392
public static string Version => GetString();
74-
public static string WaylandPermissions => GetString();
7593
public static string YesText => GetString();
7694
public static string You => GetString();
7795

@@ -99,6 +117,7 @@ private static Dictionary<string, string> GetLocalizationStrings()
99117
return JsonSerializer.Deserialize<Dictionary<string, string>>(content, _jsonOptions)
100118
?? throw new InvalidOperationException("Unable to deserialize localization file.");
101119
}
120+
102121
private static string GetString([CallerMemberName] string key = "")
103122
{
104123
if (_localizationStrings.TryGetValue(key, out var value))

0 commit comments

Comments
 (0)