Added string for "New tab" that appears in path (#1239)

yaira2 · web-flow · commit eb52dcfa8f2e · 2020-06-26T10:37:59.000-04:00
diff --git a/Files/Interacts/Interaction.cs b/Files/Interacts/Interaction.cs
@@ -99,7 +99,7 @@ public async void SetAsLockscreenBackgroundItem_Click(object sender, RoutedEvent
 
         public void OpenNewTab()
         {
-            instanceTabsView.AddNewTab(typeof(ModernShellPage), "New tab");
+            instanceTabsView.AddNewTab(typeof(ModernShellPage), ResourceController.GetTranslation("NewTab"));
         }
 
         public async void OpenInNewWindowItem_Click(object sender, RoutedEventArgs e)
diff --git a/Files/Navigation/NavigationActions.cs b/Files/Navigation/NavigationActions.cs
@@ -76,7 +76,7 @@ private static void SelectSidebarItemFromPath(Type incomingSourcePageType = null
             if (incomingSourcePageType == typeof(YourHome) && incomingSourcePageType != null)
             {
                 App.CurrentInstance.SidebarSelectedItem = App.sideBarItems.First(x => x.Path.Equals("Home"));
-                App.CurrentInstance.NavigationToolbar.PathControlDisplayText = "New tab";
+                App.CurrentInstance.NavigationToolbar.PathControlDisplayText = ResourceController.GetTranslation("NewTab");
             }
         }
     }
diff --git a/Files/UserControls/ModernNavigationToolbar.xaml.cs b/Files/UserControls/ModernNavigationToolbar.xaml.cs
@@ -209,10 +209,10 @@ public async void CheckPathInput(ItemViewModel instance, string CurrentInput)
                 //(App.CurrentInstance.OperationsControl as RibbonArea).RibbonViewModel.HomeItems.isEnabled = false;
                 //(App.CurrentInstance.OperationsControl as RibbonArea).RibbonViewModel.ShareItems.isEnabled = false;
 
-                if (CurrentInput.Equals("Home", StringComparison.OrdinalIgnoreCase) || CurrentInput.Equals("New tab", StringComparison.OrdinalIgnoreCase))
+                if (CurrentInput.Equals("Home", StringComparison.OrdinalIgnoreCase) || CurrentInput.Equals(ResourceController.GetTranslation("NewTab"), StringComparison.OrdinalIgnoreCase))
                 {
-                    App.CurrentInstance.FilesystemViewModel.WorkingDirectory = "New tab";
-                    App.CurrentInstance.ContentFrame.Navigate(typeof(YourHome), "New tab", new SuppressNavigationTransitionInfo());
+                    App.CurrentInstance.FilesystemViewModel.WorkingDirectory = ResourceController.GetTranslation("NewTab");
+                    App.CurrentInstance.ContentFrame.Navigate(typeof(YourHome), ResourceController.GetTranslation("NewTab"), new SuppressNavigationTransitionInfo());
                 }
                 else
                 {
@@ -305,7 +305,7 @@ private void VisiblePath_LostFocus(object sender, RoutedEventArgs e)
         private void PathViewInteract_ItemClick(object sender, ItemClickEventArgs e)
         {
             var itemTappedPath = (e.ClickedItem as PathBoxItem).Path.ToString();
-            if (itemTappedPath == "Home" || itemTappedPath == "New tab")
+            if (itemTappedPath == "Home" || itemTappedPath == ResourceController.GetTranslation("NewTab"))
                 return;
 
             App.CurrentInstance.ContentFrame.Navigate(AppSettings.GetLayoutType(), itemTappedPath); // navigate to folder
diff --git a/Files/UserControls/SidebarControl.cs b/Files/UserControls/SidebarControl.cs
@@ -96,7 +96,7 @@ private void Sidebar_ItemInvoked(Microsoft.UI.Xaml.Controls.NavigationView sende
 
                         if (ItemPath.Equals("Home", StringComparison.OrdinalIgnoreCase)) // Home item
                         {
-                            App.CurrentInstance.ContentFrame.Navigate(typeof(YourHome), "New tab", new SuppressNavigationTransitionInfo());
+                            App.CurrentInstance.ContentFrame.Navigate(typeof(YourHome), ResourceController.GetTranslation("NewTab"), new SuppressNavigationTransitionInfo());
 
                             return; // cancel so it doesn't try to Navigate to a path
                         }
diff --git a/Files/Views/InstanceTabsView.xaml.cs b/Files/Views/InstanceTabsView.xaml.cs
@@ -92,12 +92,12 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
                 }
                 catch (Exception)
                 {
-                    AddNewTab(typeof(ModernShellPage), "New tab");
+                    AddNewTab(typeof(ModernShellPage), ResourceController.GetTranslation("NewTab"));
                 }
             }
             else if (string.IsNullOrEmpty(navArgs))
             {
-                AddNewTab(typeof(ModernShellPage), "New tab");
+                AddNewTab(typeof(ModernShellPage), ResourceController.GetTranslation("NewTab"));
             }
             else
             {
@@ -168,7 +168,7 @@ public async void AddNewTab(Type t, string path)
                     tabLocationHeader = "OneDrive";
                     fontIconSource.Glyph = "\xE753";
                 }
-                else if (path == "New tab")
+                else if (path == ResourceController.GetTranslation("NewTab"))
                 {
                     tabLocationHeader = ResourceController.GetTranslation("NewTab");
                     fontIconSource.Glyph = "\xE737";
@@ -213,7 +213,7 @@ public async void AddNewTab(Type t, string path)
                         // Invalid path, open new tab instead (explorer opens Documents when it fails)
                         Debug.WriteLine($"Invalid path \"{path}\" in InstanceTabsView.xaml.cs\\AddNewTab");
 
-                        path = "New tab";
+                        path = ResourceController.GetTranslation("NewTab");
                         tabLocationHeader = ResourceController.GetTranslation("NewTab");
                         fontIconSource.Glyph = "\xE737";
                     }
@@ -259,7 +259,7 @@ public async void SetSelectedTabInfo(string text, string currentPathForTabIcon =
                 tabLocationHeader = ResourceController.GetTranslation("SidebarSettings/Text");
                 fontIconSource.Glyph = "\xE713";
             }
-            else if (currentPathForTabIcon == null && text == "New tab")
+            else if (currentPathForTabIcon == null && text == ResourceController.GetTranslation("NewTab"))
             {
                 tabLocationHeader = ResourceController.GetTranslation("NewTab");
                 fontIconSource.Glyph = "\xE737";
@@ -516,7 +516,7 @@ private async void TabStrip_TabCloseRequested(Microsoft.UI.Xaml.Controls.TabView
 
         private void AddTabButton_Click(object sender, RoutedEventArgs e)
         {
-            AddNewTab(typeof(ModernShellPage), "New tab");
+            AddNewTab(typeof(ModernShellPage), ResourceController.GetTranslation("NewTab"));
         }
 
         public static T GetCurrentSelectedTabInstance<T>()
diff --git a/Files/Views/ModernShellPage.xaml.cs b/Files/Views/ModernShellPage.xaml.cs
@@ -34,7 +34,7 @@ public ModernShellPage()
             }
 
             App.CurrentInstance = this as IShellPage;
-            App.CurrentInstance.NavigationToolbar.PathControlDisplayText = "New tab";
+            App.CurrentInstance.NavigationToolbar.PathControlDisplayText = ResourceController.GetTranslation("NewTab");
             App.CurrentInstance.NavigationToolbar.CanGoBack = false;
             App.CurrentInstance.NavigationToolbar.CanGoForward = false;
         }
@@ -100,12 +100,6 @@ private void Page_Loaded(object sender, RoutedEventArgs e)
                     ItemDisplayFrame.Navigate(typeof(YourHome), NavParams, new SuppressNavigationTransitionInfo());
                     SidebarControl.SelectedSidebarItem = App.sideBarItems[0];
                     break;
-
-                case "New tab":
-                    ItemDisplayFrame.Navigate(typeof(YourHome), NavParams, new SuppressNavigationTransitionInfo());
-                    SidebarControl.SelectedSidebarItem = App.sideBarItems[0];
-                    break;
-
                 case "Desktop":
                     NavigationPath = AppSettings.DesktopPath;
                     SidebarControl.SelectedSidebarItem = App.sideBarItems.First(x => x.Path.Equals(AppSettings.DesktopPath, StringComparison.OrdinalIgnoreCase));
@@ -147,7 +141,12 @@ private void Page_Loaded(object sender, RoutedEventArgs e)
                     break;
 
                 default:
-                    if (NavParams[0] >= 'A' && NavParams[0] <= 'Z' && NavParams[1] == ':')
+                    if (NavParams == ResourceController.GetTranslation("NewTab"))
+                    {
+                        ItemDisplayFrame.Navigate(typeof(YourHome), NavParams, new SuppressNavigationTransitionInfo());
+                        SidebarControl.SelectedSidebarItem = App.sideBarItems[0];
+                    }
+                    else if (NavParams[0] >= 'A' && NavParams[0] <= 'Z' && NavParams[1] == ':')
                     {
                         NavigationPath = NavParams;
                         SidebarControl.SelectedSidebarItem = AppSettings.DrivesManager.Drives.First(x => x.Path.ToString().Equals($"{NavParams[0]}:\\", StringComparison.OrdinalIgnoreCase));

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public async void SetAsLockscreenBackgroundItem_Click(object sender, RoutedEvent`
`99`	`99`
`100`	`100`	`public void OpenNewTab()`
`101`	`101`	`{`
`102`		`- instanceTabsView.AddNewTab(typeof(ModernShellPage), "New tab");`
	`102`	`+ instanceTabsView.AddNewTab(typeof(ModernShellPage), ResourceController.GetTranslation("NewTab"));`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`public async void OpenInNewWindowItem_Click(object sender, RoutedEventArgs e)`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ private static void SelectSidebarItemFromPath(Type incomingSourcePageType = null`
`76`	`76`	`if (incomingSourcePageType == typeof(YourHome) && incomingSourcePageType != null)`
`77`	`77`	`{`
`78`	`78`	`App.CurrentInstance.SidebarSelectedItem = App.sideBarItems.First(x => x.Path.Equals("Home"));`
`79`		`- App.CurrentInstance.NavigationToolbar.PathControlDisplayText = "New tab";`
	`79`	`+ App.CurrentInstance.NavigationToolbar.PathControlDisplayText = ResourceController.GetTranslation("NewTab");`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -209,10 +209,10 @@ public async void CheckPathInput(ItemViewModel instance, string CurrentInput)`
`209`	`209`	`//(App.CurrentInstance.OperationsControl as RibbonArea).RibbonViewModel.HomeItems.isEnabled = false;`
`210`	`210`	`//(App.CurrentInstance.OperationsControl as RibbonArea).RibbonViewModel.ShareItems.isEnabled = false;`
`211`	`211`
`212`		`- if (CurrentInput.Equals("Home", StringComparison.OrdinalIgnoreCase) \|\| CurrentInput.Equals("New tab", StringComparison.OrdinalIgnoreCase))`
	`212`	`+ if (CurrentInput.Equals("Home", StringComparison.OrdinalIgnoreCase) \|\| CurrentInput.Equals(ResourceController.GetTranslation("NewTab"), StringComparison.OrdinalIgnoreCase))`
`213`	`213`	`{`
`214`		`- App.CurrentInstance.FilesystemViewModel.WorkingDirectory = "New tab";`
`215`		`- App.CurrentInstance.ContentFrame.Navigate(typeof(YourHome), "New tab", new SuppressNavigationTransitionInfo());`
	`214`	`+ App.CurrentInstance.FilesystemViewModel.WorkingDirectory = ResourceController.GetTranslation("NewTab");`
	`215`	`+ App.CurrentInstance.ContentFrame.Navigate(typeof(YourHome), ResourceController.GetTranslation("NewTab"), new SuppressNavigationTransitionInfo());`
`216`	`216`	`}`
`217`	`217`	`else`
`218`	`218`	`{`
`@@ -305,7 +305,7 @@ private void VisiblePath_LostFocus(object sender, RoutedEventArgs e)`
`305`	`305`	`private void PathViewInteract_ItemClick(object sender, ItemClickEventArgs e)`
`306`	`306`	`{`
`307`	`307`	`var itemTappedPath = (e.ClickedItem as PathBoxItem).Path.ToString();`
`308`		`- if (itemTappedPath == "Home" \|\| itemTappedPath == "New tab")`
	`308`	`+ if (itemTappedPath == "Home" \|\| itemTappedPath == ResourceController.GetTranslation("NewTab"))`
`309`	`309`	`return;`
`310`	`310`
`311`	`311`	`App.CurrentInstance.ContentFrame.Navigate(AppSettings.GetLayoutType(), itemTappedPath); // navigate to folder`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ private void Sidebar_ItemInvoked(Microsoft.UI.Xaml.Controls.NavigationView sende`
`96`	`96`
`97`	`97`	`if (ItemPath.Equals("Home", StringComparison.OrdinalIgnoreCase)) // Home item`
`98`	`98`	`{`
`99`		`- App.CurrentInstance.ContentFrame.Navigate(typeof(YourHome), "New tab", new SuppressNavigationTransitionInfo());`
	`99`	`+ App.CurrentInstance.ContentFrame.Navigate(typeof(YourHome), ResourceController.GetTranslation("NewTab"), new SuppressNavigationTransitionInfo());`
`100`	`100`
`101`	`101`	`return; // cancel so it doesn't try to Navigate to a path`
`102`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,12 +92,12 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)`
`92`	`92`	`}`
`93`	`93`	`catch (Exception)`
`94`	`94`	`{`
`95`		`- AddNewTab(typeof(ModernShellPage), "New tab");`
	`95`	`+ AddNewTab(typeof(ModernShellPage), ResourceController.GetTranslation("NewTab"));`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`	`else if (string.IsNullOrEmpty(navArgs))`
`99`	`99`	`{`
`100`		`- AddNewTab(typeof(ModernShellPage), "New tab");`
	`100`	`+ AddNewTab(typeof(ModernShellPage), ResourceController.GetTranslation("NewTab"));`
`101`	`101`	`}`
`102`	`102`	`else`
`103`	`103`	`{`
`@@ -168,7 +168,7 @@ public async void AddNewTab(Type t, string path)`
`168`	`168`	`tabLocationHeader = "OneDrive";`
`169`	`169`	`fontIconSource.Glyph = "\xE753";`
`170`	`170`	`}`
`171`		`- else if (path == "New tab")`
	`171`	`+ else if (path == ResourceController.GetTranslation("NewTab"))`
`172`	`172`	`{`
`173`	`173`	`tabLocationHeader = ResourceController.GetTranslation("NewTab");`
`174`	`174`	`fontIconSource.Glyph = "\xE737";`
`@@ -213,7 +213,7 @@ public async void AddNewTab(Type t, string path)`
`213`	`213`	`// Invalid path, open new tab instead (explorer opens Documents when it fails)`
`214`	`214`	`Debug.WriteLine($"Invalid path \"{path}\" in InstanceTabsView.xaml.cs\\AddNewTab");`
`215`	`215`
`216`		`- path = "New tab";`
	`216`	`+ path = ResourceController.GetTranslation("NewTab");`
`217`	`217`	`tabLocationHeader = ResourceController.GetTranslation("NewTab");`
`218`	`218`	`fontIconSource.Glyph = "\xE737";`
`219`	`219`	`}`
`@@ -259,7 +259,7 @@ public async void SetSelectedTabInfo(string text, string currentPathForTabIcon =`
`259`	`259`	`tabLocationHeader = ResourceController.GetTranslation("SidebarSettings/Text");`
`260`	`260`	`fontIconSource.Glyph = "\xE713";`
`261`	`261`	`}`
`262`		`- else if (currentPathForTabIcon == null && text == "New tab")`
	`262`	`+ else if (currentPathForTabIcon == null && text == ResourceController.GetTranslation("NewTab"))`
`263`	`263`	`{`
`264`	`264`	`tabLocationHeader = ResourceController.GetTranslation("NewTab");`
`265`	`265`	`fontIconSource.Glyph = "\xE737";`
`@@ -516,7 +516,7 @@ private async void TabStrip_TabCloseRequested(Microsoft.UI.Xaml.Controls.TabView`
`516`	`516`
`517`	`517`	`private void AddTabButton_Click(object sender, RoutedEventArgs e)`
`518`	`518`	`{`
`519`		`- AddNewTab(typeof(ModernShellPage), "New tab");`
	`519`	`+ AddNewTab(typeof(ModernShellPage), ResourceController.GetTranslation("NewTab"));`
`520`	`520`	`}`
`521`	`521`
`522`	`522`	`public static T GetCurrentSelectedTabInstance<T>()`