Skip installing Open Shell under Windows 11

This commit is contained in:
2Shirt 2022-10-01 19:15:15 -07:00
parent a9581c9152
commit 591fb8e138
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
2 changed files with 11 additions and 0 deletions

View file

@ -10,6 +10,11 @@ BROWSER_PATHS = {
'Microsoft Edge': 'Microsoft/Edge/Application/msedge.exe', 'Microsoft Edge': 'Microsoft/Edge/Application/msedge.exe',
'Opera': 'Opera/launcher.exe', 'Opera': 'Opera/launcher.exe',
} }
DISABLED_ENTRIES_WINDOWS_11 = {
# Group Name: Option Name
'Install Software': 'Open Shell',
'Configure System': 'Open Shell',
}
LIBREOFFICE_XCU_DATA = '''<?xml version="1.0" encoding="UTF-8"?> LIBREOFFICE_XCU_DATA = '''<?xml version="1.0" encoding="UTF-8"?>
<oor:items xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <oor:items xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<item oor:path="/org.openoffice.Setup/Office/Factories/org.openoffice.Setup:Factory['com.sun.star.presentation.PresentationDocument']"><prop oor:name="ooSetupFactoryDefaultFilter" oor:op="fuse"><value>Impress MS PowerPoint 2007 XML</value></prop></item> <item oor:path="/org.openoffice.Setup/Office/Factories/org.openoffice.Setup:Factory['com.sun.star.presentation.PresentationDocument']"><prop oor:name="ooSetupFactoryDefaultFilter" oor:op="fuse"><value>Impress MS PowerPoint 2007 XML</value></prop></item>

View file

@ -12,6 +12,7 @@ import sys
from wk.cfg.main import KIT_NAME_FULL from wk.cfg.main import KIT_NAME_FULL
from wk.cfg.setup import ( from wk.cfg.setup import (
BROWSER_PATHS, BROWSER_PATHS,
DISABLED_ENTRIES_WINDOWS_11,
LIBREOFFICE_XCU_DATA, LIBREOFFICE_XCU_DATA,
REG_CHROME_UBLOCK_ORIGIN, REG_CHROME_UBLOCK_ORIGIN,
REG_WINDOWS_EXPLORER, REG_WINDOWS_EXPLORER,
@ -162,6 +163,11 @@ def build_menus(base_menus, title, presets):
MENU_PRESETS.add_action('Quit') MENU_PRESETS.add_action('Quit')
MENU_PRESETS.update() MENU_PRESETS.update()
# Disable entries incompatible with Windows 11
if OS_VERSION == 11:
for group_name, entry_name in DISABLED_ENTRIES_WINDOWS_11.items():
menus[group_name].options[entry_name]['Disabled'] = True
# Done # Done
return menus return menus