v0.8.2226.37393

gro-ove · Oct 25, 2020 · 8928bf2 · 8928bf2
1 parent 6f168fe
commit 8928bf2
Show file tree

Hide file tree

Showing 164 changed files with 5,549 additions and 973 deletions.
diff --git a/AcManager.Controls/AcManager.Controls.csproj b/AcManager.Controls/AcManager.Controls.csproj
@@ -260,6 +260,12 @@
     <Compile Include="UserControls\Web\WebTab.cs" />
     <Compile Include="UserControls\Web\WebTabEventArgs.cs" />
     <Compile Include="UserControls\Web\UrlEventArgs.cs" />
+    <Compile Include="UserControls\Workshop\WorkshopAuthorized.xaml.cs">
+      <DependentUpon>WorkshopAuthorized.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UserControls\Workshop\WorkshopCurrentUserBlock.xaml.cs">
+      <DependentUpon>WorkshopCurrentUserBlock.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Video\IVideoPlayer.cs" />
     <Compile Include="UserControls\ModernPopup.xaml.cs">
       <DependentUpon>ModernPopup.xaml</DependentUpon>
@@ -405,6 +411,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Assets\WorkshopResources.xaml" />
     <Page Include="Dialogs\CupInformationDialog.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -556,6 +563,8 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="UserControls\Workshop\WorkshopAuthorized.xaml" />
+    <Page Include="UserControls\Workshop\WorkshopCurrentUserBlock.xaml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -580,6 +589,10 @@
       <Name>AcManager.Tools</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\AcManager.Workshop\AcManager.Workshop.csproj">
+      <Project>{abcd8f3f-5730-4fac-86ba-8a28086b75f8}</Project>
+      <Name>AcManager.Workshop</Name>
+    </ProjectReference>
     <ProjectReference Include="..\AcTools.LapTimes\AcTools.LapTimes.csproj">
       <Project>{38A04388-FC0C-4E96-BED5-1DC5C6C0B18F}</Project>
       <Name>AcTools.LapTimes</Name>
@@ -612,6 +625,9 @@
   <ItemGroup>
     <Resource Include="Assets\Background.jpg" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Dialogs\Workshop" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\Libraries\PreBuildEvents.props" />
   <PropertyGroup>

diff --git a/AcManager.Controls/Assets/IconData.xaml b/AcManager.Controls/Assets/IconData.xaml
@@ -2,6 +2,9 @@
   <!-- taken from very useful http://modernuiicons.com/ -->
 
   <PathGeometry x:Key="IconData"></PathGeometry>
+  <PathGeometry x:Key="ReportIconData">F1 M 26.9204,19.0027L 28.504,19.0027C 29.3785,19.0027 30.0875,19.7116 30.0875,20.5862L 30.0875,55.4244C 30.0875,56.299 29.3785,57.008 28.504,57.008L 26.9204,57.008C 26.0459,57.008 25.3369,56.299 25.3369,55.4244L 25.3369,20.5862C 25.3369,19.7116 26.0459,19.0027 26.9204,19.0027 Z M 31.6711,23.7533C 33.2546,22.6976 34.8382,21.6419 37.4775,21.9059C 40.1167,22.1698 43.8117,23.7535 46.7148,23.7535C 49.618,23.7535 51.7294,22.1698 53.8408,20.5862L 53.8408,34.838C 51.7294,36.4216 49.618,38.0052 46.7148,38.0052C 43.8117,38.0052 40.1167,36.4216 37.4775,36.1576C 34.8382,35.8937 33.2546,36.9494 31.6711,38.0051L 31.6711,23.7533 Z</PathGeometry>
+  <PathGeometry x:Key="PersonDetailIconData">F1 M 29.9796,22.2C 33.4365,22.2 36.2389,25.0024 36.2389,28.4593C 36.2389,31.9162 33.4365,34.7185 29.9796,34.7185C 26.5228,34.7185 23.7204,31.9162 23.7204,28.4593C 23.7204,25.0024 26.5228,22.2 29.9796,22.2 Z M 23.7204,43.2315C 22.8858,43.6488 21.2167,46.987 21.2167,46.987C 21.2167,46.987 20.3821,48.2388 19.9648,53.2462L 16.2093,51.9944L 17.4611,45.7352C 17.4611,45.7352 19.9648,36.9722 24.9722,36.9723L 34.9869,36.9723C 39.9944,36.9722 42.4981,45.7352 42.4981,45.7352L 43.75,51.9945L 39.9944,53.2463C 39.5772,48.2389 38.7427,46.987 38.7427,46.987C 38.7427,46.987 37.0735,43.6488 36.2389,43.2315L 36.7447,54.6004C 34.8417,55.3427 32.7712,55.75 30.6056,55.75C 27.9657,55.75 25.4672,55.1447 23.2413,54.0654L 23.7204,43.2315 Z M 39,24L 57,24L 57,27L 39,27L 39,24 Z M 39,30L 57,30L 57,33L 39,33L 39,30 Z M 41,36L 57,36L 57,39L 41,39L 41,36 Z M 44,42L 57,42L 57,45L 44,45L 44,42 Z M 46,48L 57,48L 57,51L 46,51L 46,48 Z</PathGeometry>
+  <PathGeometry x:Key="CloudIconData">F1 M 49.0833,33.25C 53.4555,33.25 57,36.7944 57,41.1666C 57,45.5389 53.3723,48.9999 49,49L 23,49.0001C 20.8139,49 19,47.3111 19,45.125C 19,43.1866 20.3931,41.5737 22.2327,41.233C 22.1892,40.9533 22.1667,40.6667 22.1667,40.3749C 22.1667,37.3993 24.5122,34.9712 27.4553,34.8389C 28.7579,31.1462 32.2782,28.4999 36.4167,28.4999C 40.3458,28.4999 43.7179,30.8853 45.1637,34.2868C 46.3193,33.627 47.6573,33.25 49.0833,33.25 Z</PathGeometry>
   <PathGeometry x:Key="AddMultipleIconData">F1 M 39,46L 46,46L 46,39L 51,39L 51,46L 58,46L 58,51L 51,51L 51,58L 46,58L 46,51L 39,51L 39,46 Z M 31,25L 38,25L 38,18L 43,18L 43,25L 50,25L 50,30L 43,30L 43,37L 38,37L 38,30L 31,30L 31,25 Z M 18,39L 25,39L 25,32L 30,32L 30,39L 37,39L 37,44L 30,44L 30,51L 25,51L 25,44L 18,44L 18,39 Z</PathGeometry>
   <PathGeometry x:Key="CleanUpIconData">F1 M 58.5833,45.9167L 58.5833,57L 19,57L 19,45.9167L 28.8998,45.9167C 31.0306,47.2793 33.6795,48.4476 36.6434,49.2418C 40.3467,50.2341 44.7079,50.4746 47.6249,50.0692L 47.6249,45.9167L 58.5833,45.9167 Z M 56.2083,48.2917L 53.4374,48.2917L 53.4374,53.0417L 56.2082,53.0417L 56.2083,48.2917 Z M 45.7433,48.2824C 43.1578,48.6418 39.9938,48.0327 36.7113,47.1532C 31.1866,45.6728 26.8965,42.7258 25.5163,39.7952L 32.2902,33.0213L 45.7433,38.0663L 45.7433,48.2824 Z M 39.2905,28.1719C 39.6351,28.1719 39.9737,28.1941 40.3047,28.2368L 46.0048,17.0498L 49.0712,18.6122L 43.5443,29.4594C 45.1454,30.5622 46.1735,32.2733 46.1735,34.1946C 46.1735,35.0197 45.9839,35.806 45.6407,36.5221L 33.4151,31.7762C 34.4796,29.6541 36.4722,28.1719 39.2905,28.1719 Z</PathGeometry>
   <PathGeometry x:Key="ArrowLeftIconData">F1 M 57,42L 57,34L 32.25,34L 42.25,24L 31.75,24L 17.75,38L 31.75,52L 42.25,52L 32.25,42L 57,42 Z</PathGeometry>

diff --git a/AcManager.Controls/Assets/ModernUI.Default.xaml b/AcManager.Controls/Assets/ModernUI.Default.xaml
@@ -42,7 +42,7 @@
 
   <!-- For quick drive page, for those overlaying buttons -->
   <SolidColorBrush x:Key="OverlayForeground" Color="#FFFFFF" />
-  <SolidColorBrush x:Key="OverlayBackground" Color="#33000000" />
+  <SolidColorBrush x:Key="OverlayBackground" Color="#66000000" />
   <DropShadowEffect x:Key="OverlayEffect" Opacity="1" BlurRadius="4" ShadowDepth="0" />
 
   <!-- Used in stats, in tools page, in lap times sources page -->