github-starred/pgadmin3
2
0
Fork 0
mirror of https://github.com/levinsv/pgadmin3.git synced 2026-08-15 14:22:36 -06:00
Code Issues 6 Projects Packages Wiki Activity Actions

Merge
Some checks failed
CMake on a single platform / build (push) Has been cancelled
Details

Browse source
This commit is contained in:
lsv 2026-06-30 18:52:58 +05:00
commit e4511e4cec
2 changed files with 19 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

5
frm/frmExport.cpp
View file

@ -150,6 +150,11 @@ frmExport::frmExport(wxWindow *p)
wxString val;
settings->Read(wxT("Export/LastFile"), &val, wxEmptyString);
txtFilename->SetValue(val);
ctlSQLResult* ctrl= dynamic_cast<ctlSQLResult*>(parent);
if (!ctrl) {
chkXlsCopy->SetValue(false);
chkXlsCopy->Enable(false);
}
wxCommandEvent ev;
OnChange(ev);

38
frm/frmQuery.cpp
View file

@ -3140,7 +3140,10 @@ void frmQuery::OnExecute(wxCommandEvent &event)
}
}
}
execQuery(query);
if (event.GetId()==MNU_EXECFILE) {
execQuery(query, 0, false, 0, true);
} else
execQuery(query);
sqlQuery->SetFocus();
}
@ -3211,21 +3214,7 @@ void frmQuery::OnExecScript(wxCommandEvent &event)
void frmQuery::OnExecFile(wxCommandEvent &event)
{
if(sqlNotebook->GetSelection() == 1)
{
if (!updateFromGqb(true))
return;
}
wxString query = sqlQuery->GetSelectedText();
if (query.IsNull())
query = sqlQuery->GetText();
if (query.IsNull())
return;
execQuery(query, 0, false, 0, true);
sqlQuery->SetFocus();
OnExecute(event);
}
void frmQuery::OnAutoReplaceManage(wxCommandEvent &event)
{
@ -3341,9 +3330,6 @@ void frmQuery::execQuery(const wxString &query, int resultToRetrieve, bool singl
//sqlQuery->StartStyling(0);
//sqlQuery->SetStyling(sqlQuery->GetText().Length(), 0);
int i=sqlQueryBook->GetSelection();
sqlQueryBook->SetPageBitmap(i,CreateBitmap(wxColour(255,0,0)));
if (!sqlQuery->IsChanged())
setExtendedTitle();
@ -3353,9 +3339,6 @@ void frmQuery::execQuery(const wxString &query, int resultToRetrieve, bool singl
sqlResult=ctlSQL[indexResult];
sqlResult->ClearFilter();
ctlSBox[indexResult]=sqlQuery;
//
int idx=outputPane->GetPageIndex(sqlResult);
outputPane->SetPageBitmap(idx,CreateBitmap(wxNullColour));
QueryExecInfo *qi = new QueryExecInfo();
qi->queryOffset = queryOffset;
@ -3375,6 +3358,12 @@ void frmQuery::execQuery(const wxString &query, int resultToRetrieve, bool singl
return;
}
}
//
int i=sqlQueryBook->GetSelection();
sqlQueryBook->SetPageBitmap(i,CreateBitmap(wxColour(255,0,0)));
int idx=outputPane->GetPageIndex(sqlResult);
outputPane->SetPageBitmap(idx,CreateBitmap(wxNullColour));
// Remember the tab from which execute was called. By the time query completes, SQL tab selection may change.
sqlQueryExec = sqlQuery;
@ -3390,8 +3379,9 @@ void frmQuery::execQuery(const wxString &query, int resultToRetrieve, bool singl
SetStatusText(wxT(""), STATUSPOS_ROWS);
msgResult->Clear();
msgResult->SetFont(settings->GetSQLFont());
msgHistory->AppendText(wxString::Format(_("-- Executing query [%s]:\n"), sqlQueryExec->GetTitle(false).c_str()));
wxDateTime curr=wxDateTime::Now();
wxString str_curr=curr.FormatISOCombined(' ');
msgHistory->AppendText(wxString::Format(_("-- Executing query [%s]:[%s]\n"), sqlQueryExec->GetTitle(false).c_str(),str_curr.c_str()));
msgHistory->AppendText(query);
msgHistory->AppendText(wxT("\n"));
Update();