mirror of
				https://github.com/Ylianst/MeshCentral.git
				synced 2025-03-09 15:40:18 +00:00 
			
		
		
		
	fix keyboard shortcuts and add restore default keyboard shortcuts (#6103)
Signed-off-by: si458 <simonsmith5521@gmail.com>
This commit is contained in:
		
							parent
							
								
									30d958fbd9
								
							
						
					
					
						commit
						dd249938b3
					
				
					 3 changed files with 1967 additions and 1940 deletions
				
			
		
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							| 
						 | 
				
			
			@ -889,6 +889,7 @@
 | 
			
		|||
                            <div style=width:100%;margin:6px></div>
 | 
			
		||||
                        </div>
 | 
			
		||||
                        <div style="margin-right:16px;margin-left:8px"><div id=p10dialog2 style="margin:auto;margin:3px"></div></div>
 | 
			
		||||
                        <div style="width:100%;padding:2px;text-align:center"><input type=button value="Restore Default Keyboard Shortcuts" onclick=restoreDeskCustomizeKey() /></div>
 | 
			
		||||
                        <div style="padding:10px;margin-bottom:20px"><input type="button" value="OK" style="float:right;width:80px" onclick="deskCustomizeKeysEx()"></div>
 | 
			
		||||
                    </div>
 | 
			
		||||
                    <div id=p10general style="overflow-y:scroll;position:absolute;top:55px;bottom:0px;width:100%">
 | 
			
		||||
| 
						 | 
				
			
			@ -4728,6 +4729,15 @@
 | 
			
		|||
            updateDeskShortcutKeys();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        function restoreDeskCustomizeKey() {
 | 
			
		||||
            deskKeyboardShortcuts = [];
 | 
			
		||||
            putstore('deskKeyShortcuts', null);
 | 
			
		||||
            var deskKeyboardShortcutsStr = getstore('deskKeyShortcuts', '0x0A002E,0x100000,0x100028,0x100026,0x10004C,0x10004D,0x11004D,0x100052,0x020073,0x080057,0x020009,0x100025,0x100027').split(',');
 | 
			
		||||
            for (var i in deskKeyboardShortcutsStr) { if (deskKeyboardShortcutsStr[i] != "") { deskKeyboardShortcuts.push(parseInt(deskKeyboardShortcutsStr[i])); } }
 | 
			
		||||
            updateDeskShortcutKeys();
 | 
			
		||||
            deskUpdateShortcutList();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        function deskUpdateShortcutList() {
 | 
			
		||||
            var x = '';
 | 
			
		||||
            for (var i in deskKeyboardShortcuts) {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,4 +1,4 @@
 | 
			
		|||
<!DOCTYPE html>
 | 
			
		||||
<!DOCTYPE html>
 | 
			
		||||
<html lang="en" dir="ltr" xmlns="http://www.w3.org/1999/xhtml">
 | 
			
		||||
<head>
 | 
			
		||||
    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 | 
			
		||||
| 
						 | 
				
			
			@ -1805,7 +1805,7 @@
 | 
			
		|||
            // Set the user's desktop shortcut keys
 | 
			
		||||
            deskKeyboardShortcuts = [];
 | 
			
		||||
            var deskKeyboardShortcutsStr = getstore('deskKeyShortcuts', '0x0A002E,0x100000,0x100028,0x100026,0x10004C,0x10004D,0x11004D,0x100052,0x020073,0x080057,0x020009,0x100025,0x100027').split(',');
 | 
			
		||||
            for (var i in deskKeyboardShortcutsStr) { deskKeyboardShortcuts.push(parseInt(deskKeyboardShortcutsStr[i])); }
 | 
			
		||||
            for (var i in deskKeyboardShortcutsStr) { if (deskKeyboardShortcutsStr[i] != "") { deskKeyboardShortcuts.push(parseInt(deskKeyboardShortcutsStr[i])); } }
 | 
			
		||||
            updateDeskShortcutKeys();
 | 
			
		||||
 | 
			
		||||
            // Set the user's desktop strings
 | 
			
		||||
| 
						 | 
				
			
			@ -3202,7 +3202,7 @@
 | 
			
		|||
                                        // Set the user's desktop shortcut keys
 | 
			
		||||
                                        deskKeyboardShortcuts = [];
 | 
			
		||||
                                        var deskKeyboardShortcutsStr = webstate.deskKeyShortcuts.split(',');
 | 
			
		||||
                                        for (var i in deskKeyboardShortcutsStr) { deskKeyboardShortcuts.push(parseInt(deskKeyboardShortcutsStr[i])); }
 | 
			
		||||
                                        for (var i in deskKeyboardShortcutsStr) { if (deskKeyboardShortcutsStr[i] != "") { deskKeyboardShortcuts.push(parseInt(deskKeyboardShortcutsStr[i])); } }
 | 
			
		||||
                                        updateDeskShortcutKeys();
 | 
			
		||||
                                    }
 | 
			
		||||
                                    if (webstate.deskStrings != null) {
 | 
			
		||||
| 
						 | 
				
			
			@ -5255,12 +5255,12 @@
 | 
			
		|||
        }
 | 
			
		||||
 | 
			
		||||
        // Intel AMT device import for a device group
 | 
			
		||||
        function showAmtImport(meshid) {
 | 
			
		||||
            if (xxdialogMode) return false;
 | 
			
		||||
            var x = '<form method=post enctype=multipart/form-data action=amtimport.ashx target=fileUploadFrame><input type=text name=link style=display:none id=amtImportDevGroup value="' + meshid + '" /><input type=file name=files id=amtImportInput style=width:100% onchange="p5updateUploadDialogOk(\'p5uploadinput\')" /><input type=hidden name=authCookie value=' + authCookie + ' /><input type=submit id=p5loginSubmit style=display:none /></form>';
 | 
			
		||||
            setDialogMode(2, "Import Intel AMT devices", 3, p5uploadFileEx, x);
 | 
			
		||||
            p5updateUploadDialogOk('amtImportInput');
 | 
			
		||||
        }
 | 
			
		||||
        // function showAmtImport(meshid) {
 | 
			
		||||
        //     if (xxdialogMode) return false;
 | 
			
		||||
        //     var x = '<form method=post enctype=multipart/form-data action=amtimport.ashx target=fileUploadFrame><input type=text name=link style=display:none id=amtImportDevGroup value="' + meshid + '" /><input type=file name=files id=amtImportInput style=width:100% onchange="p5updateUploadDialogOk(\'p5uploadinput\')" /><input type=hidden name=authCookie value=' + authCookie + ' /><input type=submit id=p5loginSubmit style=display:none /></form>';
 | 
			
		||||
        //     setDialogMode(2, "Import Intel AMT devices", 3, p5uploadFileEx, x);
 | 
			
		||||
        //     p5updateUploadDialogOk('amtImportInput');
 | 
			
		||||
        // }
 | 
			
		||||
 | 
			
		||||
        function showAmtImport(meshid) {
 | 
			
		||||
            if (xxdialogMode) return;
 | 
			
		||||
| 
						 | 
				
			
			@ -9851,6 +9851,7 @@
 | 
			
		|||
            for (var i = 0; i < 10; i++) { x += '<option value=' + (i + 48) + '>' + i + '</option>'; }
 | 
			
		||||
            for (var i = 0; i < 26; i++) { x += '<option value=' + (i + 65) + '>' + String.fromCharCode(i + 65) + '</option>'; }
 | 
			
		||||
            x += '</select> <input type=button value=' + "Add" + ' onclick=addDeskCustomizeKey() /></div>';
 | 
			
		||||
            x += '<div style=width:100%;padding:2px;text-align:center><input type=button value="' + "Restore Default Keyboard Shortcuts" + '" onclick=restoreDeskCustomizeKey() /></div>';
 | 
			
		||||
            setDialogMode(2, "Keyboard Shortcuts Customization", 1, deskCustomizeKeysEx, x);
 | 
			
		||||
            deskUpdateShortcutList();
 | 
			
		||||
        }
 | 
			
		||||
| 
						 | 
				
			
			@ -9893,6 +9894,15 @@
 | 
			
		|||
            deskUpdateShortcutList();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        function restoreDeskCustomizeKey() {
 | 
			
		||||
            deskKeyboardShortcuts = [];
 | 
			
		||||
            putstore('deskKeyShortcuts', null);
 | 
			
		||||
            var deskKeyboardShortcutsStr = getstore('deskKeyShortcuts', '0x0A002E,0x100000,0x100028,0x100026,0x10004C,0x10004D,0x11004D,0x100052,0x020073,0x080057,0x020009,0x100025,0x100027').split(',');
 | 
			
		||||
            for (var i in deskKeyboardShortcutsStr) { if (deskKeyboardShortcutsStr[i] != "") { deskKeyboardShortcuts.push(parseInt(deskKeyboardShortcutsStr[i])); } }
 | 
			
		||||
            updateDeskShortcutKeys();
 | 
			
		||||
            deskUpdateShortcutList();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        function addDeskCustomizeKey() {
 | 
			
		||||
            var k = parseInt(Q('d2keySelect').value);
 | 
			
		||||
            if (Q('d1kshift').checked) { k |= 0x010000; }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue