void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-07 13:03:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev

Browse source
This commit is contained in:
Adam Ierymenko 2017-02-14 16:43:29 -08:00
commit d01f31197a
2 changed files with 23 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
macui/ZeroTier One/AboutViewController.m
View file

@ -32,6 +32,7 @@
[self.webView.layer setCornerRadius:1.0f]; [self.webView.layer setCornerRadius:1.0f];
self.webView.layer.masksToBounds = YES; self.webView.layer.masksToBounds = YES;
[self.webView.layer setBorderColor:[[NSColor darkGrayColor] CGColor]]; [self.webView.layer setBorderColor:[[NSColor darkGrayColor] CGColor]];
self.webView.policyDelegate = self;
NSBundle *bundle = [NSBundle mainBundle]; NSBundle *bundle = [NSBundle mainBundle];
NSURL *path = [bundle URLForResource:@"about" withExtension:@"html"]; NSURL *path = [bundle URLForResource:@"about" withExtension:@"html"];

54
windows/WinUI/ToolbarItem.xaml
View file

@ -20,54 +20,38 @@
<Grid> <Grid>
<tb:TaskbarIcon x:Name="MyNotifyIcon" <tb:TaskbarIcon x:Name="MyNotifyIcon"
IconSource="ZeroTierIcon.ico" IconSource="ZeroTierIcon.ico"
ToolTipText="ZeroTier One"> ToolTipText="ZeroTier One"
MenuActivation="LeftOrRightClick">
<tb:TaskbarIcon.ContextMenu> <tb:TaskbarIcon.ContextMenu>
<ContextMenu> <ContextMenu>
<ContextMenu.ItemsSource> <ContextMenu.ItemsSource>
<CompositeCollection> <CompositeCollection>
<MenuItem Header="Node ID: unknown" <MenuItem Header="Node ID: unknown"
Click="ToolbarItem_NodeIDClicked" Click="ToolbarItem_NodeIDClicked"
x:Name="nodeIdMenuItem"/> x:Name="nodeIdMenuItem"/>
<Separator/> <Separator/>
<MenuItem Header="Join Network..." <MenuItem Header="Join Network..."
Click="ToolbarItem_JoinNetworkClicked"/> Click="ToolbarItem_JoinNetworkClicked"/>
<MenuItem Header="Show Networks..." <MenuItem Header="Show Networks..."
Click="ToolbarItem_ShowNetworksClicked"/> Click="ToolbarItem_ShowNetworksClicked"/>
<Separator/> <Separator/>
<CollectionContainer Collection="{Binding Source={StaticResource KnownNetworks}}"> <CollectionContainer Collection="{Binding Source={StaticResource KnownNetworks}}">
</CollectionContainer> </CollectionContainer>
<Separator/> <Separator/>
<MenuItem Header="About..." <MenuItem Header="About..."
Click="ToolbarItem_AboutClicked"/> Click="ToolbarItem_AboutClicked"/>
<MenuItem Header="Preferences..." <MenuItem Header="Preferences..."
Click="ToolbarItem_PreferencesClicked"/> Click="ToolbarItem_PreferencesClicked"/>
<Separator/> <Separator/>
<MenuItem Header="Quit" <MenuItem Header="Quit"
Click="ToolbarItem_QuitClicked"/> Click="ToolbarItem_QuitClicked"/>
</CompositeCollection> </CompositeCollection>
</ContextMenu.ItemsSource> </ContextMenu.ItemsSource>
</ContextMenu>
<!--<MenuItem Header="Networks">
<MenuItem.ItemsSource>
<CompositeCollection>
<CollectionContainer Collection="{Binding Source={StaticResource KnownNetworks}}"/>
</CompositeCollection>
</MenuItem.ItemsSource>
<MenuItem.ItemContainerStyle>
<Style>
<Setter Property="MenuItem.Header" Value="{Binding Title}"/>
--><!-- <Setter Property="MenuItem.IsCheckable" Value="True"/> --><!--
<Setter Property="MenuItem.IsChecked" Value="{Binding IsConnected}"/>
<EventSetter Event="MenuItem.Click" Handler="ToolbarItem_NetworkClicked"/>
</Style>
</MenuItem.ItemContainerStyle>
</MenuItem>-->
</ContextMenu>
</tb:TaskbarIcon.ContextMenu> </tb:TaskbarIcon.ContextMenu>
</tb:TaskbarIcon> </tb:TaskbarIcon>