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

[VCM] Activate the module (#13662)

Browse Source
This commit is contained in:
Andrey Nekrasov
2021-10-07 16:48:45 +03:00
committed by GitHub
parent 68c199aa64
commit a381a64b31
5 changed files with 24 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/runner/main.cpp
View File

@@ -150,13 +150,12 @@ int runner(bool isProcessElevated, bool openSettings, std::string settingsWindow
L"modules/Awake/AwakeModuleInterface.dll"
};
// TODO(yuyoyuppe): uncomment when VCM should be enabled
//const auto VCM_PATH = L"modules/VideoConference/VideoConferenceModule.dll";
//if (const auto mf = LoadLibraryA("mf.dll"))
//{
// FreeLibrary(mf);
// knownModules.emplace_back(VCM_PATH);
//}
const auto VCM_PATH = L"modules/VideoConference/VideoConferenceModule.dll";
if (const auto mf = LoadLibraryA("mf.dll"))
{
FreeLibrary(mf);
knownModules.emplace_back(VCM_PATH);
}
for (const auto& moduleSubdir : knownModules)
{

5
src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml.cs
View File

@@ -180,8 +180,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
Link = "https://aka.ms/PowerToysOverview_ShortcutGuide",
});
// TODO(yuyoyuppe): uncomment when VCM should be enabled
/* Modules.Insert((int)PowerToysModulesEnum.VideoConference, new OobePowerToysModule()
Modules.Insert((int)PowerToysModulesEnum.VideoConference, new OobePowerToysModule()
{
ModuleName = loader.GetString("Oobe_VideoConference"),
Tag = "VideoConference",
@@ -192,7 +191,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
Description = loader.GetString("Oobe_VideoConference_Description"),
PreviewImageSource = "ms-appx:///Assets/Modules/OOBE/VideoConferenceMute.png",
Link = "https://aka.ms/PowerToysOverview_VideoConference",
}); */
});
}
public void OnClosing()

7
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml
View File

@@ -119,15 +119,14 @@
</muxc:NavigationViewItem.Icon>
</muxc:NavigationViewItem>
<!--TODO(yuyoyuppe): uncomment when VCM should be enabled-->
<!--<muxc:NavigationViewItem x:Uid="Shell_VideoConference"
<muxc:NavigationViewItem x:Uid="Shell_VideoConference"
helpers:NavHelper.NavigateTo="views:VideoConferencePage"
IsEnabled="{x:Bind ViewModel.IsVideoConferenceBuild, Mode=OneWay}">
<muxc:NavigationViewItem.Icon>
<BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsVideoConferenceMute.png"
ShowAsMonochrome="False" />
</muxc:NavigationViewItem.Icon>
</muxc:NavigationViewItem>-->
</muxc:NavigationViewItem>
</muxc:NavigationView.MenuItems>
<muxc:NavigationView.PaneFooter>
@@ -154,4 +153,4 @@
<Frame x:Name="shellFrame" />
</muxc:NavigationView>
</Grid>
</UserControl>
</UserControl>