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

Merge pull request #174 from openziti/release-1.2.13-tweaks

Browse Source 
Release 1.2.13 tweaks
This commit is contained in:
dovholuknf
2020-10-31 00:30:48 -04:00
committed by GitHub
parent d539ff3ad0 88787cdb90
commit d3a8a8216c
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DesktopEdge/IdentityDetails.xaml
+9 -6
View File
@@ -17,21 +17,24 @@
</Canvas>
<Rectangle Margin="10,10,10,10" Fill="White" RadiusY="10" RadiusX="10"></Rectangle>
<Grid Margin="20,20,20,-20">
<Grid Margin="20,20,20,-20" MaxWidth="350">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="0" Orientation="Vertical" HorizontalAlignment="Stretch" Margin="10,10,10,10">
<Grid Margin="0,0,0,10">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="70"/>
<ColumnDefinition Width="40"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="70"/>
<ColumnDefinition Width="40"/>
</Grid.ColumnDefinitions>
<local:Toggler x:Name="IdDetailToggle" Grid.Column="0" HorizontalAlignment="Left" OnToggled="IdToggle"></local:Toggler>
<Label Name="IdDetailName" Grid.Column="1" HorizontalAlignment="Center" MaxWidth="160" FontSize="14" FontWeight="SemiBold" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" Foreground="#0F0F23">
<TextBlock TextTrimming="CharacterEllipsis">Identity Name</TextBlock>
</Label>
<TextBlock Name="IdDetailName" Grid.Column="1" HorizontalAlignment="Center"
FontSize="14" FontWeight="SemiBold" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans"
Foreground="#0F0F23" VerticalAlignment="Center" TextWrapping="Wrap"
Text="Identity Name Here"
>
</TextBlock>
<Image Grid.Column="2" Cursor="Hand" Source="/Assets/Images/x.png" Width="20" Height="20" Margin="0,0,0,0" HorizontalAlignment="Right" MouseUp="HideMenu"></Image>
</Grid>
<Rectangle HorizontalAlignment="Stretch" Height="1" Fill="#7d8faf" Opacity="0.2"></Rectangle>
DesktopEdge/IdentityDetails.xaml.cs
+1 -1
View File
@@ -69,7 +69,7 @@ namespace ZitiDesktopEdge {
}
public void UpdateView() {
IdDetailName.Content = _identity.Name;
IdDetailName.Text = _identity.Name;
IdDetailToggle.Enabled = _identity.IsEnabled;
IdentityName.Value = _identity.Name;
IdentityNetwork.Value = _identity.ControllerUrl;
service/ziti-tunnel/service/state.go
+1
View File
@@ -202,6 +202,7 @@ func (t *RuntimeState) LoadIdentity(id *Id) {
return
}
id.ControllerVersion = id.CId.Version
id.CId.Fingerprint = id.FingerPrint
// hack for now - if the identity name is '<unknown>' don't set it... :(