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

Merge branch 'identity-onOff-cmdline' into config-ip-mask-update

Browse Source
This commit is contained in:
Mary Lincy Dcouto
2021-04-05 15:27:02 +05:30
parent 47d7b16d93 b083bd4e95
commit e7121e4bed
9 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/release-drafter.yml
-2
View File
@@ -29,8 +29,6 @@ version-resolver:
default: patch
exclude-labels:
- 'changelog-ignore'
include-labels:
- 'changelog-add'
template: |
## Changes
$CHANGES
DesktopEdge/App.xaml.cs
+5 -1
View File
@@ -22,7 +22,11 @@ namespace ZitiDesktopEdge {
private static readonly Logger logger = LogManager.GetCurrentClassLogger();
private static Mutex _mutex = null;
protected override void OnStartup(StartupEventArgs e) {
protected override void OnSessionEnding(SessionEndingCancelEventArgs e) {
base.OnSessionEnding(e);
}
protected override void OnStartup(StartupEventArgs e) {
const string appName = "Ziti Desktop Edge";
bool createdNew;
DesktopEdge/MainWindow.xaml.cs
+19 -15
View File
@@ -315,6 +315,7 @@ namespace ZitiDesktopEdge {
App.Current.MainWindow.Deactivated += MainWindow_Deactivated;
App.Current.MainWindow.Activated += MainWindow_Activated;
App.Current.Exit += Current_Exit;
App.Current.SessionEnding += Current_SessionEnding;
this.components = new System.ComponentModel.Container();
@@ -345,6 +346,16 @@ namespace ZitiDesktopEdge {
IdentityMenu.OnMessage += IdentityMenu_OnMessage;
}
private void Current_SessionEnding(object sender, SessionEndingCancelEventArgs e) {
if (notifyIcon != null) {
notifyIcon.Visible = false;
notifyIcon.Icon.Dispose();
notifyIcon.Dispose();
notifyIcon = null;
}
Application.Current.Shutdown();
}
private void Current_Exit(object sender, ExitEventArgs e) {
if (notifyIcon != null) {
notifyIcon.Visible = false;
@@ -355,7 +366,7 @@ namespace ZitiDesktopEdge {
}
private void contextMenuItem_Click(object Sender, EventArgs e) {
this.Close();
Application.Current.Shutdown();
}
private void NotifyIcon_MouseClick(object sender, System.Windows.Forms.MouseEventArgs e) {
@@ -392,18 +403,15 @@ namespace ZitiDesktopEdge {
}
private void MainWindow_Activated(object sender, EventArgs e) {
this.Visibility = Visibility.Visible;
Placement();
this.Show();
this.Visibility = Visibility.Visible;
this.Opacity = 1;
}
private void MainWindow_Deactivated(object sender, EventArgs e) {
if (this._isAttached) {
#if DEBUG
logger.Debug("debug is enabled - windows pinned");
this.Visibility = Visibility.Collapsed;
#else
this.Visibility = Visibility.Collapsed;
#endif
this.Visibility = Visibility.Hidden;
}
}
@@ -431,13 +439,9 @@ namespace ZitiDesktopEdge {
}
private void TargetNotifyIcon_Click(object sender, EventArgs e) {
// this.Show();
// System.Windows.Forms.MouseEventArgs mea = (System.Windows.Forms.MouseEventArgs)e;
/*if (mea.cli mea.RightButton) {
} else {
}*/
// this.Activate();
this.Show();
this.Activate();
Application.Current.MainWindow.Activate();
}
private void UpdateServiceView() {
DesktopEdge/Properties/AssemblyInfo.cs
+3 -3
View File
@@ -50,6 +50,6 @@ using System.Windows;
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.9.0.0")]
[assembly: AssemblyVersion("1.9.0.0")]
[assembly: AssemblyFileVersion("1.9.0.0")]
// [assembly: AssemblyVersion("1.9.1.0")]
[assembly: AssemblyVersion("1.9.1.0")]
[assembly: AssemblyFileVersion("1.9.1.0")]
DesktopEdge/Views/Screens/MFAScreen.xaml
+1 -1
View File
@@ -43,7 +43,7 @@
<Label Content="Setup MFA" Grid.Row="0" FontSize="16" HorizontalAlignment="Center" FontWeight="Bold"></Label>
<Label x:Name="IdName" Content="Identity Name" Grid.Row="1" FontSize="12" Foreground="DarkGray" HorizontalAlignment="Center"></Label>
<Image x:Name="MFAImage" MaxWidth="200" MaxHeight="200" Width="200" Height="200" RenderOptions.BitmapScalingMode="Fant" Stretch="UniformToFill" Source="/Assets/Images/qrcode.png" Margin="50,0,50,0" Grid.Row="2" />
<TextBlock x:Name="SecretCode" TextWrapping="WrapWithOverflow" Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center"></TextBlock>
<TextBox x:Name="SecretCode" TextWrapping="WrapWithOverflow" Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center" IsReadOnly="True" BorderThickness="0"></TextBox>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.Row="3" Grid.Column="1" VerticalAlignment="Center">
<Label HorizontalAlignment="Center" Content="Go To Link" Foreground="#0069FF" MouseUp="GoTo" Cursor="Hand"></Label>
<Label HorizontalAlignment="Center" Content=" or " Foreground="#000000" Cursor="Hand"></Label>
Installer/ZitiDesktopEdge.aip
+2 -2
View File
@@ -23,10 +23,10 @@
<ROW Property="CTRLS" Value="2"/>
<ROW Property="Manufacturer" Value="NetFoundry, Inc."/>
<ROW Property="MsiLogging" MultiBuildValue="AnyCPU_Release:vp"/>
<ROW Property="ProductCode" Value="1033:{D783620C-7A65-48E3-AA74-45F17B627C0F} " Type="16"/>
<ROW Property="ProductCode" Value="1033:{193E743B-5369-4B58-8BA5-2CE1B3CB1094} " Type="16"/>
<ROW Property="ProductLanguage" Value="1033"/>
<ROW Property="ProductName" Value="Ziti Desktop Edge"/>
<ROW Property="ProductVersion" Value="1.9.0" Type="32"/>
<ROW Property="ProductVersion" Value="1.9.1" Type="32"/>
<ROW Property="REBOOT" MultiBuildValue="AnyCPU_Release:Suppress"/>
<ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
<ROW Property="UpgradeCode" Value="{CB7E173A-663D-4A23-BB22-D1E8D885C2F3}"/>
ZitiUpdateService/Properties/AssemblyInfo.cs
+3 -3
View File
@@ -30,6 +30,6 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.9.0.0")]
[assembly: AssemblyVersion("1.9.0.0")]
[assembly: AssemblyFileVersion("1.9.0.0")]
// [assembly: AssemblyVersion("1.9.1.0")]
[assembly: AssemblyVersion("1.9.1.0")]
[assembly: AssemblyFileVersion("1.9.1.0")]
service/ziti-tunnel/version.go
+3 -3
View File
@@ -20,9 +20,9 @@
package main
const (
Version = "1.9.0"
Revision = "f5b82e2651c3"
Version = "1.9.1"
Revision = "06c846270f65"
Branch = "main"
BuildUser = ""
BuildDate = "2021-03-26 03:03:46"
BuildDate = "2021-03-29 18:07:21"
)
version
+1 -1
View File
@@ -1 +1 @@
1.9.0
1.9.1