Merge branch 'pr/76-keymap-editor'

Author: BGPierce

config.c

@@ -920,7 +920,12 @@ LRESULT CALLBACK InputConfig(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPar
         TempConfig.KeyMap = (unsigned char)
         SendDlgItemMessage(hDlg,IDC_KBCONFIG,CB_GETCURSEL,0,0);
         if (LOWORD(wParam)==IDC_KEYMAPED) {
-            // Custom keymap edit processing (KeyMapProc) is in keyboardEdit.c
+            // Notify user if custom keyboard if not selected but allow edit anyway.
+            if (CurrentConfig.KeyMap != 3) {
+                MessageBox(0, "The custom keyboard map is not currently applied. For edits "
+                               "to take effect select Custom mapping AND Apply when done.",
+                               "Notice", 0);
+            }
             DialogBox( EmuState.WindowInstance, (LPCTSTR) IDD_KEYMAPEDIT, hDlg,
                        (DLGPROC) KeyMapProc );
         }

docs/KeyMapEditor.txt

@@ -30,7 +30,7 @@ follows:
 A list of valid PC and CoCo key names can be found in keynames.h 
 in Vcc sources.
 
-Here is an sample entry line:
+Here are some example entry lines:
 
 # PC key name   Mod   CoCo name  Mod
 # -----------   ---  ----------- ---
@@ -111,4 +111,4 @@ user to choose a different keymap file.  When a file is selected
 the current custom keymapping is automatically saved to it.  If
 the file selected does not exist the user is prompted if they 
 want to create it.
-  
+ 

keyboardEdit.c

@@ -848,7 +848,7 @@ BOOL Process_CoCoKey(int BtnId)
 	    ShowCoCoKey();
 	    EnableWindow(GetDlgItem(hKeyMapDlg,IDC_SET_CUST_KEYMAP),TRUE);
 	} else {
-		MessageBox(hKeyMapDlg,"Press key(s) on PC keyboard first","Error",0);
+		MessageBox(hKeyMapDlg,"Press PC key to map first","Error",0);
 	}
 	return TRUE;
 }