diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-02-14 16:43:29 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-02-14 16:43:29 -0800 |
| commit | d01f31197affc9569c8c8748dfe10514d819ef38 (patch) | |
| tree | 26c6de030af29f306930c840c5f34ff072b42ad0 | |
| parent | 8b82f1c6095bc9761a5961154c5c3bd1b57b9510 (diff) | |
| parent | de7e8a1ca448ea2077f31514aa4f3d3ee3b5317b (diff) | |
| download | infinitytier-d01f31197affc9569c8c8748dfe10514d819ef38.tar.gz infinitytier-d01f31197affc9569c8c8748dfe10514d819ef38.zip | |
Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev
| -rw-r--r-- | macui/ZeroTier One/AboutViewController.m | 3 | ||||
| -rw-r--r-- | windows/WinUI/ToolbarItem.xaml | 58 |
2 files changed, 23 insertions, 38 deletions
diff --git a/macui/ZeroTier One/AboutViewController.m b/macui/ZeroTier One/AboutViewController.m index 21dceae1..7f92977d 100644 --- a/macui/ZeroTier One/AboutViewController.m +++ b/macui/ZeroTier One/AboutViewController.m @@ -32,7 +32,8 @@ [self.webView.layer setCornerRadius:1.0f]; self.webView.layer.masksToBounds = YES; [self.webView.layer setBorderColor:[[NSColor darkGrayColor] CGColor]]; - + self.webView.policyDelegate = self; + NSBundle *bundle = [NSBundle mainBundle]; NSURL *path = [bundle URLForResource:@"about" withExtension:@"html"]; if(path) { diff --git a/windows/WinUI/ToolbarItem.xaml b/windows/WinUI/ToolbarItem.xaml index 471a1107..3b064fc4 100644 --- a/windows/WinUI/ToolbarItem.xaml +++ b/windows/WinUI/ToolbarItem.xaml @@ -20,54 +20,38 @@ <Grid> <tb:TaskbarIcon x:Name="MyNotifyIcon" IconSource="ZeroTierIcon.ico" - ToolTipText="ZeroTier One"> + ToolTipText="ZeroTier One" + MenuActivation="LeftOrRightClick"> <tb:TaskbarIcon.ContextMenu> <ContextMenu> - <ContextMenu.ItemsSource> - <CompositeCollection> - <MenuItem Header="Node ID: unknown" + <ContextMenu.ItemsSource> + <CompositeCollection> + <MenuItem Header="Node ID: unknown" Click="ToolbarItem_NodeIDClicked" x:Name="nodeIdMenuItem"/> - <Separator/> - <MenuItem Header="Join Network..." + <Separator/> + <MenuItem Header="Join Network..." Click="ToolbarItem_JoinNetworkClicked"/> - <MenuItem Header="Show Networks..." + <MenuItem Header="Show Networks..." Click="ToolbarItem_ShowNetworksClicked"/> - <Separator/> + <Separator/> - <CollectionContainer Collection="{Binding Source={StaticResource KnownNetworks}}"> - - </CollectionContainer> + <CollectionContainer Collection="{Binding Source={StaticResource KnownNetworks}}"> - <Separator/> - <MenuItem Header="About..." + </CollectionContainer> + + <Separator/> + <MenuItem Header="About..." Click="ToolbarItem_AboutClicked"/> - <MenuItem Header="Preferences..." + <MenuItem Header="Preferences..." Click="ToolbarItem_PreferencesClicked"/> - <Separator/> - <MenuItem Header="Quit" + <Separator/> + <MenuItem Header="Quit" Click="ToolbarItem_QuitClicked"/> - - </CompositeCollection> - </ContextMenu.ItemsSource> - - <!--<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> + + </CompositeCollection> + </ContextMenu.ItemsSource> + </ContextMenu> </tb:TaskbarIcon.ContextMenu> </tb:TaskbarIcon> |