From 56ba10186069f41191debf6b89ad2e92c91cc99f Mon Sep 17 00:00:00 2001 From: Ashish Aggarwal Date: Fri, 11 Aug 2023 10:14:43 -0400 Subject: [PATCH 1/3] Fix PostDiff job --- .github/workflows/clear_cache.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/clear_cache.yml b/.github/workflows/clear_cache.yml index 37ef5949bd8..0f2e0ab5dd5 100644 --- a/.github/workflows/clear_cache.yml +++ b/.github/workflows/clear_cache.yml @@ -77,8 +77,8 @@ jobs: echo "Deleting caches..." echo "Deleting: $WNNUM-cache-net60Win-current" gh actions-cache delete $WNNUM-cache-net60Win-current -R $REPO --confirm - echo "Deleting: $WNNUM-cache-current" - gh actions-cache delete $WNNUM-cache-current -R $REPO --confirm + echo "Deleting: $WNNUM-cache-net60Win-master" + gh actions-cache delete $WNNUM-cache-master -R $REPO --confirm env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 0a671b23efea6dcdf120bde6a145e2be18a5bc15 Mon Sep 17 00:00:00 2001 From: Ashish Aggarwal Date: Tue, 16 Jan 2024 14:00:08 -0500 Subject: [PATCH 2/3] Update ShortcutToolbar.xaml.cs --- src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs b/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs index 39cd666fd9e..7bdad583b1d 100644 --- a/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs +++ b/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs @@ -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 { From d5be8c94a302ac7ffcc72d024fac383d391b60be Mon Sep 17 00:00:00 2001 From: Ashish Aggarwal Date: Tue, 16 Jan 2024 16:16:57 -0500 Subject: [PATCH 3/3] update --- src/DynamoCoreWpf/Properties/Resources.Designer.cs | 9 +++++++++ src/DynamoCoreWpf/Properties/Resources.en-US.resx | 3 +++ src/DynamoCoreWpf/Properties/Resources.resx | 3 +++ .../Controls/PackageManagerPublishControl.xaml.cs | 4 ++-- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs index 69d90d507e1..0ec0563eba3 100644 --- a/src/DynamoCoreWpf/Properties/Resources.Designer.cs +++ b/src/DynamoCoreWpf/Properties/Resources.Designer.cs @@ -8769,6 +8769,15 @@ public static string RerunButtonToolTip { } } + /// + /// Looks up a localized string similar to Your changes will be lost if you proceed.. + /// + public static string ResetChangesWarningPopupMessage { + get { + return ResourceManager.GetString("ResetChangesWarningPopupMessage", resourceCulture); + } + } + /// /// Looks up a localized string similar to Reset CPython. /// diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx index eca56492e8e..c9ed9b24703 100644 --- a/src/DynamoCoreWpf/Properties/Resources.en-US.resx +++ b/src/DynamoCoreWpf/Properties/Resources.en-US.resx @@ -3885,4 +3885,7 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in Sign out of Dynamo + + Your changes will be lost if you proceed. + \ No newline at end of file diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx index a3df5d76d3e..d334e8ef816 100644 --- a/src/DynamoCoreWpf/Properties/Resources.resx +++ b/src/DynamoCoreWpf/Properties/Resources.resx @@ -3872,4 +3872,7 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in Sign out of Dynamo + + Your changes will be lost if you proceed. + \ No newline at end of file diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml.cs b/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml.cs index 555ac3a8bf2..49870e7b6d5 100644 --- a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml.cs +++ b/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml.cs @@ -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);