0.10.0.62: New view-specific context menu enhancements including editor clear, copy all results, collapse all Schema Explorer nodes

Author: nfinit

src/sqlite-ce-edit/editor.c

@@ -177,6 +177,7 @@ static void UpdateContextMenu(int mode) {
     /* Add only the active context menu */
     if (mode == 0) {
         hCtx = g_hQueryCtx;
+        CheckMenuItem(hCtx, IDM_EXECATCURSOR, g_execAtCursor ? MF_CHECKED : MF_UNCHECKED);
         AppendMenuW(hNewMenu, MF_POPUP, (UINT)hCtx, L"&Query");
     } else if (mode == 1) {
         hCtx = g_hResultCtx;

src/sqlite-ce-edit/globals.h

@@ -87,7 +87,7 @@ BOOL WINAPI GetSaveFileNameW(CE_OPENFILENAME*);
 ** Version
 **============================================================================*/
 
-#define SQLITECEDIT_VERSION L"0.10.0.59"
+#define SQLITECEDIT_VERSION L"0.10.0.62"
 
 /*============================================================================
 ** Menu IDs
@@ -141,6 +141,7 @@ BOOL WINAPI GetSaveFileNameW(CE_OPENFILENAME*);
 #define IDM_EXPORTALLDDL  705
 #define IDM_STATUSBAR     706
 #define IDM_FULLSCREEN    707
+#define IDM_COLLAPSEALL   708
 
 /* Edit menu */
 #define IDM_UNDO      801
@@ -150,6 +151,10 @@ BOOL WINAPI GetSaveFileNameW(CE_OPENFILENAME*);
 #define IDM_SELECTALL 805
 #define IDM_DELETE    806
 
+/* Results context menu */
+#define IDM_COPYALL      901
+#define IDM_CLEARRESULTS 902
+
 /* Timer IDs */
 #define IDT_TAPHOLD 1
 

src/sqlite-ce-edit/main.c

@@ -89,10 +89,16 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
             /* Create all three context menus upfront */
             g_hQueryCtx = CreatePopupMenu();
             AppendMenuW(g_hQueryCtx, MF_STRING, IDM_EXECUTE, L"&Execute\tCtrl+Enter");
+            AppendMenuW(g_hQueryCtx, MF_STRING, IDM_EXECATCURSOR, L"Execute at &Cursor");
+            AppendMenuW(g_hQueryCtx, MF_SEPARATOR, 0, NULL);
+            AppendMenuW(g_hQueryCtx, MF_STRING, IDM_CLEAR, L"C&lear Editor");
 
             g_hResultCtx = CreatePopupMenu();
             AppendMenuW(g_hResultCtx, MF_STRING, IDM_VIEWGRID, L"&Grid View\tCtrl+G");
             AppendMenuW(g_hResultCtx, MF_SEPARATOR, 0, NULL);
+            AppendMenuW(g_hResultCtx, MF_STRING, IDM_COPYALL, L"&Copy All");
+            AppendMenuW(g_hResultCtx, MF_STRING, IDM_CLEARRESULTS, L"C&lear Results");
+            AppendMenuW(g_hResultCtx, MF_SEPARATOR, 0, NULL);
             AppendMenuW(g_hResultCtx, MF_STRING, IDM_EXPORTRESULTS, L"&Export Results...");
             AppendMenuW(g_hResultCtx, MF_STRING, IDM_EXPORTHTMLRES, L"Export &HTML...");
 
@@ -106,6 +112,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
                 AppendMenuW(g_hSchemaCtx, MF_POPUP, (UINT)hSelObj, L"Selected &Object");
                 AppendMenuW(g_hSchemaCtx, MF_SEPARATOR, 0, NULL);
                 AppendMenuW(g_hSchemaCtx, MF_STRING, IDM_REFRESH, L"&Refresh");
+                AppendMenuW(g_hSchemaCtx, MF_STRING, IDM_COLLAPSEALL, L"&Collapse All");
                 AppendMenuW(g_hSchemaCtx, MF_STRING, IDM_EXPORTALLDDL, L"Export &All DDL...");
                 AppendMenuW(g_hSchemaCtx, MF_SEPARATOR, 0, NULL);
                 AppendMenuW(g_hSchemaCtx, MF_STRING, IDM_SHOWSIZES, L"Show &Details");
@@ -341,6 +348,27 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
                 case IDM_FIND:    DoFind(); break;
                 case IDM_FINDNEXT: DoFindNext(); break;
                 case IDM_REPLACE: DoReplace(); break;
+                case IDM_CLEAR:
+                    if (g_viewMode == VIEW_QUERY) {
+                        SetWindowTextW(g_hwndQuery, L"");
+                        g_queryDirty = 0;
+                        UpdateLineNumbers();
+                    }
+                    break;
+                case IDM_COPYALL:
+                    if (g_viewMode == VIEW_RESULT && !g_gridView) {
+                        SendMessage(g_hwndResult, EM_SETSEL, 0, -1);
+                        SendMessage(g_hwndResult, WM_COPY, 0, 0);
+                        SendMessage(g_hwndResult, EM_SETSEL, 0, 0);
+                    }
+                    break;
+                case IDM_CLEARRESULTS:
+                    if (g_viewMode == VIEW_RESULT) {
+                        SetWindowTextW(g_hwndResult, L"");
+                        FreeLastResults();
+                        if (g_gridView) PopulateGrid();
+                    }
+                    break;
                 case IDM_ABOUT:
                     DoAbout();
                     break;
@@ -372,6 +400,19 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
                 case IDM_REFRESH:
                     if (g_viewMode == 2) RefreshSchema();
                     break;
+                case IDM_COLLAPSEALL:
+                    if (g_viewMode == 2 && g_hwndSchema) {
+                        /* Collapse category nodes (Tables/Views/Triggers) but keep db root expanded */
+                        HTREEITEM hRoot = TreeView_GetRoot(g_hwndSchema);
+                        if (hRoot) {
+                            HTREEITEM hChild = TreeView_GetChild(g_hwndSchema, hRoot);
+                            while (hChild) {
+                                TreeView_Expand(g_hwndSchema, hChild, TVE_COLLAPSE);
+                                hChild = TreeView_GetNextSibling(g_hwndSchema, hChild);
+                            }
+                        }
+                    }
+                    break;
                 case IDM_SHOWSIZES:
                     g_showSizes = !g_showSizes;
                     ForceMenuRebuild();