github-starred/pgadmin3
2
0
Fork 0
mirror of https://github.com/levinsv/pgadmin3.git synced 2026-05-25 22:03:16 -06:00
Code Issues 6 Projects Packages Wiki Activity Actions

Add new feature frmLog

Browse source 
Для окна состояние выполняется: set log_min_messages = FATAL
Для Log view добавлена: подержка быстрой навигации: Shift+KeyUP,KeyDOWN
переход на запись с тем же sql_state,
Alt+KeyUP,KeyDOWN - переход на запись с другим sql_state
Добавлена колонка Server - сервер с которого получен лог.
This commit is contained in:
lsv 2021-10-22 18:06:26 +05:00
parent 592cd1110b
commit 4db8267ae6
11 changed files with 196 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

93
utils/log/MyDataViewCtrl.cpp
View file

@ -132,8 +132,15 @@ void MyDataViewCtrl::ViewGroup(bool view) {
void MyDataViewCtrl::AddRow(wxString csvtext) {
StorageModel* m = dynamic_cast<StorageModel*>(GetModel());
wxDataViewItem select;
if (HasSelection()) select = GetSelection();
if (HasSelection()) {
//select = GetSelection();
if (GetSelectedItemsCount() == 1) {
wxDataViewItemArray sel;
GetSelections(sel);
if (sel.size()>0) select = sel[0];
}
}
if (m->Prepend(csvtext)) {
if (!select.IsOk()) return;
@ -396,11 +403,93 @@ void MyDataViewCtrl::OnEVT_DATAVIEW_COLUMN_HEADER_CLICK(wxDataViewEvent& event)
event.Skip(true);
}
void MyDataViewCtrl::OnKEY_UP(wxKeyEvent& event) {
// goto next state code
int go = 0;
if (event.GetKeyCode() == WXK_DOWN) {
go = 1;
}
if (event.GetKeyCode() == WXK_UP) {
go = -1;
}
bool reverse = false;
int currrow = -1;
wxDataViewItem item;
//find next state != current state
if ((event.GetModifiers() & wxMOD_ALT) == wxMOD_ALT) {
reverse = true;
item = this->GetCurrentItem();
}
//find next state == current state
if ((event.GetModifiers() & wxMOD_SHIFT) == wxMOD_SHIFT) {
item = this->GetCurrentItem();
}
if (item.IsOk() && (go != 0)) {
StorageModel* m = dynamic_cast<StorageModel*>(GetModel());
Storage* sta = m->getStorage();
wxVariant v, t;
int r = m->GetRow(item);
if (r != -1) {
m->GetValueByRow(v, r, 0);
}
else return;
int cnt = m->GetRowCount();
wxDataViewIconText ic;
ic << v;
wxString str = ic.GetText();
for (;;) {
r = r + go;
if (r < 0 || r >= cnt) break;
m->GetValueByRow(t, r, 0);
ic << t;
bool rez = ic.GetText() == str;
if (reverse) rez = !rez;
if (rez)
{
item = m->GetItem(r);
this->SetCurrentItem(item);
EnsureVisible(item);
break;
}
}
event.Skip(true);
return;
}
}
void MyDataViewCtrl::OnKEY_DOWN(wxKeyEvent& event) {
if ((event.GetModifiers() & wxMOD_CONTROL) == wxMOD_CONTROL) {
modctrl = true;
}
else modctrl = false;
int go = 0;
if (event.GetKeyCode() == WXK_DOWN) {
go = 1;
}
if (event.GetKeyCode() == WXK_UP) {
go = -1;
}
bool reverse = false;
int currrow = -1;
wxDataViewItem item;
//find next state != current state
if ((event.GetModifiers() & wxMOD_ALT) == wxMOD_ALT) {
reverse = true;
item = this->GetCurrentItem();
}
//find next state == current state
if ((event.GetModifiers() & wxMOD_SHIFT) == wxMOD_SHIFT) {
item = this->GetCurrentItem();
}
if (item.IsOk() && (go != 0)) {
event.Skip(false);
return;
}
event.Skip(true);
}