diff --git a/DistroLauncher-Appx/Assets/LargeTile.scale-100.png b/DistroLauncher-Appx/Assets/LargeTile.scale-100.png index da51d46d..a1e98213 100644 Binary files a/DistroLauncher-Appx/Assets/LargeTile.scale-100.png and b/DistroLauncher-Appx/Assets/LargeTile.scale-100.png differ diff --git a/DistroLauncher-Appx/Assets/LargeTile.scale-125.png b/DistroLauncher-Appx/Assets/LargeTile.scale-125.png index a08d9f6a..4690f628 100644 Binary files a/DistroLauncher-Appx/Assets/LargeTile.scale-125.png and b/DistroLauncher-Appx/Assets/LargeTile.scale-125.png differ diff --git a/DistroLauncher-Appx/Assets/LargeTile.scale-150.png b/DistroLauncher-Appx/Assets/LargeTile.scale-150.png index 5c5ea2fe..17296180 100644 Binary files a/DistroLauncher-Appx/Assets/LargeTile.scale-150.png and b/DistroLauncher-Appx/Assets/LargeTile.scale-150.png differ diff --git a/DistroLauncher-Appx/Assets/LargeTile.scale-200.png b/DistroLauncher-Appx/Assets/LargeTile.scale-200.png index ecc45d0a..206f46b4 100644 Binary files a/DistroLauncher-Appx/Assets/LargeTile.scale-200.png and b/DistroLauncher-Appx/Assets/LargeTile.scale-200.png differ diff --git a/DistroLauncher-Appx/Assets/LargeTile.scale-400.png b/DistroLauncher-Appx/Assets/LargeTile.scale-400.png index 7831a4ba..d5c4991a 100644 Binary files a/DistroLauncher-Appx/Assets/LargeTile.scale-400.png and b/DistroLauncher-Appx/Assets/LargeTile.scale-400.png differ diff --git a/DistroLauncher-Appx/Assets/SmallTile.scale-100.png b/DistroLauncher-Appx/Assets/SmallTile.scale-100.png index 4e35fd11..b82c41fd 100644 Binary files a/DistroLauncher-Appx/Assets/SmallTile.scale-100.png and b/DistroLauncher-Appx/Assets/SmallTile.scale-100.png differ diff --git a/DistroLauncher-Appx/Assets/SmallTile.scale-125.png b/DistroLauncher-Appx/Assets/SmallTile.scale-125.png index 7e13e1ae..851d1f30 100644 Binary files a/DistroLauncher-Appx/Assets/SmallTile.scale-125.png and b/DistroLauncher-Appx/Assets/SmallTile.scale-125.png differ diff --git a/DistroLauncher-Appx/Assets/SmallTile.scale-150.png b/DistroLauncher-Appx/Assets/SmallTile.scale-150.png index f0c2cd8f..b1877b24 100644 Binary files a/DistroLauncher-Appx/Assets/SmallTile.scale-150.png and b/DistroLauncher-Appx/Assets/SmallTile.scale-150.png differ diff --git a/DistroLauncher-Appx/Assets/SmallTile.scale-200.png b/DistroLauncher-Appx/Assets/SmallTile.scale-200.png index fe662d21..2fdce81f 100644 Binary files a/DistroLauncher-Appx/Assets/SmallTile.scale-200.png and b/DistroLauncher-Appx/Assets/SmallTile.scale-200.png differ diff --git a/DistroLauncher-Appx/Assets/SmallTile.scale-400.png b/DistroLauncher-Appx/Assets/SmallTile.scale-400.png index 577c679d..97083981 100644 Binary files a/DistroLauncher-Appx/Assets/SmallTile.scale-400.png and b/DistroLauncher-Appx/Assets/SmallTile.scale-400.png differ diff --git a/DistroLauncher-Appx/Assets/SplashScreen.scale-100.png b/DistroLauncher-Appx/Assets/SplashScreen.scale-100.png index 6fec74f6..8e77c145 100644 Binary files a/DistroLauncher-Appx/Assets/SplashScreen.scale-100.png and b/DistroLauncher-Appx/Assets/SplashScreen.scale-100.png differ diff --git a/DistroLauncher-Appx/Assets/SplashScreen.scale-125.png b/DistroLauncher-Appx/Assets/SplashScreen.scale-125.png index 6baf23af..d94c380c 100644 Binary files a/DistroLauncher-Appx/Assets/SplashScreen.scale-125.png and b/DistroLauncher-Appx/Assets/SplashScreen.scale-125.png differ diff --git a/DistroLauncher-Appx/Assets/SplashScreen.scale-150.png b/DistroLauncher-Appx/Assets/SplashScreen.scale-150.png index bedfe049..5667de6d 100644 Binary files a/DistroLauncher-Appx/Assets/SplashScreen.scale-150.png and b/DistroLauncher-Appx/Assets/SplashScreen.scale-150.png differ diff --git a/DistroLauncher-Appx/Assets/SplashScreen.scale-200.png b/DistroLauncher-Appx/Assets/SplashScreen.scale-200.png index bd692997..4efe0fd4 100644 Binary files a/DistroLauncher-Appx/Assets/SplashScreen.scale-200.png and b/DistroLauncher-Appx/Assets/SplashScreen.scale-200.png differ diff --git a/DistroLauncher-Appx/Assets/SplashScreen.scale-400.png b/DistroLauncher-Appx/Assets/SplashScreen.scale-400.png index c6e5f812..0b1c97c0 100644 Binary files a/DistroLauncher-Appx/Assets/SplashScreen.scale-400.png and b/DistroLauncher-Appx/Assets/SplashScreen.scale-400.png differ diff --git a/DistroLauncher-Appx/Assets/Square150x150Logo.scale-100.png b/DistroLauncher-Appx/Assets/Square150x150Logo.scale-100.png index e8776bdd..48d0f6a2 100644 Binary files a/DistroLauncher-Appx/Assets/Square150x150Logo.scale-100.png and b/DistroLauncher-Appx/Assets/Square150x150Logo.scale-100.png differ diff --git a/DistroLauncher-Appx/Assets/Square150x150Logo.scale-125.png b/DistroLauncher-Appx/Assets/Square150x150Logo.scale-125.png index 5717181a..53c986b6 100644 Binary files a/DistroLauncher-Appx/Assets/Square150x150Logo.scale-125.png and b/DistroLauncher-Appx/Assets/Square150x150Logo.scale-125.png differ diff --git a/DistroLauncher-Appx/Assets/Square150x150Logo.scale-150.png b/DistroLauncher-Appx/Assets/Square150x150Logo.scale-150.png index 47239ce6..102edc0d 100644 Binary files a/DistroLauncher-Appx/Assets/Square150x150Logo.scale-150.png and b/DistroLauncher-Appx/Assets/Square150x150Logo.scale-150.png differ diff --git a/DistroLauncher-Appx/Assets/Square150x150Logo.scale-200.png b/DistroLauncher-Appx/Assets/Square150x150Logo.scale-200.png index 7c509545..644941f7 100644 Binary files a/DistroLauncher-Appx/Assets/Square150x150Logo.scale-200.png and b/DistroLauncher-Appx/Assets/Square150x150Logo.scale-200.png differ diff --git a/DistroLauncher-Appx/Assets/Square150x150Logo.scale-400.png b/DistroLauncher-Appx/Assets/Square150x150Logo.scale-400.png index f64dcae2..0f911ae9 100644 Binary files a/DistroLauncher-Appx/Assets/Square150x150Logo.scale-400.png and b/DistroLauncher-Appx/Assets/Square150x150Logo.scale-400.png differ diff --git a/DistroLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-16.png b/DistroLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-16.png index 2e377ccf..f24de521 100644 Binary files a/DistroLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-16.png and b/DistroLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-16.png differ diff --git a/DistroLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/DistroLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-256.png index 254bf7ea..555bfe22 100644 Binary files a/DistroLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-256.png and b/DistroLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-256.png differ diff --git a/DistroLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-32.png b/DistroLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-32.png index 953ff7b9..58f5b3f5 100644 Binary files a/DistroLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-32.png and b/DistroLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-32.png differ diff --git a/DistroLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-48.png b/DistroLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-48.png index f1591566..5df245aa 100644 Binary files a/DistroLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-48.png and b/DistroLauncher-Appx/Assets/Square44x44Logo.altform-unplated_targetsize-48.png differ diff --git a/DistroLauncher-Appx/Assets/Square44x44Logo.scale-100.png b/DistroLauncher-Appx/Assets/Square44x44Logo.scale-100.png index d9c239ce..d02bf3e1 100644 Binary files a/DistroLauncher-Appx/Assets/Square44x44Logo.scale-100.png and b/DistroLauncher-Appx/Assets/Square44x44Logo.scale-100.png differ diff --git a/DistroLauncher-Appx/Assets/Square44x44Logo.scale-125.png b/DistroLauncher-Appx/Assets/Square44x44Logo.scale-125.png index ecdcbc51..dd47e4be 100644 Binary files a/DistroLauncher-Appx/Assets/Square44x44Logo.scale-125.png and b/DistroLauncher-Appx/Assets/Square44x44Logo.scale-125.png differ diff --git a/DistroLauncher-Appx/Assets/Square44x44Logo.scale-150.png b/DistroLauncher-Appx/Assets/Square44x44Logo.scale-150.png index 5694ba9c..89e34afa 100644 Binary files a/DistroLauncher-Appx/Assets/Square44x44Logo.scale-150.png and b/DistroLauncher-Appx/Assets/Square44x44Logo.scale-150.png differ diff --git a/DistroLauncher-Appx/Assets/Square44x44Logo.scale-200.png b/DistroLauncher-Appx/Assets/Square44x44Logo.scale-200.png index 97eddcca..8e0cdef2 100644 Binary files a/DistroLauncher-Appx/Assets/Square44x44Logo.scale-200.png and b/DistroLauncher-Appx/Assets/Square44x44Logo.scale-200.png differ diff --git a/DistroLauncher-Appx/Assets/Square44x44Logo.scale-400.png b/DistroLauncher-Appx/Assets/Square44x44Logo.scale-400.png index f73720d7..0316180c 100644 Binary files a/DistroLauncher-Appx/Assets/Square44x44Logo.scale-400.png and b/DistroLauncher-Appx/Assets/Square44x44Logo.scale-400.png differ diff --git a/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-16.png b/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-16.png index 2e377ccf..1b56d1d0 100644 Binary files a/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-16.png and b/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-16.png differ diff --git a/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-24.png b/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-24.png index 2dffbe45..0faae40a 100644 Binary files a/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-24.png and b/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-24.png differ diff --git a/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-24_altform-unplated.png index d7150e1e..4d01c2c0 100644 Binary files a/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-24_altform-unplated.png and b/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-24_altform-unplated.png differ diff --git a/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-256.png b/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-256.png index 254bf7ea..96aa0b98 100644 Binary files a/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-256.png and b/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-256.png differ diff --git a/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-32.png b/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-32.png index 953ff7b9..68b55f48 100644 Binary files a/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-32.png and b/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-32.png differ diff --git a/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-48.png b/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-48.png index f1591566..4bdd73d2 100644 Binary files a/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-48.png and b/DistroLauncher-Appx/Assets/Square44x44Logo.targetsize-48.png differ diff --git a/DistroLauncher-Appx/Assets/StoreLogo.scale-100.png b/DistroLauncher-Appx/Assets/StoreLogo.scale-100.png index 9eab8891..fc1eb412 100644 Binary files a/DistroLauncher-Appx/Assets/StoreLogo.scale-100.png and b/DistroLauncher-Appx/Assets/StoreLogo.scale-100.png differ diff --git a/DistroLauncher-Appx/Assets/StoreLogo.scale-125.png b/DistroLauncher-Appx/Assets/StoreLogo.scale-125.png index 46b8964c..d21e2940 100644 Binary files a/DistroLauncher-Appx/Assets/StoreLogo.scale-125.png and b/DistroLauncher-Appx/Assets/StoreLogo.scale-125.png differ diff --git a/DistroLauncher-Appx/Assets/StoreLogo.scale-150.png b/DistroLauncher-Appx/Assets/StoreLogo.scale-150.png index a5997ff4..6e1d1fb8 100644 Binary files a/DistroLauncher-Appx/Assets/StoreLogo.scale-150.png and b/DistroLauncher-Appx/Assets/StoreLogo.scale-150.png differ diff --git a/DistroLauncher-Appx/Assets/StoreLogo.scale-200.png b/DistroLauncher-Appx/Assets/StoreLogo.scale-200.png index 7668fac8..c4c6fed0 100644 Binary files a/DistroLauncher-Appx/Assets/StoreLogo.scale-200.png and b/DistroLauncher-Appx/Assets/StoreLogo.scale-200.png differ diff --git a/DistroLauncher-Appx/Assets/StoreLogo.scale-400.png b/DistroLauncher-Appx/Assets/StoreLogo.scale-400.png index c861e32e..e1606f59 100644 Binary files a/DistroLauncher-Appx/Assets/StoreLogo.scale-400.png and b/DistroLauncher-Appx/Assets/StoreLogo.scale-400.png differ diff --git a/DistroLauncher-Appx/Assets/Wide310x150Logo.scale-100.png b/DistroLauncher-Appx/Assets/Wide310x150Logo.scale-100.png index c6088c3c..5576aac6 100644 Binary files a/DistroLauncher-Appx/Assets/Wide310x150Logo.scale-100.png and b/DistroLauncher-Appx/Assets/Wide310x150Logo.scale-100.png differ diff --git a/DistroLauncher-Appx/Assets/Wide310x150Logo.scale-125.png b/DistroLauncher-Appx/Assets/Wide310x150Logo.scale-125.png index 4740abff..a6acac7f 100644 Binary files a/DistroLauncher-Appx/Assets/Wide310x150Logo.scale-125.png and b/DistroLauncher-Appx/Assets/Wide310x150Logo.scale-125.png differ diff --git a/DistroLauncher-Appx/Assets/Wide310x150Logo.scale-150.png b/DistroLauncher-Appx/Assets/Wide310x150Logo.scale-150.png index 6aaa1e3d..28ba573f 100644 Binary files a/DistroLauncher-Appx/Assets/Wide310x150Logo.scale-150.png and b/DistroLauncher-Appx/Assets/Wide310x150Logo.scale-150.png differ diff --git a/DistroLauncher-Appx/Assets/Wide310x150Logo.scale-200.png b/DistroLauncher-Appx/Assets/Wide310x150Logo.scale-200.png index 15cd0bce..f41e2773 100644 Binary files a/DistroLauncher-Appx/Assets/Wide310x150Logo.scale-200.png and b/DistroLauncher-Appx/Assets/Wide310x150Logo.scale-200.png differ diff --git a/DistroLauncher-Appx/Assets/Wide310x150Logo.scale-400.png b/DistroLauncher-Appx/Assets/Wide310x150Logo.scale-400.png index 62f8ef5a..475ddd3b 100644 Binary files a/DistroLauncher-Appx/Assets/Wide310x150Logo.scale-400.png and b/DistroLauncher-Appx/Assets/Wide310x150Logo.scale-400.png differ diff --git a/DistroLauncher-Appx/DistroLauncher-Appx.vcxproj b/DistroLauncher-Appx/DistroLauncher-Appx.vcxproj index 6bca538d..533fef24 100644 --- a/DistroLauncher-Appx/DistroLauncher-Appx.vcxproj +++ b/DistroLauncher-Appx/DistroLauncher-Appx.vcxproj @@ -7,11 +7,11 @@ 14.0 true Windows Store - 10.0.16299.0 + 10.0 10.0.16215.0 10.0 - mydistro - DistroLauncher-Appx + debian + Debian-wsl True @@ -165,8 +165,8 @@ Document false - Copy $(SolutionDir)\$(platform)\$(Configuration)\launcher.exe into $(SolutionDir)\$(platform)\$(Configuration)\$(ProjectName)\$(targetname).exe - copy $(SolutionDir)\$(platform)\$(Configuration)\launcher.exe $(SolutionDir)\$(platform)\$(Configuration)\$(ProjectName)\$(targetname).exe + Copy $(SolutionDir)\$(platform)\$(Configuration)\launcher.exe into $(SolutionDir)\$(platform)\$(Configuration)\$(MSBuildProjectName)\$(targetname).exe + copy $(SolutionDir)\$(platform)\$(Configuration)\launcher.exe $(SolutionDir)\$(platform)\$(Configuration)\$(MSBuildProjectName)\$(targetname).exe $(targetname).exe diff --git a/DistroLauncher-Appx/MyDistro.appxmanifest b/DistroLauncher-Appx/MyDistro.appxmanifest index f934c6ce..50b0287d 100644 --- a/DistroLauncher-Appx/MyDistro.appxmanifest +++ b/DistroLauncher-Appx/MyDistro.appxmanifest @@ -1,10 +1,10 @@  - - + + - WSL-DistroLauncher - Windows Console Dev Team + Debian + The Debian Project Assets\StoreLogo.png @@ -17,16 +17,16 @@ - - + + - + - + diff --git a/DistroLauncher/DistributionInfo.cpp b/DistroLauncher/DistributionInfo.cpp index 4742f59f..5ff82c43 100644 --- a/DistroLauncher/DistributionInfo.cpp +++ b/DistroLauncher/DistributionInfo.cpp @@ -4,6 +4,18 @@ // #include "stdafx.h" +#include "resource.h" + +static std::wstring_view LoadStringFromResource(UINT resId, std::wstring_view default) +{ + wchar_t* res; + int len = LoadStringW(GetModuleHandle(nullptr), resId, reinterpret_cast(&res), 0); + return len ? std::wstring_view(res, len) : default; +} + +const std::wstring DistributionInfo::Name(LoadStringFromResource(IDS_DISTRO_NAME, L"Debian")); +const std::wstring DistributionInfo::WindowTitle(LoadStringFromResource(IDS_WINDOW_CAPTION, L"Debian")); + bool DistributionInfo::CreateUser(std::wstring_view userName) { diff --git a/DistroLauncher/DistributionInfo.h b/DistroLauncher/DistributionInfo.h index cceb0e24..70e46db4 100644 --- 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"MyDistribution"; + extern const std::wstring Name; // The title bar for the console window while the distribution is installing. - const std::wstring WindowTitle = L"My Distribution"; + extern const std::wstring WindowTitle; // Create and configure a user account. bool CreateUser(std::wstring_view userName); diff --git a/DistroLauncher/DistroLauncher.rc b/DistroLauncher/DistroLauncher.rc index 80d86b92..bcc140a6 100644 --- a/DistroLauncher/DistroLauncher.rc +++ b/DistroLauncher/DistroLauncher.rc @@ -53,6 +53,17 @@ END // remains consistent on all systems. IDI_ICON1 ICON ".\images\icon.ico" +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE +BEGIN + IDS_DISTRO_NAME "DebianJessie" + IDS_WINDOW_CAPTION "Debian 8.0" +END + #endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/DistroLauncher/images/icon.ico b/DistroLauncher/images/icon.ico index 5d06b9f2..9acc2d87 100644 Binary files a/DistroLauncher/images/icon.ico and b/DistroLauncher/images/icon.ico differ diff --git a/DistroLauncher/images/icon.png b/DistroLauncher/images/icon.png index 9cdecd4e..ee045729 100644 Binary files a/DistroLauncher/images/icon.png and b/DistroLauncher/images/icon.png differ diff --git a/DistroLauncher/resource.h b/DistroLauncher/resource.h index e7002b7c..fa4a0d67 100644 --- a/DistroLauncher/resource.h +++ b/DistroLauncher/resource.h @@ -3,6 +3,8 @@ // Used by DistroInstaller.rc // #define IDI_ICON1 101 +#define IDS_DISTRO_NAME 150 +#define IDS_WINDOW_CAPTION 151 // Next default values for new objects //