Reinstantiated View menu for selecting editor modes with hints, implemented escape key shortcut to return to Query Editor from Schema view similar to Results pane implementation

Author: nfinit

src/sqlite-ce-edit/globals.c

@@ -13,6 +13,7 @@ HWND g_hwndMain;
 HWND g_hwndCB;
 HWND g_hwndStatus;
 HMENU g_hMenu;
+HMENU g_hViewMenu;
 HMENU g_hRecentDbMenu;
 HMENU g_hRecentQueryMenu;
 HACCEL g_hAccel;

src/sqlite-ce-edit/globals.h

@@ -158,6 +158,7 @@ extern HWND g_hwndMain;
 extern HWND g_hwndCB;
 extern HWND g_hwndStatus;
 extern HMENU g_hMenu;
+extern HMENU g_hViewMenu;
 extern HMENU g_hRecentDbMenu;
 extern HMENU g_hRecentQueryMenu;
 extern HACCEL g_hAccel;

src/sqlite-ce-edit/main.c

@@ -18,7 +18,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
         case WM_CREATE: {
             RECT rc;
             int cbHeight;
-            HMENU hMenu, hFile, hQuery;
+            HMENU hMenu, hFile, hQuery, hView;
             TBBUTTON tbButtons[15];
 
             g_hBrushWhite = CreateSolidBrush(RGB(255, 255, 255));
@@ -68,6 +68,13 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
             AppendMenuW(hQuery, MF_STRING, IDM_FINDNEXT, L"Find &Next\tF3");
             AppendMenuW(hMenu, MF_POPUP, (UINT)hQuery, L"&Query");
 
+            hView = CreatePopupMenu();
+            AppendMenuW(hView, MF_STRING, IDM_VIEWQUERY, L"&Query\tCtrl+1, Esc");
+            AppendMenuW(hView, MF_STRING, IDM_VIEWRESULT, L"&Results\tCtrl+2, F6");
+            AppendMenuW(hView, MF_STRING, IDM_VIEWSCHEMA, L"&Schema\tCtrl+3, F7");
+            g_hViewMenu = hView;
+            AppendMenuW(hMenu, MF_POPUP, (UINT)hView, L"&View");
+            
             {
                 HMENU hHelp = CreatePopupMenu();
                 AppendMenuW(hHelp, MF_STRING, IDM_ABOUT, L"&About...");
@@ -203,6 +210,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
             UpdateResultFont();
 
             g_viewMode = 0;
+            CheckMenuRadioItem(g_hViewMenu, IDM_VIEWQUERY, IDM_VIEWSCHEMA, IDM_VIEWQUERY, MF_BYCOMMAND);
             UpdateLineNumbers();
             SendMessage(hwnd, WM_SIZE, 0, 0);
 
@@ -263,18 +271,21 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
                     SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWQUERY, TRUE);
                     SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWRESULT, FALSE);
                     SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWSCHEMA, FALSE);
+                    CheckMenuRadioItem(g_hViewMenu, IDM_VIEWQUERY, IDM_VIEWSCHEMA, IDM_VIEWQUERY, MF_BYCOMMAND);
                     break;
                 case IDM_VIEWRESULT:
                     SwitchView(1);
                     SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWQUERY, FALSE);
                     SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWRESULT, TRUE);
                     SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWSCHEMA, FALSE);
+                    CheckMenuRadioItem(g_hViewMenu, IDM_VIEWQUERY, IDM_VIEWSCHEMA, IDM_VIEWRESULT, MF_BYCOMMAND);
                     break;
                 case IDM_VIEWSCHEMA:
                     SwitchView(2);
                     SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWQUERY, FALSE);
                     SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWRESULT, FALSE);
                     SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWSCHEMA, TRUE);
+                    CheckMenuRadioItem(g_hViewMenu, IDM_VIEWQUERY, IDM_VIEWSCHEMA, IDM_VIEWSCHEMA, MF_BYCOMMAND);
                     break;
                 case IDM_FONTSIZE:
                     CycleFontSize();
@@ -343,6 +354,8 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
                     TV_KEYDOWN *pKey = (TV_KEYDOWN*)lParam;
                     if (pKey->wVKey == VK_DELETE) {
                         OnSchemaDelete();
+                    } else if (pKey->wVKey == VK_ESCAPE) {
+                        SendMessage(hwnd, WM_COMMAND, IDM_VIEWQUERY, 0);
                     } else if (GetKeyState(VK_CONTROL) < 0) {
                         if (pKey->wVKey == '1') SendMessage(hwnd, WM_COMMAND, IDM_VIEWQUERY, 0);
                         else if (pKey->wVKey == '2') SendMessage(hwnd, WM_COMMAND, IDM_VIEWRESULT, 0);