Skip to content

Commit 681d7ae

Browse files
author
David Karlaš
committed
.
1 parent 440b4ff commit 681d7ae

4 files changed

Lines changed: 26 additions & 15 deletions

File tree

WinDirStat.Net.Wpf.Base/Services/SettingsService.Defaults.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ partial class SettingsService {
4848
/// <summary>Resets the settings to their defaults.</summary>
4949
public void Reset() {
5050
// Drive Select
51-
DriveSelectMode = DriveSelectMode.Individual;
51+
DriveSelectMode = DriveSelectMode.Sqlite;
5252
SelectedDrives = new[] { @"C:\" };
5353
SelectedFolderPath = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
5454

WinDirStat.Net.Wpf.Base/ViewModel/Comparers/FileComparer.cs

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ protected override Comparison<FileItemViewModel> GetSortComparison(FileSortMode
5656
case FileSortMode.Items: return SortByItems;
5757
case FileSortMode.Files: return SortByFiles;
5858
case FileSortMode.Subdirs: return SortBySubdirs;
59-
case FileSortMode.LastWrite: return SortByLastWrite;
60-
//case FileSortMode.LastAccess: return SortByLastAccess;
61-
//case FileSortMode.Creation: return SortByCreation;
62-
case FileSortMode.Attributes: return SortByAttributes;
59+
case FileSortMode.LastWrite: return SortByLastWrite;
60+
case FileSortMode.LastAccess: return SortByLastAccess;
61+
case FileSortMode.Creation: return SortByCreation;
62+
case FileSortMode.Attributes: return SortByAttributes;
6363
default:
6464
throw new ArgumentException($"Invalid {typeof(FileSortMode).Name} ({mode})!", nameof(mode));
6565
}
@@ -93,12 +93,19 @@ private static int SortBySubdirs(FileItemViewModel a, FileItemViewModel b) {
9393
return a.Model.SubdirCount - b.Model.SubdirCount;
9494
}
9595
private static int SortByAttributes(FileItemViewModel a, FileItemViewModel b) {
96-
return a.Model.SortAttributes.CompareTo(b.Model.SortAttributes);
97-
}
98-
private static int SortByLastWrite(FileItemViewModel a, FileItemViewModel b) {
99-
return a.Model.LastWriteTimeUtc.CompareTo(b.Model.LastWriteTimeUtc);
100-
}
101-
102-
#endregion
103-
}
96+
return a.Model.SortAttributes.CompareTo(b.Model.SortAttributes);
97+
}
98+
private static int SortByLastWrite(FileItemViewModel a, FileItemViewModel b) {
99+
return a.Model.LastWriteTimeUtc.CompareTo(b.Model.LastWriteTimeUtc);
100+
}
101+
102+
private static int SortByLastAccess(FileItemViewModel a, FileItemViewModel b) {
103+
return a.Model.LastAccessTimeUtc.CompareTo(b.Model.LastAccessTimeUtc);
104+
}
105+
106+
private static int SortByCreation(FileItemViewModel a, FileItemViewModel b) {
107+
return a.Model.CreationTimeUtc.CompareTo(b.Model.CreationTimeUtc);
108+
}
109+
#endregion
110+
}
104111
}

WinDirStat.Net.Wpf.Single/Converters/FileTimeFormatter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ public override object ProvideValue(IServiceProvider serviceProvider) {
1414
public object Convert(object value, Type targetType, object parameter, CultureInfo culture) {
1515
try {
1616
DateTime dt = (DateTime) value;
17-
if (dt == DateTime.MinValue)
18-
return "";
17+
if (dt.ToUniversalTime() == DateTime.MinValue)
18+
return "Never";
1919
string shortDateFormat = CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern;
2020
string dtFormatted = dt.ToString(shortDateFormat.Replace("yyyy", "yy"));
2121
return $"{dtFormatted} {dt.ToShortTimeString()}";

WinDirStat.Net.Wpf.Single/WinDirStat.Net.Wpf.Single.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
<LangVersion>latest</LangVersion>
1010
<ApplicationIcon>Resources\App.ico</ApplicationIcon>
1111
<ApplicationManifest>Properties\App.manifest</ApplicationManifest>
12+
13+
<PublishSingleFile>true</PublishSingleFile>
14+
<SelfContained>true</SelfContained>
15+
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
1216
</PropertyGroup>
1317
<ItemGroup>
1418
<Resource Include="Resources\App.ico" />

0 commit comments

Comments
 (0)