Skip to content

Commit d483325

Browse files
author
Yair Aichenbaum
committed
Merge branch 'develop' of https://github.com/duke7553/files-uwp into develop
2 parents f61b54d + f7d49e3 commit d483325

File tree

5 files changed

+496
-2
lines changed

5 files changed

+496
-2
lines changed

‎Files/App.xaml.cs

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
using Files.CommandLine;
2626
using Files.View_Models;
2727
using Files.Controls;
28+
using NLog;
2829

2930
namespace Files
3031
{
@@ -56,23 +57,40 @@ public static IShellPage CurrentInstance
5657
public static ObservableCollection<WSLDistroItem> linuxDistroItems = new ObservableCollection<WSLDistroItem>();
5758
public static SettingsViewModel AppSettings { get; set; }
5859

60+
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
61+
5962
public App()
6063
{
6164
this.InitializeComponent();
6265
this.Suspending += OnSuspending;
66+
67+
// Initialize NLog
68+
Windows.Storage.StorageFolder storageFolder = Windows.Storage.ApplicationData.Current.LocalFolder;
69+
NLog.LogManager.Configuration.Variables["LogPath"] = storageFolder.Path;
70+
71+
RegisterUncaughtExceptionLogger();
72+
6373
consentDialog = new Dialogs.ConsentDialog();
6474
propertiesDialog = new Dialogs.PropertiesDialog();
6575
layoutDialog = new Dialogs.LayoutDialog();
6676
addItemDialog = new Dialogs.AddItemDialog();
6777
exceptionDialog = new Dialogs.ExceptionDialog();
68-
//this.UnhandledException += App_UnhandledException;
78+
// this.UnhandledException += App_UnhandledException;
6979
Clipboard.ContentChanged += Clipboard_ContentChanged;
7080
Clipboard_ContentChanged(null, null);
7181
AppCenter.Start("682666d1-51d3-4e4a-93d0-d028d43baaa0", typeof(Analytics), typeof(Crashes));
7282

7383
AppSettings = new SettingsViewModel();
7484
}
7585

86+
private void RegisterUncaughtExceptionLogger()
87+
{
88+
UnhandledException += (sender, args) =>
89+
{
90+
Logger.Error(args.Exception, args.Message);
91+
};
92+
}
93+
7694
private void CoreWindow_PointerPressed(CoreWindow sender, PointerEventArgs args)
7795
{
7896
if (args.CurrentPoint.Properties.IsXButton1Pressed)
@@ -172,7 +190,9 @@ public static IReadOnlyList<ContentDialog> FindDisplayedContentDialogs<T>()
172190
/// <param name="e">Details about the launch request and process.</param>
173191
protected override void OnLaunched(LaunchActivatedEventArgs e)
174192
{
175-
bool canEnablePrelaunch = Windows.Foundation.Metadata.ApiInformation.IsMethodPresent("Windows.ApplicationModel.Core.CoreApplication", "EnablePrelaunch");
193+
Logger.Info("App launched");
194+
195+
bool canEnablePrelaunch = Windows.Foundation.Metadata.ApiInformation.IsMethodPresent("Windows.ApplicationModel.Core.CoreApplication", "EnablePrelaunch");
176196

177197
Frame rootFrame = Window.Current.Content as Frame;
178198

@@ -220,6 +240,8 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
220240

221241
protected override void OnActivated(IActivatedEventArgs args)
222242
{
243+
Logger.Info("App activated");
244+
223245
// Window management
224246
Frame rootFrame = Window.Current.Content as Frame;
225247
if (rootFrame == null)

‎Files/Files.csproj

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,9 @@
278278
<None Include="Assets\terminal\terminal.json">
279279
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
280280
</None>
281+
<None Include="NLog.config">
282+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
283+
</None>
281284
<None Include="Package.StoreAssociation.xml" />
282285
<Content Include="Assets\QuickLook\quicklook_icon_black.png" />
283286
<Content Include="Assets\WSL\alpine.svg" />
@@ -293,6 +296,7 @@
293296
<Content Include="Assets\WSL\ubuntu.svg" />
294297
<Content Include="Assets\WSL\ubuntupng.png" />
295298
<Content Include="Properties\Default.rd.xml" />
299+
<PRIResource Include="Strings\pl-PL\Resources.resw" />
296300
<PRIResource Include="Strings\nl-NL\Resources.resw" />
297301
<PRIResource Include="Strings\zh-Hans\Resources.resw" />
298302
<PRIResource Include="Strings\de-DE\Resources.resw" />
@@ -466,6 +470,12 @@
466470
<PackageReference Include="Newtonsoft.Json">
467471
<Version>12.0.3</Version>
468472
</PackageReference>
473+
<PackageReference Include="NLog">
474+
<Version>4.6.8</Version>
475+
</PackageReference>
476+
<PackageReference Include="NLog.Schema">
477+
<Version>4.6.8</Version>
478+
</PackageReference>
469479
</ItemGroup>
470480
<ItemGroup>
471481
<SDKReference Include="WindowsDesktop, Version=10.0.18362.0">
@@ -482,6 +492,7 @@
482492
<XliffResource Include="MultilingualResources\Files.es-ES.xlf" />
483493
<XliffResource Include="MultilingualResources\Files.fr-FR.xlf" />
484494
<XliffResource Include="MultilingualResources\Files.nl-NL.xlf" />
495+
<XliffResource Include="MultilingualResources\Files.pl-PL.xlf" />
485496
<XliffResource Include="MultilingualResources\Files.zh-Hans.xlf" />
486497
</ItemGroup>
487498
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">

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

Lines changed: 252 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,252 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
3+
<file datatype="xml" source-language="en-US" target-language="pl-PL" original="FILES/STRINGS/EN-US/RESOURCES.RESW" tool-id="MultilingualAppToolkit" product-name="n/a" product-version="n/a" build-num="n/a">
4+
<header>
5+
<tool tool-id="MultilingualAppToolkit" tool-name="Multilingual App Toolkit" tool-version="4.0.6915.0" tool-company="Microsoft" />
6+
</header>
7+
<body>
8+
<group id="FILES/STRINGS/EN-US/RESOURCES.RESW" datatype="resx">
9+
<trans-unit id="PropertiesCreated.Text" translate="yes" xml:space="preserve">
10+
<source>Created:</source>
11+
<target state="translated">Utworzony:</target>
12+
</trans-unit>
13+
<trans-unit id="PropertiesItemFileName.PlaceholderText" translate="yes" xml:space="preserve">
14+
<source>Item Name</source>
15+
<target state="translated">Nazwa pliku</target>
16+
</trans-unit>
17+
<trans-unit id="PropertiesItemPath.Text" translate="yes" xml:space="preserve">
18+
<source>Path:</source>
19+
<target state="translated">Lokalizacja:</target>
20+
</trans-unit>
21+
<trans-unit id="PropertiesItemSize.Text" translate="yes" xml:space="preserve">
22+
<source>Size:</source>
23+
<target state="translated">Rozmiar:</target>
24+
</trans-unit>
25+
<trans-unit id="PropertiesItemType.Text" translate="yes" xml:space="preserve">
26+
<source>Item type:</source>
27+
<target state="translated">Typ pliku:</target>
28+
</trans-unit>
29+
<trans-unit id="PropertiesModified.Text" translate="yes" xml:space="preserve">
30+
<source>Modified:</source>
31+
<target state="translated">Zmodyfikowany:</target>
32+
</trans-unit>
33+
<trans-unit id="RecentItemClearAll.Text" translate="yes" xml:space="preserve">
34+
<source>Clear all items</source>
35+
<target state="translated">Wyczyść całą listę</target>
36+
</trans-unit>
37+
<trans-unit id="RecentItemDescription.Text" translate="yes" xml:space="preserve">
38+
<source>Files and folders you've previously accessed will show up here</source>
39+
<target state="translated">Tutaj pojawią się ostatnio otwierane przez Ciebie pliki i foldery</target>
40+
</trans-unit>
41+
<trans-unit id="RecentItemOpenFileLocation.Text" translate="yes" xml:space="preserve">
42+
<source>Open file location</source>
43+
<target state="translated">Otwórz lokalizację pliku</target>
44+
</trans-unit>
45+
<trans-unit id="RecentItemRemove.Text" translate="yes" xml:space="preserve">
46+
<source>Remove this item</source>
47+
<target state="translated">Usuń z listy</target>
48+
</trans-unit>
49+
<trans-unit id="RecentItems.Text" translate="yes" xml:space="preserve">
50+
<source>Recent items</source>
51+
<target state="translated">Niedawno używane pliki</target>
52+
</trans-unit>
53+
<trans-unit id="SettingsAboutAppName.Text" translate="yes" xml:space="preserve">
54+
<source>Files UWP</source>
55+
<target state="translated">Pliki UWP</target>
56+
</trans-unit>
57+
<trans-unit id="SettingsAboutLicense.Text" translate="yes" xml:space="preserve">
58+
<source>License: </source>
59+
<target state="translated">Licencja: </target>
60+
</trans-unit>
61+
<trans-unit id="SettingsAboutSpecialThanks.Text" translate="yes" xml:space="preserve">
62+
<source>Special thanks to:</source>
63+
<target state="translated">Podziękowania:</target>
64+
</trans-unit>
65+
<trans-unit id="SettingsAboutSubmitFeedback.Text" translate="yes" xml:space="preserve">
66+
<source>Submit Feedback</source>
67+
<target state="translated">Prześlij opinię</target>
68+
</trans-unit>
69+
<trans-unit id="SettingsAboutSubmitFeedbackDescription.Text" translate="yes" xml:space="preserve">
70+
<source>Submit an issue report to provide the developers with information</source>
71+
<target state="translated">Wyślij raport o problemie prosto do developera aplikacji</target>
72+
</trans-unit>
73+
<trans-unit id="SettingsAboutThirdPartyLicenses.Text" translate="yes" xml:space="preserve">
74+
<source>Third Party Licenses</source>
75+
<target state="translated">Licencje firm trzecich</target>
76+
</trans-unit>
77+
<trans-unit id="SettingsAboutTitle.Text" translate="yes" xml:space="preserve">
78+
<source>About</source>
79+
<target state="translated">O programie</target>
80+
</trans-unit>
81+
<trans-unit id="SettingsAboutWebsite.Text" translate="yes" xml:space="preserve">
82+
<source>Website: </source>
83+
<target state="translated">Strona: </target>
84+
</trans-unit>
85+
<trans-unit id="SettingsAppearanceAcrylicSidebar.Text" translate="yes" xml:space="preserve">
86+
<source>Acrylic sidebar</source>
87+
<target state="translated">Przezroczysty pasek boczny</target>
88+
</trans-unit>
89+
<trans-unit id="SettingsAppearanceDateFormat.Text" translate="yes" xml:space="preserve">
90+
<source>Date format</source>
91+
<target state="translated">Format daty</target>
92+
</trans-unit>
93+
<trans-unit id="SettingsAppearanceTheme.Text" translate="yes" xml:space="preserve">
94+
<source>Theme</source>
95+
<target state="translated">Motyw</target>
96+
</trans-unit>
97+
<trans-unit id="SettingsAppearanceTitle.Text" translate="yes" xml:space="preserve">
98+
<source>Appearance</source>
99+
<target state="translated">Wygląd</target>
100+
</trans-unit>
101+
<trans-unit id="SettingsFilesAndFoldersShowDriveLetters.Text" translate="yes" xml:space="preserve">
102+
<source>Show drive letters</source>
103+
<target state="translated">Pokaż litery dysków</target>
104+
</trans-unit>
105+
<trans-unit id="SettingsFilesAndFoldersShowFileExtensions.Text" translate="yes" xml:space="preserve">
106+
<source>Show extensions for known file types</source>
107+
<target state="translated">Pokaż rozszerzenia znanych typów plików</target>
108+
</trans-unit>
109+
<trans-unit id="SettingsFilesAndFoldersShowHiddenFiles.Text" translate="yes" xml:space="preserve">
110+
<source>Show hidden files, folders, and drives</source>
111+
<target state="translated">Pokaż ukryte pliki, foldery i dyski</target>
112+
</trans-unit>
113+
<trans-unit id="SettingsFilesAndFoldersTitle.Text" translate="yes" xml:space="preserve">
114+
<source>Files and Folders</source>
115+
<target state="translated">Pliki i foldery</target>
116+
</trans-unit>
117+
<trans-unit id="SettingsFlagsTitle.Text" translate="yes" xml:space="preserve">
118+
<source>Flags</source>
119+
<target state="translated">Flags</target>
120+
</trans-unit>
121+
<trans-unit id="SettingsNav.PaneTitle" translate="yes" xml:space="preserve">
122+
<source>Settings</source>
123+
<target state="translated">Ustawienia</target>
124+
</trans-unit>
125+
<trans-unit id="SettingsNavAbout.Content" translate="yes" xml:space="preserve">
126+
<source>About</source>
127+
<target state="translated">O programie</target>
128+
</trans-unit>
129+
<trans-unit id="SettingsNavAppearance.Content" translate="yes" xml:space="preserve">
130+
<source>Appearance</source>
131+
<target state="translated">Wygląd</target>
132+
</trans-unit>
133+
<trans-unit id="SettingsNavFilesAndFolders.Content" translate="yes" xml:space="preserve">
134+
<source>Files and Folders</source>
135+
<target state="translated">Pliki i foldery</target>
136+
</trans-unit>
137+
<trans-unit id="SettingsNavOnStartup.Content" translate="yes" xml:space="preserve">
138+
<source>On Startup</source>
139+
<target state="translated">Po uruchomienu</target>
140+
</trans-unit>
141+
<trans-unit id="SettingsNavPageLayouts.Content" translate="yes" xml:space="preserve">
142+
<source>Page Layouts</source>
143+
<target state="translated">Układ strony</target>
144+
</trans-unit>
145+
<trans-unit id="SettingsNavPreferences.Content" translate="yes" xml:space="preserve">
146+
<source>Preferences</source>
147+
<target state="translated">Opcje</target>
148+
</trans-unit>
149+
<trans-unit id="SettingsNavSearch.PlaceholderText" translate="yes" xml:space="preserve">
150+
<source>Search</source>
151+
<target state="translated">Szukaj</target>
152+
</trans-unit>
153+
<trans-unit id="SettingsOnStartupContinueWhereYouLeftOff.Content" translate="yes" xml:space="preserve">
154+
<source>Continue where you left off</source>
155+
<target state="translated">Kontynuuj poprzednią sejsę</target>
156+
</trans-unit>
157+
<trans-unit id="SettingsOnStartupOpenANewTab.Content" translate="yes" xml:space="preserve">
158+
<source>Open a new tab</source>
159+
<target state="translated">Otwórz nową kartę</target>
160+
</trans-unit>
161+
<trans-unit id="SettingsOnStartupOpenASpecificPage.Content" translate="yes" xml:space="preserve">
162+
<source>Open a specific page or pages</source>
163+
<target state="translated">Otwórz konkretną kartę lub karty</target>
164+
</trans-unit>
165+
<trans-unit id="SettingsOnStartupTitle.Text" translate="yes" xml:space="preserve">
166+
<source>On Startup</source>
167+
<target state="translated">Po uruchomienu</target>
168+
</trans-unit>
169+
<trans-unit id="SettingsPreferencesDesktop.Text" translate="yes" xml:space="preserve">
170+
<source>Desktop</source>
171+
<target state="translated">Pulpit</target>
172+
</trans-unit>
173+
<trans-unit id="SettingsPreferencesDesktopLocation.PlaceholderText" translate="yes" xml:space="preserve">
174+
<source>Set custom desktop location</source>
175+
<target state="translated">Ustaw własną lokalizację folderu Pulpit</target>
176+
</trans-unit>
177+
<trans-unit id="SettingsPreferencesDocuments.Text" translate="yes" xml:space="preserve">
178+
<source>Documents</source>
179+
<target state="translated">Dokumenty</target>
180+
</trans-unit>
181+
<trans-unit id="SettingsPreferencesDocumentsLocation.PlaceholderText" translate="yes" xml:space="preserve">
182+
<source>Set custom documents location</source>
183+
<target state="translated">Ustaw własną lokalizację folderu Dokumenty</target>
184+
</trans-unit>
185+
<trans-unit id="SettingsPreferencesDownloads.Text" translate="yes" xml:space="preserve">
186+
<source>Downloads</source>
187+
<target state="translated">Pobrane</target>
188+
</trans-unit>
189+
<trans-unit id="SettingsPreferencesDownloadsLocation.PlaceholderText" translate="yes" xml:space="preserve">
190+
<source>Set custom downloads location</source>
191+
<target state="translated">Ustaw własną lokalizację folderu Pobrane</target>
192+
</trans-unit>
193+
<trans-unit id="SettingsPreferencesMusic.Text" translate="yes" xml:space="preserve">
194+
<source>Music</source>
195+
<target state="translated">Muzyka</target>
196+
</trans-unit>
197+
<trans-unit id="SettingsPreferencesMusicLocation.PlaceholderText" translate="yes" xml:space="preserve">
198+
<source>Set custom music location</source>
199+
<target state="translated">Ustaw własną lokalizację folderu Muzyka</target>
200+
</trans-unit>
201+
<trans-unit id="SettingsPreferencesOneDrive.Text" translate="yes" xml:space="preserve">
202+
<source>OneDrive</source>
203+
<target state="translated">OneDrive</target>
204+
</trans-unit>
205+
<trans-unit id="SettingsPreferencesOneDriveLocation.PlaceholderText" translate="yes" xml:space="preserve">
206+
<source>Set custom OneDrive location</source>
207+
<target state="translated">Ustaw własną lokalizację folderu OneDrive</target>
208+
</trans-unit>
209+
<trans-unit id="SettingsPreferencesPictures.Text" translate="yes" xml:space="preserve">
210+
<source>Pictures</source>
211+
<target state="translated">Obrazy</target>
212+
</trans-unit>
213+
<trans-unit id="SettingsPreferencesPicturesLocation.PlaceholderText" translate="yes" xml:space="preserve">
214+
<source>Set custom pictures location</source>
215+
<target state="translated">Ustaw własną lokalizację folderu Obrazy</target>
216+
</trans-unit>
217+
<trans-unit id="SettingsPreferencesPinOneDrive.Text" translate="yes" xml:space="preserve">
218+
<source>Pin OneDrive to the sidebar</source>
219+
<target state="translated">Przypnij OneDrive do paska bocznego</target>
220+
</trans-unit>
221+
<trans-unit id="SettingsPreferencesReplaceCommonLocations.Text" translate="yes" xml:space="preserve">
222+
<source>Replace common locations</source>
223+
<target state="translated">Zmień lokalizację folderów</target>
224+
</trans-unit>
225+
<trans-unit id="SettingsPreferencesSaveLocations.Content" translate="yes" xml:space="preserve">
226+
<source>Save Locations</source>
227+
<target state="translated">Zapisz lokalizację</target>
228+
</trans-unit>
229+
<trans-unit id="SettingsPreferencesTerminalApplications.Text" translate="yes" xml:space="preserve">
230+
<source>Terminal Applications</source>
231+
<target state="translated">Aplikacja wiersza poleceń</target>
232+
</trans-unit>
233+
<trans-unit id="SettingsPreferencesTitle.Text" translate="yes" xml:space="preserve">
234+
<source>Preferences</source>
235+
<target state="translated">Opcje</target>
236+
</trans-unit>
237+
<trans-unit id="SettingsPreferencesVideo.Text" translate="yes" xml:space="preserve">
238+
<source>Video</source>
239+
<target state="translated">Wideo</target>
240+
</trans-unit>
241+
<trans-unit id="SettingsPreferencesVideoLocation.PlaceholderText" translate="yes" xml:space="preserve">
242+
<source>Set custom video location</source>
243+
<target state="translated">Ustaw własną lokalizację folderu Wideo</target>
244+
</trans-unit>
245+
<trans-unit id="SideBarUnpinFromSideBar.Text" translate="yes" xml:space="preserve">
246+
<source>Unpin from Sidebar</source>
247+
<target state="translated">Odepnij od paska bocznego</target>
248+
</trans-unit>
249+
</group>
250+
</body>
251+
</file>
252+
</xliff>

‎Files/NLog.config

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4+
5+
<targets>
6+
<target name="logfile" xsi:type="File" fileName="${var:LogPath}\debug.txt" concurrentWrites="true" />
7+
<target name="logconsole" xsi:type="Console" />
8+
</targets>
9+
10+
<rules>
11+
<logger name="*" minlevel="Debug" writeTo="logconsole" />
12+
<logger name="*" minlevel="Debug" writeTo="logfile" />
13+
</rules>
14+
</nlog>

0 commit comments

Comments
 (0)