Skip to content

Commit

Permalink
Finish task and publish 3.6.223.0 version
Browse files Browse the repository at this point in the history 
1.Finish task and publish 3.6.223.0 version
2Use run and linebreak to replace double texblock
  • Loading branch information
@Gaoyifei1011
Gaoyifei1011 committed Feb 23, 2024
1 parent 5899f22 commit a00f181
Show file tree
Hide file tree
Showing 12 changed files with 108 additions and 84 deletions.
Binary file modified GetStoreApp/GetStoreAppResource.res
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion GetStoreApp/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public static void Main(string[] args)
{
DispatcherQueueSynchronizationContext context = new DispatcherQueueSynchronizationContext(DispatcherQueue.GetForCurrentThread());
SynchronizationContext.SetSynchronizationContext(context);
WinUIApp app = new WinUIApp();
new WinUIApp();
});
}
}
Expand Down
6 changes: 3 additions & 3 deletions GetStoreApp/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
[assembly: AssemblyCompany("高怡飞")]
[assembly: AssemblyCopyright("Copyright ©2022-2024 高怡飞, All Rights Reserved.")]
[assembly: AssemblyDescription("获取商店应用")]
[assembly: AssemblyFileVersion("3.5.218.0")]
[assembly: AssemblyInformationalVersion("3.5.218.0")]
[assembly: AssemblyFileVersion("3.6.223.0")]
[assembly: AssemblyInformationalVersion("3.6.223.0")]
[assembly: AssemblyProduct("获取商店应用")]
[assembly: AssemblyTitle("获取商店应用")]
[assembly: AssemblyVersion("3.5.218.0")]
[assembly: AssemblyVersion("3.6.223.0")]

// 设置程序集对 COM 组件的访问权限
[assembly: ComVisible(false)]
Expand Down
9 changes: 5 additions & 4 deletions GetStoreApp/UI/Controls/Download/CompletedControl.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,10 +284,11 @@

<ToolTipService.ToolTip>
<ToolTip>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{x:Bind root:ResourceService.GetLocalized('Download/FileSizeToolTip')}" />
<TextBlock Text="{x:Bind helper:FileSizeHelper.ConvertFileSizeToString(TotalSize), Mode=OneWay}" />
</StackPanel>
<TextBlock>
<Run Text="{x:Bind root:ResourceService.GetLocalized('Download/FileSizeToolTip')}" />
<LineBreak />
<Run Text="{x:Bind helper:FileSizeHelper.ConvertFileSizeToString(TotalSize), Mode=OneWay}" />
</TextBlock>
</ToolTip>
</ToolTipService.ToolTip>
</TextBlock>
Expand Down
27 changes: 15 additions & 12 deletions GetStoreApp/UI/Controls/Download/DownloadingControl.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,10 +274,11 @@

<ToolTipService.ToolTip>
<ToolTip>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{x:Bind root:ResourceService.GetLocalized('Download/FinishedSizeToolTip')}" />
<TextBlock Text="{x:Bind helper:FileSizeHelper.ConvertFileSizeToString(FinishedSize), Mode=OneWay}" />
</StackPanel>
<TextBlock>
<Run Text="{x:Bind root:ResourceService.GetLocalized('Download/FinishedSizeToolTip')}" />
<LineBreak />
<Run Text="{x:Bind helper:FileSizeHelper.ConvertFileSizeToString(FinishedSize), Mode=OneWay}" />
</TextBlock>
</ToolTip>
</ToolTipService.ToolTip>
</TextBlock>
Expand All @@ -293,10 +294,11 @@

<ToolTipService.ToolTip>
<ToolTip>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{x:Bind root:ResourceService.GetLocalized('Download/TotalSizeToolTip')}" />
<TextBlock Text="{x:Bind helper:FileSizeHelper.ConvertFileSizeToString(TotalSize), Mode=OneWay}" />
</StackPanel>
<TextBlock>
<Run Text="{x:Bind root:ResourceService.GetLocalized('Download/TotalSizeToolTip')}" />
<LineBreak />
<Run Text="{x:Bind helper:FileSizeHelper.ConvertFileSizeToString(TotalSize), Mode=OneWay}" />
</TextBlock>
</ToolTip>
</ToolTipService.ToolTip>
</TextBlock>
Expand All @@ -312,10 +314,11 @@

<ToolTipService.ToolTip>
<ToolTip>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{x:Bind root:ResourceService.GetLocalized('Download/CurrentSpeedToolTip')}" />
<TextBlock Text="{x:Bind helper:FileSizeHelper.ConvertFileSizeToString(CurrentSpeed), Mode=OneWay}" />
</StackPanel>
<TextBlock>
<Run Text="{x:Bind root:ResourceService.GetLocalized('Download/CurrentSpeedToolTip')}" />
<LineBreak />
<Run Text="{x:Bind helper:FileSizeHelper.ConvertFileSizeToString(CurrentSpeed), Mode=OneWay}" />
</TextBlock>
</ToolTip>
</ToolTipService.ToolTip>
</TextBlock>
Expand Down
36 changes: 20 additions & 16 deletions GetStoreApp/UI/Controls/UWPApp/AppListControl.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -375,10 +375,11 @@

<ToolTipService.ToolTip>
<ToolTip>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{x:Bind root:ResourceService.GetLocalized('UWPApp/DisplayNameToolTip')}" />
<TextBlock Text="{x:Bind DisplayName}" />
</StackPanel>
<TextBlock>
<Run Text="{x:Bind root:ResourceService.GetLocalized('UWPApp/DisplayNameToolTip')}" />
<LineBreak />
<Run Text="{x:Bind DisplayName}" />
</TextBlock>
</ToolTip>
</ToolTipService.ToolTip>
</TextBlock>
Expand All @@ -396,10 +397,11 @@

<ToolTipService.ToolTip>
<ToolTip>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{x:Bind root:ResourceService.GetLocalized('UWPApp/PublisherNameToolTip')}" />
<TextBlock Text="{x:Bind PublisherName}" />
</StackPanel>
<TextBlock>
<Run Text="{x:Bind root:ResourceService.GetLocalized('UWPApp/PublisherNameToolTip')}" />
<LineBreak />
<Run Text="{x:Bind PublisherName}" />
</TextBlock>
</ToolTip>
</ToolTipService.ToolTip>
</TextBlock>
Expand All @@ -418,10 +420,11 @@

<ToolTipService.ToolTip>
<ToolTip>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{x:Bind root:ResourceService.GetLocalized('UWPApp/VersionToolTip')}" />
<TextBlock Text="{x:Bind Version}" />
</StackPanel>
<TextBlock>
<Run Text="{x:Bind root:ResourceService.GetLocalized('UWPApp/VersionToolTip')}" />
<LineBreak />
<Run Text="{x:Bind Version}" />
</TextBlock>
</ToolTip>
</ToolTipService.ToolTip>
</TextBlock>
Expand All @@ -440,10 +443,11 @@

<ToolTipService.ToolTip>
<ToolTip>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{x:Bind root:ResourceService.GetLocalized('UWPApp/InstallDateToolTip')}" />
<TextBlock Text="{x:Bind InstallDate}" />
</StackPanel>
<TextBlock>
<Run Text="{x:Bind root:ResourceService.GetLocalized('UWPApp/InstallDateToolTip')}" />
<LineBreak />
<Run Text="{x:Bind InstallDate}" />
</TextBlock>
</ToolTip>
</ToolTipService.ToolTip>
</TextBlock>
Expand Down
27 changes: 15 additions & 12 deletions GetStoreApp/UI/Controls/WinGet/InstalledAppsControl.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,10 +276,11 @@

<ToolTipService.ToolTip>
<ToolTip>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{x:Bind root:ResourceService.GetLocalized('WinGet/AppNameToolTip')}" />
<TextBlock Text="{x:Bind AppName}" />
</StackPanel>
<TextBlock>
<Run Text="{x:Bind root:ResourceService.GetLocalized('WinGet/AppNameToolTip')}" />
<LineBreak />
<Run Text="{x:Bind AppName}" />
</TextBlock>
</ToolTip>
</ToolTipService.ToolTip>
</TextBlock>
Expand All @@ -297,10 +298,11 @@

<ToolTipService.ToolTip>
<ToolTip>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{x:Bind root:ResourceService.GetLocalized('WinGet/AppPublisherToolTip')}" />
<TextBlock Text="{x:Bind AppPublisher}" />
</StackPanel>
<TextBlock>
<Run Text="{x:Bind root:ResourceService.GetLocalized('WinGet/AppPublisherToolTip')}" />
<LineBreak />
<Run Text="{x:Bind AppPublisher}" />
</TextBlock>
</ToolTip>
</ToolTipService.ToolTip>
</TextBlock>
Expand All @@ -319,10 +321,11 @@

<ToolTipService.ToolTip>
<ToolTip>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{x:Bind root:ResourceService.GetLocalized('WinGet/AppVersionToolTip')}" />
<TextBlock Text="{x:Bind AppVersion}" />
</StackPanel>
<TextBlock>
<Run Text="{x:Bind root:ResourceService.GetLocalized('WinGet/AppVersionToolTip')}" />
<LineBreak />
<Run Text="{x:Bind AppVersion}" />
</TextBlock>
</ToolTip>
</ToolTipService.ToolTip>
</TextBlock>
Expand Down
27 changes: 15 additions & 12 deletions GetStoreApp/UI/Controls/WinGet/SearchAppsControl.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,10 +240,11 @@

<ToolTipService.ToolTip>
<ToolTip>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{x:Bind root:ResourceService.GetLocalized('WinGet/AppNameToolTip')}" />
<TextBlock Text="{x:Bind AppName}" />
</StackPanel>
<TextBlock>
<Run Text="{x:Bind root:ResourceService.GetLocalized('WinGet/AppNameToolTip')}" />
<LineBreak />
<Run Text="{x:Bind AppName}" />
</TextBlock>
</ToolTip>
</ToolTipService.ToolTip>
</TextBlock>
Expand All @@ -261,10 +262,11 @@

<ToolTipService.ToolTip>
<ToolTip>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{x:Bind root:ResourceService.GetLocalized('WinGet/AppPublisherToolTip')}" />
<TextBlock Text="{x:Bind AppPublisher}" />
</StackPanel>
<TextBlock>
<Run Text="{x:Bind root:ResourceService.GetLocalized('WinGet/AppPublisherToolTip')}" />
<LineBreak />
<Run Text="{x:Bind AppPublisher}" />
</TextBlock>
</ToolTip>
</ToolTipService.ToolTip>
</TextBlock>
Expand All @@ -283,10 +285,11 @@

<ToolTipService.ToolTip>
<ToolTip>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{x:Bind root:ResourceService.GetLocalized('WinGet/AppVersionToolTip')}" />
<TextBlock Text="{x:Bind AppVersion}" />
</StackPanel>
<TextBlock>
<Run Text="{x:Bind root:ResourceService.GetLocalized('WinGet/AppVersionToolTip')}" />
<LineBreak />
<Run Text="{x:Bind AppVersion}" />
</TextBlock>
</ToolTip>
</ToolTipService.ToolTip>
</TextBlock>
Expand Down
36 changes: 20 additions & 16 deletions GetStoreApp/UI/Controls/WinGet/UpgradableAppsControl.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,11 @@

<ToolTipService.ToolTip>
<ToolTip>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{x:Bind root:ResourceService.GetLocalized('WinGet/AppNameToolTip')}" />
<TextBlock Text="{x:Bind AppName}" />
</StackPanel>
<TextBlock>
<Run Text="{x:Bind root:ResourceService.GetLocalized('WinGet/AppNameToolTip')}" />
<LineBreak />
<Run Text="{x:Bind AppName}" />
</TextBlock>
</ToolTip>
</ToolTipService.ToolTip>
</TextBlock>
Expand All @@ -209,10 +210,11 @@

<ToolTipService.ToolTip>
<ToolTip>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{x:Bind root:ResourceService.GetLocalized('WinGet/AppPublisherToolTip')}" />
<TextBlock Text="{x:Bind AppPublisher}" />
</StackPanel>
<TextBlock>
<Run Text="{x:Bind root:ResourceService.GetLocalized('WinGet/AppPublisherToolTip')}" />
<LineBreak />
<Run Text="{x:Bind AppPublisher}" />
</TextBlock>
</ToolTip>
</ToolTipService.ToolTip>
</TextBlock>
Expand All @@ -231,10 +233,11 @@

<ToolTipService.ToolTip>
<ToolTip>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{x:Bind root:ResourceService.GetLocalized('WinGet/AppCurrentVersionToolTip')}" />
<TextBlock Text="{x:Bind AppCurrentVersion}" />
</StackPanel>
<TextBlock>
<Run Text="{x:Bind root:ResourceService.GetLocalized('WinGet/AppCurrentVersionToolTip')}" />
<LineBreak />
<Run Text="{x:Bind AppCurrentVersion}" />
</TextBlock>
</ToolTip>
</ToolTipService.ToolTip>
</TextBlock>
Expand All @@ -254,10 +257,11 @@

<ToolTipService.ToolTip>
<ToolTip>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{x:Bind root:ResourceService.GetLocalized('WinGet/AppNewestVersionToolTip')}" />
<TextBlock Text="{x:Bind AppNewestVersion}" />
</StackPanel>
<TextBlock>
<Run Text="{x:Bind root:ResourceService.GetLocalized('WinGet/AppNewestVersionToolTip')}" />
<LineBreak />
<Run Text="{x:Bind AppNewestVersion}" />
</TextBlock>
</ToolTip>
</ToolTipService.ToolTip>
</TextBlock>
Expand Down
Loading

0 comments on commit a00f181

Please sign in to comment.