From b5ec42108588c8b924d864b04baabb39c380134d Mon Sep 17 00:00:00 2001 From: lsv Date: Wed, 21 Jan 2026 17:33:36 +0500 Subject: [PATCH] Little fixes. Added a hotkey to generate. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Два первых шаблона генерации можно вызвать Ctrl+1 и Ctrl+2 соответственно. --- frm/frmQuery.cpp | 33 ++++++++++++++++++++------------- tests/test_Formatter.cpp | 2 +- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/frm/frmQuery.cpp b/frm/frmQuery.cpp index 0c3dbbe..939649a 100644 --- a/frm/frmQuery.cpp +++ b/frm/frmQuery.cpp @@ -575,20 +575,22 @@ frmQuery::frmQuery(frmMain *form, const wxString &_title, pgConn *_conn, const w entries[idx++].Set(wxACCEL_CTRL, (int)'E', MNU_EXECUTE); entries[idx++].Set(wxACCEL_CTRL, (int)'O', MNU_OPEN); entries[idx++].Set(wxACCEL_CTRL, (int)'S', MNU_SAVE); - entries[idx++].Set(wxACCEL_CMD, (int)'S', MNU_SAVE); entries[idx++].Set(wxACCEL_CTRL, (int)'F', MNU_FIND); entries[idx++].Set(wxACCEL_CTRL, (int)'R', MNU_REPLACE); entries[idx++].Set(wxACCEL_NORMAL, WXK_F8, MNU_EXECUTE); entries[idx++].Set(wxACCEL_NORMAL, WXK_F7, MNU_EXPLAIN); entries[idx++].Set(wxACCEL_ALT, WXK_PAUSE, MNU_CANCEL); entries[idx++].Set(wxACCEL_CTRL, (int)'A', MNU_SELECTALL); - entries[idx++].Set(wxACCEL_CMD, (int)'A', MNU_SELECTALL); entries[idx++].Set(wxACCEL_NORMAL, WXK_F1, MNU_HELP); entries[idx++].Set(wxACCEL_CTRL, (int)'N', MNU_NEW); entries[idx++].Set(wxACCEL_NORMAL, WXK_F6, MNU_EXECPGS); entries[idx++].Set(wxACCEL_NORMAL, WXK_F5, MNU_EXECFILE); entries[idx++].Set(wxACCEL_CTRL, (int)'T', MNU_NEWSQLTAB); + entries[idx++].Set(wxACCEL_CTRL, (int)'1', MNU_GENERATESQL+1); + entries[idx++].Set(wxACCEL_CTRL, (int)'2', MNU_GENERATESQL+2); + + wxAcceleratorTable accel(idx, entries); SetAcceleratorTable(accel); wxLogInfo(wxT("frmQuery::Create key map Ok")); @@ -2311,14 +2313,17 @@ void frmQuery::OnCopy_WhereList(wxCommandEvent& ev) void frmQuery::OnGenerateInvoke(wxCommandEvent& ev) { // if (currentControl() == sqlResult) - int id=ev.GetId(); - wxMenu* mi = static_cast(ev.GetEventObject()); - wxString templ = mi->GetHelpString(id); + int id=ev.GetId()-MNU_GENERATESQL-1; + wxString s = _("No template generate."); + //wxMenu* mi = static_cast(ev.GetEventObject()); + if (id>=0 && idGenerateTemplate(templ,0); SetStatusText(s, STATUSPOS_MSGS); } + } else + SetStatusText(s, STATUSPOS_MSGS); } void frmQuery::OnCopy_TableToHtml(wxCommandEvent& ev) { @@ -4577,13 +4582,15 @@ void frmQuery::OnSqlBookPageChanging(wxAuiNotebookEvent& event) } if (sqlQueryBook->GetPageCount() > 1) { - size_t curpage = sqlQueryBook->GetSelection(); - sqlQuery = wxDynamicCast(sqlQueryBook->GetPage(curpage), ctlSQLBox); - if (sqlQuery != NULL) - { - //wxString activePage = sqlNotebook->GetPageText(curpage); - wxString activePage = sqlQuery->GetTitle(false); - fileMarkerActive(false, activePage); + int curpage = sqlQueryBook->GetSelection(); + if (curpage!=wxNOT_FOUND) { + sqlQuery = wxDynamicCast(sqlQueryBook->GetPage(curpage), ctlSQLBox); + if (sqlQuery != NULL) + { + //wxString activePage = sqlNotebook->GetPageText(curpage); + wxString activePage = sqlQuery->GetTitle(false); + fileMarkerActive(false, activePage); + } } } } diff --git a/tests/test_Formatter.cpp b/tests/test_Formatter.cpp index c86ed8d..6de21cd 100644 --- a/tests/test_Formatter.cpp +++ b/tests/test_Formatter.cpp @@ -317,7 +317,7 @@ delete from t2 using t4,t5 where t4.id=t5 and t2.id=t4.id returning t2.id; end )"); std::vector list = f2.ParsePLpgsql(); o=f2.GetListTable(list); - exp = "[ f1,] \n[ f2,] \n[ tab1,] \n[ f3,] \n[ f4,] \n[ t2,] \n[ t5,] \n"; + exp = "[ f1,] \n[ f2,] \n[ tab1,] \n[ f3,] \n[ f4,] \n[ t2,] \n[ t4,] \n[ t5,] \n"; CHECK(o==exp); }