Skip to content

Commit 588e814

Browse files
onesoundsonesounds
committed
- Add style for hiding when non-filesize
- Add Strings
1 parent dcf72bc commit 588e814

File tree

3 files changed

+89
-17
lines changed

3 files changed

+89
-17
lines changed

‎Flow.Launcher/Languages/en.xaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,4 +413,8 @@
413413
<system:String x:Key="RecommendAcronyms">sn</system:String>
414414
<system:String x:Key="RecommendAcronymsDesc">Sticky Notes</system:String>
415415

416+
<!-- Preview Area -->
417+
<system:String x:Key="FileSize">File Size</system:String>
418+
<system:String x:Key="Created">Created</system:String>
419+
<system:String x:Key="LastModified">Last Modified</system:String>
416420
</ResourceDictionary>

‎Flow.Launcher/MainWindow.xaml

Lines changed: 76 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
xmlns:flowlauncher="clr-namespace:Flow.Launcher"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
99
xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
10+
xmlns:sys="clr-namespace:System;assembly=mscorlib"
1011
xmlns:ui="http://schemas.modernwpf.com/2019"
1112
xmlns:vm="clr-namespace:Flow.Launcher.ViewModel"
1213
Name="FlowMainWindow"
@@ -490,17 +491,81 @@
490491
x:Name="PreviewSubTitle"
491492
Style="{DynamicResource PreviewItemSubTitleStyle}"
492493
Text="{Binding Result.SubTitle}" />
493-
<StackPanel Orientation="Horizontal">
494-
<TextBlock Text="FileSize" />
495-
<TextBlock Style="{DynamicResource PreviewItemSubTitleStyle}" Text="{Binding Result.FileSize}" />
496-
</StackPanel>
497-
<StackPanel Orientation="Horizontal">
498-
<TextBlock Text="Created" />
499-
<TextBlock Style="{DynamicResource PreviewItemSubTitleStyle}" Text="{Binding Result.FileCreated}" />
500-
</StackPanel>
501-
<StackPanel Orientation="Horizontal">
502-
<TextBlock Text="Last Modified" />
503-
<TextBlock Style="{DynamicResource PreviewItemSubTitleStyle}" Text="{Binding Result.LastModifed}" />
494+
<StackPanel Orientation="Vertical">
495+
<StackPanel.Style>
496+
<Style TargetType="{x:Type StackPanel}">
497+
<Style.Triggers>
498+
<DataTrigger Binding="{Binding ElementName=SizeValue, UpdateSourceTrigger=PropertyChanged, Path=Text}" Value="{x:Static sys:String.Empty}">
499+
<Setter Property="Height" Value="0" />
500+
</DataTrigger>
501+
</Style.Triggers>
502+
</Style>
503+
</StackPanel.Style>
504+
<Separator Margin="0,0,0,0" Style="{DynamicResource PreviewSep}" />
505+
<Grid Margin="0,10,0,0" VerticalAlignment="Center">
506+
<Grid.ColumnDefinitions>
507+
<ColumnDefinition Width="100" />
508+
<ColumnDefinition Width="*" />
509+
</Grid.ColumnDefinitions>
510+
<Grid.RowDefinitions>
511+
<RowDefinition Height="Auto" />
512+
<RowDefinition Height="Auto" />
513+
<RowDefinition Height="Auto" />
514+
</Grid.RowDefinitions>
515+
<TextBlock
516+
Grid.Row="0"
517+
Grid.Column="0"
518+
Margin="0"
519+
VerticalAlignment="Top"
520+
Style="{DynamicResource PreviewItemSubTitleStyle}"
521+
Text="{DynamicResource FileSize}"
522+
TextWrapping="Wrap" />
523+
<TextBlock
524+
Name="SizeValue"
525+
Grid.Row="0"
526+
Grid.Column="1"
527+
Margin="0"
528+
HorizontalAlignment="Right"
529+
VerticalAlignment="Top"
530+
Style="{DynamicResource PreviewItemSubTitleStyle}"
531+
Text="{Binding Result.FileSize}"
532+
TextWrapping="Wrap" />
533+
<TextBlock
534+
Grid.Row="1"
535+
Grid.Column="0"
536+
Margin="0"
537+
VerticalAlignment="Top"
538+
Style="{DynamicResource PreviewItemSubTitleStyle}"
539+
Text="{DynamicResource Created}"
540+
TextWrapping="Wrap" />
541+
<TextBlock
542+
Grid.Row="1"
543+
Grid.Column="1"
544+
Margin="0"
545+
HorizontalAlignment="Right"
546+
VerticalAlignment="Top"
547+
Style="{DynamicResource PreviewItemSubTitleStyle}"
548+
Text="{Binding Result.FileCreated}"
549+
TextWrapping="Wrap" />
550+
551+
<TextBlock
552+
Grid.Row="2"
553+
Grid.Column="0"
554+
Margin="0"
555+
VerticalAlignment="Top"
556+
Style="{DynamicResource PreviewItemSubTitleStyle}"
557+
Text="{DynamicResource LastModified}"
558+
TextWrapping="Wrap" />
559+
<TextBlock
560+
Grid.Row="2"
561+
Grid.Column="1"
562+
Margin="0"
563+
HorizontalAlignment="Right"
564+
VerticalAlignment="Top"
565+
Style="{DynamicResource PreviewItemSubTitleStyle}"
566+
Text="{Binding Result.LastModifed}"
567+
TextWrapping="Wrap" />
568+
</Grid>
504569
</StackPanel>
505570
</StackPanel>
506571
</Grid>

‎Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using System.Windows.Input;
1111
using System.Windows.Shapes;
1212
using Path = System.IO.Path;
13+
using System.Globalization;
1314

1415
namespace Flow.Launcher.Plugin.Explorer.Search
1516
{
@@ -189,11 +190,11 @@ private static string ToReadableSize(long pDrvSize, int pi)
189190
if (mok == 1)
190191
uom = "KB";
191192
else if (mok == 2)
192-
uom = " MB";
193+
uom = "MB";
193194
else if (mok == 3)
194-
uom = " GB";
195+
uom = "GB";
195196
else if (mok == 4)
196-
uom = " TB";
197+
uom = "TB";
197198

198199
var returnStr = $"{Convert.ToInt32(drvSize)}{uom}";
199200
if (mok != 0)
@@ -241,14 +242,16 @@ internal static Result CreateFileResult(string filePath, Query query, int score
241242

242243
var title = Path.GetFileName(filePath);
243244

245+
244246
/* Preview Detail */
245247
long fileSize = new System.IO.FileInfo(filePath).Length;
246-
string fileSizStr = fileSize.ToString();
248+
string fileSizStr = ToReadableSize(fileSize, 2);
247249

248250
DateTime created = System.IO.File.GetCreationTime(filePath);
249-
string createdStr = created.ToString("yyyy-MM-dd HH:mm:ss");
251+
string createdStr = created.ToString("yy-M-dd ddd hh:mm", CultureInfo.CurrentCulture);
250252
DateTime lastModified = System.IO.File.GetLastWriteTime(filePath);
251-
string lastModifiedStr = lastModified.ToString("yyyy-MM-dd HH:mm:ss");
253+
string lastModifiedStr = lastModified.ToString("yy-M-dd ddd hh:mm", CultureInfo.CurrentCulture);
254+
252255

253256

254257
var result = new Result

0 commit comments

Comments
 (0)