Project: FAR manager
Revision: 1942
Author: drkns
Date: 06 Aug 2008 14:57:07
Changes:reserved space in lng for Fx-keys with modifiers
Files:modified: /trunk/unicode_far/keyboard.cpp (
try)
modified: /trunk/unicode_far/keybar.hpp (
try)
modified: /trunk/unicode_far/vbuild.m4 (
try)
modified: /trunk/unicode_far/fileedit.cpp (
try)
modified: /trunk/unicode_far/changelog (
try)
modified: /trunk/unicode_far/infolist.cpp (
try)
modified: /trunk/unicode_far/help.cpp (
try)
modified: /trunk/unicode_far/farlang.templ (
try)
modified: /trunk/unicode_far/fileview.cpp (
try)
modified: /trunk/unicode_far/filelist.cpp (
try)
modified: /trunk/unicode_far/qview.cpp (
try)
modified: /trunk/unicode_far/treelist.cpp (
try)
modified: /trunk/unicode_far/keybar.cpp (
try)
| ...... | @@ -2353,7 +2353,7 @@ |
| 2353 | 2353 | return(KEY_SHIFT|KEY_CTRLALT|KEY_DIVIDE);
|
| 2354 | 2354 | case VK_MULTIPLY:
|
| 2355 | 2355 | return(KEY_SHIFT|KEY_CTRLALT|KEY_MULTIPLY);
|
| 2356 | | case VK_PAUSE:
|
| 2356 | case VK_CANCEL:
|
| 2357 | 2357 | return(KEY_SHIFT|KEY_CTRLALT|KEY_PAUSE);
|
| 2358 | 2358 | }
|
| 2359 | 2359 | if (Char.UnicodeChar)
|
| ...... | @@ -45,6 +45,7 @@ |
| 45 | 45 | KBL_CTRLSHIFT,
|
| 46 | 46 | KBL_ALTSHIFT,
|
| 47 | 47 | KBL_CTRLALT,
|
| 48 | KBL_CTRLALTSHIFT,
|
| 48 | 49 |
|
| 49 | 50 | KBL_GROUP_COUNT
|
| 50 | 51 | };
|
| ...... | @@ -101,6 +102,7 @@ |
| 101 | 102 | void SetCtrlShift(const wchar_t * const *Key,int KeyCount) { SetGroup (KBL_CTRLSHIFT, Key, KeyCount); }
|
| 102 | 103 | void SetAltShift(const wchar_t * const *Key,int KeyCount) { SetGroup (KBL_ALTSHIFT, Key, KeyCount); }
|
| 103 | 104 | void SetCtrlAlt(const wchar_t **Key,int KeyCount) { SetGroup (KBL_CTRLALT, Key, KeyCount); }
|
| 105 | void SetCtrlAltShift(const wchar_t **Key,int KeyCount) { SetGroup (KBL_CTRLALTSHIFT, Key, KeyCount); }
|
| 104 | 106 |
|
| 105 | 107 | void SetDisableMask(int Mask);
|
| 106 | 108 | void Change(const wchar_t *NewStr,int Pos) { Change (KBL_MAIN, NewStr, Pos); }
|
| ...... | @@ -1 +1 @@ |
| 0 | | m4_define(BUILD,543)m4_dnl |
| 0 | m4_define(BUILD,544)m4_dnl |
| ...... | @@ -801,13 +801,14 @@ |
| 801 | 801 |
|
| 802 | 802 | void FileEditor::InitKeyBar(void)
|
| 803 | 803 | {
|
| 804 | | EditKeyBar.SetAllGroup (KBL_MAIN, Opt.OnlyEditorViewerUsed?MSingleEditF1:MEditF1, 12);
|
| 805 | | EditKeyBar.SetAllGroup (KBL_SHIFT, Opt.OnlyEditorViewerUsed?MSingleEditShiftF1:MEditShiftF1, 12);
|
| 806 | | EditKeyBar.SetAllGroup (KBL_ALT, Opt.OnlyEditorViewerUsed?MSingleEditAltF1:MEditAltF1, 12);
|
| 807 | | EditKeyBar.SetAllGroup (KBL_CTRL, Opt.OnlyEditorViewerUsed?MSingleEditCtrlF1:MEditCtrlF1, 12);
|
| 808 | | EditKeyBar.SetAllGroup (KBL_CTRLSHIFT, Opt.OnlyEditorViewerUsed?MSingleEditCtrlShiftF1:MEditCtrlShiftF1, 12);
|
| 809 | | EditKeyBar.SetAllGroup (KBL_CTRLALT, Opt.OnlyEditorViewerUsed?MSingleEditCtrlAltF1:MEditCtrlAltF1, 12);
|
| 810 | | EditKeyBar.SetAllGroup (KBL_ALTSHIFT, Opt.OnlyEditorViewerUsed?MSingleEditAltShiftF1:MEditAltShiftF1, 12);
|
| 804 | EditKeyBar.SetAllGroup (KBL_MAIN, Opt.OnlyEditorViewerUsed?MSingleEditF1:MEditF1, 12);
|
| 805 | EditKeyBar.SetAllGroup (KBL_SHIFT, Opt.OnlyEditorViewerUsed?MSingleEditShiftF1:MEditShiftF1, 12);
|
| 806 | EditKeyBar.SetAllGroup (KBL_ALT, Opt.OnlyEditorViewerUsed?MSingleEditAltF1:MEditAltF1, 12);
|
| 807 | EditKeyBar.SetAllGroup (KBL_CTRL, Opt.OnlyEditorViewerUsed?MSingleEditCtrlF1:MEditCtrlF1, 12);
|
| 808 | EditKeyBar.SetAllGroup (KBL_CTRLSHIFT, Opt.OnlyEditorViewerUsed?MSingleEditCtrlShiftF1:MEditCtrlShiftF1, 12);
|
| 809 | EditKeyBar.SetAllGroup (KBL_CTRLALT, Opt.OnlyEditorViewerUsed?MSingleEditCtrlAltF1:MEditCtrlAltF1, 12);
|
| 810 | EditKeyBar.SetAllGroup (KBL_ALTSHIFT, Opt.OnlyEditorViewerUsed?MSingleEditAltShiftF1:MEditAltShiftF1, 12);
|
| 811 | EditKeyBar.SetAllGroup (KBL_CTRLALTSHIFT, Opt.OnlyEditorViewerUsed?MSingleEditCtrlAltShiftF1:MEditCtrlAltShiftF1, 12);
|
| 811 | 812 |
|
| 812 | 813 | if(!GetCanLoseFocus())
|
| 813 | 814 | EditKeyBar.Change(KBL_SHIFT,L"",4-1);
|
| ...... | @@ -1,3 +1,10 @@ |
| 1 | drkns 06.08.2008 22:28:53 +0200 - build 544
|
| 2 |
|
| 3 | 1. |
| ...... | @@ -658,9 +658,10 @@ |
| 658 | 658 | KB->SetAllGroup (KBL_SHIFT, MInfoShiftF1, 12);
|
| 659 | 659 | KB->SetAllGroup (KBL_ALT, MInfoAltF1, 12);
|
| 660 | 660 | KB->SetAllGroup (KBL_CTRL, MInfoCtrlF1, 12);
|
| 661 | | KB->ClearGroup (KBL_CTRLSHIFT);
|
| 662 | | KB->ClearGroup (KBL_CTRLALT);
|
| 663 | | KB->ClearGroup (KBL_ALTSHIFT);
|
| 661 | KB->SetAllGroup (KBL_CTRLSHIFT, MInfoCtrlShiftF1, 12);
|
| 662 | KB->SetAllGroup (KBL_CTRLALT, MInfoCtrlAltF1, 12);
|
| 663 | KB->SetAllGroup (KBL_ALTSHIFT, MInfoAltShiftF1, 12);
|
| 664 | KB->SetAllGroup (KBL_CTRLALTSHIFT, MInfoCtrlAltShiftF1, 12);
|
| 664 | 665 | DynamicUpdateKeyBar();
|
| 665 | 666 |
|
| 666 | 667 | return TRUE;
|
| ...... | @@ -2048,9 +2048,10 @@ |
| 2048 | 2048 | HelpKeyBar.SetAllGroup (KBL_SHIFT, MHelpShiftF1, 12);
|
| 2049 | 2049 | HelpKeyBar.SetAllGroup (KBL_ALT, MHelpAltF1, 12);
|
| 2050 | 2050 | HelpKeyBar.SetAllGroup (KBL_CTRL, MHelpCtrlF1, 12);
|
| 2051 | | HelpKeyBar.ClearGroup (KBL_CTRLSHIFT);
|
| 2052 | | HelpKeyBar.ClearGroup (KBL_CTRLALT);
|
| 2053 | | HelpKeyBar.ClearGroup (KBL_ALTSHIFT);
|
| 2051 | HelpKeyBar.SetAllGroup (KBL_CTRLSHIFT, MHelpCtrlShiftF1, 12);
|
| 2052 | HelpKeyBar.SetAllGroup (KBL_CTRLALT, MHelpCtrlAltF1, 12);
|
| 2053 | HelpKeyBar.SetAllGroup (KBL_ALTSHIFT, MHelpAltShiftF1, 12);
|
| 2054 | HelpKeyBar.SetAllGroup (KBL_CTRLALTSHIFT, MHelpCtrlAltShiftF1, 12);
|
| 2054 | 2055 |
|
| 2055 | 2056 | // |
| ...... | @@ -491,6 +491,56 @@ |
| 491 | 491 | ""
|
| 492 | 492 |
|
| 493 | 493 | MCtrlAltF12
|
| 494 | ""
|
| 495 | ""
|
| 496 |
|
| 497 | MCtrlAltShiftF1
|
| 498 | l:
|
| 499 | l:// Main CtrlAltShift
|
| 500 | ""
|
| 501 | ""
|
| 502 |
|
| 503 | MCtrlAltShiftF2
|
| 504 | ""
|
| 505 | ""
|
| 506 |
|
| 507 | MCtrlAltShiftF3
|
| 508 | ""
|
| 509 | ""
|
| 510 |
|
| 511 | MCtrlAltShiftF4
|
| 512 | ""
|
| 513 | ""
|
| 514 |
|
| 515 | MCtrlAltShiftF5
|
| 516 | ""
|
| 517 | ""
|
| 518 |
|
| 519 | MCtrlAltShiftF6
|
| 520 | ""
|
| 521 | ""
|
| 522 |
|
| 523 | MCtrlAltShiftF7
|
| 524 | ""
|
| 525 | ""
|
| 526 |
|
| 527 | MCtrlAltShiftF8
|
| 528 | ""
|
| 529 | ""
|
| 530 |
|
| 531 | MCtrlAltShiftF9
|
| 532 | ""
|
| 533 | ""
|
| 534 |
|
| 535 | MCtrlAltShiftF10
|
| 536 | ""
|
| 537 | ""
|
| 538 |
|
| 539 | MCtrlAltShiftF11
|
| 540 | ""
|
| 541 | ""
|
| 542 |
|
| 543 | MCtrlAltShiftF12
|
| 494 | 544 | le://End of functional keys
|
| 495 | 545 | ""
|
| 496 | 546 | ""
|
| ...... | @@ -2122,6 +2172,56 @@ |
| 2122 | 2172 | ""
|
| 2123 | 2173 |
|
| 2124 | 2174 | MEditCtrlAltF12
|
| 2175 | ""
|
| 2176 | ""
|
| 2177 |
|
| 2178 | MEditCtrlAltShiftF1
|
| 2179 | l:
|
| 2180 | l:// Editor: CtrlAltShift
|
| 2181 | ""
|
| 2182 | ""
|
| 2183 |
|
| 2184 | MEditCtrlAltShiftF2
|
| 2185 | ""
|
| 2186 | ""
|
| 2187 |
|
| 2188 | MEditCtrlAltShiftF3
|
| 2189 | ""
|
| 2190 | ""
|
| 2191 |
|
| 2192 | MEditCtrlAltShiftF4
|
| 2193 | ""
|
| 2194 | ""
|
| 2195 |
|
| 2196 | MEditCtrlAltShiftF5
|
| 2197 | ""
|
| 2198 | ""
|
| 2199 |
|
| 2200 | MEditCtrlAltShiftF6
|
| 2201 | ""
|
| 2202 | ""
|
| 2203 |
|
| 2204 | MEditCtrlAltShiftF7
|
| 2205 | ""
|
| 2206 | ""
|
| 2207 |
|
| 2208 | MEditCtrlAltShiftF8
|
| 2209 | ""
|
| 2210 | ""
|
| 2211 |
|
| 2212 | MEditCtrlAltShiftF9
|
| 2213 | ""
|
| 2214 | ""
|
| 2215 |
|
| 2216 | MEditCtrlAltShiftF10
|
| 2217 | ""
|
| 2218 | ""
|
| 2219 |
|
| 2220 | MEditCtrlAltShiftF11
|
| 2221 | ""
|
| 2222 | ""
|
| 2223 |
|
| 2224 | MEditCtrlAltShiftF12
|
| 2125 | 2225 | le://End of functional keys (Editor)
|
| 2126 | 2226 | ""
|
| 2127 | 2227 | ""
|
| ...... | @@ -2478,6 +2578,56 @@ |
| 2478 | 2578 | ""
|
| 2479 | 2579 |
|
| 2480 | 2580 | MSingleEditCtrlAltF12
|
| 2581 | ""
|
| 2582 | ""
|
| 2583 |
|
| 2584 | MSingleEditCtrlAltShiftF1
|
| 2585 | l:
|
| 2586 | l://Single Editor: CtrlAltShift
|
| 2587 | ""
|
| 2588 | ""
|
| 2589 |
|
| 2590 | MSingleEditCtrlAltShiftF2
|
| 2591 | ""
|
| 2592 | ""
|
| 2593 |
|
| 2594 | MSingleEditCtrlAltShiftF3
|
| 2595 | ""
|
| 2596 | ""
|
| 2597 |
|
| 2598 | MSingleEditCtrlAltShiftF4
|
| 2599 | ""
|
| 2600 | ""
|
| 2601 |
|
| 2602 | MSingleEditCtrlAltShiftF5
|
| 2603 | ""
|
| 2604 | ""
|
| 2605 |
|
| 2606 | MSingleEditCtrlAltShiftF6
|
| 2607 | ""
|
| 2608 | ""
|
| 2609 |
|
| 2610 | MSingleEditCtrlAltShiftF7
|
| 2611 | ""
|
| 2612 | ""
|
| 2613 |
|
| 2614 | MSingleEditCtrlAltShiftF8
|
| 2615 | ""
|
| 2616 | ""
|
| 2617 |
|
| 2618 | MSingleEditCtrlAltShiftF9
|
| 2619 | ""
|
| 2620 | ""
|
| 2621 |
|
| 2622 | MSingleEditCtrlAltShiftF10
|
| 2623 | ""
|
| 2624 | ""
|
| 2625 |
|
| 2626 | MSingleEditCtrlAltShiftF11
|
| 2627 | ""
|
| 2628 | ""
|
| 2629 |
|
| 2630 | MSingleEditCtrlAltShiftF12
|
| 2481 | 2631 | le://End of functional keys (Single Editor)
|
| 2482 | 2632 | ""
|
| 2483 | 2633 | ""
|
| ...... | @@ -3100,6 +3250,56 @@ |
| 3100 | 3250 | ""
|
| 3101 | 3251 |
|
| 3102 | 3252 | MViewCtrlAltF12
|
| 3253 | ""
|
| 3254 | ""
|
| 3255 |
|
| 3256 | MViewCtrlAltShiftF1
|
| 3257 | l:
|
| 3258 | l://Viewer: CtrlAltShift
|
| 3259 | ""
|
| 3260 | ""
|
| 3261 |
|
| 3262 | MViewCtrlAltShiftF2
|
| 3263 | ""
|
| 3264 | ""
|
| 3265 |
|
| 3266 | MViewCtrlAltShiftF3
|
| 3267 | ""
|
| 3268 | ""
|
| 3269 |
|
| 3270 | MViewCtrlAltShiftF4
|
| 3271 | ""
|
| 3272 | ""
|
| 3273 |
|
| 3274 | MViewCtrlAltShiftF5
|
| 3275 | ""
|
| 3276 | ""
|
| 3277 |
|
| 3278 | MViewCtrlAltShiftF6
|
| 3279 | ""
|
| 3280 | ""
|
| 3281 |
|
| 3282 | MViewCtrlAltShiftF7
|
| 3283 | ""
|
| 3284 | ""
|
| 3285 |
|
| 3286 | MViewCtrlAltShiftF8
|
| 3287 | ""
|
| 3288 | ""
|
| 3289 |
|
| 3290 | MViewCtrlAltShiftF9
|
| 3291 | ""
|
| 3292 | ""
|
| 3293 |
|
| 3294 | MViewCtrlAltShiftF10
|
| 3295 | ""
|
| 3296 | ""
|
| 3297 |
|
| 3298 | MViewCtrlAltShiftF11
|
| 3299 | ""
|
| 3300 | ""
|
| 3301 |
|
| 3302 | MViewCtrlAltShiftF12
|
| 3103 | 3303 | le://end of functional keys (Viewer)
|
| 3104 | 3304 | ""
|
| 3105 | 3305 | ""
|
| ...... | @@ -3465,6 +3665,56 @@ |
| 3465 | 3665 | ""
|
| 3466 | 3666 |
|
| 3467 | 3667 | MSingleViewCtrlAltF12
|
| 3668 | ""
|
| 3669 | ""
|
| 3670 |
|
| 3671 | MSingleViewCtrlAltShiftF1
|
| 3672 | l:
|
| 3673 | l://Single Viewer: CtrlAltShift
|
| 3674 | ""
|
| 3675 | ""
|
| 3676 |
|
| 3677 | MSingleViewCtrlAltShiftF2
|
| 3678 | ""
|
| 3679 | ""
|
| 3680 |
|
| 3681 | MSingleViewCtrlAltShiftF3
|
| 3682 | ""
|
| 3683 | ""
|
| 3684 |
|
| 3685 | MSingleViewCtrlAltShiftF4
|
| 3686 | ""
|
| 3687 | ""
|
| 3688 |
|
| 3689 | MSingleViewCtrlAltShiftF5
|
| 3690 | ""
|
| 3691 | ""
|
| 3692 |
|
| 3693 | MSingleViewCtrlAltShiftF6
|
| 3694 | ""
|
| 3695 | ""
|
| 3696 |
|
| 3697 | MSingleViewCtrlAltShiftF7
|
| 3698 | ""
|
| 3699 | ""
|
| 3700 |
|
| 3701 | MSingleViewCtrlAltShiftF8
|
| 3702 | ""
|
| 3703 | ""
|
| 3704 |
|
| 3705 | MSingleViewCtrlAltShiftF9
|
| 3706 | ""
|
| 3707 | ""
|
| 3708 |
|
| 3709 | MSingleViewCtrlAltShiftF10
|
| 3710 | ""
|
| 3711 | ""
|
| 3712 |
|
| 3713 | MSingleViewCtrlAltShiftF11
|
| 3714 | ""
|
| 3715 | ""
|
| 3716 |
|
| 3717 | MSingleViewCtrlAltShiftF12
|
| 3468 | 3718 | le://end of functional keys (Single Viewer)
|
| 3469 | 3719 | ""
|
| 3470 | 3720 | ""
|
| ...... | @@ -6480,88 +6730,288 @@ |
| 6480 | 6730 | ""
|
| 6481 | 6731 | ""
|
| 6482 | 6732 |
|
| 6483 | | MInfoF1
|
| 6733 | MHelpCtrlShiftF1
|
| 6484 | 6734 | l:
|
| 6485 | | l:// InfoPanel KeyBar F1-F12
|
| 6486 | | " |
| ...... | @@ -152,13 +152,14 @@ |
| 152 | 152 |
|
| 153 | 153 | void FileViewer::InitKeyBar(void)
|
| 154 | 154 | {
|
| 155 | | ViewKeyBar.SetAllGroup (KBL_MAIN, Opt.OnlyEditorViewerUsed?MSingleViewF1:MViewF1, 12);
|
| 156 | | ViewKeyBar.SetAllGroup (KBL_SHIFT, Opt.OnlyEditorViewerUsed?MSingleViewShiftF1:MViewShiftF1, 12);
|
| 157 | | ViewKeyBar.SetAllGroup (KBL_ALT, Opt.OnlyEditorViewerUsed?MSingleViewAltF1:MViewAltF1, 12);
|
| 158 | | ViewKeyBar.SetAllGroup (KBL_CTRL, Opt.OnlyEditorViewerUsed?MSingleViewCtrlF1:MViewCtrlF1, 12);
|
| 159 | | ViewKeyBar.SetAllGroup (KBL_CTRLSHIFT, Opt.OnlyEditorViewerUsed?MSingleViewCtrlShiftF1:MViewCtrlShiftF1, 12);
|
| 160 | | ViewKeyBar.SetAllGroup (KBL_CTRLALT, Opt.OnlyEditorViewerUsed?MSingleViewCtrlAltF1:MViewCtrlAltF1, 12);
|
| 161 | | ViewKeyBar.SetAllGroup (KBL_ALTSHIFT, Opt.OnlyEditorViewerUsed?MSingleViewAltShiftF1:MViewAltShiftF1, 12);
|
| 155 | ViewKeyBar.SetAllGroup (KBL_MAIN, Opt.OnlyEditorViewerUsed?MSingleViewF1:MViewF1, 12);
|
| 156 | ViewKeyBar.SetAllGroup (KBL_SHIFT, Opt.OnlyEditorViewerUsed?MSingleViewShiftF1:MViewShiftF1, 12);
|
| 157 | ViewKeyBar.SetAllGroup (KBL_ALT, Opt.OnlyEditorViewerUsed?MSingleViewAltF1:MViewAltF1, 12);
|
| 158 | ViewKeyBar.SetAllGroup (KBL_CTRL, Opt.OnlyEditorViewerUsed?MSingleViewCtrlF1:MViewCtrlF1, 12);
|
| 159 | ViewKeyBar.SetAllGroup (KBL_CTRLSHIFT, Opt.OnlyEditorViewerUsed?MSingleViewCtrlShiftF1:MViewCtrlShiftF1, 12);
|
| 160 | ViewKeyBar.SetAllGroup (KBL_CTRLALT, Opt.OnlyEditorViewerUsed?MSingleViewCtrlAltF1:MViewCtrlAltF1, 12);
|
| 161 | ViewKeyBar.SetAllGroup (KBL_ALTSHIFT, Opt.OnlyEditorViewerUsed?MSingleViewAltShiftF1:MViewAltShiftF1, 12);
|
| 162 | ViewKeyBar.SetAllGroup (KBL_CTRLALTSHIFT, Opt.OnlyEditorViewerUsed?MSingleViewCtrlAltShiftF1:MViewCtrlAltShiftF1, 12);
|
| 162 | 163 |
|
| 163 | 164 | if(DisableEdit)
|
| 164 | 165 | ViewKeyBar.Change(KBL_MAIN,L"",6-1);
|
| ...... | @@ -4189,6 +4189,7 @@ |
| 4189 | 4189 | KB->SetAllGroup (KBL_CTRLSHIFT, MCtrlShiftF1, 12);
|
| 4190 | 4190 | KB->SetAllGroup (KBL_CTRLALT, MCtrlAltF1, 12);
|
| 4191 | 4191 | KB->SetAllGroup (KBL_ALTSHIFT, MAltShiftF1, 12);
|
| 4192 | KB->SetAllGroup (KBL_CTRLALTSHIFT, MCtrlAltShiftF1, 12);
|
| 4192 | 4193 |
|
| 4193 | 4194 | if(WinVer.dwPlatformId != VER_PLATFORM_WIN32_NT)
|
| 4194 | 4195 | KB->Change(KBL_ALT,L"",6-1);
|
| ...... | @@ -545,9 +545,10 @@ |
| 545 | 545 | KB->SetAllGroup (KBL_SHIFT, MQViewShiftF1, 12);
|
| 546 | 546 | KB->SetAllGroup (KBL_ALT, MQViewAltF1, 12);
|
| 547 | 547 | KB->SetAllGroup (KBL_CTRL, MQViewCtrlF1, 12);
|
| 548 | | KB->ClearGroup (KBL_CTRLSHIFT);
|
| 549 | | KB->ClearGroup (KBL_CTRLALT);
|
| 550 | | KB->ClearGroup (KBL_ALTSHIFT);
|
| 548 | KB->SetAllGroup (KBL_CTRLSHIFT, MQViewCtrlShiftF1, 12);
|
| 549 | KB->SetAllGroup (KBL_CTRLALT, MQViewCtrlAltF1, 12);
|
| 550 | KB->SetAllGroup (KBL_ALTSHIFT, MQViewAltShiftF1, 12);
|
| 551 | KB->SetAllGroup (KBL_CTRLALTSHIFT, MQViewCtrlAltShiftF1, 12);
|
| 551 | 552 |
|
| 552 | 553 | DynamicUpdateKeyBar();
|
| 553 | 554 |
|
| ...... | @@ -1963,9 +1963,10 @@ |
| 1963 | 1963 | KB->SetAllGroup (KBL_SHIFT, MKBTreeShiftF1, 12);
|
| 1964 | 1964 | KB->SetAllGroup (KBL_ALT, MKBTreeAltF1, 12);
|
| 1965 | 1965 | KB->SetAllGroup (KBL_CTRL, MKBTreeCtrlF1, 12);
|
| 1966 | | KB->ClearGroup (KBL_CTRLSHIFT);
|
| 1967 | | KB->ClearGroup (KBL_CTRLALT);
|
| 1968 | | KB->ClearGroup (KBL_ALTSHIFT);
|
| 1966 | KB->SetAllGroup (KBL_CTRLSHIFT, MKBTreeCtrlShiftF1, 12);
|
| 1967 | KB->SetAllGroup (KBL_CTRLALT, MKBTreeCtrlAltF1, 12);
|
| 1968 | KB->SetAllGroup (KBL_ALTSHIFT, MKBTreeAltShiftF1, 12);
|
| 1969 | KB->SetAllGroup (KBL_CTRLALTSHIFT, MKBTreeCtrlAltShiftF1, 12);
|
| 1969 | 1970 |
|
| 1970 | 1971 | DynamicUpdateKeyBar();
|
| 1971 | 1972 |
|
| ...... | @@ -91,6 +91,11 @@ |
| 91 | 91 | if (I<KeyCounts [KBL_CTRLSHIFT])
|
| 92 | 92 | Label=KeyTitles [KBL_CTRLSHIFT][I];
|
| 93 | 93 | }
|
| 94 | else if(!(Opt.CASRule&1) || !(Opt.CASRule&2))
|
| 95 | {
|
| 96 | if (I<KeyCounts [KBL_CTRLALTSHIFT])
|
| 97 | Label=KeyTitles [KBL_CTRLALTSHIFT][I];
|
| 98 | }
|
| 94 | 99 | }
|
| 95 | 100 | else if (AltPressed)
|
| 96 | 101 | {
|
| ...... | @@ -183,13 +188,14 @@ |
| 183 | 188 | {
|
| 184 | 189 | size_t J;
|
| 185 | 190 | static DWORD Area[][2]={
|
| 186 | | { KBL_MAIN, 0 },
|
| 187 | | { KBL_SHIFT, KEY_SHIFT },
|
| 188 | | { KBL_CTRL, KEY_CTRL },
|
| 189 | | { KBL_ALT, KEY_ALT },
|
| 190 | | { KBL_CTRLSHIFT, KEY_CTRL|KEY_SHIFT },
|
| 191 | | { KBL_ALTSHIFT, KEY_ALT|KEY_SHIFT },
|
| 192 | | { KBL_CTRLALT, KEY_CTRL|KEY_ALT },
|
| 191 | { KBL_MAIN, 0 },
|
| 192 | { KBL_SHIFT, KEY_SHIFT },
|
| 193 | { KBL_CTRL, KEY_CTRL },
|
| 194 | { KBL_ALT, KEY_ALT },
|
| 195 | { KBL_CTRLSHIFT, KEY_CTRL|KEY_SHIFT },
|
| 196 | { KBL_ALTSHIFT, KEY_ALT|KEY_SHIFT },
|
| 197 | { KBL_CTRLALT, KEY_CTRL|KEY_ALT },
|
| 198 | { KBL_CTRLALTSHIFT, KEY_CTRL|KEY_ALT|KEY_SHIFT },
|
| 193 | 199 | };
|
| 194 | 200 | for(J=0; J < countof(Area); ++J)
|
| 195 | 201 | if(Area[J][1] == Ctrl)
|
To list