gsadmin/desktop-edge-win
1
0
Fork 0
mirror of https://github.com/openziti/desktop-edge-win.git synced 2026-10-13 08:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

further refinement based on PR review

Browse Source
This commit is contained in:
dovholuknf
2020-10-14 08:15:16 -04:00
parent 8382e76742
commit 08e47e0b35
4 changed files with 3 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DesktopEdge/MainMenu.xaml.cs
+2 -3
View File
@@ -201,7 +201,8 @@ namespace ZitiDesktopEdge
}
private void ShowFeedback(object sender, MouseButtonEventArgs e) {
ServiceClient.Client client = (ServiceClient.Client)Application.Current.Properties["ServiceClient"];
var mailMessage = new MailMessage("", "ziti-support@netfoundry.io");
var mailMessage = new MailMessage();
mailMessage.From = new MailAddress("ziti-support@netfoundry.io");
mailMessage.Subject = "Ziti Support";
mailMessage.IsBodyHtml = true;
mailMessage.Body = "";
@@ -251,7 +252,6 @@ namespace ZitiDesktopEdge
DetachButton.Visibility = Visibility.Collapsed;
AttachButton.Visibility = Visibility.Visible;
Arrow.Visibility = Visibility.Collapsed;
UIModel.HideOnLostFocus = false;
if (OnAttachmentChange != null) {
OnAttachmentChange(false);
}
@@ -269,7 +269,6 @@ namespace ZitiDesktopEdge
DetachButton.Visibility = Visibility.Visible;
AttachButton.Visibility = Visibility.Collapsed;
Arrow.Visibility = Visibility.Visible;
UIModel.HideOnLostFocus = true;
if (OnAttachmentChange != null) {
OnAttachmentChange(true);
}
DesktopEdge/MainWindow.xaml.cs
-3
View File
@@ -74,13 +74,11 @@ namespace ZitiDesktopEdge {
}
private void MainWindow_Deactivated(object sender, EventArgs e) {
if (UIModel.HideOnLostFocus) {
#if DEBUG
Debug.WriteLine("debug is enabled - windows pinned");
#else
this.Visibility = Visibility.Collapsed;
#endif
}
}
private void MainWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e) {
@@ -104,7 +102,6 @@ namespace ZitiDesktopEdge {
_isAttached = false;
IdentityMenu.Arrow.Visibility = Visibility.Collapsed;
Arrow.Visibility = Visibility.Collapsed;
UIModel.HideOnLostFocus = false;
MainMenu.Detach();
this.DragMove();
}
README.md
+1
View File
@@ -14,3 +14,4 @@ components:
* A Windows service which runs as the local system account which creates the TUN as well as manages the Ziti connections
* A Windows UWP UI application that allows the interactively logged on user to interact with the Windows service
cmon_travis.bat
-21
View File
@@ -1,21 +0,0 @@
@echo mkdir and adding to actual known hosts... 2>&1
@echo mkdir %USERPROFILE%\.ssh 2>&1
mkdir %USERPROFILE%\.ssh 2>&1
@echo adding github key: ssh-keyscan -t rsa github.com 2>&1
ssh-keyscan -t rsa github.com >> %USERPROFILE%\.ssh\known_hosts 2>&1
@echo looking for key using: ssh-keygen -F github.com - expect to find it this time! 2>&1
ssh-keygen -F github.com 2>&1
@echo "getting ziti-ci" 2>&1
call get-ziti-ci.bat 2>&1
@echo "ziti-ci has been retrieved. running\:ziti-ci version" 2>&1
ziti-ci version 2>&1
ziti-ci configure-git 2>&1
@echo test ssh - expect it to work 2>&1
ssh -Tv -i github_deploy_key git@github.com 2>&1
REM @echo test ssh - manual known hosts 2>&1
REM ssh -vT -o "UserKnownHostsFile manual-known-hosts.txt" -i github_deploy_key github.com 2>&1