diff --git a/ZitiTunneler/App.xaml b/ZitiTunneler/App.xaml index 55740ca9..48a2aaab 100644 --- a/ZitiTunneler/App.xaml +++ b/ZitiTunneler/App.xaml @@ -5,6 +5,20 @@ ShutdownMode="OnExplicitShutdown" StartupUri="MainWindow.xaml"> - + diff --git a/ZitiTunneler/IdentityDetails.xaml b/ZitiTunneler/IdentityDetails.xaml index e40a751e..718c8268 100644 --- a/ZitiTunneler/IdentityDetails.xaml +++ b/ZitiTunneler/IdentityDetails.xaml @@ -5,16 +5,19 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:ZitiTunneler" mc:Ignorable="d" - d:DesignHeight="400" d:DesignWidth="375"> - - + x:Name="IdentityArea" + d:DesignHeight="500" d:DesignWidth="350"> + + + - + + - + @@ -25,26 +28,40 @@ - + - + + + + + + + + + + + + + + - - - - + + + + - + diff --git a/ZitiTunneler/IdentityItem.xaml b/ZitiTunneler/IdentityItem.xaml index 2e86f95b..c86ac0d2 100644 --- a/ZitiTunneler/IdentityItem.xaml +++ b/ZitiTunneler/IdentityItem.xaml @@ -5,7 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:ZitiTunneler" mc:Ignorable="d" - d:DesignHeight="60" d:DesignWidth="375" Width="375" Height="60"> + d:DesignHeight="60" d:DesignWidth="375" Height="60"> @@ -24,13 +24,13 @@ - + - + - - + + diff --git a/ZitiTunneler/MainMenu.xaml b/ZitiTunneler/MainMenu.xaml index ff30e75b..5b091745 100644 --- a/ZitiTunneler/MainMenu.xaml +++ b/ZitiTunneler/MainMenu.xaml @@ -5,33 +5,55 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:ZitiTunneler" mc:Ignorable="d" - d:DesignHeight="400" d:DesignWidth="375"> - - - - - - - + x:Name="MainMenuArea" + d:DesignHeight="400" d:DesignWidth="350"> + + + + + + + + + + + + + + + + - + - + - + - - + + + + + + + + + + + + + + @@ -39,7 +61,8 @@ - + + @@ -60,11 +83,13 @@ - - - - - - - + + + + + + + + + diff --git a/ZitiTunneler/MainMenu.xaml.cs b/ZitiTunneler/MainMenu.xaml.cs index 28e97a59..cc4fab7c 100644 --- a/ZitiTunneler/MainMenu.xaml.cs +++ b/ZitiTunneler/MainMenu.xaml.cs @@ -123,7 +123,14 @@ namespace ZitiTunneler Process.Start(new ProcessStartInfo("https://support.netfoundry.io") { UseShellExecute = true }); } private void DetachWindow(object sender, MouseButtonEventArgs e) { - + Application.Current.MainWindow.ShowInTaskbar = true; + DetachButton.Visibility = Visibility.Collapsed; + AttachButton.Visibility = Visibility.Visible; + } + private void RetachWindow(object sender, MouseButtonEventArgs e) { + Application.Current.MainWindow.ShowInTaskbar = false; + DetachButton.Visibility = Visibility.Visible; + AttachButton.Visibility = Visibility.Collapsed; } private void SaveConfig(object sender, RoutedEventArgs e) { diff --git a/ZitiTunneler/MainWindow.xaml b/ZitiTunneler/MainWindow.xaml index 5a9adc11..a3dcccb6 100644 --- a/ZitiTunneler/MainWindow.xaml +++ b/ZitiTunneler/MainWindow.xaml @@ -7,8 +7,8 @@ mc:Ignorable="d" ShowInTaskbar="False" x:Name="MainUI" - Title="MainWindow" Height="510" - Width="375" ResizeMode="NoResize" + Title="MainWindow" Height="560" + Width="350" ResizeMode="NoResize" Icon="Assets/Images/icon.png" AllowsTransparency="True" Closing="Window_Closing" WindowStyle="None" Loaded="MainWindow1_Loaded" Background="#000F0F23"> @@ -16,15 +16,14 @@ + - - @@ -38,58 +37,79 @@ - - - - - - - + + + + + + + + + + + + + + + - + - - + + - + + + + + + + + + + + + + + - + - + - - + + - - - + + + - - - + + + - - @@ -103,10 +123,10 @@ - + - @@ -115,10 +135,10 @@ - + - @@ -134,5 +154,5 @@ - + diff --git a/ZitiTunneler/MainWindow.xaml.cs b/ZitiTunneler/MainWindow.xaml.cs index d882fb79..50ac5398 100644 --- a/ZitiTunneler/MainWindow.xaml.cs +++ b/ZitiTunneler/MainWindow.xaml.cs @@ -120,14 +120,15 @@ namespace ZitiTunneler { id.OnClick += OpenIdentity; IdList.Children.Add(id); } - UIMain.Height = 480+(identities.Count*60); - BgColor.Height = 480+(identities.Count*60); - FormGrowAnimation.To = UIMain.Height; - FormGrowOutAnimation.From = BgColor.Height; - App.Current.MainWindow.Height = 490+(identities.Count*60); + //MainUI.Height = 480+(identities.Count*60); + //BgColor.Height = 480+(identities.Count*60); + //FormGrowAnimation.To = MainUI.Height; + //FormGrowOutAnimation.From = BgColor.Height; + //App.Current.MainWindow.Height = 490+(identities.Count*60); var desktopWorkingArea = System.Windows.SystemParameters.WorkArea; this.Left = desktopWorkingArea.Right-this.Width-25; this.Top = desktopWorkingArea.Bottom-this.Height-25; + this.Top = desktopWorkingArea.Bottom-this.Height-25; } private void OpenIdentity(ZitiIdentity identity) { diff --git a/ZitiTunneler/MenuEditItem.xaml b/ZitiTunneler/MenuEditItem.xaml index 627df073..403ce435 100644 --- a/ZitiTunneler/MenuEditItem.xaml +++ b/ZitiTunneler/MenuEditItem.xaml @@ -5,17 +5,19 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:ZitiTunneler" mc:Ignorable="d" - d:DesignHeight="50" HorizontalAlignment="Stretch" d:DesignWidth="375" Cursor="Hand"> - - - - - - - - - - - + d:DesignHeight="50" HorizontalAlignment="Stretch" d:DesignWidth="350" Cursor="Hand"> + + + + + + + + + + + + + \ No newline at end of file diff --git a/ZitiTunneler/MenuEditItem.xaml.cs b/ZitiTunneler/MenuEditItem.xaml.cs index 3150a107..1ca956ee 100644 --- a/ZitiTunneler/MenuEditItem.xaml.cs +++ b/ZitiTunneler/MenuEditItem.xaml.cs @@ -27,7 +27,7 @@ namespace ZitiTunneler { } set { this._label = value; - MainLabel.Content = this._label; + MainLabel.Text = this._label; } } public string Value { diff --git a/ZitiTunneler/MenuItem.xaml b/ZitiTunneler/MenuItem.xaml index f447e62b..d8894595 100644 --- a/ZitiTunneler/MenuItem.xaml +++ b/ZitiTunneler/MenuItem.xaml @@ -6,7 +6,21 @@ xmlns:local="clr-namespace:ZitiTunneler" mc:Ignorable="d" d:DesignHeight="50" HorizontalAlignment="Stretch" d:DesignWidth="375" Cursor="Hand"> - + + + + + + + + + + + + + + + diff --git a/ZitiTunneler/MenuItem.xaml.cs b/ZitiTunneler/MenuItem.xaml.cs index 75d698b8..a83c7a63 100644 --- a/ZitiTunneler/MenuItem.xaml.cs +++ b/ZitiTunneler/MenuItem.xaml.cs @@ -44,5 +44,5 @@ namespace ZitiTunneler { public MenuItem() { InitializeComponent(); } - } + } } diff --git a/ZitiTunneler/Models/ZitiIdentity.cs b/ZitiTunneler/Models/ZitiIdentity.cs index 26dff85a..2307fb63 100644 --- a/ZitiTunneler/Models/ZitiIdentity.cs +++ b/ZitiTunneler/Models/ZitiIdentity.cs @@ -37,7 +37,7 @@ namespace ZitiTunneler.Models { ControllerUrl = id.Config.ztAPI, EnrollmentStatus = "status", Fingerprint = id.FingerPrint, - IsEnabled = false, + IsEnabled = id.Active, Name = id.Name, Status = id.Status, };