Skip to content

Fixed status bar visibility on home page #681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 26, 2020
Merged

Fixed status bar visibility on home page #681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fef41bd
Fixed status bar visibility on home page
Apr 24, 2020
4538ef7
Added strings
Apr 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Files/Interacts/Interaction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ await CoreWindow.GetForCurrentThread().Dispatcher.RunAsync(CoreDispatcherPriorit
instanceTabsView.AddNewTab(typeof(ModernShellPage), listedItem.ItemPath);
});
}
}
}

public void OpenPathInNewTab(string path)
{
Expand Down Expand Up @@ -703,15 +703,15 @@ public async Task<bool> RenameFileItem(ListedItem item, string oldName, string n
catch (Exception)

{
var dialog = new ContentDialog()
var ItemAlreadyExistsDialog = new ContentDialog()
{
Title = "Item already exists",
Content = "An item with this name already exists in this folder.",
PrimaryButtonText = "Generate new name",
SecondaryButtonText = "Replace existing item"
Title = ResourceController.GetTranslation("ItemAlreadyExistsDialogTitle"),
Content = ResourceController.GetTranslation("ItemAlreadyExistsDialogContent"),
PrimaryButtonText = ResourceController.GetTranslation("ItemAlreadyExistsDialogPrimaryButtonText"),
SecondaryButtonText = ResourceController.GetTranslation("ItemAlreadyExistsDialogSecondaryButtonText")
};

ContentDialogResult result = await dialog.ShowAsync();
ContentDialogResult result = await ItemAlreadyExistsDialog.ShowAsync();

if (result == ContentDialogResult.Primary)
{
Expand Down
16 changes: 16 additions & 0 deletions Files/MultilingualResources/Files.de-DE.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,6 +618,22 @@
<source>View sample profiles</source>
<target state="new">View sample profiles</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogContent" translate="yes" xml:space="preserve">
<source>An item with this name already exists in this directory.</source>
<target state="new">An item with this name already exists in this directory.</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogPrimaryButtonText" translate="yes" xml:space="preserve">
<source>Generate new name</source>
<target state="new">Generate new name</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogTitle" translate="yes" xml:space="preserve">
<source>Item already exists</source>
<target state="new">Item already exists</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogSecondaryButtonText" translate="yes" xml:space="preserve">
<source>Replace existing item</source>
<target state="new">Replace existing item</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
18 changes: 17 additions & 1 deletion Files/MultilingualResources/Files.es-ES.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,23 @@
<source>View sample profiles</source>
<target state="translated">Ver perfiles personalizados</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogContent" translate="yes" xml:space="preserve">
<source>An item with this name already exists in this directory.</source>
<target state="new">An item with this name already exists in this directory.</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogPrimaryButtonText" translate="yes" xml:space="preserve">
<source>Generate new name</source>
<target state="new">Generate new name</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogTitle" translate="yes" xml:space="preserve">
<source>Item already exists</source>
<target state="new">Item already exists</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogSecondaryButtonText" translate="yes" xml:space="preserve">
<source>Replace existing item</source>
<target state="new">Replace existing item</target>
</trans-unit>
</group>
</body>
</file>
</xliff>
</xliff>
16 changes: 16 additions & 0 deletions Files/MultilingualResources/Files.fr-FR.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,6 +616,22 @@
<source>View sample profiles</source>
<target state="new">View sample profiles</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogContent" translate="yes" xml:space="preserve">
<source>An item with this name already exists in this directory.</source>
<target state="new">An item with this name already exists in this directory.</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogPrimaryButtonText" translate="yes" xml:space="preserve">
<source>Generate new name</source>
<target state="new">Generate new name</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogTitle" translate="yes" xml:space="preserve">
<source>Item already exists</source>
<target state="new">Item already exists</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogSecondaryButtonText" translate="yes" xml:space="preserve">
<source>Replace existing item</source>
<target state="new">Replace existing item</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
16 changes: 16 additions & 0 deletions Files/MultilingualResources/Files.it-IT.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,22 @@
<source>View sample profiles</source>
<target state="new">View sample profiles</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogContent" translate="yes" xml:space="preserve">
<source>An item with this name already exists in this directory.</source>
<target state="new">An item with this name already exists in this directory.</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogPrimaryButtonText" translate="yes" xml:space="preserve">
<source>Generate new name</source>
<target state="new">Generate new name</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogTitle" translate="yes" xml:space="preserve">
<source>Item already exists</source>
<target state="new">Item already exists</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogSecondaryButtonText" translate="yes" xml:space="preserve">
<source>Replace existing item</source>
<target state="new">Replace existing item</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
16 changes: 16 additions & 0 deletions Files/MultilingualResources/Files.nl-NL.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,6 +616,22 @@
<source>View sample profiles</source>
<target state="new">View sample profiles</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogContent" translate="yes" xml:space="preserve">
<source>An item with this name already exists in this directory.</source>
<target state="new">An item with this name already exists in this directory.</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogPrimaryButtonText" translate="yes" xml:space="preserve">
<source>Generate new name</source>
<target state="new">Generate new name</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogTitle" translate="yes" xml:space="preserve">
<source>Item already exists</source>
<target state="new">Item already exists</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogSecondaryButtonText" translate="yes" xml:space="preserve">
<source>Replace existing item</source>
<target state="new">Replace existing item</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
16 changes: 16 additions & 0 deletions Files/MultilingualResources/Files.pl-PL.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,6 +616,22 @@
<source>View sample profiles</source>
<target state="new">View sample profiles</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogContent" translate="yes" xml:space="preserve">
<source>An item with this name already exists in this directory.</source>
<target state="new">An item with this name already exists in this directory.</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogPrimaryButtonText" translate="yes" xml:space="preserve">
<source>Generate new name</source>
<target state="new">Generate new name</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogTitle" translate="yes" xml:space="preserve">
<source>Item already exists</source>
<target state="new">Item already exists</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogSecondaryButtonText" translate="yes" xml:space="preserve">
<source>Replace existing item</source>
<target state="new">Replace existing item</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
16 changes: 16 additions & 0 deletions Files/MultilingualResources/Files.ru-RU.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,6 +614,22 @@
<source>View sample profiles</source>
<target state="new">View sample profiles</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogContent" translate="yes" xml:space="preserve">
<source>An item with this name already exists in this directory.</source>
<target state="new">An item with this name already exists in this directory.</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogPrimaryButtonText" translate="yes" xml:space="preserve">
<source>Generate new name</source>
<target state="new">Generate new name</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogTitle" translate="yes" xml:space="preserve">
<source>Item already exists</source>
<target state="new">Item already exists</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogSecondaryButtonText" translate="yes" xml:space="preserve">
<source>Replace existing item</source>
<target state="new">Replace existing item</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
16 changes: 16 additions & 0 deletions Files/MultilingualResources/Files.tr-TR.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,6 +616,22 @@
<source>View sample profiles</source>
<target state="new">View sample profiles</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogContent" translate="yes" xml:space="preserve">
<source>An item with this name already exists in this directory.</source>
<target state="new">An item with this name already exists in this directory.</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogPrimaryButtonText" translate="yes" xml:space="preserve">
<source>Generate new name</source>
<target state="new">Generate new name</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogTitle" translate="yes" xml:space="preserve">
<source>Item already exists</source>
<target state="new">Item already exists</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogSecondaryButtonText" translate="yes" xml:space="preserve">
<source>Replace existing item</source>
<target state="new">Replace existing item</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
16 changes: 16 additions & 0 deletions Files/MultilingualResources/Files.uk-UA.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,6 +614,22 @@
<source>View sample profiles</source>
<target state="new">View sample profiles</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogContent" translate="yes" xml:space="preserve">
<source>An item with this name already exists in this directory.</source>
<target state="new">An item with this name already exists in this directory.</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogPrimaryButtonText" translate="yes" xml:space="preserve">
<source>Generate new name</source>
<target state="new">Generate new name</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogTitle" translate="yes" xml:space="preserve">
<source>Item already exists</source>
<target state="new">Item already exists</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogSecondaryButtonText" translate="yes" xml:space="preserve">
<source>Replace existing item</source>
<target state="new">Replace existing item</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
16 changes: 16 additions & 0 deletions Files/MultilingualResources/Files.zh-Hans.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,6 +616,22 @@
<source>View sample profiles</source>
<target state="new">View sample profiles</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogContent" translate="yes" xml:space="preserve">
<source>An item with this name already exists in this directory.</source>
<target state="new">An item with this name already exists in this directory.</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogPrimaryButtonText" translate="yes" xml:space="preserve">
<source>Generate new name</source>
<target state="new">Generate new name</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogTitle" translate="yes" xml:space="preserve">
<source>Item already exists</source>
<target state="new">Item already exists</target>
</trans-unit>
<trans-unit id="ItemAlreadyExistsDialogSecondaryButtonText" translate="yes" xml:space="preserve">
<source>Replace existing item</source>
<target state="new">Replace existing item</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
14 changes: 13 additions & 1 deletion Files/Strings/en-US/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@
</data>
<data name="SettingsNavSearch.PlaceholderText" xml:space="preserve">
<value>Search</value>
</data>
</data>
<data name="SettingsExperimentalDescription.Text" xml:space="preserve">
<value>WARNING: EXPERIMENTAL FEATURES AHEAD!</value>
</data>
Expand Down Expand Up @@ -573,4 +573,16 @@
<data name="SettingsPreferencesTerminalApplicationsSampleProfiles.ToolTipService.ToolTip" xml:space="preserve">
<value>View sample profiles</value>
</data>
<data name="ItemAlreadyExistsDialogContent" xml:space="preserve">
<value>An item with this name already exists in this directory.</value>
</data>
<data name="ItemAlreadyExistsDialogPrimaryButtonText" xml:space="preserve">
<value>Generate new name</value>
</data>
<data name="ItemAlreadyExistsDialogSecondaryButtonText" xml:space="preserve">
<value>Replace existing item</value>
</data>
<data name="ItemAlreadyExistsDialogTitle" xml:space="preserve">
<value>Item already exists</value>
</data>
</root>
2 changes: 1 addition & 1 deletion Files/Views/InstanceTabsView.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ public void TabStrip_SelectionChanged(object sender, SelectionChangedEventArgs e
}
else
{
if ((tabView.SelectedItem as TabViewItem).Header.ToString() == "New tab")
if ((tabView.SelectedItem as TabViewItem).Header.ToString() == ResourceController.GetTranslation("NewTab"))
{
App.InteractionViewModel.IsPageTypeNotHome = false;
}
Expand Down