2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/dev' into dev

Browse source
This commit is contained in:
2Shirt 2021-10-27 20:41:49 -06:00
commit ac9a6bfc73
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
scripts/wk/cfg/repairs.py
View file

@ -60,6 +60,7 @@ BLEACH_BIT_CLEANERS = (
'windows_explorer.thumbnails', 'windows_explorer.thumbnails',
) )
CUSTOM_POWER_PLAN_NAME = f'{KIT_NAME_SHORT} Power Plan' CUSTOM_POWER_PLAN_NAME = f'{KIT_NAME_SHORT} Power Plan'
CUSTOM_POWER_PLAN_DESC = 'Customized for the best experience.'
POWER_PLANS = { POWER_PLANS = {
'Balanced': '381b4222-f694-41f0-9685-ff5bb260df2e', 'Balanced': '381b4222-f694-41f0-9685-ff5bb260df2e',
'Custom': '01189998-8199-9119-725c-ccccccccccc3', 'Custom': '01189998-8199-9119-725c-ccccccccccc3',

10
scripts/wk/cfg/setup.py
View file

@ -12,11 +12,11 @@ BROWSER_PATHS = {
} }
FAB_TIMEFRAME = 14 # If it's been at least this many days don't prompt for an AV scan FAB_TIMEFRAME = 14 # If it's been at least this many days don't prompt for an AV scan
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 <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.Present <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.sheet.SpreadsheetDoc <item oor:path="/org.openoffice.Setup/Office/Factories/org.openoffice.Setup:Factory['com.sun.star.sheet.SpreadsheetDocument']"><prop oor:name="ooSetupFactoryDefaultFilter" oor:op="fuse"><value>Calc MS Excel 2007 XML</value></prop></item>
<item oor:path="/org.openoffice.Setup/Office/Factories/org.openoffice.Setup:Factory['com.sun.star.text.TextDocument']" <item oor:path="/org.openoffice.Setup/Office/Factories/org.openoffice.Setup:Factory['com.sun.star.text.TextDocument']"><prop oor:name="ooSetupFactoryDefaultFilter" oor:op="fuse"><value>MS Word 2007 XML</value></prop></item>
<item oor:path="/org.openoffice.Office.Common/Save/Document"><prop oor:name="WarnAlienFormat" oor:op="fuse"><value>fal <item oor:path="/org.openoffice.Office.Common/Save/Document"><prop oor:name="WarnAlienFormat" oor:op="fuse"><value>false</value></prop></item>
</oor:items> </oor:items>
''' '''
REG_CHROME_UBLOCK_ORIGIN = { REG_CHROME_UBLOCK_ORIGIN = {

6
scripts/wk/repairs/win.py
View file

@ -16,6 +16,7 @@ from wk.cfg.repairs import (
AUTO_REPAIR_DELAY_IN_SECONDS, AUTO_REPAIR_DELAY_IN_SECONDS,
AUTO_REPAIR_KEY, AUTO_REPAIR_KEY,
BLEACH_BIT_CLEANERS, BLEACH_BIT_CLEANERS,
CUSTOM_POWER_PLAN_DESC,
CUSTOM_POWER_PLAN_NAME, CUSTOM_POWER_PLAN_NAME,
POWER_PLANS, POWER_PLANS,
POWER_PLAN_SLEEP_TIMEOUTS, POWER_PLAN_SLEEP_TIMEOUTS,
@ -1274,7 +1275,10 @@ def create_custom_power_plan(enable_sleep=True, keep_display_on=False):
LOG.error("Failed to create custom power plan.\n Details: %s", proc) LOG.error("Failed to create custom power plan.\n Details: %s", proc)
# Change the name # Change the name
cmd = ['powercfg', '-ChangeName', custom_guid, CUSTOM_POWER_PLAN_NAME] cmd = [
'powercfg', '-ChangeName', custom_guid,
CUSTOM_POWER_PLAN_NAME, CUSTOM_POWER_PLAN_DESC,
]
run_program(cmd) run_program(cmd)
# Set as active plan # Set as active plan