-
Notifications
You must be signed in to change notification settings - Fork 30
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Finish task and publish 1.4.120.0 version
1.Finish task and publish 1.4.120.0 version 2.Use commandbarflyout to replace taskbar tray icon menuflyout
- Loading branch information
1 parent
fd9ec2f
commit c4d7a9f
Showing
15 changed files
with
129 additions
and
108 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,67 +1,72 @@ | ||
| <ContentControl | ||
| x:Class="GetStoreAppHelper.UI.Controls.TrayMenuControl" | ||
| xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:controls="using:GetStoreAppHelper.ViewModels.Controls" | ||
| xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | ||
| xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | ||
| xmlns:root="using:GetStoreAppHelper.Services" | ||
| xmlns:controls="using:GetStoreAppHelper.ViewModels.Controls" | ||
| mc:Ignorable="d"> | ||
| <ContentControl.DataContext> | ||
| <controls:TrayMenuViewModel x:Name="ViewModel" x:FieldModifier="public" /> | ||
| </ContentControl.DataContext> | ||
|
|
||
| <MenuFlyout x:Name="TrayMenuFlyout" Opened="{x:Bind ViewModel.OnOpened}"> | ||
| <MenuFlyoutItem | ||
| MinHeight="40" | ||
| Command="{x:Bind ViewModel.ProjectDescriptionCommand}" | ||
| Text="{x:Bind root:ResourceService.GetLocalized('HelperResources/ProjectHomePage')}"> | ||
| <CommandBarFlyout | ||
| x:Name="TrayMenuFlyout" | ||
| Opened="{x:Bind ViewModel.OnOpened}" | ||
| Placement="Full"> | ||
| <CommandBarFlyout.SecondaryCommands> | ||
| <AppBarButton | ||
| Command="{x:Bind ViewModel.ProjectDescriptionCommand}" | ||
| Label="{x:Bind root:ResourceService.GetLocalized('HelperResources/ProjectHomePage')}" | ||
| RequestedTheme="{x:Bind ViewModel.CommandBarTheme, Mode=OneWay}"> | ||
|
|
||
| <MenuFlyoutItem.Icon> | ||
| <FontIcon Glyph="" Style="{StaticResource SegoeFluentStyle}" /> | ||
| </MenuFlyoutItem.Icon> | ||
| </MenuFlyoutItem> | ||
| <AppBarButton.Icon> | ||
| <FontIcon Glyph="" Style="{StaticResource SegoeFluentStyle}" /> | ||
| </AppBarButton.Icon> | ||
| </AppBarButton> | ||
|
|
||
| <MenuFlyoutItem | ||
| MinHeight="40" | ||
| Command="{x:Bind ViewModel.AboutAppCommand}" | ||
| Text="{x:Bind root:ResourceService.GetLocalized('HelperResources/AboutApp')}"> | ||
| <AppBarButton | ||
| Command="{x:Bind ViewModel.AboutAppCommand}" | ||
| Label="{x:Bind root:ResourceService.GetLocalized('HelperResources/AboutApp')}" | ||
| RequestedTheme="{x:Bind ViewModel.CommandBarTheme, Mode=OneWay}"> | ||
|
|
||
| <MenuFlyoutItem.Icon> | ||
| <FontIcon Glyph="" Style="{StaticResource SegoeFluentStyle}" /> | ||
| </MenuFlyoutItem.Icon> | ||
| </MenuFlyoutItem> | ||
| <AppBarButton.Icon> | ||
| <FontIcon Glyph="" Style="{StaticResource SegoeFluentStyle}" /> | ||
| </AppBarButton.Icon> | ||
| </AppBarButton> | ||
|
|
||
| <MenuFlyoutSeparator /> | ||
| <AppBarSeparator Loaded="{x:Bind ViewModel.OnLoaded}" RequestedTheme="{x:Bind ViewModel.CommandBarTheme, Mode=OneWay}" /> | ||
|
|
||
| <MenuFlyoutItem | ||
| MinHeight="40" | ||
| Command="{x:Bind ViewModel.ShowOrHideWindowCommand}" | ||
| Text="{x:Bind root:ResourceService.GetLocalized('HelperResources/ShowOrHideWindow')}"> | ||
| <AppBarButton | ||
| Command="{x:Bind ViewModel.ShowOrHideWindowCommand}" | ||
| Label="{x:Bind root:ResourceService.GetLocalized('HelperResources/ShowOrHideWindow')}" | ||
| RequestedTheme="{x:Bind ViewModel.CommandBarTheme, Mode=OneWay}"> | ||
|
|
||
| <MenuFlyoutItem.Icon> | ||
| <FontIcon Glyph="" Style="{StaticResource SegoeFluentStyle}" /> | ||
| </MenuFlyoutItem.Icon> | ||
| </MenuFlyoutItem> | ||
| <AppBarButton.Icon> | ||
| <FontIcon Glyph="" Style="{StaticResource SegoeFluentStyle}" /> | ||
| </AppBarButton.Icon> | ||
| </AppBarButton> | ||
|
|
||
| <MenuFlyoutItem | ||
| MinHeight="40" | ||
| Command="{x:Bind ViewModel.SettingsCommand}" | ||
| Text="{x:Bind root:ResourceService.GetLocalized('HelperResources/Settings')}"> | ||
| <AppBarButton | ||
| Command="{x:Bind ViewModel.SettingsCommand}" | ||
| Label="{x:Bind root:ResourceService.GetLocalized('HelperResources/Settings')}" | ||
| RequestedTheme="{x:Bind ViewModel.CommandBarTheme, Mode=OneWay}"> | ||
|
|
||
| <MenuFlyoutItem.Icon> | ||
| <FontIcon Glyph="" Style="{StaticResource SegoeFluentStyle}" /> | ||
| </MenuFlyoutItem.Icon> | ||
| </MenuFlyoutItem> | ||
| <AppBarButton.Icon> | ||
| <FontIcon Glyph="" Style="{StaticResource SegoeFluentStyle}" /> | ||
| </AppBarButton.Icon> | ||
| </AppBarButton> | ||
|
|
||
| <MenuFlyoutItem | ||
| MinHeight="40" | ||
| Command="{x:Bind ViewModel.ExitCommand}" | ||
| Text="{x:Bind root:ResourceService.GetLocalized('HelperResources/Exit')}"> | ||
| <AppBarButton | ||
| Command="{x:Bind ViewModel.ExitCommand}" | ||
| Label="{x:Bind root:ResourceService.GetLocalized('HelperResources/Exit')}" | ||
| RequestedTheme="{x:Bind ViewModel.CommandBarTheme, Mode=OneWay}"> | ||
|
|
||
| <MenuFlyoutItem.Icon> | ||
| <FontIcon Glyph="" Style="{StaticResource SegoeFluentStyle}" /> | ||
| </MenuFlyoutItem.Icon> | ||
| </MenuFlyoutItem> | ||
| </MenuFlyout> | ||
| <AppBarButton.Icon> | ||
| <FontIcon Glyph="" Style="{StaticResource SegoeFluentStyle}" /> | ||
| </AppBarButton.Icon> | ||
| </AppBarButton> | ||
| </CommandBarFlyout.SecondaryCommands> | ||
| </CommandBarFlyout> | ||
| </ContentControl> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| using System.ComponentModel; | ||
| using System.Runtime.CompilerServices; | ||
|
|
||
| namespace GetStoreAppHelper.ViewModels.Base | ||
| { | ||
| /// <summary> | ||
| /// 该视图模型基类实现了InotifyPropertyChanged接口用于通知UI更新 | ||
| /// </summary> | ||
| public class ViewModelBase : INotifyPropertyChanged | ||
| { | ||
| public event PropertyChangedEventHandler PropertyChanged; | ||
|
|
||
| protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null) | ||
| { | ||
| PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.