diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
index 49f2e77653f..7ef9725da51 100644
--- a/src/DynamoCoreWpf/Properties/Resources.Designer.cs
+++ b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
@@ -1016,6 +1016,42 @@ public static string DynamoViewDebugMenuVerboseLogging {
}
}
+ ///
+ /// Looks up a localized string similar to _Dynamo.
+ ///
+ public static string DynamoViewDynamoMenu {
+ get {
+ return ResourceManager.GetString("DynamoViewDynamoMenu", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to _About....
+ ///
+ public static string DynamoViewDynamoMenuAbout {
+ get {
+ return ResourceManager.GetString("DynamoViewDynamoMenuAbout", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to _Exit Dynamo.
+ ///
+ public static string DynamoViewDynamoMenuExit {
+ get {
+ return ResourceManager.GetString("DynamoViewDynamoMenuExit", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to _Preferences....
+ ///
+ public static string DynamoViewDynamoMenuPreferences {
+ get {
+ return ResourceManager.GetString("DynamoViewDynamoMenuPreferences", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to _Edit.
///
@@ -1242,20 +1278,20 @@ public static string DynamoViewEditMenuUndo {
}
///
- /// Looks up a localized string similar to _Exit.
+ /// Looks up a localized string similar to _File.
///
- public static string DynamoViewFiileMenuExit {
+ public static string DynamoViewFileMenu {
get {
- return ResourceManager.GetString("DynamoViewFiileMenuExit", resourceCulture);
+ return ResourceManager.GetString("DynamoViewFileMenu", resourceCulture);
}
}
///
- /// Looks up a localized string similar to _File.
+ /// Looks up a localized string similar to _Export.
///
- public static string DynamoViewFileMenu {
+ public static string DynamoViewFileMenuExport {
get {
- return ResourceManager.GetString("DynamoViewFileMenu", resourceCulture);
+ return ResourceManager.GetString("DynamoViewFileMenuExport", resourceCulture);
}
}
@@ -1359,7 +1395,7 @@ public static string DynamoViewFileMenuSaveAs {
}
///
- /// Looks up a localized string similar to Open Dynamo Dictionary.
+ /// Looks up a localized string similar to Dynamo Dictionary.
///
public static string DynamoViewHelpDictionary {
get {
@@ -1376,15 +1412,6 @@ public static string DynamoViewHelpMenu {
}
}
- ///
- /// Looks up a localized string similar to _About....
- ///
- public static string DynamoViewHelpMenuAbout {
- get {
- return ResourceManager.GetString("DynamoViewHelpMenuAbout", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to _Display Start Page.
///
@@ -1395,7 +1422,7 @@ public static string DynamoViewHelpMenuDisplayStartPage {
}
///
- /// Looks up a localized string similar to _Go To Project Website.
+ /// Looks up a localized string similar to _Dynamo Website.
///
public static string DynamoViewHelpMenuGotoWebsite {
get {
@@ -1404,7 +1431,7 @@ public static string DynamoViewHelpMenuGotoWebsite {
}
///
- /// Looks up a localized string similar to Go To Project _Wiki.
+ /// Looks up a localized string similar to Dynamo Project _Wiki.
///
public static string DynamoViewHelpMenuGotoWiki {
get {
diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
index bb89cbfdc80..d537a20980f 100644
--- a/src/DynamoCoreWpf/Properties/Resources.en-US.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
@@ -583,9 +583,9 @@ You will get a chance to save your work.
_Undo
Edit menu | Undo
-
- _Exit
- File menu | Exit Dynamo
+
+ _Exit Dynamo
+ Dynamo menu | Exit Dynamo
_File
@@ -636,26 +636,23 @@ You will get a chance to save your work.
File menu | Save as
- Open Dynamo Dictionary
+ Dynamo Dictionary
+ Help menu | Go to Dynamo Dictionary
Help
Help menu
-
- _About...
- Help menu | Display About dialog
-
_Display Start Page
Help menu | Display start page
- _Go To Project Website
+ _Dynamo Website
Help menu | Go go Dynamo website
- Go To Project _Wiki
+ Dynamo Project _Wiki
Help menu | Go to wiki
@@ -2284,4 +2281,20 @@ Uninstall the following packages: {0}?
Select Node Libraries
+
+ _Dynamo
+ Dynamo menu
+
+
+ _About...
+ Dynamo menu | Display About dialog
+
+
+ _Preferences...
+ Dynamo menu | Preferences
+
+
+ _Export
+ File menu | Export
+
\ No newline at end of file
diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
index cda076f21e9..58f773ff1c0 100644
--- a/src/DynamoCoreWpf/Properties/Resources.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -334,9 +334,9 @@
_Undo
Edit menu | Undo
-
- _Exit
- File menu | Exit Dynamo
+
+ _Exit Dynamo
+ Dynamo menu | Exit Dynamo
_File
@@ -386,20 +386,20 @@
Help
Help menu
-
+
_About...
- Help menu | Display About dialog
+ Dynamo menu | Display About dialog
_Display Start Page
Help menu | Display start page
- _Go To Project Website
- Help menu | Go go Dynamo website
+ _Dynamo Website
+ Help menu | Go Dynamo website
- Go To Project _Wiki
+ Dynamo Project _Wiki
Help menu | Go to wiki
@@ -2140,7 +2140,8 @@ Want to publish a different package?
Please update the permissions or go to 'Settings > Manage Node and Package Paths...' to change your default directory.
- Open Dynamo Dictionary
+ Dynamo Dictionary
+ Help menu | Go to Dynamo dictionary
Apply Changes
@@ -2286,4 +2287,16 @@ Uninstall the following packages: {0}?
Select Node Libraries
+
+ _Dynamo
+ Dynamo menu
+
+
+ _Preferences...
+ Dynamo menu | Preferences
+
+
+ _Export
+ File menu | Export
+
\ No newline at end of file
diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml
index ace13245484..6957c516a66 100644
--- a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml
+++ b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml
@@ -291,6 +291,23 @@
+
+
-
-
-
-
-
diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
index a4f8dfd9b39..6a59f272641 100644
--- a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
+++ b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
@@ -190,6 +190,17 @@ public DynamoView(DynamoViewModel dynamoViewModel)
}
}
+ // Sets the visibility of the preferences option in the Dynamo menu depending on the debug mode being enabled
+ // This will be deleted once the option goes into production
+ if (Dynamo.Configuration.DebugModes.IsEnabled("DynamoPreferencesMenuDebugMode"))
+ {
+ preferencesOption.Visibility = Visibility.Visible;
+ }
+ else
+ {
+ preferencesOption.Visibility = Visibility.Collapsed;
+ }
+
// when an extension is added if dynamoView is loaded, call loaded on
// that extension (this alerts late loaded extensions).
this.viewExtensionManager.ExtensionAdded += (extension) =>
@@ -2280,11 +2291,6 @@ private void ExtensionsButtonClicked(object sender, EventArgs e)
collapsedExtensionSidebar.Visibility = Visibility.Visible;
}
- private void OnSettingsSubMenuOpened(object sender, RoutedEventArgs e)
- {
- this.ChangeScaleFactorMenu.IsEnabled = !dynamoViewModel.ShowStartPage;
- }
-
private void Workspace_SizeChanged(object sender, SizeChangedEventArgs e)
{
//http://stackoverflow.com/questions/4474670/how-to-catch-the-ending-resize-window