Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[[DYN-6539] Update reset package manager publish window dialog box message #14850

Merged
merged 33 commits into from
Jan 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
56ba101
Fix PostDiff job
zeusongit Aug 11, 2023
dc250de
Merge branch 'master' of https://github.com/zeusongit/Dynamo
zeusongit Aug 11, 2023
1fecd29
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
zeusongit Aug 16, 2023
90a6c41
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
zeusongit Aug 28, 2023
64c202b
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
zeusongit Aug 29, 2023
d6ac751
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
zeusongit Sep 5, 2023
255feeb
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
zeusongit Sep 7, 2023
4e55f7f
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
zeusongit Sep 8, 2023
1886669
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
zeusongit Sep 8, 2023
8ac6b74
Merge branch 'master' of https://github.com/zeusongit/Dynamo
zeusongit Sep 12, 2023
41c461c
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
zeusongit Sep 12, 2023
f9cf237
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
zeusongit Sep 28, 2023
a0adaef
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
zeusongit Oct 13, 2023
2ab3d49
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
zeusongit Oct 17, 2023
558df01
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
zeusongit Oct 20, 2023
efdb82b
Merge branch 'master' of https://github.com/zeusongit/Dynamo
zeusongit Oct 20, 2023
9b712f2
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
zeusongit Oct 23, 2023
7c2dc1e
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
zeusongit Oct 25, 2023
83bcb52
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
zeusongit Nov 1, 2023
30b861d
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
zeusongit Nov 3, 2023
71d23c2
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
zeusongit Dec 1, 2023
cd1c4f9
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
zeusongit Dec 1, 2023
0cae237
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
zeusongit Dec 6, 2023
d9d38c8
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
zeusongit Dec 12, 2023
ecebcda
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
zeusongit Dec 13, 2023
a53e033
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
zeusongit Dec 20, 2023
764342d
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
zeusongit Jan 3, 2024
83b1162
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
zeusongit Jan 10, 2024
8538a67
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
zeusongit Jan 11, 2024
0cef456
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
zeusongit Jan 16, 2024
8aa6539
Merge branch 'master' of https://github.com/DynamoDS/Dynamo
zeusongit Jan 16, 2024
0a671b2
Update ShortcutToolbar.xaml.cs
zeusongit Jan 16, 2024
d5be8c9
update
zeusongit Jan 16, 2024
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
7 changes: 5 additions & 2 deletions src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,12 @@ public ShortcutToolbar(DynamoViewModel dynamoViewModel)
if (authManager != null)
{
authManager.LoginStateChanged += AuthChangeHandler;
if (authManager.LoginState == LoginState.LoggedIn && loginMenu.Items.Count == 0)
if (authManager.LoginState == LoginState.LoggedIn)
{
loginMenu.Items.Add(logoutOption);
if(loginMenu.Items.Count == 0)
{
loginMenu.Items.Add(logoutOption);
}
}
else
{
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 @@ -3885,4 +3885,7 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
<data name="SignOutConfirmationDialogTitle" xml:space="preserve">
<value>Sign out of Dynamo</value>
</data>
<data name="ResetChangesWarningPopupMessage" xml:space="preserve">
<value>Your changes will be lost if you proceed.</value>
</data>
</root>
3 changes: 3 additions & 0 deletions src/DynamoCoreWpf/Properties/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -3872,4 +3872,7 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
<data name="SignOutConfirmationDialogTitle" xml:space="preserve">
<value>Sign out of Dynamo</value>
</data>
<data name="ResetChangesWarningPopupMessage" xml:space="preserve">
<value>Your changes will be lost if you proceed.</value>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -347,8 +347,8 @@ private void CancelButton_Click(object sender, RoutedEventArgs e)
MessageBoxResult response = DynamoModel.IsTestMode ? MessageBoxResult.OK :
MessageBoxService.Show(
Owner,
Dynamo.Wpf.Properties.Resources.DiscardChangesWarningPopupMessage,
Dynamo.Wpf.Properties.Resources.DiscardChangesWarningPopupCaption,
Wpf.Properties.Resources.ResetChangesWarningPopupMessage,
Wpf.Properties.Resources.DiscardChangesWarningPopupCaption,
MessageBoxButton.OKCancel,
MessageBoxImage.Warning);

Expand Down
Loading