From 2efb8d1889c816af81649fc806e756eb99869d23 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Mon, 2 Nov 2020 13:41:20 +0000 Subject: [PATCH 1/3] [ci skip] committing updated version information --- service/ziti-tunnel/version.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index 28668001..e75605e9 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -20,9 +20,9 @@ package main const ( - Version = "1.2.13" - Revision = "9a50a507e59a" - Branch = "release-1.2.13-ui-tweaks" + Version = "1.2.15" + Revision = "fc4a0594546a" + Branch = "release-1.3.4-dragger" BuildUser = "" - BuildDate = "2020-11-01 19:25:09" + BuildDate = "2020-11-02 13:37:49" ) From 7e865cc7c3d4d1a040962970de3505373c21e4f8 Mon Sep 17 00:00:00 2001 From: Jeremy Tellier - ROG Date: Mon, 2 Nov 2020 13:41:29 +0000 Subject: [PATCH 2/3] Dragger from Sub Menus --- DesktopEdge/IdentityDetails.xaml | 4 ++-- DesktopEdge/IdentityDetails.xaml.cs | 9 +++++++++ DesktopEdge/MainMenu.xaml | 2 +- DesktopEdge/MainMenu.xaml.cs | 7 +++++++ DesktopEdge/MainWindow.xaml.cs | 26 ++++++++++++++++---------- 5 files changed, 35 insertions(+), 13 deletions(-) diff --git a/DesktopEdge/IdentityDetails.xaml b/DesktopEdge/IdentityDetails.xaml index 079690c2..d2472688 100644 --- a/DesktopEdge/IdentityDetails.xaml +++ b/DesktopEdge/IdentityDetails.xaml @@ -29,8 +29,8 @@ - - + + diff --git a/DesktopEdge/IdentityDetails.xaml.cs b/DesktopEdge/IdentityDetails.xaml.cs index 68ab8d36..68635e7d 100644 --- a/DesktopEdge/IdentityDetails.xaml.cs +++ b/DesktopEdge/IdentityDetails.xaml.cs @@ -26,6 +26,8 @@ namespace ZitiDesktopEdge { public event Forgot OnForgot; public delegate void ErrorOccurred(string message); public event ErrorOccurred OnError; + public delegate void Detched(MouseButtonEventArgs e); + public event Detched OnDetach; public double MainHeight = 500; private List identities { @@ -52,6 +54,13 @@ namespace ZitiDesktopEdge { public IdentityItem SelectedIdentity { get; set; } + private void Window_MouseDown(object sender, MouseButtonEventArgs e) { + if (e.ChangedButton == MouseButton.Left) { + _isAttached = false; + OnDetach(e); + } + } + public bool IsAttached { get { diff --git a/DesktopEdge/MainMenu.xaml b/DesktopEdge/MainMenu.xaml index f249f99d..1f744639 100644 --- a/DesktopEdge/MainMenu.xaml +++ b/DesktopEdge/MainMenu.xaml @@ -32,7 +32,7 @@ - + diff --git a/DesktopEdge/MainMenu.xaml.cs b/DesktopEdge/MainMenu.xaml.cs index 11a89570..4581d4c6 100644 --- a/DesktopEdge/MainMenu.xaml.cs +++ b/DesktopEdge/MainMenu.xaml.cs @@ -26,6 +26,8 @@ namespace ZitiDesktopEdge public event AttachementChanged OnAttachmentChange; public delegate void LogLevelChanged(string level); public event LogLevelChanged OnLogLevelChanged; + public delegate void Detched(MouseButtonEventArgs e); + public event Detched OnDetach; public string menuState = "Main"; public string licenseData = "it's open source."; public string LogLevel = ""; @@ -43,6 +45,11 @@ namespace ZitiDesktopEdge UpdateState(); MainMenuArea.Visibility = Visibility.Collapsed; } + private void Window_MouseDown(object sender, MouseButtonEventArgs e) { + if (e.ChangedButton == MouseButton.Left) { + OnDetach(e); + } + } private void CloseApp(object sender, MouseButtonEventArgs e) { Application.Current.Shutdown(); diff --git a/DesktopEdge/MainWindow.xaml.cs b/DesktopEdge/MainWindow.xaml.cs index f6cc685d..bdf2f994 100644 --- a/DesktopEdge/MainWindow.xaml.cs +++ b/DesktopEdge/MainWindow.xaml.cs @@ -67,12 +67,28 @@ namespace ZitiDesktopEdge { notifyIcon.Visible = true; notifyIcon.Click += TargetNotifyIcon_Click; notifyIcon.Visible = true; + IdentityMenu.OnDetach += OnDetach; + MainMenu.OnDetach += OnDetach; LaunchOrInstall(); SetNotifyIcon("white"); } + private void Window_MouseDown(object sender, MouseButtonEventArgs e) { + OnDetach(e); + } + + private void OnDetach(MouseButtonEventArgs e) { + if (e.ChangedButton == MouseButton.Left) { + _isAttached = false; + IdentityMenu.Arrow.Visibility = Visibility.Collapsed; + Arrow.Visibility = Visibility.Collapsed; + MainMenu.Detach(); + this.DragMove(); + } + } + private void MainWindow_Activated(object sender, EventArgs e) { this.Visibility = Visibility.Visible; Placement(); @@ -106,16 +122,6 @@ namespace ZitiDesktopEdge { SetCantDisplay("Service Not Started", "Start the Ziti Tunnel Service to get started"); } - private void Window_MouseDown(object sender, MouseButtonEventArgs e) { - if (e.ChangedButton == MouseButton.Left) { - _isAttached = false; - IdentityMenu.Arrow.Visibility = Visibility.Collapsed; - Arrow.Visibility = Visibility.Collapsed; - MainMenu.Detach(); - this.DragMove(); - } - } - private void TargetNotifyIcon_Click(object sender, EventArgs e) { this.Show(); this.Activate(); From b91314be7ef6f3bc6ec0016319e64f5da137b6c7 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Mon, 2 Nov 2020 13:49:41 +0000 Subject: [PATCH 3/3] [ci skip] committing updated version information --- service/ziti-tunnel/version.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index e75605e9..364d4b81 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.2.15" - Revision = "fc4a0594546a" + Revision = "12439f31b02c" Branch = "release-1.3.4-dragger" BuildUser = "" - BuildDate = "2020-11-02 13:37:49" + BuildDate = "2020-11-02 13:45:50" )