Skip to content

Commit 61bb498

Browse files
author
Yair Aichenbaum
committed
Improved layout modes
1 parent c12a0e3 commit 61bb498

File tree

9 files changed

+89
-23
lines changed

9 files changed

+89
-23
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,14 @@
423423
<source>Text Documnet</source>
424424
<target state="new">Text Documnet</target>
425425
</trans-unit>
426+
<trans-unit id="StatusBarControlListView.Text" translate="yes" xml:space="preserve">
427+
<source>List View</source>
428+
<target state="new">List View</target>
429+
</trans-unit>
430+
<trans-unit id="StatusBarControlGridView.Text" translate="yes" xml:space="preserve">
431+
<source>Grid View</source>
432+
<target state="new">Grid View</target>
433+
</trans-unit>
426434
</group>
427435
</body>
428436
</file>

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,14 @@
422422
<source>Text Documnet</source>
423423
<target state="new">Text Documnet</target>
424424
</trans-unit>
425+
<trans-unit id="StatusBarControlListView.Text" translate="yes" xml:space="preserve">
426+
<source>List View</source>
427+
<target state="new">List View</target>
428+
</trans-unit>
429+
<trans-unit id="StatusBarControlGridView.Text" translate="yes" xml:space="preserve">
430+
<source>Grid View</source>
431+
<target state="new">Grid View</target>
432+
</trans-unit>
425433
</group>
426434
</body>
427435
</file>

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,14 @@
422422
<source>Text Documnet</source>
423423
<target state="new">Text Documnet</target>
424424
</trans-unit>
425+
<trans-unit id="StatusBarControlListView.Text" translate="yes" xml:space="preserve">
426+
<source>List View</source>
427+
<target state="new">List View</target>
428+
</trans-unit>
429+
<trans-unit id="StatusBarControlGridView.Text" translate="yes" xml:space="preserve">
430+
<source>Grid View</source>
431+
<target state="new">Grid View</target>
432+
</trans-unit>
425433
</group>
426434
</body>
427435
</file>

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,14 @@
422422
<source>Text Documnet</source>
423423
<target state="new">Text Documnet</target>
424424
</trans-unit>
425+
<trans-unit id="StatusBarControlListView.Text" translate="yes" xml:space="preserve">
426+
<source>List View</source>
427+
<target state="new">List View</target>
428+
</trans-unit>
429+
<trans-unit id="StatusBarControlGridView.Text" translate="yes" xml:space="preserve">
430+
<source>Grid View</source>
431+
<target state="new">Grid View</target>
432+
</trans-unit>
425433
</group>
426434
</body>
427435
</file>

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,14 @@
422422
<source>Text Documnet</source>
423423
<target state="new">Text Documnet</target>
424424
</trans-unit>
425+
<trans-unit id="StatusBarControlListView.Text" translate="yes" xml:space="preserve">
426+
<source>List View</source>
427+
<target state="new">List View</target>
428+
</trans-unit>
429+
<trans-unit id="StatusBarControlGridView.Text" translate="yes" xml:space="preserve">
430+
<source>Grid View</source>
431+
<target state="new">Grid View</target>
432+
</trans-unit>
425433
</group>
426434
</body>
427435
</file>

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,14 @@
422422
<source>Text Documnet</source>
423423
<target state="new">Text Documnet</target>
424424
</trans-unit>
425+
<trans-unit id="StatusBarControlListView.Text" translate="yes" xml:space="preserve">
426+
<source>List View</source>
427+
<target state="new">List View</target>
428+
</trans-unit>
429+
<trans-unit id="StatusBarControlGridView.Text" translate="yes" xml:space="preserve">
430+
<source>Grid View</source>
431+
<target state="new">Grid View</target>
432+
</trans-unit>
425433
</group>
426434
</body>
427435
</file>

‎Files/Strings/en-US/Resources.resw

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,12 @@
192192
<data name="StatusBarControlClearSelection.Text" xml:space="preserve">
193193
<value>Clear Selection</value>
194194
</data>
195+
<data name="StatusBarControlListView.Text" xml:space="preserve">
196+
<value>List View</value>
197+
</data>
198+
<data name="StatusBarControlGridView.Text" xml:space="preserve">
199+
<value>Grid View</value>
200+
</data>
195201
<data name="PropertiesModified.Text" xml:space="preserve">
196202
<value>Modified:</value>
197203
</data>

‎Files/UserControls/StatusBarControl.xaml

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,32 @@
4242
Height="30"
4343
Margin="2,0,2,0"
4444
Background="Transparent"
45-
Command="{x:Bind AppSettings.ToggleLayoutMode}"
46-
Content="{x:Bind AppSettings.ToggleLayoutModeIcon, Mode=OneWay}"
45+
Content="&#xE152;"
4746
CornerRadius="2"
4847
FontFamily="Segoe MDL2 Assets"
49-
FontSize="16" />
48+
FontSize="16"
49+
Style="{StaticResource ToolBarButtonStyle}">
50+
<Button.Flyout>
51+
<MenuFlyout>
52+
<MenuFlyoutItem
53+
x:Uid="StatusBarControlGridView"
54+
Command="{x:Bind AppSettings.ToggleLayoutModeGridView}"
55+
Text="Grid View">
56+
<MenuFlyoutItem.Icon>
57+
<FontIcon Glyph="&#xF0E2;" />
58+
</MenuFlyoutItem.Icon>
59+
</MenuFlyoutItem>
60+
<MenuFlyoutItem
61+
x:Uid="StatusBarControlListView"
62+
Command="{x:Bind AppSettings.ToggleLayoutModeListView}"
63+
Text="List View">
64+
<MenuFlyoutItem.Icon>
65+
<FontIcon Glyph="&#xE14C;" />
66+
</MenuFlyoutItem.Icon>
67+
</MenuFlyoutItem>
68+
</MenuFlyout>
69+
</Button.Flyout>
70+
</Button>
5071
</StackPanel>
51-
5272
</Grid>
5373
</UserControl>

‎Files/View Models/SettingsViewModel.cs

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -526,30 +526,22 @@ public Int32 LayoutMode
526526
set => Set(value);
527527
}
528528

529-
public string ToggleLayoutModeIcon
530-
{
531-
get => Get(""); // List View;
532-
set => Set(value);
533-
}
534-
535529
public event EventHandler LayoutModeChangeRequested;
536-
private RelayCommand toggleLayoutMode;
537-
public RelayCommand ToggleLayoutMode => toggleLayoutMode = new RelayCommand(() =>
530+
531+
private RelayCommand toggleLayoutModeGridView;
532+
public RelayCommand ToggleLayoutModeGridView => toggleLayoutModeGridView = new RelayCommand(() =>
538533
{
539-
switch (LayoutMode)
540-
{
541-
case 0:
542-
LayoutMode = 1; // Grid View
543-
ToggleLayoutModeIcon = "";
544-
break;
545-
case 1:
546-
LayoutMode = 0; // List View
547-
ToggleLayoutModeIcon = "";
548-
break;
549-
}
534+
LayoutMode = 1; // Grid View
550535

551536
LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);
537+
});
552538

539+
private RelayCommand toggleLayoutModeListView;
540+
public RelayCommand ToggleLayoutModeListView => toggleLayoutModeListView = new RelayCommand(() =>
541+
{
542+
LayoutMode = 0; // List View
543+
544+
LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);
553545
});
554546

555547
[Obsolete]

0 commit comments

Comments
 (0)