mirror of
https://github.com/levinsv/pgadmin3.git
synced 2026-05-21 06:45:27 -06:00
The context menu of the "Log File" window has been removed. Clicking on the right button opens the row preview.
Убрано контекстное меню с командами. Нужно использовать горяции клавиши для вызова команд. Правая кнопка вызывает окно просмотра строки лога.
This commit is contained in:
parent
b5ec421085
commit
24fcdc4e0e
3 changed files with 17 additions and 7 deletions
|
|
@ -437,6 +437,7 @@ bool ctlNavigatePanel::RunKeyCommand(wxKeyEvent& event,int numCmd) {
|
||||||
}
|
}
|
||||||
if (help) {
|
if (help) {
|
||||||
wxMessageBox(helpstr, _("Help"));
|
wxMessageBox(helpstr, _("Help"));
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|
|
||||||
|
|
@ -387,7 +387,7 @@ wxString ctlSQLResult::GenerateTemplate(wxString &templ,int action)
|
||||||
if (c=='a') isalign=true;
|
if (c=='a') isalign=true;
|
||||||
else if (c=='e') e.flags.no_quote=true;
|
else if (c=='e') e.flags.no_quote=true;
|
||||||
else {
|
else {
|
||||||
wxString msg=wxString::Format(_("Incorrect flag at the %s column."),col);
|
wxString msg=wxString::Format(_("Incorrect flag at the '%s' column."),col);
|
||||||
if (action == 0) wxMessageBox(msg);
|
if (action == 0) wxMessageBox(msg);
|
||||||
return msg;
|
return msg;
|
||||||
}
|
}
|
||||||
|
|
@ -409,13 +409,13 @@ wxString ctlSQLResult::GenerateTemplate(wxString &templ,int action)
|
||||||
if (c=='@') {
|
if (c=='@') {
|
||||||
isvar=false;
|
isvar=false;
|
||||||
if (col.Len()==0) {
|
if (col.Len()==0) {
|
||||||
wxString msg=wxString::Format(_("The column name empty. %s ."),templ.substr(startvarpos,pos-startvarpos));
|
wxString msg=wxString::Format(_("The column name empty. '%s' ."),templ.substr(startvarpos,pos-startvarpos));
|
||||||
if (action == 0) wxMessageBox(msg);
|
if (action == 0) wxMessageBox(msg);
|
||||||
return msg;
|
return msg;
|
||||||
}
|
}
|
||||||
int idx=colNames.Index(col);
|
int idx=colNames.Index(col);
|
||||||
if (idx==wxNOT_FOUND) {
|
if (idx==wxNOT_FOUND) {
|
||||||
wxString msg=wxString::Format(_("The column name %s was not found in the query results."),col);
|
wxString msg=wxString::Format(_("The column name '%s' was not found in the query results."),col);
|
||||||
if (action == 0) wxMessageBox(msg);
|
if (action == 0) wxMessageBox(msg);
|
||||||
return msg;
|
return msg;
|
||||||
}
|
}
|
||||||
|
|
@ -439,7 +439,7 @@ wxString ctlSQLResult::GenerateTemplate(wxString &templ,int action)
|
||||||
}
|
}
|
||||||
if (isvar )
|
if (isvar )
|
||||||
{
|
{
|
||||||
wxString msg=wxString::Format(_("The column name %s is not closed."),col);
|
wxString msg=wxString::Format(_("The column name '%s' is not closed."),col);
|
||||||
if (action == 0) wxMessageBox(msg);
|
if (action == 0) wxMessageBox(msg);
|
||||||
return msg;
|
return msg;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4803,9 +4803,18 @@ void frmStatus::OnMoveMouseLog(wxMouseEvent& event)
|
||||||
void frmStatus::OnRightClickLogGrid(wxListEvent& event)
|
void frmStatus::OnRightClickLogGrid(wxListEvent& event)
|
||||||
{
|
{
|
||||||
delayHitLog->Stop();
|
delayHitLog->Stop();
|
||||||
wxMenu* logListPopupMenu;
|
lastmouse = wxGetMousePosition();
|
||||||
logListPopupMenu = nav->GetPopupMenu();
|
wxTimerEvent tm;
|
||||||
logList->PopupMenu(logListPopupMenu, event.GetPoint());
|
//logList->GetItem();
|
||||||
|
//int flags = wxLIST_HITTEST_ONITEMLABEL;
|
||||||
|
//long item=logList->HitTest(mp,flags);
|
||||||
|
long item=event.GetIndex();
|
||||||
|
lastlogitem=item;
|
||||||
|
lastlogitemShow=-1;
|
||||||
|
OnTimerHintLog(tm);
|
||||||
|
// wxMenu* logListPopupMenu;
|
||||||
|
// logListPopupMenu = nav->GetPopupMenu();
|
||||||
|
// logList->PopupMenu(logListPopupMenu, event.GetPoint());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue