Dynamo SignIn UI toolbar fixes and tooltip updates (#14842)

zeusongit · web-flow · commit b0eb47a713f3 · 2024-01-16T01:16:49.000+08:00
* Fix PostDiff job

* fixes 1 and 2

* DYN-5868 fix-3
diff --git a/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml b/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml
@@ -216,7 +216,7 @@
                         </MenuItem.Header>
                         <MenuItem Focusable="False"
                                               Header="{x:Static p:Resources.LogoutMenuItemText}"
-                                              Command="{Binding SignOutCommand}"
+                                              Click="LogoutOption_Click"
                                               Name="logoutOption">
                             <MenuItem.ToolTip>
                                 <ToolTip Content="{x:Static p:Resources.LogoutMenuItemText}" Style="{StaticResource GenericToolTipLight}"/>
diff --git a/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs b/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs
@@ -56,12 +56,17 @@ public ShortcutToolbar(DynamoViewModel dynamoViewModel)
             var shortcutToolbar = new ShortcutToolbarViewModel(dynamoViewModel);
             DataContext = shortcutToolbar;
             authManager = dynamoViewModel.Model.AuthenticationManager;
-            if (authManager.IsLoggedInInitial())
+            if (authManager != null)
             {
                 authManager.LoginStateChanged += AuthChangeHandler;
-            }
-            else {
-                logoutOption.Visibility = Visibility.Collapsed;
+                if (authManager.LoginState == LoginState.LoggedIn)
+                {
+                    loginMenu.Items.Add(logoutOption);
+                }
+                else
+                {
+                    loginMenu.Items.Remove(logoutOption);
+                }
             }
 
             this.Loaded += ShortcutToolbar_Loaded;
@@ -90,12 +95,17 @@ private void AuthChangeHandler(LoginState status)
                 LoginButton.ToolTip = Wpf.Properties.Resources.SignInButtonContentToolTip;
                 txtSignIn.Text = Wpf.Properties.Resources.SignInButtonText;
                 logoutOption.Visibility = Visibility.Collapsed;
+                loginMenu.Items.Remove(logoutOption);
             }
             else if (status == LoginState.LoggedIn)
             {
                 txtSignIn.Text = authManager.Username;
-                logoutOption.Visibility = Visibility.Visible;
                 LoginButton.ToolTip = null;
+                if (loginMenu.Items.Count == 0)
+                {
+                    loginMenu.Items.Add(logoutOption);
+                }
+                logoutOption.Visibility = Visibility.Visible;
             }
         }
 
@@ -134,6 +144,18 @@ private void LoginButton_OnClick(object sender, RoutedEventArgs e)
             }
         }
 
+        private void LogoutOption_Click(object sender, RoutedEventArgs e)
+        {
+            if (authManager.LoginState == LoginState.LoggedIn)
+            {
+                var result = Wpf.Utilities.MessageBoxService.Show(Application.Current?.MainWindow, Wpf.Properties.Resources.SignOutConfirmationDialogText, Wpf.Properties.Resources.SignOutConfirmationDialogTitle,MessageBoxButton.OKCancel, new List<string>() { "Sign Out", "Cancel"}, MessageBoxImage.Information);
+                if (result == MessageBoxResult.OK)
+                {
+                    authManager.ToggleLoginState(null);
+                }
+            }
+        }
+
         public List<Control> AllChildren(DependencyObject parent)
         {
             var _list = new List<Control> { };
diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
@@ -2589,7 +2589,7 @@ Do you wish to uninstall {1}? Restart {2} to complete the uninstall and try down
     <value>Package/Library Search Paths</value>
   </data>
   <data name="PreferencesViewShowRunPreviewTooltip" xml:space="preserve">
-    <value>Switchable only when the current workspace is in Manual run mode.</value>
+    <value>To preview the execution state of your graph, wires connected to ports that will be affected by a graph run are highlighted in orange. Available only when the current workspace is in Manual run mode.</value>
   </data>
   <data name="PersistentVisualStatusOfLinterIssues" xml:space="preserve">
     <value>Issues found</value>
@@ -3879,4 +3879,10 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
   <data name="GESUnitMillimeters" xml:space="preserve">
     <value>Millimeters</value>
   </data>
-</root>
+  <data name="SignOutConfirmationDialogText" xml:space="preserve">
+    <value>Signing out of Dynamo will sign you out of all Autodesk desktop products.</value>
+  </data>
+  <data name="SignOutConfirmationDialogTitle" xml:space="preserve">
+    <value>Sign out of Dynamo</value>
+  </data>
+</root>
diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -2877,7 +2877,7 @@ Do you wish to uninstall {1}? Restart {2} to complete the uninstall and try down
     <value>Package/Library Search Paths</value>
   </data>
   <data name="PreferencesViewShowRunPreviewTooltip" xml:space="preserve">
-    <value>Switchable only when the current workspace is in Manual run mode.</value>
+    <value>To preview the execution state of your graph, wires connected to ports that will be affected by a graph run are highlighted in orange. Available only when the current workspace is in Manual run mode.</value>
   </data>
   <data name="PersistentVisualStatusOfLinterIssues" xml:space="preserve">
     <value>Issues found</value>
@@ -3866,4 +3866,10 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
   <data name="GESUnitMillimeters" xml:space="preserve">
     <value>Millimeters</value>
   </data>
-</root>
+  <data name="SignOutConfirmationDialogText" xml:space="preserve">
+    <value>Signing out of Dynamo will sign you out of all Autodesk desktop products.</value>
+  </data>
+  <data name="SignOutConfirmationDialogTitle" xml:space="preserve">
+    <value>Sign out of Dynamo</value>
+  </data>
+</root>
diff --git a/src/DynamoCoreWpf/UI/Prompts/DynamoMessageBox.xaml.cs b/src/DynamoCoreWpf/UI/Prompts/DynamoMessageBox.xaml.cs
@@ -272,6 +272,27 @@ internal static MessageBoxResult Show(string messageBoxText, string caption, Mes
             return dynamoMessageBox.CustomDialogResult;
         }
 
+        internal static MessageBoxResult Show(Window owner, string messageBoxText, string caption, MessageBoxButton button, IEnumerable<string> buttonNames,
+            MessageBoxImage icon)
+        {
+            var dynamoMessageBox = new DynamoMessageBox
+            {
+                BodyText = messageBoxText,
+                TitleText = caption,
+                MessageBoxButton = button,
+                MessageBoxImage = icon
+            };
+
+            if (owner != null && owner.IsLoaded)
+            {
+                dynamoMessageBox.Owner = owner;
+            }
+
+            dynamoMessageBox.ConfigureButtons(button, buttonNames);
+            dynamoMessageBox.ShowDialog();
+            return dynamoMessageBox.CustomDialogResult;
+        }
+
         public event PropertyChangedEventHandler PropertyChanged;
 
         /// <summary>
diff --git a/src/DynamoCoreWpf/Utilities/MessageBoxUtilities.cs b/src/DynamoCoreWpf/Utilities/MessageBoxUtilities.cs
@@ -12,6 +12,7 @@ internal interface IMessageBox
             MessageBoxResult Show(string msg, string title, MessageBoxButton button, MessageBoxImage img);
             MessageBoxResult Show(string msg, string title, bool showRichTextBox, MessageBoxButton button, MessageBoxImage img);
             MessageBoxResult Show(Window owner,string msg, string title, MessageBoxButton button, MessageBoxImage img);
+            MessageBoxResult Show(Window owner, string msg, string title, MessageBoxButton button, IEnumerable<string> buttonNames, MessageBoxImage img);
             MessageBoxResult Show(string msg, string title, MessageBoxButton button, IEnumerable<string> buttonNames, MessageBoxImage img);
         }
 
@@ -38,6 +39,11 @@ MessageBoxResult IMessageBox.Show(string msg, string title, MessageBoxButton but
             {
                 return DynamoMessageBox.Show(msg, title, button,buttonNames, img);
             }
+
+            MessageBoxResult IMessageBox.Show(Window owner, string msg, string title, MessageBoxButton button, IEnumerable<string> buttonNames, MessageBoxImage img)
+            {
+                return DynamoMessageBox.Show(owner, msg, title, button, buttonNames, img);
+            }
         }
 
         private static IMessageBox msg_box;
@@ -57,6 +63,10 @@ public static MessageBoxResult Show(Window owner,string msg, string title, Messa
         {
             return (msg_box ?? (msg_box = new DefaultMessageBox())).Show(owner,msg, title, button, img);
         }
+        public static MessageBoxResult Show(Window owner, string msg, string title, MessageBoxButton button, IEnumerable<string> buttonNames, MessageBoxImage img)
+        {
+            return (msg_box ?? (msg_box = new DefaultMessageBox())).Show(owner, msg, title, button, buttonNames, img);
+        }
         public static MessageBoxResult Show(string msg, string title, MessageBoxButton button, IEnumerable<string> buttonNames, MessageBoxImage img)
         {
             return (msg_box ?? (msg_box = new DefaultMessageBox())).Show(msg, title, button, buttonNames, img);

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ internal interface IMessageBox`
`12`	`12`	`MessageBoxResult Show(string msg, string title, MessageBoxButton button, MessageBoxImage img);`
`13`	`13`	`MessageBoxResult Show(string msg, string title, bool showRichTextBox, MessageBoxButton button, MessageBoxImage img);`
`14`	`14`	`MessageBoxResult Show(Window owner,string msg, string title, MessageBoxButton button, MessageBoxImage img);`
	`15`	`+ MessageBoxResult Show(Window owner, string msg, string title, MessageBoxButton button, IEnumerable<string> buttonNames, MessageBoxImage img);`
`15`	`16`	`MessageBoxResult Show(string msg, string title, MessageBoxButton button, IEnumerable<string> buttonNames, MessageBoxImage img);`
`16`	`17`	`}`
`17`	`18`
`@@ -38,6 +39,11 @@ MessageBoxResult IMessageBox.Show(string msg, string title, MessageBoxButton but`
`38`	`39`	`{`
`39`	`40`	`return DynamoMessageBox.Show(msg, title, button,buttonNames, img);`
`40`	`41`	`}`
	`42`	`+`
	`43`	`+ MessageBoxResult IMessageBox.Show(Window owner, string msg, string title, MessageBoxButton button, IEnumerable<string> buttonNames, MessageBoxImage img)`
	`44`	`+ {`
	`45`	`+ return DynamoMessageBox.Show(owner, msg, title, button, buttonNames, img);`
	`46`	`+ }`
`41`	`47`	`}`
`42`	`48`
`43`	`49`	`private static IMessageBox msg_box;`
`@@ -57,6 +63,10 @@ public static MessageBoxResult Show(Window owner,string msg, string title, Messa`
`57`	`63`	`{`
`58`	`64`	`return (msg_box ?? (msg_box = new DefaultMessageBox())).Show(owner,msg, title, button, img);`
`59`	`65`	`}`
	`66`	`+ public static MessageBoxResult Show(Window owner, string msg, string title, MessageBoxButton button, IEnumerable<string> buttonNames, MessageBoxImage img)`
	`67`	`+ {`
	`68`	`+ return (msg_box ?? (msg_box = new DefaultMessageBox())).Show(owner, msg, title, button, buttonNames, img);`
	`69`	`+ }`
`60`	`70`	`public static MessageBoxResult Show(string msg, string title, MessageBoxButton button, IEnumerable<string> buttonNames, MessageBoxImage img)`
`61`	`71`	`{`
`62`	`72`	`return (msg_box ?? (msg_box = new DefaultMessageBox())).Show(msg, title, button, buttonNames, img);`