Merge pull request #398 from WhitewaterFoundry/1.2-finishing

Minor UI improvements
WhitewaterFoundry · Apr 11, 2019 · b1f0524 · b1f0524
2 parents 363d6e5 + be06ad0
commit b1f0524
Show file tree

Hide file tree

Showing 50 changed files with 11 additions and 8 deletions.
diff --git a/DistroLauncher-Appx/Assets/LargeTile.scale-100.png b/DistroLauncher-Appx/Assets/LargeTile.scale-100.png
diff --git a/DistroLauncher-Appx/Assets/LargeTile.scale-125.png b/DistroLauncher-Appx/Assets/LargeTile.scale-125.png
diff --git a/DistroLauncher-Appx/Assets/LargeTile.scale-150.png b/DistroLauncher-Appx/Assets/LargeTile.scale-150.png
diff --git a/DistroLauncher-Appx/Assets/LargeTile.scale-200.png b/DistroLauncher-Appx/Assets/LargeTile.scale-200.png
diff --git a/DistroLauncher-Appx/Assets/LargeTile.scale-400.png b/DistroLauncher-Appx/Assets/LargeTile.scale-400.png
diff --git a/DistroLauncher-Appx/Assets/SmallTile.scale-100.png b/DistroLauncher-Appx/Assets/SmallTile.scale-100.png
diff --git a/DistroLauncher-Appx/Assets/SmallTile.scale-125.png b/DistroLauncher-Appx/Assets/SmallTile.scale-125.png
diff --git a/DistroLauncher-Appx/Assets/SmallTile.scale-150.png b/DistroLauncher-Appx/Assets/SmallTile.scale-150.png
diff --git a/DistroLauncher-Appx/Assets/SmallTile.scale-200.png b/DistroLauncher-Appx/Assets/SmallTile.scale-200.png
diff --git a/DistroLauncher-Appx/Assets/SmallTile.scale-400.png b/DistroLauncher-Appx/Assets/SmallTile.scale-400.png
diff --git a/DistroLauncher-Appx/Assets/SplashScreen.scale-100.png b/DistroLauncher-Appx/Assets/SplashScreen.scale-100.png
diff --git a/DistroLauncher-Appx/Assets/SplashScreen.scale-125.png b/DistroLauncher-Appx/Assets/SplashScreen.scale-125.png
diff --git a/DistroLauncher-Appx/Assets/SplashScreen.scale-150.png b/DistroLauncher-Appx/Assets/SplashScreen.scale-150.png
diff --git a/DistroLauncher-Appx/Assets/SplashScreen.scale-200.png b/DistroLauncher-Appx/Assets/SplashScreen.scale-200.png
diff --git a/DistroLauncher-Appx/Assets/SplashScreen.scale-400.png b/DistroLauncher-Appx/Assets/SplashScreen.scale-400.png
diff --git a/DistroLauncher-Appx/Assets/Square150x150Logo.scale-100.png b/DistroLauncher-Appx/Assets/Square150x150Logo.scale-100.png
diff --git a/DistroLauncher-Appx/Assets/Square150x150Logo.scale-125.png b/DistroLauncher-Appx/Assets/Square150x150Logo.scale-125.png
diff --git a/DistroLauncher-Appx/Assets/Square150x150Logo.scale-150.png b/DistroLauncher-Appx/Assets/Square150x150Logo.scale-150.png
diff --git a/DistroLauncher-Appx/Assets/Square150x150Logo.scale-200.png b/DistroLauncher-Appx/Assets/Square150x150Logo.scale-200.png
diff --git a/DistroLauncher-Appx/Assets/Square150x150Logo.scale-400.png b/DistroLauncher-Appx/Assets/Square150x150Logo.scale-400.png
diff --git a/DistroLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-16.png b/DistroLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-16.png
diff --git a/DistroLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/DistroLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-256.png
diff --git a/DistroLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-32.png b/DistroLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-32.png
diff --git a/DistroLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-48.png b/DistroLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-48.png
diff --git a/DistroLauncher-Appx/Assets/Square44x44Logo.scale-100.png b/DistroLauncher-Appx/Assets/Square44x44Logo.scale-100.png
diff --git a/DistroLauncher-Appx/Assets/Square44x44Logo.scale-125.png b/DistroLauncher-Appx/Assets/Square44x44Logo.scale-125.png
diff --git a/DistroLauncher-Appx/Assets/Square44x44Logo.scale-150.png b/DistroLauncher-Appx/Assets/Square44x44Logo.scale-150.png
diff --git a/DistroLauncher-Appx/Assets/Square44x44Logo.scale-200.png b/DistroLauncher-Appx/Assets/Square44x44Logo.scale-200.png
diff --git a/DistroLauncher-Appx/Assets/Square44x44Logo.scale-400.png b/DistroLauncher-Appx/Assets/Square44x44Logo.scale-400.png
diff --git a/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-16.png b/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-16.png
diff --git a/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-24.png b/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-24.png
diff --git a/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
diff --git a/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-256.png b/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-256.png
diff --git a/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-32.png b/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-32.png
diff --git a/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-48.png b/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-48.png
diff --git a/DistroLauncher-Appx/Assets/StoreLogo.scale-100.png b/DistroLauncher-Appx/Assets/StoreLogo.scale-100.png
diff --git a/DistroLauncher-Appx/Assets/StoreLogo.scale-125.png b/DistroLauncher-Appx/Assets/StoreLogo.scale-125.png
diff --git a/DistroLauncher-Appx/Assets/StoreLogo.scale-150.png b/DistroLauncher-Appx/Assets/StoreLogo.scale-150.png
diff --git a/DistroLauncher-Appx/Assets/StoreLogo.scale-200.png b/DistroLauncher-Appx/Assets/StoreLogo.scale-200.png
diff --git a/DistroLauncher-Appx/Assets/StoreLogo.scale-400.png b/DistroLauncher-Appx/Assets/StoreLogo.scale-400.png
diff --git a/DistroLauncher-Appx/Assets/Wide310x150Logo.scale-100.png b/DistroLauncher-Appx/Assets/Wide310x150Logo.scale-100.png
diff --git a/DistroLauncher-Appx/Assets/Wide310x150Logo.scale-125.png b/DistroLauncher-Appx/Assets/Wide310x150Logo.scale-125.png
diff --git a/DistroLauncher-Appx/Assets/Wide310x150Logo.scale-150.png b/DistroLauncher-Appx/Assets/Wide310x150Logo.scale-150.png
diff --git a/DistroLauncher-Appx/Assets/Wide310x150Logo.scale-200.png b/DistroLauncher-Appx/Assets/Wide310x150Logo.scale-200.png
diff --git a/DistroLauncher-Appx/Assets/Wide310x150Logo.scale-400.png b/DistroLauncher-Appx/Assets/Wide310x150Logo.scale-400.png
diff --git a/DistroLauncher-Appx/DistroLauncher-Appx.vcxproj b/DistroLauncher-Appx/DistroLauncher-Appx.vcxproj
@@ -82,7 +82,7 @@
     <AppxBundlePlatforms>x64|arm64</AppxBundlePlatforms>
     <AppInstallerUpdateFrequency>1</AppInstallerUpdateFrequency>
     <AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
-    <AppxPackageDir>$(SolutionDir)\out\</AppxPackageDir>
+    <AppxPackageDir>C:\Users\Hayden\OneDrive\Desktop\</AppxPackageDir>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <Link>
@@ -173,4 +173,4 @@
   <ItemGroup>
     <None Include="Package.StoreAssociation.xml" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/DistroLauncher-Appx/DistroLauncher-Appx.vcxproj.filters b/DistroLauncher-Appx/DistroLauncher-Appx.vcxproj.filters
@@ -159,5 +159,7 @@
     <CustomBuild Include="$(targetname)" />
     <CustomBuild Include="$(targetname)" />
     <CustomBuild Include="$(targetname)" />
+    <CustomBuild Include="$(targetname)" />
+    <CustomBuild Include="$(targetname)" />
   </ItemGroup>
 </Project>
diff --git a/DistroLauncher-Appx/MyDistro.appxmanifest b/DistroLauncher-Appx/MyDistro.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap2="http://schemas.microsoft.com/appx/manifest/uap/windows10/2" xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3" xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap mp uap2 uap3 rescap desktop">
-  <Identity Name="WhitewaterFoundryLtd.Co.16571368D6CFF" Version="1.2.0.0" Publisher="CN=9879127B-9E92-4DE5-9C32-0B1F09F95DCF" ProcessorArchitecture="x64" />
+  <Identity Name="WhitewaterFoundryLtd.Co.16571368D6CFF" Version="1.2.3.0" Publisher="CN=9879127B-9E92-4DE5-9C32-0B1F09F95DCF" ProcessorArchitecture="x64" />
   <mp:PhoneIdentity PhoneProductId="9188b505-0a15-4907-9bdc-83940a868616" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>Pengwin</DisplayName>
@@ -18,14 +18,15 @@
   </Resources>
   <Applications>
     <Application Id="Pengwin" Executable="pengwin.exe" EntryPoint="Windows.FullTrustApplication">
-      <uap:VisualElements DisplayName="Pengwin" Description="The bespoke WSL distro." Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" BackgroundColor="#9A54BB">
+      <uap:VisualElements DisplayName="Pengwin" Description="The bespoke WSL distro." Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" BackgroundColor="#ffffff">
         <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" Square310x310Logo="Assets\LargeTile.png" Square71x71Logo="Assets\SmallTile.png" ShortName="Pengwin">
           <uap:ShowNameOnTiles>
+            <uap:ShowOn Tile="square150x150Logo" />
             <uap:ShowOn Tile="wide310x150Logo" />
             <uap:ShowOn Tile="square310x310Logo" />
           </uap:ShowNameOnTiles>
         </uap:DefaultTile>
-        <uap:SplashScreen Image="Assets\SplashScreen.png" BackgroundColor="#9A54BB" />
+        <uap:SplashScreen Image="Assets\SplashScreen.png" BackgroundColor="transparent" />
       </uap:VisualElements>
       <Extensions>
         <uap3:Extension Category="windows.appExecutionAlias" Executable="Pengwin.exe" EntryPoint="Windows.FullTrustApplication">

diff --git a/DistroLauncher/DistributionInfo.h b/DistroLauncher/DistributionInfo.h
@@ -13,10 +13,10 @@ namespace DistributionInfo
     //
     // WARNING: This value must not change between versions of your app,
     // otherwise users upgrading from older versions will see launch failures.
-    const std::wstring Name = L"Pengwin";
+    const std::wstring Name = L"WLinux";
 
     // The title bar for the console window while the distribution is installing.
-    const std::wstring WindowTitle = L"Pengwin";
+    const std::wstring WindowTitle = L"Loading Pengwin";
 
     // Create and configure a user account.
     bool CreateUser(std::wstring_view userName);

diff --git a/DistroLauncher/messages.mc b/DistroLauncher/messages.mc
@@ -49,7 +49,7 @@ Usage:
 
 MessageId=1006 SymbolicName=MSG_STATUS_INSTALLING
 Language=English
-Installing, this may take a few minutes...
+Unpacking Pengwin, this may take a few minutes...
 .
 
 MessageId=1007 SymbolicName=MSG_INSTALL_SUCCESS