mirror of
https://github.com/openziti/desktop-edge-win.git
synced 2026-10-23 12:46:00 +00:00
dovholuknf
Binary file not shown.
|
After Width: | Height: | Size: 2.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 572 B |
@@ -148,7 +148,7 @@
|
||||
<Label Content="IDENTITY" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" Foreground="White" Height="25" Margin="0,-14,0,0" FontSize="10" HorizontalAlignment="Right"></Label>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
<Canvas Name="ConnectButton" Width="400" Height="160" MouseUp="ConnectButtonClick" Visibility="Visible">
|
||||
<Canvas Name="ConnectButton" Width="400" Height="160" MouseUp="StartZitiService" Visibility="Collapsed">
|
||||
<Grid Width="{Binding ActualWidth, ElementName=ConnectButton}" Height="140">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="221*"/>
|
||||
@@ -195,7 +195,7 @@
|
||||
<Image Grid.Column="1" Source="/Assets/Images/up.png" Width="20" HorizontalAlignment="Left" Height="20"></Image>
|
||||
</Grid>
|
||||
<Label Name="UploadSpeed" Margin="0,-16,0,0" Foreground="#FF0047" Content="0" FontSize="40" HorizontalAlignment="Center" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" />
|
||||
<Label Name="UploadSpeedLabel" Foreground="White" Margin="0,-20,0,30" Content="KBps" FontSize="11" HorizontalAlignment="Center" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" />
|
||||
<Label Name="UploadSpeedLabel" MouseUp="UploadSpeedLabel_MouseUp" Foreground="White" Margin="0,-20,0,30" Content="KBps" FontSize="11" HorizontalAlignment="Center" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" />
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
<!--
|
||||
@@ -235,10 +235,37 @@
|
||||
</StackPanel>
|
||||
|
||||
|
||||
|
||||
<local:MainMenu x:Name="MainMenu" Visibility="Collapsed"></local:MainMenu>
|
||||
<local:IdentityDetails x:Name="IdentityMenu" Visibility="Collapsed"></local:IdentityDetails>
|
||||
|
||||
|
||||
<Grid x:Name="BlurbArea" Visibility="Collapsed" Height="80" Margin="0,500,0,0" VerticalAlignment="Bottom">
|
||||
<Border Margin="10,10,10,10" BorderBrush="Black" BorderThickness="8" CornerRadius="10">
|
||||
<Border.Effect>
|
||||
<DropShadowEffect BlurRadius="20" Direction="1" RenderingBias="Quality" ShadowDepth="1" Opacity="1"/>
|
||||
</Border.Effect>
|
||||
</Border>
|
||||
<Rectangle Margin="10,10,10,10" RadiusX="10" RadiusY="10" ClipToBounds="True">
|
||||
<Rectangle.Fill>
|
||||
<SolidColorBrush Color="#FFFFFF" Opacity="0.97"/>
|
||||
</Rectangle.Fill>
|
||||
</Rectangle>
|
||||
<Grid Margin="30,0,30,0">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="30"></ColumnDefinition>
|
||||
<ColumnDefinition Width="*"></ColumnDefinition>
|
||||
<ColumnDefinition Width="30"></ColumnDefinition>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="*"></RowDefinition>
|
||||
<RowDefinition Height="60"></RowDefinition>
|
||||
<RowDefinition Height="*"></RowDefinition>
|
||||
</Grid.RowDefinitions>
|
||||
<Image Source="/Assets/Images/WarningRed.png" Grid.Column="0" Width="30" Grid.Row="1" Height="30" Margin="0,0,0,0"></Image>
|
||||
<Label x:Name="Blurb" Content="An Update is available!" MouseUp="BlurbAction" Grid.Column="1" Padding="0,0,0,0" Grid.Row="1" Margin="0,0,0,0" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" Foreground="#000000" FontSize="12" Cursor="Hand" HorizontalAlignment="Center" VerticalAlignment="Center"></Label>
|
||||
<Image Source="/Assets/Images/closeBlack.png" Grid.Column="2" Width="10" Height="10" Grid.Row="1" Margin="0,0,0,0" Cursor="Hand" MouseUp="DoHideBlurb"></Image>
|
||||
</Grid>
|
||||
</Grid>
|
||||
|
||||
<Grid x:Name="NoServiceView" Visibility="Collapsed" Margin="10,10,10,10">
|
||||
<Rectangle RadiusX="10" RadiusY="10">
|
||||
<Rectangle.Fill>
|
||||
|
||||
@@ -10,6 +10,7 @@ using System.Windows.Controls;
|
||||
using System.Drawing;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Media.Animation;
|
||||
|
||||
using ZitiDesktopEdge.Models;
|
||||
using ZitiDesktopEdge.DataStructures;
|
||||
@@ -312,7 +313,7 @@ namespace ZitiDesktopEdge {
|
||||
|
||||
string nextVersionStr = null;
|
||||
private void MonitorClient_OnReconnectFailure(object sender, object e) {
|
||||
if(nextVersionStr == null) {
|
||||
if (nextVersionStr == null) {
|
||||
// check for the current version
|
||||
nextVersionStr = "checking for update";
|
||||
Version nextVersion = VersionUtil.NormalizeVersion(GithubAPI.GetVersion(GithubAPI.GetJson(GithubAPI.ProdUrl)));
|
||||
@@ -331,7 +332,6 @@ namespace ZitiDesktopEdge {
|
||||
logger.Info("Current version installed: {0} is the same as the latest released version {1}", currentVersion, nextVersion);
|
||||
MainMenu.SetAppUpgradeAvailableText("");
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -445,6 +445,9 @@ namespace ZitiDesktopEdge {
|
||||
|
||||
bool startZitiButtonVisible = false;
|
||||
private void ShowServiceNotStarted() {
|
||||
TunnelConnected(false);
|
||||
LoadIdentities(true);
|
||||
/*
|
||||
this.Dispatcher.Invoke(() => {
|
||||
semaphoreSlim.Wait(); //make sure the event is only added to the button once
|
||||
CloseErrorButton.Click -= CloseError;
|
||||
@@ -456,6 +459,7 @@ namespace ZitiDesktopEdge {
|
||||
semaphoreSlim.Release();
|
||||
SetCantDisplay("Service Not Started", "Do you want to start the data service now?", Visibility.Visible);
|
||||
});
|
||||
*/
|
||||
}
|
||||
|
||||
private void MonitorClient_OnClientConnected(object sender, object e) {
|
||||
@@ -689,13 +693,12 @@ namespace ZitiDesktopEdge {
|
||||
IdList.MaxHeight = _maxHeight - 520;
|
||||
ZitiIdentity[] ids = identities.OrderBy(i => i.Name.ToLower()).ToArray();
|
||||
MainMenu.SetupIdList(ids);
|
||||
double height = 490 + (ids.Length * 60);
|
||||
if (height > _maxHeight) height = _maxHeight;
|
||||
|
||||
this.Height = height;
|
||||
IdentityMenu.SetHeight(this.Height - 160);
|
||||
|
||||
if (ids.Length>0) {
|
||||
if (ids.Length>0&&serviceClient.Connected) {
|
||||
double height = 490 + (ids.Length * 60);
|
||||
if (height > _maxHeight) height = _maxHeight;
|
||||
this.Height = height;
|
||||
IdentityMenu.SetHeight(this.Height - 160);
|
||||
MainMenu.IdentitiesButton.Visibility = Visibility.Visible;
|
||||
foreach (var id in ids) {
|
||||
IdentityItem idItem = new IdentityItem();
|
||||
@@ -710,11 +713,19 @@ namespace ZitiDesktopEdge {
|
||||
idItem.Identity = id;
|
||||
IdList.Children.Add(idItem);
|
||||
}
|
||||
IdList.Height = (double)(ids.Length * 64);
|
||||
//IdList.Height = ;
|
||||
DoubleAnimation animation = new DoubleAnimation((double)(ids.Length * 64), TimeSpan.FromSeconds(.3));
|
||||
IdList.BeginAnimation(FrameworkElement.HeightProperty, animation);
|
||||
IdListScroller.Visibility = Visibility.Visible;
|
||||
AddIdButton.Visibility = Visibility.Visible;
|
||||
AddIdAreaButton.Visibility = Visibility.Visible;
|
||||
} else {
|
||||
this.Height = 490;
|
||||
MainMenu.IdentitiesButton.Visibility = Visibility.Collapsed;
|
||||
IdListScroller.Visibility = Visibility.Collapsed;
|
||||
AddIdButton.Visibility = Visibility.Collapsed;
|
||||
AddIdAreaButton.Visibility = Visibility.Collapsed;
|
||||
Debug.WriteLine("Height: " + this.Height + " " + this.ActualHeight);
|
||||
}
|
||||
|
||||
Placement();
|
||||
@@ -858,16 +869,6 @@ namespace ZitiDesktopEdge {
|
||||
_tunnelUptimeTimer.Enabled = true;
|
||||
_tunnelUptimeTimer.Start();
|
||||
}
|
||||
private void ConnectButtonClick(object sender, RoutedEventArgs e) {
|
||||
if (!_isServiceInError) {
|
||||
ShowLoad("Starting Service", "Please wait while the service is started...");
|
||||
this.Dispatcher.Invoke(async () => {
|
||||
//Dispatcher.Invoke(new Action(() => { }), System.Windows.Threading.DispatcherPriority.ContextIdle);
|
||||
await DoConnectAsync();
|
||||
HideLoad();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
async private Task DoConnectAsync() {
|
||||
try {
|
||||
@@ -994,6 +995,49 @@ namespace ZitiDesktopEdge {
|
||||
}
|
||||
}
|
||||
|
||||
private string _blurbUrl = "";
|
||||
|
||||
public void ShowBlurb(string message, string url) {
|
||||
Blurb.Content = message;
|
||||
_blurbUrl = url;
|
||||
BlurbArea.Visibility = Visibility.Visible;
|
||||
BlurbArea.Opacity = 0;
|
||||
BlurbArea.Margin = new Thickness(0, 0, 0, 0);
|
||||
DoubleAnimation animation = new DoubleAnimation(1, TimeSpan.FromSeconds(.3));
|
||||
ThicknessAnimation animateThick = new ThicknessAnimation(new Thickness(15, 0, 15, 15), TimeSpan.FromSeconds(.3));
|
||||
BlurbArea.BeginAnimation(Grid.OpacityProperty, animation);
|
||||
BlurbArea.BeginAnimation(Grid.MarginProperty, animateThick);
|
||||
}
|
||||
|
||||
private void DoHideBlurb(object sender, MouseButtonEventArgs e) {
|
||||
HideBlurb();
|
||||
}
|
||||
|
||||
private void HideBlurb() {
|
||||
DoubleAnimation animation = new DoubleAnimation(0, TimeSpan.FromSeconds(.3));
|
||||
ThicknessAnimation animateThick = new ThicknessAnimation(new Thickness(0, 0, 0, 0), TimeSpan.FromSeconds(.3));
|
||||
animation.Completed += HideComplete;
|
||||
BlurbArea.BeginAnimation(Grid.OpacityProperty, animation);
|
||||
BlurbArea.BeginAnimation(Grid.MarginProperty, animateThick);
|
||||
}
|
||||
|
||||
private void HideComplete(object sender, EventArgs e) {
|
||||
BlurbArea.Visibility = Visibility.Collapsed;
|
||||
}
|
||||
|
||||
private void BlurbAction(object sender, MouseButtonEventArgs e) {
|
||||
if (_blurbUrl.Length>0) {
|
||||
// So this simply execute a url but you could do like if (_blurbUrl=="DoSomethingNifty") CallNifyFunction();
|
||||
Process.Start(new ProcessStartInfo(_blurbUrl) { UseShellExecute = true });
|
||||
} else {
|
||||
HideBlurb();
|
||||
}
|
||||
}
|
||||
|
||||
private void UploadSpeedLabel_MouseUp(object sender, MouseButtonEventArgs e) {
|
||||
ShowBlurb("An Update is available!", "https://www.axeda.com?buddy=true");
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
private void MainUI_DpiChanged(object sender, DpiChangedEventArgs e) {
|
||||
|
||||
@@ -398,5 +398,17 @@
|
||||
<ItemGroup>
|
||||
<Resource Include="Assets\Images\identities.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Assets\Images\Error.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Assets\Images\ErrorBlack.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Assets\Images\closeBlack.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Assets\Images\WarningRed.png" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
</Project>
|
||||
@@ -1,8 +1,18 @@
|
||||
# Release 1.7.9
|
||||
|
||||
## What's New
|
||||
* Stopping the data service (`ziti`) using the big button no longer shows the old warning asking to start the service or exit the UI.
|
||||
Now the expected behavior is to see the button "off" which is used to turn the tunnel back "on"
|
||||
|
||||
## Other changes:
|
||||
* none
|
||||
|
||||
## Bugs fixed:
|
||||
* [#310](https://github.com/openziti/desktop-edge-win/pull/310) Restore identities moved by Windows after Windows system update
|
||||
|
||||
## Dependency Updates
|
||||
* Tunneler SDK to v0.8.21/CSDK 0.20.13
|
||||
|
||||
# Release 1.7.8
|
||||
|
||||
## What's New
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ REM See the License for the specific language governing permissions and
|
||||
REM limitations under the License.
|
||||
REM
|
||||
SET REPO_URL=https://github.com/openziti/ziti-tunnel-sdk-c.git
|
||||
SET ZITI_TUNNEL_REPO_BRANCH=v0.8.17
|
||||
SET ZITI_TUNNEL_REPO_BRANCH=v0.8.21
|
||||
REM override the c sdk used in the build - leave blank for the same as specified in the tunneler sdk
|
||||
SET ZITI_SDK_C_BRANCH=
|
||||
REM the number of TCP connections the tunneler sdk can have at any one time
|
||||
|
||||
Reference in New Issue
Block a user