Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
6fcf879
Fix new folder/file creation looses focus with each letter (#607)
tsvietOK Apr 15, 2020
548101b
Fix Download folder location (#610)
tsvietOK Apr 16, 2020
40d1cdd
Don't create folder or file if dialog was canceled (#608)
tsvietOK Apr 16, 2020
a6b421c
Add Invert Selection, icons to status bar, fix folder navigation and …
jeffsieu Apr 16, 2020
c66e014
Various fixes for v0.7.6 (#611)
lukeblevins Apr 16, 2020
e27f216
new string translated into spanish (#613)
Richard-HM Apr 17, 2020
24c5a86
Added strings for it-IT (#618)
yaira2 Apr 19, 2020
53352dc
Fixed OneDrive selection in the sidebar (#617)
yaira2 Apr 19, 2020
443111d
Fixed mistake with wrong label on the right click context menu (#616)
yaira2 Apr 19, 2020
ece606a
Translation update [Spanish] (#621)
Richard-HM Apr 19, 2020
c70db1e
Redesign Properties window
tsvietOK Apr 19, 2020
9d5a593
Fixed crash when opening folders in GridView (#619)
yaira2 Apr 19, 2020
27d7859
Refactored detecting user locations (#614)
yaira2 Apr 19, 2020
dfdd78f
New strings translated [Spanish] (#622)
Richard-HM Apr 19, 2020
dc6c1d9
Moved image to top (#603)
Apr 19, 2020
85362b7
Improved PropertiesDialog design (#623)
yaira2 Apr 19, 2020
3b23a77
Experimental settings (#624)
yaira2 Apr 20, 2020
2e3653f
Added option to open sidebar items in a new tab or window (#625)
yaira2 Apr 20, 2020
188c85b
v0.7.7 (#626)
yaira2 Apr 20, 2020
6518d33
Merge branch 'master' into develop
yaira2 Apr 20, 2020
0a3d11b
Fixed merge conflicts
Apr 20, 2020
8caf41e
Translation Update [Spanish] (#629)
Richard-HM Apr 20, 2020
6d560a4
Fixed crash when opening folders in GridView
Apr 20, 2020
eb5731b
Fixed issue with detecting mouse button clicks (#631)
yaira2 Apr 20, 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
11 changes: 1 addition & 10 deletions Files.Launcher/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,7 @@ static void Main(string[] args)
{
if (arguments.Equals("StartupTasks"))
{
// Detect User Paths
ApplicationData.Current.LocalSettings.Values["DesktopPath"] = Microsoft.Win32.Registry.GetValue(@"HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders", "Desktop", null);
ApplicationData.Current.LocalSettings.Values["DownloadsPath"] = Microsoft.Win32.Registry.GetValue(@"HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders", "{374DE290-123F-4565-9164-39C4925E467B}", null);
ApplicationData.Current.LocalSettings.Values["DocumentsPath"] = Microsoft.Win32.Registry.GetValue(@"HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders", "Personal", null);
ApplicationData.Current.LocalSettings.Values["PicturesPath"] = Microsoft.Win32.Registry.GetValue(@"HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders", "My Pictures", null);
ApplicationData.Current.LocalSettings.Values["MusicPath"] = Microsoft.Win32.Registry.GetValue(@"HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders", "My Music", null);
ApplicationData.Current.LocalSettings.Values["VideosPath"] = Microsoft.Win32.Registry.GetValue(@"HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders", "My Video", null);
ApplicationData.Current.LocalSettings.Values["OneDrivePath"] = Microsoft.Win32.Registry.GetValue(@"HKEY_CURRENT_USER\Software\Microsoft\OneDrive", "UserFolder", null);

// Check QuickLook Availability
// Check QuickLook Availability
QuickLook.CheckQuickLookAvailability(localSettings);
}
else if (arguments.Equals("ToggleQuickLook"))
Expand Down
4 changes: 2 additions & 2 deletions Files.Package/Package.appxmanifest
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4" xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5" IgnorableNamespaces="uap uap5 mp rescap desktop4 desktop">
<Identity Name="49306atecsolution.FilesUWP" Publisher="CN=53EC4384-7F5B-4CF6-8C23-513FFE9D1AB7" Version="0.7.6.0" />
<Identity Name="49306atecsolution.FilesUWP" Publisher="CN=53EC4384-7F5B-4CF6-8C23-513FFE9D1AB7" Version="0.7.7.0" />
<Properties>
<DisplayName>Files UWP - Preview</DisplayName>
<PublisherDisplayName>Yair A</PublisherDisplayName>
Expand Down Expand Up @@ -48,7 +48,7 @@
</Application>
</Applications>
<Capabilities>
<rescap:Capability Name="packageQuery"/>
<!--<rescap:Capability Name="packageQuery"/>-->
<rescap:Capability Name="runFullTrust" />
<rescap:Capability Name="broadFileSystemAccess" />
<uap:Capability Name="removableStorage" />
Expand Down
2 changes: 1 addition & 1 deletion Files/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ private void CoreWindow_PointerPressed(CoreWindow sender, PointerEventArgs args)
{
NavigationActions.Back_Click(null, null);
}
else if (args.CurrentPoint.Properties.IsXButton1Pressed)
else if (args.CurrentPoint.Properties.IsXButton2Pressed)
{
NavigationActions.Forward_Click(null, null);
}
Expand Down
12 changes: 7 additions & 5 deletions Files/Files.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@
<Compile Include="Views\Pages\ModernShellPage.xaml.cs">
<DependentUpon>ModernShellPage.xaml</DependentUpon>
</Compile>
<Compile Include="Properties.xaml.cs">
<Compile Include="Views\Pages\Properties.xaml.cs">
<DependentUpon>Properties.xaml</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
Expand All @@ -240,8 +240,8 @@
<Compile Include="Views\SettingsPages\Appearance.xaml.cs">
<DependentUpon>Appearance.xaml</DependentUpon>
</Compile>
<Compile Include="Views\SettingsPages\Flags.xaml.cs">
<DependentUpon>Flags.xaml</DependentUpon>
<Compile Include="Views\SettingsPages\Experimental.xaml.cs">
<DependentUpon>Experimental.xaml</DependentUpon>
</Compile>
<Compile Include="Views\SettingsPages\Preferences.xaml.cs">
<DependentUpon>Preferences.xaml</DependentUpon>
Expand Down Expand Up @@ -332,6 +332,7 @@
<Content Include="Assets\WSL\ubuntu.svg" />
<Content Include="Assets\WSL\ubuntupng.png" />
<Content Include="Properties\Default.rd.xml" />
<PRIResource Include="Strings\it-IT\Resources.resw" />
<PRIResource Include="Strings\uk-UA\Resources.resw" />
<PRIResource Include="Strings\tr-TR\Resources.resw" />
<PRIResource Include="Strings\ru-RU\Resources.resw" />
Expand Down Expand Up @@ -408,7 +409,7 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Properties.xaml">
<Page Include="Views\Pages\Properties.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
Expand Down Expand Up @@ -436,7 +437,7 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\SettingsPages\Flags.xaml">
<Page Include="Views\SettingsPages\Experimental.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
Expand Down Expand Up @@ -516,6 +517,7 @@
<XliffResource Include="MultilingualResources\Files.de-DE.xlf" />
<XliffResource Include="MultilingualResources\Files.es-ES.xlf" />
<XliffResource Include="MultilingualResources\Files.fr-FR.xlf" />
<XliffResource Include="MultilingualResources\Files.it-IT.xlf" />
<XliffResource Include="MultilingualResources\Files.nl-NL.xlf" />
<XliffResource Include="MultilingualResources\Files.pl-PL.xlf" />
<XliffResource Include="MultilingualResources\Files.ru-RU.xlf" />
Expand Down
52 changes: 38 additions & 14 deletions Files/Interacts/Interaction.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using Files.Filesystem;
using Microsoft.Toolkit.Uwp.UI.Controls;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics;
Expand Down Expand Up @@ -32,8 +31,6 @@
using Windows.UI.Xaml.Hosting;
using Windows.UI.WindowManagement.Preview;
using Windows.UI;
using Files.View_Models;
using System.Security.Cryptography;
using Windows.Security.Cryptography.Core;
using Microsoft.Toolkit.Uwp.Helpers;
using Windows.Security.Cryptography;
Expand Down Expand Up @@ -111,11 +108,22 @@ public async void OpenDirectoryInNewTab_Click(object sender, RoutedEventArgs e)
var items = (CurrentInstance.ContentPage as BaseLayout).SelectedItems;
foreach (ListedItem listedItem in items)
{
await CoreWindow.GetForCurrentThread().Dispatcher.RunAsync(CoreDispatcherPriority.Low, () =>
await CoreWindow.GetForCurrentThread().Dispatcher.RunAsync(CoreDispatcherPriority.Low, () =>
{
instanceTabsView.AddNewTab(typeof(ModernShellPage), listedItem.ItemPath);
});
}
}

public void OpenPathInNewTab(string path)
{
instanceTabsView.AddNewTab(typeof(ModernShellPage), path);
}

public async void OpenPathInNewWindow(string path)
{
var folderUri = new Uri("files-uwp:" + "?folder=" + path);
await Launcher.LaunchUriAsync(folderUri);
}

public async void OpenDirectoryInTerminal(object sender, RoutedEventArgs e)
Expand Down Expand Up @@ -254,7 +262,7 @@ public void AllView_RightTapped(object sender, RightTappedRoutedEventArgs e)
if (App.CurrentInstance.ContentPage.SelectedItems.Contains(ObjectPressed))
return;
}

// The following code is only reachable when a user RightTapped an unselected row
dataGrid.SelectedItems.Clear();
dataGrid.SelectedItems.Add(ObjectPressed);
Expand Down Expand Up @@ -436,17 +444,32 @@ public async void ShowPropertiesButton_Click(object sender, RoutedEventArgs e)
{
AppWindow appWindow = await AppWindow.TryCreateAsync();
Frame frame = new Frame();
appWindow.TitleBar.ExtendsContentIntoTitleBar = true;
var titleBar = appWindow.TitleBar;
titleBar.ButtonBackgroundColor = Colors.Transparent;
titleBar.ButtonInactiveBackgroundColor = Colors.Transparent;
var selectedTheme = Application.Current.RequestedTheme;
if (selectedTheme == ApplicationTheme.Light)
{
titleBar.ButtonForegroundColor = Color.FromArgb(255, 0, 0, 0);
titleBar.ButtonHoverBackgroundColor = Color.FromArgb(20, 0, 0, 0);
}
else if (selectedTheme == ApplicationTheme.Dark)
{
titleBar.ButtonHoverBackgroundColor = Color.FromArgb(40, 255, 255, 255);
}
frame.Navigate(typeof(Properties), null, new SuppressNavigationTransitionInfo());
WindowManagementPreview.SetPreferredMinSize(appWindow, new Size(400, 475));

appWindow.RequestSize(new Size(400, 475));
appWindow.Title = "Properties";
appWindow.Title = ResourceController.GetTranslation("PropertiesTitle");

ElementCompositionPreview.SetAppWindowContent(appWindow, frame);
AppWindows.Add(frame.UIContext, appWindow);

appWindow.Closed += delegate
{
Interaction.AppWindows.Remove(frame.UIContext);
AppWindows.Remove(frame.UIContext);
frame.Content = null;
appWindow = null;
};
Expand All @@ -470,7 +493,7 @@ public async void ShowFolderPropertiesButton_Click(object sender, RoutedEventArg
frame.Navigate(typeof(Properties), null, new SuppressNavigationTransitionInfo());
WindowManagementPreview.SetPreferredMinSize(appWindow, new Size(400, 475));
appWindow.RequestSize(new Size(400, 475));
appWindow.Title = "Properties";
appWindow.Title = ResourceController.GetTranslation("PropertiesTitle");

ElementCompositionPreview.SetAppWindowContent(appWindow, frame);
AppWindows.Add(frame.UIContext, appWindow);
Expand Down Expand Up @@ -643,7 +666,7 @@ public async void DeleteItem_Click(object sender, RoutedEventArgs e)
catch (FileNotFoundException)
{
Debug.WriteLine("Attention: Tried to delete an item that could be found");
}
}

App.InteractionViewModel.PermanentlyDelete = false; //reset PermanentlyDelete flag
}
Expand Down Expand Up @@ -686,7 +709,7 @@ public async Task<bool> RenameFileItem(ListedItem item, string oldName, string n
}

catch (Exception)

{
var dialog = new ContentDialog()
{
Expand Down Expand Up @@ -730,7 +753,7 @@ public async Task<bool> RenameFileItem(ListedItem item, string oldName, string n
}
}
}

CurrentInstance.NavigationToolbar.CanGoForward = false;
return true;
}
Expand Down Expand Up @@ -772,7 +795,8 @@ public async void CutItem_Click(object sender, RoutedEventArgs e)
if (App.CurrentInstance.CurrentPageType == typeof(GenericFileBrowser))
{
(CurrentInstance.ContentPage as GenericFileBrowser).AllView.Columns[0].GetCellContent(listedItem).Opacity = 0.4;
} else if (App.CurrentInstance.CurrentPageType == typeof(PhotoAlbum))
}
else if (App.CurrentInstance.CurrentPageType == typeof(PhotoAlbum))
{
GridViewItem itemToDimForCut = (GridViewItem)(CurrentInstance.ContentPage as PhotoAlbum).FileList.ContainerFromItem(listedItem);
List<Grid> itemContentGrids = new List<Grid>();
Expand Down Expand Up @@ -934,7 +958,7 @@ public async Task PasteItems(DataPackageView packageView, string destinationPath

if (acceptedOperation == DataPackageOperation.Move)
{
foreach (IStorageItem item in pastedItems)
foreach (IStorageItem item in itemsToPaste)
{
if (item.IsOfType(StorageItemTypes.File))
{
Expand Down Expand Up @@ -970,7 +994,7 @@ public async Task<StorageFolder> CloneDirectoryAsync(string SourcePath, string D

foreach (StorageFile fileInSourceDir in await SourceFolder.GetFilesAsync())
{
if(itemsToPaste != null)
if (itemsToPaste != null)
{
if (itemsToPaste.Count > 3 && !suppressProgressFlyout)
{
Expand Down
48 changes: 40 additions & 8 deletions Files/MultilingualResources/Files.de-DE.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,6 @@
<source>Unpin from Sidebar</source>
<target state="translated">Von Seitenleiste entfernen</target>
</trans-unit>
<trans-unit id="SettingsFlagsTitle.Text" translate="yes" xml:space="preserve">
<source>Flags</source>
<target state="translated">Flags</target>
</trans-unit>
<trans-unit id="ConfirmDeleteDialog.Title" translate="yes" xml:space="preserve">
<source>Delete Item(s)</source>
<target state="translated">Löschen</target>
Expand Down Expand Up @@ -321,10 +317,6 @@
<source>Extract</source>
<target state="translated">Entpacken</target>
</trans-unit>
<trans-unit id="BaseLayoutItemContextFlyoutOpenWith.Text" translate="yes" xml:space="preserve">
<source>Open with...</source>
<target state="translated">Öffnen mit...</target>
</trans-unit>
<trans-unit id="BaseLayoutItemContextFlyoutOpenInNewTab.Text" translate="yes" xml:space="preserve">
<source>Open in new tab</source>
<target state="translated">In neuem Tab öffnen</target>
Expand Down Expand Up @@ -582,6 +574,46 @@
<source>Invert Selection</source>
<target state="new">Invert Selection</target>
</trans-unit>
<trans-unit id="BaseLayoutItemContextFlyoutOpenItem.Text" translate="yes" xml:space="preserve">
<source>Open</source>
<target state="new">Open</target>
</trans-unit>
<trans-unit id="PropertiesTitle" translate="yes" xml:space="preserve">
<source>Properties</source>
<target state="new">Properties</target>
</trans-unit>
<trans-unit id="PropertiesAttributes.Text" translate="yes" xml:space="preserve">
<source>Attributes:</source>
<target state="new">Attributes:</target>
</trans-unit>
<trans-unit id="PropertiesTitleSecondary.Text" translate="yes" xml:space="preserve">
<source>Properties</source>
<target state="new">Properties</target>
</trans-unit>
<trans-unit id="SideBarOpenInNewTab.Text" translate="yes" xml:space="preserve">
<source>Open in new tab</source>
<target state="new">Open in new tab</target>
</trans-unit>
<trans-unit id="SideBarOpenInNewWindow.Text" translate="yes" xml:space="preserve">
<source>Open in new window</source>
<target state="new">Open in new window</target>
</trans-unit>
<trans-unit id="SettingsExperimentalTitle.Text" translate="yes" xml:space="preserve">
<source>Experimental</source>
<target state="new">Experimental</target>
</trans-unit>
<trans-unit id="SettingsExperimentalDescription.Text" translate="yes" xml:space="preserve">
<source>WARNING: EXPERIMENTAL FEATURES AHEAD!</source>
<target state="new">WARNING: EXPERIMENTAL FEATURES AHEAD!</target>
</trans-unit>
<trans-unit id="SettingsNavExperimental.Content" translate="yes" xml:space="preserve">
<source>Experimental</source>
<target state="new">Experimental</target>
</trans-unit>
<trans-unit id="SettingsExperimentalDoubleTapToRenameFiles.Text" translate="yes" xml:space="preserve">
<source>Double tap to rename files</source>
<target state="new">Double tap to rename files</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
Loading