From 27d6bcb74f392f15a79f58e1bd9347d520f02365 Mon Sep 17 00:00:00 2001 From: "Aaron (Qilong)" Date: Wed, 10 Jan 2024 13:43:29 -0500 Subject: [PATCH 1/3] updates --- src/DynamoCoreWpf/Properties/Resources.Designer.cs | 4 ++-- src/DynamoCoreWpf/Properties/Resources.en-US.resx | 6 +++--- src/DynamoCoreWpf/Properties/Resources.resx | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs index 1e7b36fd450..7b909150777 100644 --- a/src/DynamoCoreWpf/Properties/Resources.Designer.cs +++ b/src/DynamoCoreWpf/Properties/Resources.Designer.cs @@ -160,7 +160,7 @@ public static string AddToLibraryButton { } /// - /// Looks up a localized string similar to I would like to participate in data collection. + /// Looks up a localized string similar to I would like to participate in data collection for Machine Learning Programs. /// public static string AgreeToMLAutocompleteTOUText { get { @@ -9962,7 +9962,7 @@ public static string UpdateMessage { } /// - /// Looks up a localized string similar to Agreement and Terms of Use. + /// Looks up a localized string similar to Agreements for Data Collection. /// public static string UsageReportPromptDialogTitle { get { diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx index 53a702137cd..280674101ba 100644 --- a/src/DynamoCoreWpf/Properties/Resources.en-US.resx +++ b/src/DynamoCoreWpf/Properties/Resources.en-US.resx @@ -2220,10 +2220,10 @@ Installing the latest update requires Dynamo and any host applications to close. Do you want to install the latest Dynamo update? - Agreement and Terms of Use + Agreements for Data Collection - I would like to participate in data collection + I would like to participate in data collection for Machine Learning Programs Keep 1 input list's nesting @@ -3882,4 +3882,4 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in Millimeters - \ No newline at end of file + diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx index 767a569dbbb..be5e7175b26 100644 --- a/src/DynamoCoreWpf/Properties/Resources.resx +++ b/src/DynamoCoreWpf/Properties/Resources.resx @@ -1151,10 +1151,10 @@ Don't worry, you'll have the option to save your work. Cancel - Agreement and Terms of Use + Agreements for Data Collection - I would like to participate in data collection + I would like to participate in data collection for Machine Learning Programs Clear @@ -3869,4 +3869,4 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in Millimeters - \ No newline at end of file + From f5fe4f2a128e42e259222071901ca237c7381c5d Mon Sep 17 00:00:00 2001 From: "Aaron (Qilong)" Date: Wed, 10 Jan 2024 14:24:32 -0500 Subject: [PATCH 2/3] update --- src/DynamoCoreWpf/Properties/Resources.Designer.cs | 2 +- src/DynamoCoreWpf/Properties/Resources.en-US.resx | 4 ++-- src/DynamoCoreWpf/Properties/Resources.resx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs index 7b909150777..0d779519d0d 100644 --- a/src/DynamoCoreWpf/Properties/Resources.Designer.cs +++ b/src/DynamoCoreWpf/Properties/Resources.Designer.cs @@ -2288,7 +2288,7 @@ public static string DynamoViewSettingMenuShowDataReportingDialog { } /// - /// Looks up a localized string similar to Display the dialog of agreement on data collecting and Machine Learning Node Autocomplete terms of use. + /// Looks up a localized string similar to Display the dialog of agreements for data collecting in Dynamo and Machine Learning Node Autocomplete. /// public static string DynamoViewSettingMenuShowDataReportingDialogTooltip { get { diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx index 280674101ba..65eb3adac1e 100644 --- a/src/DynamoCoreWpf/Properties/Resources.en-US.resx +++ b/src/DynamoCoreWpf/Properties/Resources.en-US.resx @@ -764,7 +764,7 @@ Don't worry, you'll have the option to save your work. Setting menu | Decimal inch - Agreement and _Terms of Use + Agreement for _Data Collection Dynamo menu | Show user agreement dialog about data collecting @@ -2316,7 +2316,7 @@ Uninstall the following packages: {0}? Filter by - Display the dialog of agreement on data collecting and Machine Learning Node Autocomplete terms of use + Display the dialog of agreements for data collecting in Dynamo and Machine Learning Node Autocomplete diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx index be5e7175b26..c15cd5ba19e 100644 --- a/src/DynamoCoreWpf/Properties/Resources.resx +++ b/src/DynamoCoreWpf/Properties/Resources.resx @@ -2606,7 +2606,7 @@ Uninstall the following packages: {0}? Filter by - Display the dialog of agreement on data collecting and Machine Learning Node Autocomplete terms of use + Display the dialog of agreements for data collecting in Dynamo and Machine Learning Node Autocomplete From 61aaa3d49db27bc460f1befb0ff2b692876d6995 Mon Sep 17 00:00:00 2001 From: "Aaron (Qilong)" Date: Wed, 10 Jan 2024 15:05:16 -0500 Subject: [PATCH 3/3] Remove tooltip for menu item --- src/DynamoCoreWpf/Properties/Resources.Designer.cs | 11 +---------- src/DynamoCoreWpf/Properties/Resources.en-US.resx | 5 +---- src/DynamoCoreWpf/Properties/Resources.resx | 5 +---- src/DynamoCoreWpf/Views/Core/DynamoView.xaml | 3 --- 4 files changed, 3 insertions(+), 21 deletions(-) diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs index 0d779519d0d..5149c86c9a3 100644 --- a/src/DynamoCoreWpf/Properties/Resources.Designer.cs +++ b/src/DynamoCoreWpf/Properties/Resources.Designer.cs @@ -2279,7 +2279,7 @@ public static string DynamoViewSettingMenuNumberFormat { } /// - /// Looks up a localized string similar to Agreement and _Terms of Use. + /// Looks up a localized string similar to Agreements for _Data Collection. /// public static string DynamoViewSettingMenuShowDataReportingDialog { get { @@ -2287,15 +2287,6 @@ public static string DynamoViewSettingMenuShowDataReportingDialog { } } - /// - /// Looks up a localized string similar to Display the dialog of agreements for data collecting in Dynamo and Machine Learning Node Autocomplete. - /// - public static string DynamoViewSettingMenuShowDataReportingDialogTooltip { - get { - return ResourceManager.GetString("DynamoViewSettingMenuShowDataReportingDialogTooltip", resourceCulture); - } - } - /// /// Looks up a localized string similar to Square Centimeter. /// diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx index 65eb3adac1e..9dcd6add055 100644 --- a/src/DynamoCoreWpf/Properties/Resources.en-US.resx +++ b/src/DynamoCoreWpf/Properties/Resources.en-US.resx @@ -764,7 +764,7 @@ Don't worry, you'll have the option to save your work. Setting menu | Decimal inch - Agreement for _Data Collection + Agreements for _Data Collection Dynamo menu | Show user agreement dialog about data collecting @@ -2315,9 +2315,6 @@ Uninstall the following packages: {0}? Filter by - - Display the dialog of agreements for data collecting in Dynamo and Machine Learning Node Autocomplete - ..\ViewModels\Watch3D\compiledShaders\psDynamoMesh;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx index c15cd5ba19e..f8530049348 100644 --- a/src/DynamoCoreWpf/Properties/Resources.resx +++ b/src/DynamoCoreWpf/Properties/Resources.resx @@ -487,7 +487,7 @@ Setting menu | Decimal inch - Agreement and _Terms of Use + Agreements for _Data Collection Dynamo menu | Show user agreement dialog about data collecting @@ -2605,9 +2605,6 @@ Uninstall the following packages: {0}? Filter by - - Display the dialog of agreements for data collecting in Dynamo and Machine Learning Node Autocomplete - ..\ViewModels\Watch3D\compiledShaders\psDynamoMesh;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml index 82e8b72a55d..3824a34408b 100644 --- a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml +++ b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml @@ -306,9 +306,6 @@ Command="{Binding Path=ToggleIsAnalyticsReportingApprovedCommand, Source={x:Static service:UsageReportingManager.Instance} }" CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:DynamoView}}}" Visibility="{Binding HideReportOptions, Converter={StaticResource InverseBoolToVisibilityCollapsedConverter}}"> - - -