Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
Name="RightMenu">
<MenuItem Name="loginMenu" Margin="0,-3,-10,0">
<MenuItem.Header>
<Button Name="LoginButton" Click="LoginButton_OnClick" Foreground="#DCDCDC"
<Button Name="LoginButton" Click="LoginButton_OnClick" Foreground="#DCDCDC" ToolTipService.ShowOnDisabled="True"
>
<StackPanel FlowDirection="LeftToRight" Orientation="Horizontal">

Expand Down Expand Up @@ -210,7 +210,18 @@

</Button.Style>
<Button.ToolTip>
<ToolTip Content="{x:Static p:Resources.SignInButtonContentToolTip}" Style="{StaticResource GenericToolTipLight}"/>
<ToolTip>
<ToolTip.Style>
<Style TargetType="ToolTip" BasedOn="{StaticResource GenericToolTipLight}">
<Setter Property="Content" Value="{x:Static p:Resources.SignInButtonContentToolTip}" />
<Style.Triggers>
<DataTrigger Binding="{Binding PlacementTarget.IsEnabled, RelativeSource={RelativeSource Self}}" Value="False">
<Setter Property="Content" Value="{x:Static p:Resources.SignInOfflineButtonContentToolTip}" />
</DataTrigger>
</Style.Triggers>
</Style>
</ToolTip.Style>
</ToolTip>
</Button.ToolTip>
</Button>
</MenuItem.Header>
Expand Down
1 change: 1 addition & 0 deletions src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ private void ShortcutToolbar_Loaded(object sender, RoutedEventArgs e)
{
IsSaveButtonEnabled = false;
IsExportMenuEnabled = false;
IsLoginMenuEnabled = !DynamoViewModel.Model.NoNetworkMode;
DynamoViewModel.OnRequestShorcutToolbarLoaded(RightMenu.ActualWidth);
}

Expand Down
9 changes: 9 additions & 0 deletions src/DynamoCoreWpf/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions src/DynamoCoreWpf/Properties/Resources.en-US.resx
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,9 @@
<data name="SignInButtonContentToolTip" xml:space="preserve">
<value>Sign in to access online services that integrate with your desktop software.</value>
</data>
<data name="SignInOfflineButtonContentToolTip" xml:space="preserve">
<value>Enable Network Mode to be able to sign in.</value>
</data>
<data name="Autodesk360SignInButtonTitleToolTip" xml:space="preserve">
<value>Autodesk A360</value>
</data>
Expand Down
3 changes: 3 additions & 0 deletions src/DynamoCoreWpf/Properties/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -2114,6 +2114,9 @@ Do you want to install the latest Dynamo update?</value>
<data name="SignInButtonContentToolTip" xml:space="preserve">
<value>Sign in to access online services that integrate with your desktop software.</value>
</data>
<data name="SignInOfflineButtonContentToolTip" xml:space="preserve">
<value>Enable Network Mode to be able to sign in.</value>
</data>
<data name="Autodesk360SignInButtonTitleToolTip" xml:space="preserve">
<value>Autodesk A360</value>
</data>
Expand Down
1 change: 1 addition & 0 deletions src/DynamoCoreWpf/PublicAPI.Unshipped.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5650,6 +5650,7 @@ static Dynamo.Wpf.Properties.Resources.SideBarPanelViewTitle.get -> string
static Dynamo.Wpf.Properties.Resources.SignInButtonContentToolTip.get -> string
static Dynamo.Wpf.Properties.Resources.SignInButtonText.get -> string
static Dynamo.Wpf.Properties.Resources.SigningInButtonText.get -> string
static Dynamo.Wpf.Properties.Resources.SignInOfflineButtonContentToolTip.get -> string
static Dynamo.Wpf.Properties.Resources.SignOutConfirmationDialogText.get -> string
static Dynamo.Wpf.Properties.Resources.SignOutConfirmationDialogTitle.get -> string
static Dynamo.Wpf.Properties.Resources.SolutionToFolderNotWritatbleError.get -> string
Expand Down
5 changes: 5 additions & 0 deletions src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,11 @@ private void DynamoViewModel_RequestEnableShortcutBarItems(bool enable)
shortcutBar.IsLoginMenuEnabled = true;
shortcutBar.IsNotificationCenterEnabled = true;
}

if (dynamoViewModel.Model.NoNetworkMode)
{
shortcutBar.IsLoginMenuEnabled = false;
}
}
}

Expand Down
Loading