Skip to content

Commit 992bfed

Browse files
lukeblevinslukeblevins
committed
Merge branch 'develop' of https://github.com/duke7553/files-uwp into develop
2 parents 4794243 + dd118dc commit 992bfed

32 files changed

+310
-271
lines changed

‎Files/App.xaml.cs

Lines changed: 26 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,33 @@
1-
using Files.Interacts;
1+
using Files.CommandLine;
2+
using Files.Controls;
3+
using Files.Filesystem;
4+
using Files.Interacts;
5+
using Files.View_Models;
6+
using Microsoft.AppCenter;
7+
using Microsoft.AppCenter.Analytics;
8+
using Microsoft.AppCenter.Crashes;
9+
using NLog;
210
using System;
311
using System.Collections.Generic;
4-
using System.Diagnostics;
12+
using System.Collections.ObjectModel;
13+
using System.Linq;
514
using Windows.ApplicationModel;
615
using Windows.ApplicationModel.Activation;
716
using Windows.ApplicationModel.DataTransfer;
817
using Windows.Storage;
9-
using Windows.UI;
18+
using Windows.UI.Core;
1019
using Windows.UI.Xaml;
1120
using Windows.UI.Xaml.Controls;
21+
using Windows.UI.Xaml.Controls.Primitives;
22+
using Windows.UI.Xaml.Media;
1223
using Windows.UI.Xaml.Media.Animation;
1324
using Windows.UI.Xaml.Navigation;
14-
using Microsoft.AppCenter;
15-
using Microsoft.AppCenter.Analytics;
16-
using Microsoft.AppCenter.Crashes;
17-
using Windows.UI.Xaml.Media;
18-
using Files.Filesystem;
19-
using System.IO;
20-
using System.Linq;
21-
using System.Collections.ObjectModel;
22-
using Windows.UI.Core;
23-
using Windows.UI.Xaml.Controls.Primitives;
24-
using Windows.System;
25-
using Files.CommandLine;
26-
using Files.View_Models;
27-
using Files.Controls;
28-
using NLog;
2925

3026
namespace Files
3127
{
3228
sealed partial class App : Application
3329
{
34-
30+
3531
private static IShellPage currentInstance;
3632
public static IShellPage CurrentInstance
3733
{
@@ -41,9 +37,9 @@ public static IShellPage CurrentInstance
4137
}
4238
set
4339
{
44-
if(value != currentInstance && value != null)
40+
if (value != currentInstance && value != null)
4541
{
46-
currentInstance = value;
42+
currentInstance = value;
4743
}
4844
}
4945
}
@@ -62,7 +58,7 @@ public static IShellPage CurrentInstance
6258

6359
public App()
6460
{
65-
this.InitializeComponent();
61+
this.InitializeComponent();
6662
this.Suspending += OnSuspending;
6763

6864
// Initialize NLog
@@ -87,10 +83,10 @@ public App()
8783

8884
private void RegisterUncaughtExceptionLogger()
8985
{
90-
UnhandledException += (sender, args) =>
91-
{
92-
Logger.Error(args.Exception, args.Message);
93-
};
86+
UnhandledException += (sender, args) =>
87+
{
88+
Logger.Error(args.Exception, args.Message);
89+
};
9490
}
9591

9692
private void CoreWindow_PointerPressed(CoreWindow sender, PointerEventArgs args)
@@ -153,15 +149,15 @@ public static void Clipboard_ContentChanged(object sender, object e)
153149

154150
public static Windows.UI.Xaml.UnhandledExceptionEventArgs exceptionInfo { get; set; }
155151
public static string exceptionStackTrace { get; set; }
156-
152+
157153

158154

159155
private async void App_UnhandledException(object sender, Windows.UI.Xaml.UnhandledExceptionEventArgs e)
160156
{
161157
e.Handled = true;
162158
exceptionInfo = e;
163159
exceptionStackTrace = e.Exception.StackTrace;
164-
await exceptionDialog.ShowAsync(ContentDialogPlacement.Popup);
160+
await exceptionDialog.ShowAsync(ContentDialogPlacement.Popup);
165161
}
166162

167163
public static IReadOnlyList<ContentDialog> FindDisplayedContentDialogs<T>()
@@ -170,7 +166,7 @@ public static IReadOnlyList<ContentDialog> FindDisplayedContentDialogs<T>()
170166
List<ContentDialog> dialogs = new List<ContentDialog>();
171167
List<ContentDialog> openDialogs = new List<ContentDialog>();
172168
Interaction.FindChildren<ContentDialog>(dialogs, Window.Current.Content.XamlRoot.Content as DependencyObject);
173-
foreach(var dialog in dialogs)
169+
foreach (var dialog in dialogs)
174170
{
175171
var popups = new List<Popup>();
176172
Interaction.FindChildren<Popup>(popups, dialog);
@@ -194,7 +190,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
194190
{
195191
Logger.Info("App launched");
196192

197-
bool canEnablePrelaunch = Windows.Foundation.Metadata.ApiInformation.IsMethodPresent("Windows.ApplicationModel.Core.CoreApplication", "EnablePrelaunch");
193+
bool canEnablePrelaunch = Windows.Foundation.Metadata.ApiInformation.IsMethodPresent("Windows.ApplicationModel.Core.CoreApplication", "EnablePrelaunch");
198194

199195
Frame rootFrame = Window.Current.Content as Frame;
200196

‎Files/BaseLayout.cs

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using Files.Controls;
2-
using Files.Filesystem;
1+
using Files.Filesystem;
32
using Files.Interacts;
43
using Files.Views.Pages;
54
using System;
@@ -8,17 +7,11 @@
87
using System.IO;
98
using System.Linq;
109
using System.Runtime.CompilerServices;
11-
using System.Runtime.InteropServices.WindowsRuntime;
12-
using Windows.Foundation;
13-
using Windows.Foundation.Collections;
1410
using Windows.Storage;
1511
using Windows.UI.Core;
1612
using Windows.UI.Xaml;
1713
using Windows.UI.Xaml.Controls;
18-
using Windows.UI.Xaml.Controls.Primitives;
19-
using Windows.UI.Xaml.Data;
2014
using Windows.UI.Xaml.Input;
21-
using Windows.UI.Xaml.Media;
2215
using Windows.UI.Xaml.Navigation;
2316

2417

@@ -61,13 +54,17 @@ public List<ListedItem> SelectedItems
6154
}
6255
set
6356
{
64-
if(value != _SelectedItems)
57+
if (value != _SelectedItems)
6558
{
6659
_SelectedItems = value;
67-
if(value == null)
60+
if (value == null)
6861
{
6962
IsItemSelected = false;
7063
}
64+
else
65+
{
66+
IsItemSelected = true;
67+
}
7168
NotifyPropertyChanged("SelectedItems");
7269
}
7370
}
@@ -89,6 +86,10 @@ public ListedItem SelectedItem
8986
{
9087
IsItemSelected = false;
9188
}
89+
else
90+
{
91+
IsItemSelected = true;
92+
}
9293
NotifyPropertyChanged("SelectedItem");
9394
}
9495
}

‎Files/LocationsList.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,13 @@ public class FavoriteLocationItem
1313

1414
public class ItemLoader
1515
{
16-
public ItemLoader()
17-
{
18-
}
1916
public static List<FavoriteLocationItem> itemsAdded = new List<FavoriteLocationItem>();
2017
public static void DisplayItems()
2118
{
2219
itemsAdded.Add(new FavoriteLocationItem() { ImageSource = "Assets/Cards/Gradients/Blue.png", Icon = "\xE896", Text = "Downloads", Tag = "Downloads" });
2320
itemsAdded.Add(new FavoriteLocationItem() { ImageSource = "Assets/Cards/Gradients/Green.png", Icon = "\xE8A5", Text = "Documents", Tag = "Documents" });
2421
itemsAdded.Add(new FavoriteLocationItem() { ImageSource = "Assets/Cards/Gradients/Orange.png", Icon = "\xEB9F", Text = "Pictures", Tag = "Pictures" });
25-
itemsAdded.Add(new FavoriteLocationItem() { ImageSource = "Assets/Cards/Gradients/Pink.png", Icon = "\xEC4F", Text = "Music", Tag = "Music"});
22+
itemsAdded.Add(new FavoriteLocationItem() { ImageSource = "Assets/Cards/Gradients/Pink.png", Icon = "\xEC4F", Text = "Music", Tag = "Music" });
2623
itemsAdded.Add(new FavoriteLocationItem() { ImageSource = "Assets/Cards/Gradients/Red.png", Icon = "\xE8B2", Text = "Videos", Tag = "Videos" });
2724
}
2825
}

‎Files/MultilingualResources/Files.de-DE.xlf

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,18 @@
411411
<source>Clear Selection</source>
412412
<target state="new">Clear Selection</target>
413413
</trans-unit>
414+
<trans-unit id="ModernNavigationToolbaNewFolder.Text" translate="yes" xml:space="preserve">
415+
<source>Folder</source>
416+
<target state="new">Folder</target>
417+
</trans-unit>
418+
<trans-unit id="ModernNavigationToolbaNewBitmapImage.Text" translate="yes" xml:space="preserve">
419+
<source>Bitmap Image</source>
420+
<target state="new">Bitmap Image</target>
421+
</trans-unit>
422+
<trans-unit id="ModernNavigationToolbaNewTextDocument.Text" translate="yes" xml:space="preserve">
423+
<source>Text Documnet</source>
424+
<target state="new">Text Documnet</target>
425+
</trans-unit>
414426
</group>
415427
</body>
416428
</file>

‎Files/MultilingualResources/Files.es-ES.xlf

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,18 @@
410410
<source>Clear Selection</source>
411411
<target state="new">Clear Selection</target>
412412
</trans-unit>
413+
<trans-unit id="ModernNavigationToolbaNewFolder.Text" translate="yes" xml:space="preserve">
414+
<source>Folder</source>
415+
<target state="new">Folder</target>
416+
</trans-unit>
417+
<trans-unit id="ModernNavigationToolbaNewBitmapImage.Text" translate="yes" xml:space="preserve">
418+
<source>Bitmap Image</source>
419+
<target state="new">Bitmap Image</target>
420+
</trans-unit>
421+
<trans-unit id="ModernNavigationToolbaNewTextDocument.Text" translate="yes" xml:space="preserve">
422+
<source>Text Documnet</source>
423+
<target state="new">Text Documnet</target>
424+
</trans-unit>
413425
</group>
414426
</body>
415427
</file>

‎Files/MultilingualResources/Files.fr-FR.xlf

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,18 @@
410410
<source>Clear Selection</source>
411411
<target state="new">Clear Selection</target>
412412
</trans-unit>
413+
<trans-unit id="ModernNavigationToolbaNewFolder.Text" translate="yes" xml:space="preserve">
414+
<source>Folder</source>
415+
<target state="new">Folder</target>
416+
</trans-unit>
417+
<trans-unit id="ModernNavigationToolbaNewBitmapImage.Text" translate="yes" xml:space="preserve">
418+
<source>Bitmap Image</source>
419+
<target state="new">Bitmap Image</target>
420+
</trans-unit>
421+
<trans-unit id="ModernNavigationToolbaNewTextDocument.Text" translate="yes" xml:space="preserve">
422+
<source>Text Documnet</source>
423+
<target state="new">Text Documnet</target>
424+
</trans-unit>
413425
</group>
414426
</body>
415427
</file>

‎Files/MultilingualResources/Files.nl-NL.xlf

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,18 @@
410410
<source>Clear Selection</source>
411411
<target state="new">Clear Selection</target>
412412
</trans-unit>
413+
<trans-unit id="ModernNavigationToolbaNewFolder.Text" translate="yes" xml:space="preserve">
414+
<source>Folder</source>
415+
<target state="new">Folder</target>
416+
</trans-unit>
417+
<trans-unit id="ModernNavigationToolbaNewBitmapImage.Text" translate="yes" xml:space="preserve">
418+
<source>Bitmap Image</source>
419+
<target state="new">Bitmap Image</target>
420+
</trans-unit>
421+
<trans-unit id="ModernNavigationToolbaNewTextDocument.Text" translate="yes" xml:space="preserve">
422+
<source>Text Documnet</source>
423+
<target state="new">Text Documnet</target>
424+
</trans-unit>
413425
</group>
414426
</body>
415427
</file>

‎Files/MultilingualResources/Files.pl-PL.xlf

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,18 @@
410410
<source>Clear Selection</source>
411411
<target state="new">Clear Selection</target>
412412
</trans-unit>
413+
<trans-unit id="ModernNavigationToolbaNewFolder.Text" translate="yes" xml:space="preserve">
414+
<source>Folder</source>
415+
<target state="new">Folder</target>
416+
</trans-unit>
417+
<trans-unit id="ModernNavigationToolbaNewBitmapImage.Text" translate="yes" xml:space="preserve">
418+
<source>Bitmap Image</source>
419+
<target state="new">Bitmap Image</target>
420+
</trans-unit>
421+
<trans-unit id="ModernNavigationToolbaNewTextDocument.Text" translate="yes" xml:space="preserve">
422+
<source>Text Documnet</source>
423+
<target state="new">Text Documnet</target>
424+
</trans-unit>
413425
</group>
414426
</body>
415427
</file>

‎Files/MultilingualResources/Files.zh-Hans.xlf

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,18 @@
410410
<source>Clear Selection</source>
411411
<target state="new">Clear Selection</target>
412412
</trans-unit>
413+
<trans-unit id="ModernNavigationToolbaNewFolder.Text" translate="yes" xml:space="preserve">
414+
<source>Folder</source>
415+
<target state="new">Folder</target>
416+
</trans-unit>
417+
<trans-unit id="ModernNavigationToolbaNewBitmapImage.Text" translate="yes" xml:space="preserve">
418+
<source>Bitmap Image</source>
419+
<target state="new">Bitmap Image</target>
420+
</trans-unit>
421+
<trans-unit id="ModernNavigationToolbaNewTextDocument.Text" translate="yes" xml:space="preserve">
422+
<source>Text Documnet</source>
423+
<target state="new">Text Documnet</target>
424+
</trans-unit>
413425
</group>
414426
</body>
415427
</file>

‎Files/NavigationActions.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
using System;
2-
using Files.Filesystem;
32
using System.Linq;
43
using Windows.UI.Core;
54
using Windows.UI.Xaml;
65
using Windows.UI.Xaml.Controls;
76
using Windows.UI.Xaml.Media.Animation;
8-
using Files.View_Models;
9-
using Files.Controls;
107

118
namespace Files
129
{

0 commit comments

Comments
 (0)