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 2022-10-19 23:39:32 -07:00
commit 54b15da2e6
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
3 changed files with 30 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
scripts/wk/cfg/launchers.py
View file

@ -18,8 +18,8 @@ LAUNCHERS = {
},
'2) Windows Updates': {
'L_TYPE': 'Executable',
'L_PATH': '.',
'L_ITEM': 'control',
'L_PATH': r'%SystemRoot%\System32',
'L_ITEM': 'control.exe',
'L_ARGS': 'update',
'L_ELEV': 'True',
},
@ -81,6 +81,24 @@ LAUNCHERS = {
'L_PATH': 'ConEmu',
'L_ITEM': 'ConEmu.exe',
},
'Debug Console (Command Prompt)': {
'L_TYPE': 'Executable',
'L_PATH': 'ConEmu',
'L_ITEM': 'ConEmu.exe',
'L_ARGS': r'-Dir %bin%\Scripts',
'L_ELEV': 'True',
},
'Debug Console (Python)': {
'L_TYPE': 'Executable',
'L_PATH': 'ConEmu',
'L_ITEM': 'ConEmu.exe',
'L_ARGS': r'-Dir %bin%\Scripts -Run ..\Python\x%ARCH%\python.exe -i embedded_python_env.py',
'L_ELEV': 'True',
'Extra Code': [
'set ARCH=32',
'if /i "%PROCESSOR_ARCHITECTURE%" == "AMD64" set "ARCH=64"',
],
},
'ERUNT': {
'L_TYPE': 'Executable',
'L_PATH': 'erunt',
@ -309,17 +327,6 @@ LAUNCHERS = {
'L_PATH': 'WinSCP',
'L_ITEM': 'WinSCP.exe',
},
'WizardKit Debug Console': {
'L_TYPE': 'Executable',
'L_PATH': 'ConEmu',
'L_ITEM': 'ConEmu.exe',
'L_ARGS': r'-Dir %bin%\Scripts -Run ..\Python\x%ARCH%\python.exe -i embedded_python_env.py',
'L_ELEV': 'True',
'Extra Code': [
'set ARCH=32',
'if /i "%PROCESSOR_ARCHITECTURE%" == "AMD64" set "ARCH=64"',
],
},
'WizTree': {
'L_TYPE': 'Executable',
'L_PATH': 'WizTree',

4
scripts/wk/clone/ddrescue.py
View file

@ -767,6 +767,10 @@ class State():
self.destination = select_path('Destination')
self.update_top_panes()
# Update details
self.source.update_details(skip_children=False)
self.destination.update_details(skip_children=False)
# Confirmation #1
advanced_selection = False
try:

11
scripts/wk/setup/win.py
View file

@ -168,11 +168,6 @@ def build_menus(base_menus, title, presets):
MENU_PRESETS.add_action('Quit')
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
return menus
@ -279,6 +274,12 @@ def load_preset(menus, presets, title, enable_menu_exit=True):
# Re-enable Main Menu action if disabled
MENU_PRESETS.actions['Main Menu'].update({'Disabled':False, 'Hidden':False})
# 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
menus[group_name].options[entry_name]['Selected'] = False
def run_auto_setup(base_menus, presets):
"""Run Auto Setup."""