Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-10 13:35:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Settings work properly now

Browse Source
This commit is contained in:
Den Delimarsky
2021-04-08 14:00:07 -07:00
parent 162f7498a4
commit a178ad7524
2 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/modules/espresso/Espresso/Espresso.vcxproj.filters
View File

@@ -1,19 +1,29 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<ClCompile Include="dllmain.cpp" /> <ClCompile Include="trace.cpp">
<ClCompile Include="pch.cpp" /> <Filter>Source Files</Filter>
<ClCompile Include="trace.cpp" /> </ClCompile>
<ClCompile Include="pch.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="dllmain.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="trace.h" />
<ClInclude Include="pch.h"> <ClInclude Include="pch.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="EspressoConstants.h"> <ClInclude Include="EspressoConstants.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="resource.h" /> <ClInclude Include="trace.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="resource.h">
<Filter>Generated Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="Header Files"> <Filter Include="Header Files">
@@ -25,8 +35,16 @@
<Filter Include="Generated Files"> <Filter Include="Generated Files">
<UniqueIdentifier>{c2a23a2b-5846-440f-b29e-eea748dba12d}</UniqueIdentifier> <UniqueIdentifier>{c2a23a2b-5846-440f-b29e-eea748dba12d}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Source Files">
<UniqueIdentifier>{77f1702b-da7f-4ff6-90a3-19db515cf963}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="Espresso.rc" /> <None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Espresso.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>

25
src/modules/espresso/Espresso/dllmain.cpp
View File

@@ -293,30 +293,11 @@ void Espresso::init_settings()
{ {
// Load and parse the settings file for this PowerToy. // Load and parse the settings file for this PowerToy.
PowerToysSettings::PowerToyValues settings = PowerToysSettings::PowerToyValues settings =
PowerToysSettings::PowerToyValues::load_from_settings_file(Espresso::get_name()); PowerToysSettings::PowerToyValues::load_from_settings_file(get_key());
// Load a bool property.
//if (auto v = settings.get_bool_value(L"bool_toggle_1")) {
// g_settings.bool_prop = *v;
//}
// Load an int property.
//if (auto v = settings.get_int_value(L"int_spinner_1")) {
// g_settings.int_prop = *v;
//}
// Load a string property.
//if (auto v = settings.get_string_value(L"string_text_1")) {
// g_settings.string_prop = *v;
//}
// Load a color property.
//if (auto v = settings.get_string_value(L"color_picker_1")) {
// g_settings.color_prop = *v;
//}
} }
catch (std::exception&) catch (std::exception ex)
{ {
Logger::warn(L"An exception occurred while loading the settings file");
// Error while loading from the settings file. Let default values stay as they are. // Error while loading from the settings file. Let default values stay as they are.
} }
} }