0.9.0.48: Replaced assorted magic numbers for view switching with named global constants, fixed bug where view grid view button would enable in edit mode if you imported a CEDB database while viewing and editing a table

Author: nfinit

src/sqlite-ce-edit/execute.c

@@ -280,7 +280,7 @@ void ExecuteSQL(const char *sql) {
     /* Switch to results */
     if (g_gridView && g_hwndGrid)
         SendMessage(g_hwndGrid, WM_SETREDRAW, FALSE, 0);
-    SwitchView(1);
+    SwitchView(VIEW_RESULT);
     SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWQUERY, FALSE);
     SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWRESULT, TRUE);
     SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWSCHEMA, FALSE);
@@ -648,7 +648,7 @@ void ExecuteQuery(void) {
         /* Suppress redraw during view switch to avoid flicker */
         if (g_gridView && g_hwndGrid)
             SendMessage(g_hwndGrid, WM_SETREDRAW, FALSE, 0);
-        SwitchView(1);
+        SwitchView(VIEW_RESULT);
         SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWQUERY, FALSE);
         SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWRESULT, TRUE);
         SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWSCHEMA, FALSE);

src/sqlite-ce-edit/globals.h

@@ -87,7 +87,7 @@ BOOL WINAPI GetSaveFileNameW(CE_OPENFILENAME*);
 ** Version
 **============================================================================*/
 
-#define SQLITECEDIT_VERSION L"0.9.0.46"
+#define SQLITECEDIT_VERSION L"0.9.0.48"
 
 /*============================================================================
 ** Menu IDs

src/sqlite-ce-edit/import.c

@@ -553,9 +553,13 @@ void DoImportCEDB(void) {
         OutputLine(msg);
     }
     FlushOutput();
-    SwitchView(1);
+    ClearEditMode();
+    g_lastResultRows = 0;
+    SwitchView(VIEW_RESULT);
     SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWQUERY, FALSE);
     SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWRESULT, TRUE);
+    SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWSCHEMA, FALSE);
+    SendMessage(g_hwndCB, TB_ENABLEBUTTON, IDM_EXECATCURSOR, FALSE);
 
 cleanup:
     for (i = 0; i < dbCount; i++) {

src/sqlite-ce-edit/main.c

@@ -341,21 +341,21 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
                     DoOptions();
                     break;
                 case IDM_VIEWQUERY:
-                    SwitchView(0);
+                    SwitchView(VIEW_QUERY);
                     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);
+                    SwitchView(VIEW_RESULT);
                     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);
+                    SwitchView(VIEW_SCHEMA);
                     SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWQUERY, FALSE);
                     SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWRESULT, FALSE);
                     SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWSCHEMA, TRUE);

src/sqlite-ce-edit/schema.c

@@ -531,7 +531,7 @@ void OpenTableForEditing(const char *tablename) {
             /* Populate grid and switch to grid view */
             g_gridView = 1;
             PopulateGrid();
-            SwitchView(1);
+            SwitchView(VIEW_RESULT);
             SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWQUERY, FALSE);
             SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWRESULT, TRUE);
             SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWSCHEMA, FALSE);