Skip to content

Commit aa49e47

Browse files
XTsatXTsat
committed
Optimize key value
1 parent c08025b commit aa49e47

17 files changed

+581
-640
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,3 +367,4 @@ FodyWeavers.xsd
367367
# IntelliJ
368368
.idea/
369369
/CompactGUI.WatcherCS
370+
/.history

‎CompactGUI/Components/Converters/IValueConverters.vb‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,16 +93,16 @@ Public Class RelativeDateConverter : Implements IValueConverter
9393
Dim ts As TimeSpan = DateTime.Now - dt
9494

9595
If ts > TimeSpan.FromDays(19000) Then
96-
Return LanguageHelper.GetString("RelativeTimeUnknown")
96+
Return LanguageHelper.GetString("Time_Unknown")
9797
End If
9898
If ts > TimeSpan.FromDays(2) Then
99-
Return String.Format(LanguageHelper.GetString("RelativeTimeDaysAgo"), ts.TotalDays)
99+
Return String.Format(LanguageHelper.GetString("Time_DaysAgo"), ts.TotalDays)
100100
ElseIf ts > TimeSpan.FromHours(2) Then
101-
Return String.Format(LanguageHelper.GetString("RelativeTimeHoursAgo"), ts.TotalHours)
101+
Return String.Format(LanguageHelper.GetString("Time_HoursAgo"), ts.TotalHours)
102102
ElseIf ts > TimeSpan.FromMinutes(2) Then
103-
Return String.Format(LanguageHelper.GetString("RelativeTimeMinutesAgo"), ts.TotalMinutes)
103+
Return String.Format(LanguageHelper.GetString("Time_MinutesAgo"), ts.TotalMinutes)
104104
Else
105-
Return LanguageHelper.GetString("RelativeTimeJustNow")
105+
Return LanguageHelper.GetString("Time_Now")
106106
End If
107107
End Function
108108

‎CompactGUI/Components/Settings/Settings_skiplistflyout.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<Grid x:Name="MainGrid">
4646
<ui:TitleBar Panel.ZIndex="10"
4747
ShowMaximize="False" ShowMinimize="False" />
48-
<TextBlock Text="{local:Localize SettingsSkiplistflyoutEditSkippedFiletypes}"
48+
<TextBlock Text="{local:Localize SetFiletypeManagement_LocalSkipFiletypesEdit}"
4949
d:Text="edit skipped filetypes"
5050
Margin="10"
5151
FontSize="22" FontWeight="SemiBold" />

‎CompactGUI/MainWindow.xaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<ui:NavigationView.MenuItems>
4242

4343

44-
<ui:NavigationViewItem Content="{local:Localize NameMainWindowHome}"
44+
<ui:NavigationViewItem Content="{local:Localize Title_Home}"
4545
d:Content="Home"
4646
Margin="15,2,15,10"
4747
NavigationCacheMode="Required"
@@ -53,7 +53,7 @@
5353
</ui:NavigationViewItem>
5454

5555

56-
<ui:NavigationViewItem Content="{local:Localize NameMainWindowWatcher}"
56+
<ui:NavigationViewItem Content="{local:Localize Title_Watcher}"
5757
d:Content="Watcher"
5858
Margin="15,2,15,10"
5959
NavigationCacheMode="Required"
@@ -64,7 +64,7 @@
6464
</ui:NavigationViewItem.Icon>
6565
</ui:NavigationViewItem>
6666

67-
<ui:NavigationViewItem Content="{local:Localize NameMainWindowCompressionDB}"
67+
<ui:NavigationViewItem Content="{local:Localize Title_CompressionDB}"
6868
d:Content="Compression DB"
6969
Margin="15,2,15,10"
7070
NavigationCacheMode="Disabled"
@@ -234,7 +234,7 @@
234234
</Style>
235235
</Label.Style>
236236
<StackPanel VerticalAlignment="Center" Orientation="Horizontal">
237-
<TextBlock Text="{local:Localize TitleCompactGUI}" d:Text="CompactGUI"
237+
<TextBlock Text="{local:Localize Title_CompactGUI}" d:Text="CompactGUI"
238238
Margin="0,0,20,0" VerticalAlignment="Center"
239239
Foreground="#20FFFFFF"
240240
Visibility="{Binding IsAdmin, Converter={StaticResource BooleanToInverseVisibilityConverter}}" />

‎CompactGUI/Views/Components/CompressionMode_Radio.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242

4343
<ui:TextBlock x:Name="estimatedSize_Text"
44-
Text="{local:Localize CompressionModeRadioEstimatedSize}"
44+
Text="{local:Localize CompressionModeRadio_EstimatedSize}"
4545
d:Text="Estimated size"
4646
Grid.Row="0"
4747
Margin="-10,10,0,0" HorizontalAlignment="Left" VerticalAlignment="Center"
@@ -54,7 +54,7 @@
5454
</ui:TextBlock>
5555

5656
<ui:TextBlock x:Name="savings_Text"
57-
Text="{local:Localize CompressionModeRadioSavings}"
57+
Text="{local:Localize CompressionModeRadio_Savings}"
5858
d:Text="Savings"
5959
Grid.Row="0"
6060
Margin="0,40,0,0" HorizontalAlignment="Left" VerticalAlignment="Center"
@@ -68,7 +68,7 @@
6868

6969

7070
<Grid Grid.Column="1" Visibility="{Binding IsEstimating, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToInverseVisibilityConverter}}">
71-
<ui:TextBlock Text="{local:Localize CompressionModeRadioUnknown}" d:Text="unknown"
71+
<ui:TextBlock Text="{local:Localize CompressionModeRadio_Unknown}" d:Text="unknown"
7272
HorizontalAlignment="Right" VerticalAlignment="Center"
7373
FontSize="13" Foreground="#30FFFFFF"
7474
Visibility="{Binding BytesAfter, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ZeroCountToVisibilityConverter}, ConverterParameter=invert}" />

‎CompactGUI/Views/Components/FolderWatcherCard.xaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737

3838
<StackPanel Orientation="Horizontal" Grid.Row="0">
39-
<TextBlock Text="{local:Localize PageFolderWatcherCardWatchedFoldersName}"
39+
<TextBlock Text="{local:Localize Watcher_WatchedFolders}"
4040
d:Text="Watched Folders"
4141
Grid.Row="0"
4242
VerticalAlignment="Top"
@@ -71,7 +71,7 @@
7171
FontSize="18" FontWeight="SemiBold"
7272
Foreground="#40FFFFFF">
7373
<Run Text="{Binding Watcher.TotalSaved, Mode=OneWay, Converter={StaticResource BytesToReadableConverter}}" d:Text="51.8GB" />
74-
<Run Text="{local:Localize FolderWatcherCardSaved}" d:Text="saved" />
74+
<Run Text="{local:Localize Watcher_WatchedSaved}" d:Text="saved" />
7575
</TextBlock>
7676

7777
<StackPanel Grid.Row="1" Grid.RowSpan="2"
@@ -83,7 +83,7 @@
8383
FontSize="14" FontWeight="SemiBold" Foreground="#40FFFFFF">
8484
<TextBlock.Text>
8585
<MultiBinding StringFormat="{}{0} {1}">
86-
<Binding Source="{local:Localize FolderWatcherCardLastAnalysed}" />
86+
<Binding Source="{local:Localize Watcher_LastAnalysed}" />
8787
<Binding Path="Watcher.LastAnalysed" Converter="{StaticResource RelativeDateConverter}" />
8888
</MultiBinding>
8989
</TextBlock.Text>
@@ -112,8 +112,8 @@
112112

113113
<StackPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" HorizontalAlignment="Right">
114114

115-
<Button Content="{local:Localize FolderWatcherCardCancelBackgroundCompressor}" d:Content="Cancel Background Compressor" Command="{Binding CancelBackgroundingCommand}" Visibility="{Binding Watcher.IsRunning, Converter={StaticResource BooleanToVisibilityConverter}}"/>
116-
<Button Content="{local:Localize FolderWatcherCardCompressAllNow}" d:Content="Compress All Now" Command="{Binding RunWatcherCommand}" Visibility="{Binding Watcher.IsRunning, Converter={StaticResource BooleanToInverseVisibilityConverter}}"/>
115+
<Button Content="{local:Localize Watcher_CancelBackgroundCompressor}" d:Content="Cancel Background Compressor" Command="{Binding CancelBackgroundingCommand}" Visibility="{Binding Watcher.IsRunning, Converter={StaticResource BooleanToVisibilityConverter}}"/>
116+
<Button Content="{local:Localize Watcher_CompressAllNow}" d:Content="Compress All Now" Command="{Binding RunWatcherCommand}" Visibility="{Binding Watcher.IsRunning, Converter={StaticResource BooleanToInverseVisibilityConverter}}"/>
117117
</StackPanel>
118118

119119

‎CompactGUI/Views/Pages/DatabasePage.xaml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<RowDefinition Height="*"/>
1515
</Grid.RowDefinitions>
1616

17-
<TextBlock Text="{local:Localize PageDatabaseResults}"
17+
<TextBlock Text="{local:Localize CompressionDB_DatabaseResults}"
1818
d:Text="Database Results"
1919
Grid.Row="0"
2020
VerticalAlignment="Top"
@@ -25,7 +25,7 @@
2525
<TextBlock Grid.Row="2" HorizontalAlignment="Right" VerticalAlignment="Top"
2626
Foreground="#10FFFFFF" Margin="0 0 0 0" FontSize="12">
2727
<TextBlock.Text>
28-
<MultiBinding StringFormat="{local:Localize DatabaseLastFetched}">
28+
<MultiBinding StringFormat="{local:Localize Status_LastFetched}">
2929
<Binding Path="LastUpdatedDatabase" />
3030
</MultiBinding>
3131
</TextBlock.Text>
@@ -39,7 +39,7 @@
3939
<Run Text="Submissions" />
4040
<Run Text="across" />-->
4141
<Run Text="{Binding DatabaseGamesCount, Mode=OneWay }" />
42-
<Run Text="{local:Localize DatabaseResultsGames}" d:Text="Games" />
42+
<Run Text="{local:Localize CompressionDB_DatabaseResults_Games}" d:Text="Games" />
4343
</TextBlock>
4444

4545
<Grid Grid.Row="0" Margin="20 0 0 0" HorizontalAlignment="Right" Grid.RowSpan="1">
@@ -52,26 +52,26 @@
5252
<!-- Search Box -->
5353
<ui:TextBox VerticalAlignment="Center"
5454
FontSize="14" Width="250"
55-
PlaceholderText="{local:Localize DatabaseResultsSearchSteamID}"
55+
PlaceholderText="{local:Localize CompressionDB_DatabaseResults_SearchSteamID}"
5656
d:PlaceholderText="Search by game name or SteamID..."
5757
Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}" />
5858

5959
<!-- Sorting Menu -->
6060
<ui:DropDownButton Grid.Column="1" Margin="20 0 0 0" Foreground="{StaticResource LabelForeground}" Height="36" VerticalAlignment="Center" HorizontalAlignment="Stretch">
61-
<TextBlock Text="{local:Localize DatabaseResultsSort}" d:Text="Sort By"/>
61+
<TextBlock Text="{local:Localize CompressionDB_DatabaseResults_Sort}" d:Text="Sort By"/>
6262
<ui:DropDownButton.Flyout>
6363
<ContextMenu>
64-
<MenuItem Header="{local:Localize DatabaseResultsSortGameName}" d:Header="Game Name">
65-
<MenuItem Header="{local:Localize DatabasePage_Ascending}" d:Header="Ascending" Command="{Binding SortResultsCommand}" CommandParameter="GameNameAsc"/>
66-
<MenuItem Header="{local:Localize DatabasePage_Descending}" d:Header="Descending" Command="{Binding SortResultsCommand}" CommandParameter="GameNameDesc"/>
64+
<MenuItem Header="{local:Localize CompressionDB_DatabaseResults_SortGameName}" d:Header="Game Name">
65+
<MenuItem Header="{local:Localize CompressionDB_DatabaseResults_SortAscending}" d:Header="Ascending" Command="{Binding SortResultsCommand}" CommandParameter="GameNameAsc"/>
66+
<MenuItem Header="{local:Localize CompressionDB_DatabaseResults_SortDescending}" d:Header="Descending" Command="{Binding SortResultsCommand}" CommandParameter="GameNameDesc"/>
6767
</MenuItem>
68-
<MenuItem Header="{local:Localize DatabaseResultsSortSteamID}" d:Header="SteamID">
69-
<MenuItem Header="{local:Localize DatabasePage_Ascending}" d:Header="Ascending" Command="{Binding SortResultsCommand}" CommandParameter="SteamIDAsc"/>
70-
<MenuItem Header="{local:Localize DatabasePage_Descending}" d:Header="Descending" Command="{Binding SortResultsCommand}" CommandParameter="SteamIDDesc"/>
68+
<MenuItem Header="{local:Localize CompressionDB_DatabaseResults_SortSteamID}" d:Header="SteamID">
69+
<MenuItem Header="{local:Localize CompressionDB_DatabaseResults_SortAscending}" d:Header="Ascending" Command="{Binding SortResultsCommand}" CommandParameter="SteamIDAsc"/>
70+
<MenuItem Header="{local:Localize CompressionDB_DatabaseResults_SortDescending}" d:Header="Descending" Command="{Binding SortResultsCommand}" CommandParameter="SteamIDDesc"/>
7171
</MenuItem>
72-
<MenuItem Header="{local:Localize DatabaseResultsSortMaxSavings}" d:Header="Max Savings">
73-
<MenuItem Header="{local:Localize DatabasePage_Ascending}" d:Header="Ascending" Command="{Binding SortResultsCommand}" CommandParameter="MaxSavingsAsc"/>
74-
<MenuItem Header="{local:Localize DatabasePage_Descending}" d:Header="Descending" Command="{Binding SortResultsCommand}" CommandParameter="MaxSavingsDesc"/>
72+
<MenuItem Header="{local:Localize CompressionDB_DatabaseResults_SortMaxSavings}" d:Header="Max Savings">
73+
<MenuItem Header="{local:Localize CompressionDB_DatabaseResults_SortAscending}" d:Header="Ascending" Command="{Binding SortResultsCommand}" CommandParameter="MaxSavingsAsc"/>
74+
<MenuItem Header="{local:Localize CompressionDB_DatabaseResults_SortDescending}" d:Header="Descending" Command="{Binding SortResultsCommand}" CommandParameter="MaxSavingsDesc"/>
7575
</MenuItem>
7676
</ContextMenu>
7777
</ui:DropDownButton.Flyout>
@@ -166,11 +166,11 @@
166166
<ColumnDefinition Width="130"/>
167167
</Grid.ColumnDefinitions>
168168

169-
<TextBlock Text="{local:Localize DatabasePageMODE}" d:Text="MODE" FontWeight="SemiBold" Foreground="{StaticResource CardForegroundDisabled}"/>
170-
<TextBlock Grid.Column="1" Text="{local:Localize DatabasePageBEFORE}" d:Text="BEFORE" FontWeight="SemiBold" HorizontalAlignment="Right" Foreground="{StaticResource CardForegroundDisabled}"/>
171-
<TextBlock Grid.Column="2" Text="{local:Localize DatabasePageAFTER}" d:Text="AFTER" FontWeight="SemiBold" HorizontalAlignment="Right" Foreground="{StaticResource CardForegroundDisabled}"/>
172-
<TextBlock Grid.Column="3" Text="{local:Localize DatabasePageSAVINGS}" d:Text="SAVINGS" FontWeight="SemiBold" HorizontalAlignment="Right" Foreground="{StaticResource CardForegroundDisabled}"/>
173-
<TextBlock Grid.Column="4" Text="{local:Localize DatabasePageTOTALRESULTS}" d:Text="TOTAL RESULTS" FontWeight="SemiBold" HorizontalAlignment="Right" Foreground="{StaticResource CardForegroundDisabled}"/>
169+
<TextBlock Text="{local:Localize Status_CompressionMode}" d:Text="MODE" FontWeight="SemiBold" Foreground="{StaticResource CardForegroundDisabled}"/>
170+
<TextBlock Grid.Column="1" Text="{local:Localize Status_Before}" d:Text="BEFORE" FontWeight="SemiBold" HorizontalAlignment="Right" Foreground="{StaticResource CardForegroundDisabled}"/>
171+
<TextBlock Grid.Column="2" Text="{local:Localize Status_After}" d:Text="AFTER" FontWeight="SemiBold" HorizontalAlignment="Right" Foreground="{StaticResource CardForegroundDisabled}"/>
172+
<TextBlock Grid.Column="3" Text="{local:Localize CompressionModeRadio_Savings}" d:Text="SAVINGS" FontWeight="SemiBold" HorizontalAlignment="Right" Foreground="{StaticResource CardForegroundDisabled}"/>
173+
<TextBlock Grid.Column="4" Text="{local:Localize CompressionModeRadio_TotalResults}" d:Text="TOTAL RESULTS" FontWeight="SemiBold" HorizontalAlignment="Right" Foreground="{StaticResource CardForegroundDisabled}"/>
174174

175175
</Grid>
176176

‎CompactGUI/Views/Pages/FolderView.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@
105105
Foreground="#30FFFFFF" />
106106

107107
<StackPanel Grid.Row="1" Orientation="Horizontal" Margin="0 0 0 5">
108-
<ui:TextBlock Text="{local:Localize FolderViewUncompressedSize}" d:Text="uncompressed size" FontSize="13" Foreground="#30FFFFFF" VerticalAlignment="Bottom" Margin="0 0 8 -1"/>
108+
<ui:TextBlock Text="{local:Localize Status_UncompressedSize}" d:Text="uncompressed size" FontSize="13" Foreground="#30FFFFFF" VerticalAlignment="Bottom" Margin="0 0 8 -1"/>
109109
<ui:TextBlock Text="{Binding Folder.UncompressedBytes, Converter={StaticResource BytesToReadableConverter}}" FontSize="20" VerticalAlignment="Bottom" Width="80"/>
110-
<ui:TextBlock Text="{local:Localize FolderViewContainedFiles}" d:Text="contained files" FontSize="13" Foreground="#30FFFFFF" VerticalAlignment="Bottom" Margin="30 0 8 -1" />
110+
<ui:TextBlock Text="{local:Localize Status_ContainedFiles}" d:Text="contained files" FontSize="13" Foreground="#30FFFFFF" VerticalAlignment="Bottom" Margin="30 0 8 -1" />
111111
<ui:TextBlock Text="{Binding TotalFiles, Converter={StaticResource NumberWithSpacesConverter}}" FontSize="20" VerticalAlignment="Bottom"/>
112112
</StackPanel>
113113

0 commit comments

Comments
 (0)