Enable python zoom scale in Dynamo Preferences Panel (DynamoDS#13798)

* python zoom scale * python zoom scale preference settings * fix old comments * remove unused variables * tooltip localization * Comments * updates * clean up * update * Update Python Editor Label * Update test * Comments --------- Co-authored-by: Aaron (Qilong) <[email protected]> Co-authored-by: Aaron (Qilong) <[email protected]>
sm6srw · Mar 29, 2023 · 0fb08ad · 0fb08ad
1 parent ab2bfed
commit 0fb08ad
Show file tree

Hide file tree

Showing 13 changed files with 338 additions and 74 deletions.
diff --git a/src/DynamoCore/Configuration/PreferenceSettings.cs b/src/DynamoCore/Configuration/PreferenceSettings.cs
@@ -176,6 +176,11 @@ public bool IsADPAnalyticsReportingApproved
         /// </summary>
         public int LibraryZoomScale { get; set; }
 
+        /// <summary>
+        /// Indicates the zoom scale of the Python editor
+        /// </summary>
+        public int PythonScriptZoomScale { get; set; }
+
         /// <summary>
         /// The types of connector: Bezier or Polyline.
         /// </summary>
@@ -789,6 +794,7 @@ public PreferenceSettings()
             BackupFiles = new List<string>();
 
             LibraryZoomScale = 100;
+            PythonScriptZoomScale = 22;
 
             CustomPackageFolders = new List<string>();
 
@@ -1211,5 +1217,6 @@ public bool IsCreatedFromValidFile
         {
             get { return isCreatedFromValidFile; }
         }
+
     }
 }
diff --git a/src/DynamoCoreWpf/Properties/AssemblyInfo.cs b/src/DynamoCoreWpf/Properties/AssemblyInfo.cs
@@ -47,6 +47,7 @@
 [assembly: InternalsVisibleTo("PackageDetailsViewExtension")]
 [assembly: InternalsVisibleTo("Notifications")]
 [assembly: InternalsVisibleTo("LibraryViewExtensionWebView2")]
+[assembly: InternalsVisibleTo("PythonNodeModelsWpf")]
 [assembly: InternalsVisibleTo("IronPythonTests")]
 [assembly: InternalsVisibleTo("DynamoPackagesWPF")]
 [assembly: InternalsVisibleTo("DynamoPlayerExtension")]

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
@@ -3494,6 +3494,9 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
   <data name="DynamoViewSettingLibraryZoomScale" xml:space="preserve">
     <value>Library</value>
   </data>
+  <data name="PythonZoomScaleTooltipText" xml:space="preserve">
+    <value>Drag to adjust Python Editor zoom scale between 10% and 100%. You can also adjust this in Python Editor by pressing Shift and scrolling the mouse wheel.</value>
+  </data>
   <data name="PreferencesViewLanguageSwitchHelp" xml:space="preserve">
     <value>Dynamo must be relaunched to apply the language selection.</value>
   </data>
@@ -3515,4 +3518,23 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
   <data name="CustomColorPickerTitle" xml:space="preserve">
     <value>Color</value>
   </data>
+  <data name="PreferencesViewZoomScaling0Percent" xml:space="preserve">
+    <value>0%</value>
+  </data>
+  <data name="PreferencesViewZoomScaling100Percent" xml:space="preserve">
+    <value>100%</value>
+  </data>
+  <data name="PreferencesViewZoomScaling10Percent" xml:space="preserve">
+    <value>10%</value>
+  </data>
+  <data name="PreferencesViewZoomScaling25Percent" xml:space="preserve">
+    <value>25%</value>
+  </data>
+  <data name="PreferencesViewZoomScaling300Percent" xml:space="preserve">
+    <value>300%</value>
+  </data>
+  <data name="PreferencesViewPythonEditorLable" xml:space="preserve">
+    <value>Python Editor</value>
+    <comment>Preferences -&gt; ZoomScalling -&gt; Python Editor</comment>
+  </data>
 </root>
diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -3481,6 +3481,9 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
   <data name="DynamoViewSettingLibraryZoomScale" xml:space="preserve">
     <value>Library</value>
   </data>
+  <data name="PythonZoomScaleTooltipText" xml:space="preserve">
+    <value>Drag to adjust Python Editor zoom scale between 10% and 100%. You can also adjust this in Python Editor by pressing Shift and scrolling the mouse wheel.</value>
+  </data>
   <data name="PreferencesViewLanguageSwitchHelp" xml:space="preserve">
     <value>Dynamo must be relaunched to apply the language selection.</value>
   </data>
@@ -3502,4 +3505,23 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
   <data name="CustomColorPickerTitle" xml:space="preserve">
     <value>Color</value>
   </data>
+  <data name="PreferencesViewZoomScaling0Percent" xml:space="preserve">
+    <value>0%</value>
+  </data>
+  <data name="PreferencesViewZoomScaling100Percent" xml:space="preserve">
+    <value>100%</value>
+  </data>
+  <data name="PreferencesViewZoomScaling10Percent" xml:space="preserve">
+    <value>10%</value>
+  </data>
+  <data name="PreferencesViewZoomScaling25Percent" xml:space="preserve">
+    <value>25%</value>
+  </data>
+  <data name="PreferencesViewZoomScaling300Percent" xml:space="preserve">
+    <value>300%</value>
+  </data>
+  <data name="PreferencesViewPythonEditorLable" xml:space="preserve">
+    <value>Python Editor</value>
+    <comment>Preferences -&gt; ZoomScalling -&gt; Python Editor</comment>
+  </data>
 </root>
diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
@@ -816,6 +816,16 @@ void Watch3DViewModelPropertyChanged(object sender, PropertyChangedEventArgs e)
             }
         }
 
+
+        internal event EventHandler PreferencesWindowChanged;
+        internal void OnPreferencesWindowChanged(object preferencesView)
+        {
+            if(PreferencesWindowChanged != null)
+            {
+                PreferencesWindowChanged(preferencesView, new EventArgs());
+            }
+        }
+
         internal event EventHandler NodeViewReady;
         internal void OnNodeViewReady(object nodeView)
         {

diff --git a/src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs b/src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs
@@ -1195,7 +1195,7 @@ public virtual void OnRequestShowFileDialog(object sender, PythonTemplatePathEve
 
         public DelegateCommand AddPythonPathCommand { get; private set; }
         public DelegateCommand DeletePythonPathCommand { get; private set; }
-        public DelegateCommand UpdatePythonPathCommand { get; private set; }
+        public DelegateCommand UpdatePythonPathCommand { get; private set; }        
 
         private void InitializeCommands()
         {

diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
@@ -103,8 +103,6 @@ internal PreferencesView PreferencesWindow {
             get { return preferencesWindow; }
         }
 
-        internal event Action OnPreferencesWindowChanged;
-
         /// <summary>
         /// Constructor
         /// </summary>
@@ -1913,7 +1911,7 @@ private void OnDebugModesClick(object sender, RoutedEventArgs e)
         private void OnPreferencesWindowClick(object sender, RoutedEventArgs e)
         {
             preferencesWindow = new PreferencesView(this);
-            OnPreferencesWindowChanged();
+            dynamoViewModel.OnPreferencesWindowChanged(preferencesWindow);
             preferencesWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
             preferencesWindow.ShowDialog();
         }