From 5aeb93b625c069d714883ee38311a4f3bb6146b8 Mon Sep 17 00:00:00 2001
From: lsv <gtm7@yandex.ru>
Date: Thu, 27 Mar 2025 10:13:11 +0500
Subject: [PATCH] Optimization for linux.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Исправлено форматирование и учтены особенности GTK для корректного
отображения Log View.
---
 ctl/explainShape.cpp       | 1066 ++++++++++----------
 frm/frmLog.cpp             | 1907 ++++++++++++++++++------------------
 utils/log/StorageModel.cpp |   33 +-
 3 files changed, 1517 insertions(+), 1489 deletions(-)

diff --git a/ctl/explainShape.cpp b/ctl/explainShape.cpp
index 7ed166a..4c6e2d9 100644
--- a/ctl/explainShape.cpp
+++ b/ctl/explainShape.cpp
@@ -80,568 +80,582 @@
 
 ExplainShape::ExplainShape(const wxImage &bmp, const wxString &description, long tokenNo, long detailNo)
 {
-	SetBitmap(wxBitmap(bmp));
-	SetLabel(description, tokenNo, detailNo);
-	SetDisableLabel(true);
-	kidCount = 0;
-	totalShapes = 0;
-	usedShapes = 0;
-	m_rootShape = false;
+    SetBitmap(wxBitmap(bmp));
+    SetLabel(description, tokenNo, detailNo);
+    SetDisableLabel(true);
+    kidCount = 0;
+    totalShapes = 0;
+    usedShapes = 0;
+    m_rootShape = false;
 }
 
 
 void ExplainShape::SetLabel(const wxString &str, int tokenNo, int detailNo)
 {
-	if (tokenNo < 0)
-	{
-		description = str;
-		label = str;
-	}
-	else
-	{
-		wxStringTokenizer tokens(str, wxT(" "));
+    if (tokenNo < 0)
+    {
+        description = str;
+        label = str;
+    }
+    else
+    {
+        wxStringTokenizer tokens(str, wxT(" "));
 
-		while (tokenNo-- >= 0)
-		{
-			label = tokens.GetNextToken();
+        while (tokenNo-- >= 0)
+        {
+            label = tokens.GetNextToken();
 
-			if (detailNo <= 0)
-			{
-				if (!description.IsEmpty())
-					description.Append(wxT(" "));
+            if (detailNo <= 0)
+            {
+                if (!description.IsEmpty())
+                    description.Append(wxT(" "));
 
-				description.Append(label);
-			}
-		}
-		if (detailNo > 0)
-		{
-			tokens.SetString(str, wxT(" "));
+                description.Append(label);
+            }
+        }
+        if (detailNo > 0)
+        {
+            tokens.SetString(str, wxT(" "));
 
-			while (detailNo--)
-			{
-				if (!description.IsEmpty())
-					description.Append(wxT(" "));
+            while (detailNo--)
+            {
+                if (!description.IsEmpty())
+                    description.Append(wxT(" "));
 
-				description.Append(tokens.GetNextToken());
-			}
-			detail = tokens.GetString();
-		}
-	}
+                description.Append(tokens.GetNextToken());
+            }
+            detail = tokens.GetString();
+        }
+    }
 }
-
+typedef struct autospacesolver {
+    int flags = 0;
+    wxSize min{-1,-1};
+    wxSize max;
+} autospacesolver;
 void ExplainShape::OnDraw(wxDC &dc)
 {
-	wxBitmap &bmp = GetBitmap();
-	if (!bmp.Ok())
-		return;
+    wxBitmap &bmp = GetBitmap();
+    if (!bmp.Ok())
+        return;
 
-	// We do not draw the root shape
-	if (m_rootShape)
-		return;
-	wxRect trg=GetCanvas()->GetClientRect();
-	wxMouseEvent ev;
-	ev.m_x = 0;
-	ev.m_y = 0;
-	wxPoint logPos(ev.GetLogicalPosition(dc));
-	ev.m_x = trg.x+trg.width;
-	ev.m_y = trg.height;
-	wxPoint logPos2(ev.GetLogicalPosition(dc));
-	wxRect cliprect(logPos, logPos2);
-	double width = 0.0, height = 0.0;
-	GetBoundingBoxMin(&width,&height);
-	wxRect sp((int)(GetX()), (int)(GetY()), (int) (width), (int)(height));
-	//int x = (int)(GetX() + (width ));
-	//int y = (int)(GetY() + (height));
-	if (!cliprect.Intersects(sp)) {
-		if (dynamic_cast<ExplainCanvas *>(GetCanvas())->isneedoptimizedraw) return;
-		
-	}
-	// dynamic bitmap
-	bool bmpdynamic = false;
-	wxBitmap bmpm(bmp.GetWidth(),bmp.GetHeight());
-	if (label.StartsWith("Memoize")) {
-		wxPen p = dc.GetPen();
-		wxMemoryDC dc2;
-		dc2.SelectObject(bmpm);
-		//dc2.SetBackgroundMode(wxBRUSHSTYLE_SOLID);
-		dc2.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)));
-		dc2.Clear();
-		int w = bmpm.GetWidth();
-		int h = bmpm.GetHeight();
-		dc2.DrawRectangle(0, 0, w, h);
-		wxRegEx r("Hits: (\\d+)  Misses: (\\d+)  Evictions: (\\d+)  Overflows: (\\d+)  Memory Usage: (\\d+\\S+)");
-		long hit=0, mis=0, evi=0, ovr=0;
-		wxString mem;
-		int x = 0, y = 0;
-		int tw, th;
-		wxString txt = _("Cache");
-		wxFont f(GetCanvas()->GetFont());
-		f.SetPointSize(8);
-		mem = f.GetNativeFontInfoDesc();
-		dc2.SetFont(f);
-		dc2.SetPen(p);
-		//dc2.SetTextForeground(*wxBLACK);
-		//dc2.SetTextBackground(*wxWHITE);
-		dc2.GetTextExtent(txt, &tw, &th);
-		int border = 2;
-		y += border;
-		x = (w - tw) / 2;
-		dc2.DrawText(txt, x, y);
-		y += th+ border;
-		//dc2.DrawText("TEst", 0, 0);
-		mem = wxEmptyString;
-		if (r.Matches(condition)) {
-			hit=StrToLong( r.GetMatch(condition, 1));
-			mis = StrToLong(r.GetMatch(condition, 2));
-			evi = StrToLong(r.GetMatch(condition, 3));
-			ovr = StrToLong(r.GetMatch(condition, 4));
-			mem = (r.GetMatch(condition, 5));
-		}
-		wxRect rect(border, y, w - 2 * border, th / 2);
-		//dc2.DrawRectangle(0, 0, w, h);
-		if ((mis + hit) > 0) {
-			int hitwidth = rect.width * hit * 1.0 / (mis + hit);
-			{
-				wxDCPenChanger ppen(dc2, *wxTRANSPARENT_PEN);
-				//wxColour c(wxString("#00FF00"));
-				wxColour c(*wxGREEN);
-				wxDCBrushChanger br(dc2, wxBrush(c));
-				//dc2.SetBrush(*wxGREEN_BRUSH);
-				dc2.DrawRectangle(BMP_BORDER, y, hitwidth, rect.height);
-				dc2.SetPen(dc.GetPen());
-				dc2.SetBrush(*wxTRANSPARENT_BRUSH);
-				dc2.DrawRectangle(rect);
-			}
-			y += rect.height + border;
-		}
-		else {
-			wxDCBrushChanger br(dc2, wxBrush(p.GetColour(), wxHATCHSTYLE_BDIAGONAL));
-			rect.x = 0; rect.width = w; rect.height = h - y;
-			dc2.DrawRectangle(rect);
-		}
-		if (!mem.IsEmpty()) {
-			mem = "" + mem;
-			dc2.DrawText(mem, border, y);
-			y += th;
-		}
-		x = border;
-		if (evi > 0) {
-			wxDCBrushChanger br(dc2, wxBrush(*wxBLUE));
-			int r = 4;
-			wxPoint p(x+r,y+r);
-			dc2.DrawCircle(p, r);
-			//y + 2 * r + 1;
-			x += 2 * r + r;
-		}
-		if (ovr > 0) {
-			wxDCBrushChanger br(dc2, wxBrush(*wxRED));
-			int r = 4;
-			wxPoint p(x + r, y + r);
-			dc2.DrawCircle(p, r);
-			x += 2 * r + 3;
-		}
+    // We do not draw the root shape
+    if (m_rootShape)
+        return;
+    wxRect trg=GetCanvas()->GetClientRect();
+    wxMouseEvent ev;
+    ev.m_x = 0;
+    ev.m_y = 0;
+    wxPoint logPos(ev.GetLogicalPosition(dc));
+    ev.m_x = trg.x+trg.width;
+    ev.m_y = trg.height;
+    wxPoint logPos2(ev.GetLogicalPosition(dc));
+    wxRect cliprect(logPos, logPos2);
+    double width = 0.0, height = 0.0;
+    GetBoundingBoxMin(&width,&height);
+    wxRect sp((int)(GetX()), (int)(GetY()), (int) (width), (int)(height));
+    //int x = (int)(GetX() + (width ));
+    //int y = (int)(GetY() + (height));
+    if (!cliprect.Intersects(sp)) {
+        if (dynamic_cast<ExplainCanvas *>(GetCanvas())->isneedoptimizedraw) return;
+        
+    }
+    // dynamic bitmap
+    bool bmpdynamic = false;
+    wxBitmap bmpm(bmp.GetWidth(),bmp.GetHeight());
+    if (label.StartsWith("Memoize")) {
+        wxPen p = dc.GetPen();
+        wxMemoryDC dc2;
+        dc2.SelectObject(bmpm);
+        //dc2.SetBackgroundMode(wxBRUSHSTYLE_SOLID);
+        dc2.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)));
+        dc2.Clear();
+        int w = bmpm.GetWidth();
+        int h = bmpm.GetHeight();
+        dc2.DrawRoundedRectangle(wxRect(0, 0, w, h),2);
+        //dc2.DrawRectangle(0, 0, w, h);
+        wxRegEx r("Hits: (\\d+)  Misses: (\\d+)  Evictions: (\\d+)  Overflows: (\\d+)  Memory Usage: (\\d+\\S+)");
+        long hit=0, mis=0, evi=0, ovr=0;
+        wxString mem;
+        int x = 0, y = 0;
+        int tw, th;
+        wxString txt = _("Cache");
+        wxFont f(GetCanvas()->GetFont());
+        f.SetPointSize(8);
+        mem = f.GetNativeFontInfoDesc();
+        dc2.SetFont(f);
+        dc2.SetPen(p);
+        //dc2.SetTextForeground(*wxBLACK);
+        //dc2.SetTextBackground(*wxWHITE);
+        dc2.GetTextExtent(txt, &tw, &th);
+        int border = 2;
+        y += border;
+        x = (w - tw) / 2;
+        dc2.DrawText(txt, x, y);
+        y += th+ border;
+        //dc2.DrawText("TEst", 0, 0);
+        mem = wxEmptyString;
+        int spaceV = h-y; // label Cache
+        int rr = 4;
+        int h_line = th / 2;
+        if (r.Matches(condition)) {
+            hit=StrToLong( r.GetMatch(condition, 1));
+            mis = StrToLong(r.GetMatch(condition, 2));
+            evi = StrToLong(r.GetMatch(condition, 3));
+            ovr = StrToLong(r.GetMatch(condition, 4));
+            mem = (r.GetMatch(condition, 5));
+            spaceV = spaceV - th;  // memory usage
+            if (evi || ovr) {
+                spaceV = spaceV - 2 * rr;
+                if (spaceV < 8) {
+                    border = 1; h_line = 6; rr = 3;
+                }
+            }
+        }
+        wxRect rect(border, y, w - 2 * border, h_line);
+        //dc2.DrawRectangle(0, 0, w, h);
+        if ((mis + hit) > 0) {
+            int hitwidth = rect.width * hit * 1.0 / (mis + hit);
+            {
+                wxDCPenChanger ppen(dc2, *wxTRANSPARENT_PEN);
+                //wxColour c(wxString("#00FF00"));
+                wxColour c(*wxGREEN);
+                wxDCBrushChanger br(dc2, wxBrush(c));
+                //dc2.SetBrush(*wxGREEN_BRUSH);
+                dc2.DrawRectangle(BMP_BORDER, y, hitwidth, rect.height);
+                dc2.SetPen(dc.GetPen());
+                dc2.SetBrush(*wxTRANSPARENT_BRUSH);
+                dc2.DrawRoundedRectangle(rect,(double)2.0);
+                
+            }
+            y += rect.height + border;
+        }
+        else {
+            wxDCBrushChanger br(dc2, wxBrush(p.GetColour(), wxHATCHSTYLE_BDIAGONAL));
+            rect.x = 0; rect.width = w; rect.height = h - y;
+            dc2.DrawRectangle(rect);
+        }
+        if (!mem.IsEmpty()) {
+            mem = "" + mem;
+            dc2.DrawText(mem, border, y);
+            y += th;
+        }
+        x = border;
+        if (evi > 0) {
+            wxDCBrushChanger br(dc2, wxBrush(*wxBLUE));
+            wxPoint p(x+rr,y+rr);
+            dc2.DrawCircle(p, rr);
+            //y + 2 * r + 1;
+            x += 2 * rr + rr;
+        }
+        if (ovr > 0) {
+            wxDCBrushChanger br(dc2, wxBrush(*wxRED));
+            wxPoint p(x + rr, y + rr);
+            dc2.DrawCircle(p, rr);
+            x += 2 * rr + 3;
+        }
 
-		{
-			wxPen p = dc.GetPen();
-			wxDCPenChanger ppen(dc2, wxPen(p.GetColour(), 2));
-			//dc2.DrawLine(wxPoint(0, 0), wxPoint(w, h));
-			//dc2.DrawLine(wxPoint(w, 0), wxPoint(0, h));
-		}
-		dc2.SelectObject(wxNullBitmap);
-		bmpdynamic = true;
-	}
-	int x, y;
-	x = WXROUND(m_xpos - bmp.GetWidth() / 2.0);
-	y = WXROUND(m_ypos - GetHeight() / 2.0);
+        {
+            wxPen p = dc.GetPen();
+            wxDCPenChanger ppen(dc2, wxPen(p.GetColour(), 2));
+            //dc2.DrawLine(wxPoint(0, 0), wxPoint(w, h));
+            //dc2.DrawLine(wxPoint(w, 0), wxPoint(0, h));
+        }
+        dc2.SelectObject(wxNullBitmap);
+        bmpdynamic = true;
+    }
+    int x, y;
+    x = WXROUND(m_xpos - bmp.GetWidth() / 2.0);
+    y = WXROUND(m_ypos - GetHeight() / 2.0);
 
-	if (bmpdynamic) dc.DrawBitmap(bmpm, x, y, true); else dc.DrawBitmap(bmp, x, y, true);
+    if (bmpdynamic) dc.DrawBitmap(bmpm, x, y, true); else dc.DrawBitmap(bmp, x, y, true);
 
-	int w, h;
-	dc.SetFont(GetCanvas()->GetFont());
-	dc.GetTextExtent(label.Trim(), &w, &h);
+    int w, h;
+    dc.SetFont(GetCanvas()->GetFont());
+    dc.GetTextExtent(label.Trim(), &w, &h);
 
-	x = WXROUND(m_xpos - w / 2.0);
-	y += bmp.GetHeight() + BMP_BORDER;
+    x = WXROUND(m_xpos - w / 2.0);
+    y += bmp.GetHeight() + BMP_BORDER;
 
-	dc.DrawText(label.Trim(), x, y);
+    dc.DrawText(label.Trim(), x, y);
 }
 
 
 void ExplainShape::OnLeftClick(double x, double y, int keys, int attachment)
 {
-	((ExplainCanvas *)GetCanvas())->ShowPopup(this);
+    ((ExplainCanvas *)GetCanvas())->ShowPopup(this);
 }
 
 
 #define ARROWMARGIN 5
 wxRealPoint ExplainShape::GetStartPoint()
 {
-	wxRealPoint rp(GetX() + GetBitmap().GetWidth() / 2.0 + ARROWMARGIN, GetY() - (GetHeight() - GetBitmap().GetHeight()) / 2.);
-	return rp;
+    wxRealPoint rp(GetX() + GetBitmap().GetWidth() / 2.0 + ARROWMARGIN, GetY() - (GetHeight() - GetBitmap().GetHeight()) / 2.);
+    return rp;
 }
 
 
 wxRealPoint ExplainShape::GetEndPoint(int kidNo)
 {
-	wxRealPoint rp(GetX() - GetBitmap().GetWidth() / 2.0 - ARROWMARGIN, GetY() - (GetHeight() - GetBitmap().GetHeight()) / 2. + (kidCount > 1 ? GetBitmap().GetHeight() * 2. / 3. * kidNo / (2 * kidCount - 2) : 0 ));
-	return rp;
+    wxRealPoint rp(GetX() - GetBitmap().GetWidth() / 2.0 - ARROWMARGIN, GetY() - (GetHeight() - GetBitmap().GetHeight()) / 2. + (kidCount > 1 ? GetBitmap().GetHeight() * 2. / 3. * kidNo / (2 * kidCount - 2) : 0 ));
+    return rp;
 }
 
 
 
 ExplainShape *ExplainShape::Create(long level, ExplainShape *last, const wxString &str)
 {
-	ExplainShape *s = 0;
+    ExplainShape *s = 0;
 
-	int costPos = str.Find(wxT("(cost="));
-	int actPos = str.Find(wxT("(actual"));
-	bool parallel=false;
-	int inc=0;
-	wxStringTokenizer tokens(str, wxT(" "));
-	wxString token = tokens.GetNextToken();
-	if (token == wxT("Parallel")) 
-		{
-			token = tokens.GetNextToken();
-			parallel=true;
-			inc=1;
-		}
-	
-	wxString token2 = tokens.GetNextToken();
-	wxString token3 = tokens.GetNextToken();
-	wxString token4;
-	if (tokens.HasMoreTokens())
-		token4 = tokens.GetNextToken();
-	wxString descr;
-	if (costPos > 0)
-		descr = str.Left(costPos);
-	else if (actPos > 0)
-		descr = str.Left(actPos);
-	else
-		descr = str;
+    int costPos = str.Find(wxT("(cost="));
+    int actPos = str.Find(wxT("(actual"));
+    bool parallel=false;
+    int inc=0;
+    wxStringTokenizer tokens(str, wxT(" "));
+    wxString token = tokens.GetNextToken();
+    if (token == wxT("Parallel")) 
+        {
+            token = tokens.GetNextToken();
+            parallel=true;
+            inc=1;
+        }
+    
+    wxString token2 = tokens.GetNextToken();
+    wxString token3 = tokens.GetNextToken();
+    wxString token4;
+    if (tokens.HasMoreTokens())
+        token4 = tokens.GetNextToken();
+    wxString descr;
+    if (costPos > 0)
+        descr = str.Left(costPos);
+    else if (actPos > 0)
+        descr = str.Left(actPos);
+    else
+        descr = str;
 
-	// Requested an empty shape, which can be treated as a root shape
-	if (level == 0)
-	{
-		s = new ExplainShape(*ex_unknown_png_img, wxEmptyString);
-		s->SetDraggable(false);
-		s->m_rootShape = true;
-		s->level = level;
-		int w = 50, h = 20;
+    // Requested an empty shape, which can be treated as a root shape
+    if (level == 0)
+    {
+        s = new ExplainShape(*ex_unknown_png_img, wxEmptyString);
+        s->SetDraggable(false);
+        s->m_rootShape = true;
+        s->level = level;
+        int w = 50, h = 20;
 
-		wxBitmap &bmp = s->GetBitmap();
-		if (w < bmp.GetWidth())
-			w = bmp.GetWidth();
+        wxBitmap &bmp = s->GetBitmap();
+        if (w < bmp.GetWidth())
+            w = bmp.GetWidth();
 
-		s->SetHeight(bmp.GetHeight() + BMP_BORDER + h);
-		s->SetWidth(w);
+        s->SetHeight(bmp.GetHeight() + BMP_BORDER + h);
+        s->SetWidth(w);
 
-		s->upperShape = NULL;
-		s->kidNo = 0;
+        s->upperShape = NULL;
+        s->kidNo = 0;
 
-		return s;
-	}
+        return s;
+    }
 
 
-	// possible keywords can be found in postgresql/src/backend/commands/explain.c
+    // possible keywords can be found in postgresql/src/backend/commands/explain.c
 
-	if (token == wxT("Total"))              return 0;
-	else if (token == wxT("Trigger"))       return 0;
-	else if (token == wxT("Settings:"))		return 0;		/* Greenplum */
-	else if (token == wxT("Slice"))			return 0;		/* Greenplum */
-	else if (token.Mid(0, 6) == wxT("(slice"))	return 0;	/* Greenplum */
-	else if (token == wxT("Result"))        s = new ExplainShape(*ex_result_png_img, descr);
-	else if (token == wxT("Append"))        s = new ExplainShape(*ex_append_png_img, descr);
-	else if (token == wxT("Gather"))	    s = new ExplainShape(*ex_gatcher_png_img, descr);
-	else if (token == wxT("Partial") && token2 == wxT("GroupAggregate"))  s = new ExplainShape(*ex_partial_aggregate_png_img, descr);
-	else if (token == wxT("Finalize") && token2 == wxT("GroupAggregate"))  s = new ExplainShape(*ex_finalize_aggregate_png_img, descr);
-	else if (token == wxT("Nested"))
-	{
-		if (token2 == wxT("Loop") && token4 == wxT("Join"))
-		{
-			// Nested Loop Anti Join
-			if (token3 == wxT("Anti"))
-			{
-				s = new ExplainShape(*ex_nested_loop_anti_join_png_img, descr);
-			}
-			// Nested Loop Semi Join
-			else
-			{
-				s = new ExplainShape(*ex_nested_loop_semi_join_png_img, descr);
-			}
-		}
-		if (!s)
-			s = new ExplainShape(*ex_nested_png_img, descr);
-	}
-	else if (token == wxT("Merge"))
-	{
-		if (token3 == wxT("Join"))
-		{
-			// Merge Anti Join
-			if (token2 == wxT("Anti"))
-			{
-				s = new ExplainShape(*ex_merge_anti_join_png_img, descr);
-			}
-			// Merge Semi Join
-			else
-			{
-				s = new ExplainShape(*ex_merge_semi_join_png_img, descr);
-			}
-		}
-		// Merge Append
-		else if (token2 == wxT("Append"))
-		{
-			s = new ExplainShape(*ex_merge_append_png_img, descr);
-		}
-		else
-		{
-			s = new ExplainShape(*ex_merge_png_img, descr);
-		}
-	}
-	else if (token == wxT("Hash"))
-	{
-		if (token2 == wxT("Join"))
-		{
-			s = new ExplainShape(*ex_join_png_img, descr);
-		}
-		else
-		{
-			if (token3 == wxT("Join"))
-			{
-				// Hash Anti Join
-				if (token2 == wxT("Anti"))
-				{
-					s = new ExplainShape(*ex_hash_anti_join_png_img, descr);
-				}
-				// Hash Semi Join
-				else if (token2 == wxT("Semi"))
-				{
-					s = new ExplainShape(*ex_hash_semi_join_png_img, descr);
-				}
-				else
-				{
-					s = new ExplainShape(*ex_hash_png_img, descr);
-				}
-			}
-			else
-			{
-				s = new ExplainShape(*ex_hash_png_img, descr);
-			}
-		}
-	}
-	else if (token == wxT("HashSetOp"))
-	{
-		if (token2 == wxT("Except"))
-		{
-			// HashSetOp Except ALL
-			if (token3 == wxT("ALL"))
-			{
-				s = new ExplainShape(*ex_hash_setop_except_all_png_img, descr);
-			}
-			// HashSetOp Except
-			else
-			{
-				s = new ExplainShape(*ex_hash_setop_except_png_img, descr);
-			}
-		}
-		else if (token2 == wxT("Intersect"))
-		{
-			// HashSetOp Intersect ALL
-			if (token3 == wxT("ALL"))
-			{
-				s = new ExplainShape(*ex_hash_setop_intersect_all_png_img, descr);
-			}
-			// HashSetOp Intersect
-			else
-			{
-				s = new ExplainShape(*ex_hash_setop_intersect_png_img, descr);
-			}
-		}
-		else
-		{
-			// HashSetOp ???
-			s = new ExplainShape(*ex_hash_setop_unknown_png_img, descr);
-		}
-	}
-	else if (token == wxT("Subquery"))      s = new ExplainShape(*ex_subplan_png_img, descr, 0, 2);
-	else if (token == wxT("Function"))      s = new ExplainShape(*ex_result_png_img, descr, 0, 2);
-	else if (token == wxT("Materialize"))   s = new ExplainShape(*ex_materialize_png_img, descr);
-	else if (token == wxT("Sort"))          s = new ExplainShape(*ex_sort_png_img, descr);
-	else if (token == wxT("Group"))         s = new ExplainShape(*ex_group_png_img, descr);
-	else if (token == wxT("Aggregate") || token == wxT("GroupAggregate") || token == wxT("HashAggregate"))
-		s = new ExplainShape(*ex_aggregate_png_img, descr);
-	else if (token == wxT("Unique"))        s = new ExplainShape(*ex_unique_png_img, descr);
-	else if (token == wxT("SetOp"))         s = new ExplainShape(*ex_setop_png_img, descr);
-	else if (token == wxT("Limit"))         s = new ExplainShape(*ex_limit_png_img, descr);
-	else if (token == wxT("LockRows"))      s = new ExplainShape(*ex_lock_rows_png_img, descr);
-	else if (token == wxT("Bitmap"))
-	{
-		if (token2 == wxT("Index"))         s = new ExplainShape(*ex_bmp_index_png_img, descr, 4+inc, 3+inc);
-		else                                s = new ExplainShape(*ex_bmp_heap_png_img, descr, 4+inc, 3+inc);
-	}
-	else if (token == wxT("BitmapAnd"))     s = new ExplainShape(*ex_bmp_and_png_img, descr);
-	else if (token == wxT("BitmapOr"))      s = new ExplainShape(*ex_bmp_or_png_img, descr);
-	else if (token2 == wxT("Scan"))
-	{
-		if (token == wxT("Index"))
-			// Scan Index Backward
-			if (token3 == wxT("Backward"))
-				s = new ExplainShape(*ex_index_scan_png_img, descr, 4+inc, 3+inc);
-			else
-				s = new ExplainShape(*ex_index_scan_png_img, descr, 3+inc, 2+inc);
-		// Tid Scan
-		else if (token == wxT("Tid"))
-			s = new ExplainShape(*ex_tid_scan_png_img, descr, 3+inc, 2+inc);
-		// WorkTable Scan
-		else if (token == wxT("WorkTable"))
-			s = new ExplainShape(*ex_worktable_scan_png_img, descr, 3+inc, 2+inc);
-		// CTE Scan
-		else if (token == wxT("CTE"))
-			s = new ExplainShape(*ex_cte_scan_png_img, descr, 3, 2);
-		// Foreign Scan
-		else if (token == wxT("Foreign"))
-			s = new ExplainShape(*ex_foreign_scan_png_img, descr, 3, 2);
-		// Values Scan
-		else if (token == wxT("Values"))
-			s = new ExplainShape(*ex_values_scan_png_img, descr, 3, 2);
-		else if (parallel) s = new ExplainShape(*ex_pscan_png_img, descr, 4, 3);
-		else
-			s = new ExplainShape(*ex_scan_png_img, descr, 3+inc, 2+inc);
-	}
-	else if (token == wxT("Index"))
-	{
-		// Index Only Scan
-		if (token2 == wxT("Only") && token3 == wxT("Scan"))
-		{
-			s = new ExplainShape(*ex_index_only_scan_png_img, descr, 4+inc, 3+inc);
-		}
-	}
-	else if (token2 == wxT("Seek"))         s = new ExplainShape(*ex_seek_png_img, descr, 3, 2);
-	// Recursive Union
-	else if (token == wxT("Recursive") && token2 == wxT("Union"))
-		s = new ExplainShape(*ex_recursive_union_png_img, descr);
-	else if (token == wxT("WindowAgg"))
-		s = new ExplainShape(*ex_window_aggregate_png_img, descr);
+    if (token == wxT("Total"))              return 0;
+    else if (token == wxT("Trigger"))       return 0;
+    else if (token == wxT("Settings:"))		return 0;		/* Greenplum */
+    else if (token == wxT("Slice"))			return 0;		/* Greenplum */
+    else if (token.Mid(0, 6) == wxT("(slice"))	return 0;	/* Greenplum */
+    else if (token == wxT("Result"))        s = new ExplainShape(*ex_result_png_img, descr);
+    else if (token == wxT("Append"))        s = new ExplainShape(*ex_append_png_img, descr);
+    else if (token == wxT("Gather"))	    s = new ExplainShape(*ex_gatcher_png_img, descr);
+    else if (token == wxT("Partial") && token2 == wxT("GroupAggregate"))  s = new ExplainShape(*ex_partial_aggregate_png_img, descr);
+    else if (token == wxT("Finalize") && token2 == wxT("GroupAggregate"))  s = new ExplainShape(*ex_finalize_aggregate_png_img, descr);
+    else if (token == wxT("Nested"))
+    {
+        if (token2 == wxT("Loop") && token4 == wxT("Join"))
+        {
+            // Nested Loop Anti Join
+            if (token3 == wxT("Anti"))
+            {
+                s = new ExplainShape(*ex_nested_loop_anti_join_png_img, descr);
+            }
+            // Nested Loop Semi Join
+            else
+            {
+                s = new ExplainShape(*ex_nested_loop_semi_join_png_img, descr);
+            }
+        }
+        if (!s)
+            s = new ExplainShape(*ex_nested_png_img, descr);
+    }
+    else if (token == wxT("Merge"))
+    {
+        if (token3 == wxT("Join"))
+        {
+            // Merge Anti Join
+            if (token2 == wxT("Anti"))
+            {
+                s = new ExplainShape(*ex_merge_anti_join_png_img, descr);
+            }
+            // Merge Semi Join
+            else
+            {
+                s = new ExplainShape(*ex_merge_semi_join_png_img, descr);
+            }
+        }
+        // Merge Append
+        else if (token2 == wxT("Append"))
+        {
+            s = new ExplainShape(*ex_merge_append_png_img, descr);
+        }
+        else
+        {
+            s = new ExplainShape(*ex_merge_png_img, descr);
+        }
+    }
+    else if (token == wxT("Hash"))
+    {
+        if (token2 == wxT("Join"))
+        {
+            s = new ExplainShape(*ex_join_png_img, descr);
+        }
+        else
+        {
+            if (token3 == wxT("Join"))
+            {
+                // Hash Anti Join
+                if (token2 == wxT("Anti"))
+                {
+                    s = new ExplainShape(*ex_hash_anti_join_png_img, descr);
+                }
+                // Hash Semi Join
+                else if (token2 == wxT("Semi"))
+                {
+                    s = new ExplainShape(*ex_hash_semi_join_png_img, descr);
+                }
+                else
+                {
+                    s = new ExplainShape(*ex_hash_png_img, descr);
+                }
+            }
+            else
+            {
+                s = new ExplainShape(*ex_hash_png_img, descr);
+            }
+        }
+    }
+    else if (token == wxT("HashSetOp"))
+    {
+        if (token2 == wxT("Except"))
+        {
+            // HashSetOp Except ALL
+            if (token3 == wxT("ALL"))
+            {
+                s = new ExplainShape(*ex_hash_setop_except_all_png_img, descr);
+            }
+            // HashSetOp Except
+            else
+            {
+                s = new ExplainShape(*ex_hash_setop_except_png_img, descr);
+            }
+        }
+        else if (token2 == wxT("Intersect"))
+        {
+            // HashSetOp Intersect ALL
+            if (token3 == wxT("ALL"))
+            {
+                s = new ExplainShape(*ex_hash_setop_intersect_all_png_img, descr);
+            }
+            // HashSetOp Intersect
+            else
+            {
+                s = new ExplainShape(*ex_hash_setop_intersect_png_img, descr);
+            }
+        }
+        else
+        {
+            // HashSetOp ???
+            s = new ExplainShape(*ex_hash_setop_unknown_png_img, descr);
+        }
+    }
+    else if (token == wxT("Subquery"))      s = new ExplainShape(*ex_subplan_png_img, descr, 0, 2);
+    else if (token == wxT("Function"))      s = new ExplainShape(*ex_result_png_img, descr, 0, 2);
+    else if (token == wxT("Materialize"))   s = new ExplainShape(*ex_materialize_png_img, descr);
+    else if (token == wxT("Sort"))          s = new ExplainShape(*ex_sort_png_img, descr);
+    else if (token == wxT("Group"))         s = new ExplainShape(*ex_group_png_img, descr);
+    else if (token == wxT("Aggregate") || token == wxT("GroupAggregate") || token == wxT("HashAggregate"))
+        s = new ExplainShape(*ex_aggregate_png_img, descr);
+    else if (token == wxT("Unique"))        s = new ExplainShape(*ex_unique_png_img, descr);
+    else if (token == wxT("SetOp"))         s = new ExplainShape(*ex_setop_png_img, descr);
+    else if (token == wxT("Limit"))         s = new ExplainShape(*ex_limit_png_img, descr);
+    else if (token == wxT("LockRows"))      s = new ExplainShape(*ex_lock_rows_png_img, descr);
+    else if (token == wxT("Bitmap"))
+    {
+        if (token2 == wxT("Index"))         s = new ExplainShape(*ex_bmp_index_png_img, descr, 4+inc, 3+inc);
+        else                                s = new ExplainShape(*ex_bmp_heap_png_img, descr, 4+inc, 3+inc);
+    }
+    else if (token == wxT("BitmapAnd"))     s = new ExplainShape(*ex_bmp_and_png_img, descr);
+    else if (token == wxT("BitmapOr"))      s = new ExplainShape(*ex_bmp_or_png_img, descr);
+    else if (token2 == wxT("Scan"))
+    {
+        if (token == wxT("Index"))
+            // Scan Index Backward
+            if (token3 == wxT("Backward"))
+                s = new ExplainShape(*ex_index_scan_png_img, descr, 4+inc, 3+inc);
+            else
+                s = new ExplainShape(*ex_index_scan_png_img, descr, 3+inc, 2+inc);
+        // Tid Scan
+        else if (token == wxT("Tid"))
+            s = new ExplainShape(*ex_tid_scan_png_img, descr, 3+inc, 2+inc);
+        // WorkTable Scan
+        else if (token == wxT("WorkTable"))
+            s = new ExplainShape(*ex_worktable_scan_png_img, descr, 3+inc, 2+inc);
+        // CTE Scan
+        else if (token == wxT("CTE"))
+            s = new ExplainShape(*ex_cte_scan_png_img, descr, 3, 2);
+        // Foreign Scan
+        else if (token == wxT("Foreign"))
+            s = new ExplainShape(*ex_foreign_scan_png_img, descr, 3, 2);
+        // Values Scan
+        else if (token == wxT("Values"))
+            s = new ExplainShape(*ex_values_scan_png_img, descr, 3, 2);
+        else if (parallel) s = new ExplainShape(*ex_pscan_png_img, descr, 4, 3);
+        else
+            s = new ExplainShape(*ex_scan_png_img, descr, 3+inc, 2+inc);
+    }
+    else if (token == wxT("Index"))
+    {
+        // Index Only Scan
+        if (token2 == wxT("Only") && token3 == wxT("Scan"))
+        {
+            s = new ExplainShape(*ex_index_only_scan_png_img, descr, 4+inc, 3+inc);
+        }
+    }
+    else if (token2 == wxT("Seek"))         s = new ExplainShape(*ex_seek_png_img, descr, 3, 2);
+    // Recursive Union
+    else if (token == wxT("Recursive") && token2 == wxT("Union"))
+        s = new ExplainShape(*ex_recursive_union_png_img, descr);
+    else if (token == wxT("WindowAgg"))
+        s = new ExplainShape(*ex_window_aggregate_png_img, descr);
 
-	// DML
-	else if (token == wxT("Insert"))
-		s = new ExplainShape(*ex_insert_png_img, descr, 2, 1);
-	else if (token == wxT("Update"))
-		s = new ExplainShape(*ex_update_png_img, descr, 2, 1);
-	else if (token == wxT("Delete"))
-		s = new ExplainShape(*ex_delete_png_img, descr, 2, 1);
+    // DML
+    else if (token == wxT("Insert"))
+        s = new ExplainShape(*ex_insert_png_img, descr, 2, 1);
+    else if (token == wxT("Update"))
+        s = new ExplainShape(*ex_update_png_img, descr, 2, 1);
+    else if (token == wxT("Delete"))
+        s = new ExplainShape(*ex_delete_png_img, descr, 2, 1);
 
-	// Greenplum additions
-	else if (token == wxT("Gather") && token2 == wxT("Motion"))
-		s = new ExplainShape(*ex_gather_motion_png_img, descr);
-	else if (token == wxT("Broadcast") && token2 == wxT("Motion"))
-		s = new ExplainShape(*ex_broadcast_motion_png_img, descr);
-	else if (token == wxT("Redistribute") && token2 == wxT("Motion"))
-		s = new ExplainShape(*ex_redistribute_motion_png_img, descr);
+    // Greenplum additions
+    else if (token == wxT("Gather") && token2 == wxT("Motion"))
+        s = new ExplainShape(*ex_gather_motion_png_img, descr);
+    else if (token == wxT("Broadcast") && token2 == wxT("Motion"))
+        s = new ExplainShape(*ex_broadcast_motion_png_img, descr);
+    else if (token == wxT("Redistribute") && token2 == wxT("Motion"))
+        s = new ExplainShape(*ex_redistribute_motion_png_img, descr);
 
-	if (!s)
-		s = new ExplainShape(*ex_unknown_png_img, descr);
+    if (!s)
+        s = new ExplainShape(*ex_unknown_png_img, descr);
 
-	s->SetDraggable(false);
+    s->SetDraggable(false);
 
-	s->level = level;
+    s->level = level;
 
-	if (costPos > 0)
-	{
-		if (actPos > 0)
-		{
-			s->actual = str.Mid(actPos);
-			s->cost = str.Mid(costPos, actPos - costPos);
-		}
-		else
-			s->cost = str.Mid(costPos);
-	}
-	else if (actPos > 0)
-		s->actual = str.Mid(actPos);
+    if (costPos > 0)
+    {
+        if (actPos > 0)
+        {
+            s->actual = str.Mid(actPos);
+            s->cost = str.Mid(costPos, actPos - costPos);
+        }
+        else
+            s->cost = str.Mid(costPos);
+    }
+    else if (actPos > 0)
+        s->actual = str.Mid(actPos);
 
-	int w = 50, h = 20;
+    int w = 50, h = 20;
 
-	wxBitmap &bmp = s->GetBitmap();
-	if (w < bmp.GetWidth())
-		w = bmp.GetWidth();
+    wxBitmap &bmp = s->GetBitmap();
+    if (w < bmp.GetWidth())
+        w = bmp.GetWidth();
 
-	s->SetHeight(bmp.GetHeight() + BMP_BORDER + h);
-	s->SetWidth(w);
+    s->SetHeight(bmp.GetHeight() + BMP_BORDER + h);
+    s->SetWidth(w);
 
-	s->upperShape = last;
-	if (last)
-	{
-		s->kidNo = last->kidCount;
-		last->kidCount++;
-	}
-	else
-		s->kidNo = 0;
+    s->upperShape = last;
+    if (last)
+    {
+        s->kidNo = last->kidCount;
+        last->kidCount++;
+    }
+    else
+        s->kidNo = 0;
 
-	if (costPos > 0)
-	{
-		wxChar *cl = const_cast<wxChar *>((const wxChar *)str + costPos + 6);
-		wxChar *ch = wxStrstr(cl, wxT(".."));
-		if (ch)
-		{
-			*ch = 0;
-			ch += 2;
-		}
-		s->costLow = StrToDouble(cl);
-		if (ch)
-		{
-			wxChar *r = wxStrstr(ch, wxT(" rows="));
-			if (r)
-			{
-				*r = 0;
-				r += 6;
-			}
-			s->costHigh = StrToDouble(ch);
-			if (r)
-			{
-				wxChar *w = wxStrstr(r, wxT(" width="));
-				if (w)
-				{
-					*w = 0;
-					w += 7;
-				}
-				s->rows = StrToLong(r);
-				if (w)
-					s->width = StrToLong(w);
-			}
-		}
-	}
-	return s;
+    if (costPos > 0)
+    {
+        wxChar *cl = const_cast<wxChar *>((const wxChar *)str + costPos + 6);
+        wxChar *ch = wxStrstr(cl, wxT(".."));
+        if (ch)
+        {
+            *ch = 0;
+            ch += 2;
+        }
+        s->costLow = StrToDouble(cl);
+        if (ch)
+        {
+            wxChar *r = wxStrstr(ch, wxT(" rows="));
+            if (r)
+            {
+                *r = 0;
+                r += 6;
+            }
+            s->costHigh = StrToDouble(ch);
+            if (r)
+            {
+                wxChar *w = wxStrstr(r, wxT(" width="));
+                if (w)
+                {
+                    *w = 0;
+                    w += 7;
+                }
+                s->rows = StrToLong(r);
+                if (w)
+                    s->width = StrToLong(w);
+            }
+        }
+    }
+    return s;
 }
 
 
 ExplainLine::ExplainLine(ExplainShape *from, ExplainShape *to, double weight)
 {
-	SetCanvas(from->GetCanvas());
-	from->AddLine(this, to);
-	MakeLineControlPoints(4);
+    SetCanvas(from->GetCanvas());
+    from->AddLine(this, to);
+    MakeLineControlPoints(4);
 
-	width = (int) log(from->GetAverageCost());
-	if (width > 10)
-		width = 10;
+    width = (int) log(from->GetAverageCost());
+    if (width > 10)
+        width = 10;
 
-	// If we got an average cost of 0, width is probably negative
-	// which will look pretty darn ugly as an arrow width!
-	// This may happen on Greenplum.
-	if (width < 1)
-		width = 1;
+    // If we got an average cost of 0, width is probably negative
+    // which will look pretty darn ugly as an arrow width!
+    // This may happen on Greenplum.
+    if (width < 1)
+        width = 1;
 
-	wxNode *first = GetLineControlPoints()->GetFirst();
-	wxNode *last  = GetLineControlPoints()->GetLast();
-	*(wxRealPoint *)first->GetData() = from->GetStartPoint();
-	*(wxRealPoint *)last->GetData() = to->GetEndPoint(from->GetKidno());
+    wxNode *first = GetLineControlPoints()->GetFirst();
+    wxNode *last  = GetLineControlPoints()->GetLast();
+    *(wxRealPoint *)first->GetData() = from->GetStartPoint();
+    *(wxRealPoint *)last->GetData() = to->GetEndPoint(from->GetKidno());
 
-	wxRealPoint *p1 = (wxRealPoint *)first->GetNext()->GetData();
-	wxRealPoint *p2 = (wxRealPoint *)last->GetPrevious()->GetData();
-	*p1 = from->GetStartPoint();
-	*p2 = to->GetEndPoint(from->GetKidno());
-	p1->x -= (p1->x - p2->x) / 3. + 8;
-	p2->x += (p1->x - p2->x) / 3. - 8;
+    wxRealPoint *p1 = (wxRealPoint *)first->GetNext()->GetData();
+    wxRealPoint *p2 = (wxRealPoint *)last->GetPrevious()->GetData();
+    *p1 = from->GetStartPoint();
+    *p2 = to->GetEndPoint(from->GetKidno());
+    p1->x -= (p1->x - p2->x) / 3. + 8;
+    p2->x += (p1->x - p2->x) / 3. - 8;
 
-	Initialise();
+    Initialise();
 }
 
 
@@ -650,48 +664,48 @@ ExplainLine::ExplainLine(ExplainShape *from, ExplainShape *to, double weight)
 
 void ExplainLine::OnDraw(wxDC &dc)
 {
-	if (m_lineControlPoints)
-	{
-		dc.SetPen(*wxThePenList->FindOrCreatePen(*wxBLACK, 1, wxPENSTYLE_SOLID));
-		dc.SetBrush(*wxTheBrushList->FindOrCreateBrush(*wxLIGHT_GREY, wxBRUSHSTYLE_SOLID));
+    if (m_lineControlPoints)
+    {
+        dc.SetPen(*wxThePenList->FindOrCreatePen(*wxBLACK, 1, wxPENSTYLE_SOLID));
+        dc.SetBrush(*wxTheBrushList->FindOrCreateBrush(*wxLIGHT_GREY, wxBRUSHSTYLE_SOLID));
 
-		wxPoint *points = new wxPoint[11];
-		wxRealPoint *point0 = (wxRealPoint *) m_lineControlPoints->Item(0)->GetData();
-		wxRealPoint *point1 = (wxRealPoint *) m_lineControlPoints->Item(1)->GetData();
-		wxRealPoint *point2 = (wxRealPoint *) m_lineControlPoints->Item(2)->GetData();
-		wxRealPoint *point3 = (wxRealPoint *) m_lineControlPoints->Item(3)->GetData();
+        wxPoint *points = new wxPoint[11];
+        wxRealPoint *point0 = (wxRealPoint *) m_lineControlPoints->Item(0)->GetData();
+        wxRealPoint *point1 = (wxRealPoint *) m_lineControlPoints->Item(1)->GetData();
+        wxRealPoint *point2 = (wxRealPoint *) m_lineControlPoints->Item(2)->GetData();
+        wxRealPoint *point3 = (wxRealPoint *) m_lineControlPoints->Item(3)->GetData();
 
-		double phi  = atan2(point2->y - point1->y, point2->x - point1->x);
-		double offs = width * tan(phi / 2);
+        double phi  = atan2(point2->y - point1->y, point2->x - point1->x);
+        double offs = width * tan(phi / 2);
 
-		points[0].x  = WXROUND(point0->x);
-		points[0].y  = WXROUND(point0->y) - width;
-		points[10].x = WXROUND(point0->x);
-		points[10].y = WXROUND(point0->y) + width;
+        points[0].x  = WXROUND(point0->x);
+        points[0].y  = WXROUND(point0->y) - width;
+        points[10].x = WXROUND(point0->x);
+        points[10].y = WXROUND(point0->y) + width;
 
-		points[1].x  = WXROUND(point1->x + offs);
-		points[1].y  = WXROUND(point1->y) - width;
-		points[9].x  = WXROUND(point1->x - offs);
-		points[9].y  = WXROUND(point1->y) + width;
+        points[1].x  = WXROUND(point1->x + offs);
+        points[1].y  = WXROUND(point1->y) - width;
+        points[9].x  = WXROUND(point1->x - offs);
+        points[9].y  = WXROUND(point1->y) + width;
 
-		points[2].x  = WXROUND(point2->x + offs);
-		points[2].y  = WXROUND(point2->y) - width;
-		points[8].x  = WXROUND(point2->x - offs);
-		points[8].y  = WXROUND(point2->y) + width;
+        points[2].x  = WXROUND(point2->x + offs);
+        points[2].y  = WXROUND(point2->y) - width;
+        points[8].x  = WXROUND(point2->x - offs);
+        points[8].y  = WXROUND(point2->y) + width;
 
-		points[3].x  = WXROUND(point3->x) - width - ARROWWIDTH;
-		points[3].y  = WXROUND(point3->y) - width;
-		points[7].x  = WXROUND(point3->x) - width - ARROWWIDTH;
-		points[7].y  = WXROUND(point3->y) + width;
+        points[3].x  = WXROUND(point3->x) - width - ARROWWIDTH;
+        points[3].y  = WXROUND(point3->y) - width;
+        points[7].x  = WXROUND(point3->x) - width - ARROWWIDTH;
+        points[7].y  = WXROUND(point3->y) + width;
 
-		points[4].x  = points[3].x;
-		points[4].y  = points[3].y - ARROWWIDTH;
-		points[6].x  = points[7].x;
-		points[6].y  = points[7].y + ARROWWIDTH;
+        points[4].x  = points[3].x;
+        points[4].y  = points[3].y - ARROWWIDTH;
+        points[6].x  = points[7].x;
+        points[6].y  = points[7].y + ARROWWIDTH;
 
-		points[5].x  = WXROUND(point3->x);
-		points[5].y  = WXROUND(point3->y);
+        points[5].x  = WXROUND(point3->x);
+        points[5].y  = WXROUND(point3->y);
 
-		dc.DrawPolygon(11, points, 0, 0);
-	}
+        dc.DrawPolygon(11, points, 0, 0);
+    }
 }
diff --git a/frm/frmLog.cpp b/frm/frmLog.cpp
index c27ddcb..d9b8ab3 100644
--- a/frm/frmLog.cpp
+++ b/frm/frmLog.cpp
@@ -61,189 +61,189 @@ wxEND_EVENT_TABLE()
 
 
 void frmLog::OnActivate(wxActivateEvent& event) {
-	m_storage_model->getStorage()->SetErrMsgFlag(false);
-	seticon(false);
-	event.Skip();
+    m_storage_model->getStorage()->SetErrMsgFlag(false);
+    seticon(false);
+    event.Skip();
 }
 void frmLog::OnSetFocus(wxFocusEvent& event) {
-	m_storage_model->getStorage()->SetErrMsgFlag(false);
-	seticon(false);
+    m_storage_model->getStorage()->SetErrMsgFlag(false);
+    seticon(false);
 }
 void frmLog::OnKillFocus(wxFocusEvent& event) {
-	m_storage_model->getStorage()->SetErrMsgFlag(false);
-	seticon(false);
+    m_storage_model->getStorage()->SetErrMsgFlag(false);
+    seticon(false);
 
 }
 void frmLog::OnClose(wxCloseEvent& event) {
-	if (event.CanVeto()&& detail->IsChecked())
-	{
-		my_view->setGroupMode(true);
-		detail->SetValue(false);
-	//detail->Enable(event.IsChecked());
-		event.Veto();
-		return;
-	}
-	DBthread->DoTerminate();
-	while (!DBthread->isReadyRows()) {
-		wxThread::Sleep(50);
-		wxYield();
-	}
-	DBthread->GoReadRows();
-	
-	wxThread::Sleep(50);
-	event.Skip();
+    if (event.CanVeto()&& detail->IsChecked())
+    {
+        my_view->setGroupMode(true);
+        detail->SetValue(false);
+    //detail->Enable(event.IsChecked());
+        event.Veto();
+        return;
+    }
+    DBthread->DoTerminate();
+    while (!DBthread->isReadyRows()) {
+        wxThread::Sleep(50);
+        wxYield();
+    }
+    DBthread->GoReadRows();
+    
+    wxThread::Sleep(50);
+    event.Skip();
 }
 
 // Class declarations
 void frmLog::OnClearAllFilter(wxCommandEvent& event) {
 
-	my_view->ClearAllFilter(false);
+    my_view->ClearAllFilter(false);
 }
 void frmLog::OnAddFilterIgnore(wxCommandEvent& event) {
-	wxString Fname = "LoadSkip";
-	my_view->ModUserFilter(Fname, "AddUserFilter", listUserFilter, contentFilter);
-	//my_view->AddFilterIgnore(Fname);
+    wxString Fname = "LoadSkip";
+    my_view->ModUserFilter(Fname, "AddUserFilter", listUserFilter, contentFilter);
+    //my_view->AddFilterIgnore(Fname);
 }
 void frmLog::OnAddUFilter(wxCommandEvent& event) {
-	wxString txt = listUserFilter->GetValue();
-	my_view->ModUserFilter(txt, "AddUserFilter", listUserFilter, contentFilter);
+    wxString txt = listUserFilter->GetValue();
+    my_view->ModUserFilter(txt, "AddUserFilter", listUserFilter, contentFilter);
 
 }
 void frmLog::OnDelUFilter(wxCommandEvent& event) {
-	my_view->ModUserFilter("", "RemoveFilter", listUserFilter, contentFilter);
+    my_view->ModUserFilter("", "RemoveFilter", listUserFilter, contentFilter);
 }
 void frmLog::OnChangeUFilter(wxCommandEvent& event) {
-	if (event.GetSelection() >= 0) {
-		my_view->ModUserFilter("", "ChangeFilter", listUserFilter, contentFilter);
-	}
+    if (event.GetSelection() >= 0) {
+        my_view->ModUserFilter("", "ChangeFilter", listUserFilter, contentFilter);
+    }
 }
 void frmLog::OnExtendedLog(wxCommandEvent& event) {
-	//my_view->ModUserFilter("", "RemoveFilter", listUserFilter, contentFilter);
-	StorageModel* m = dynamic_cast<StorageModel*>(my_view->GetModel());
-	m->DeleteAll();
-	bool b = true;
-	b=group->GetValue();
-	my_view->setGroupMode(b);
-	detail->SetValue(false);
-	my_view->ViewGroup(false);
+    //my_view->ModUserFilter("", "RemoveFilter", listUserFilter, contentFilter);
+    StorageModel* m = dynamic_cast<StorageModel*>(my_view->GetModel());
+    m->DeleteAll();
+    bool b = true;
+    b=group->GetValue();
+    my_view->setGroupMode(b);
+    detail->SetValue(false);
+    my_view->ViewGroup(false);
 
 }
 void frmLog::OnTextChange(wxCommandEvent& event) {
-	//my_view->ModUserFilter("", "RemoveFilter", listUserFilter, contentFilter);
-	wxTextCtrl* t = (wxTextCtrl*)event.GetEventObject();
-	wxString text = t->GetValue();
-	int count = 1;
-	if (wxSscanf(text, "%d", &count) > 0) {
-		bool isOk=DBthread->SetLimitFiles(count);
-		OnExtendedLog(event);
-	};
+    //my_view->ModUserFilter("", "RemoveFilter", listUserFilter, contentFilter);
+    wxTextCtrl* t = (wxTextCtrl*)event.GetEventObject();
+    wxString text = t->GetValue();
+    int count = 1;
+    if (wxSscanf(text, "%d", &count) > 0) {
+        bool isOk=DBthread->SetLimitFiles(count);
+        OnExtendedLog(event);
+    };
 }
 
 void frmLog::OnChangeSmart(wxCommandEvent& event) {
-	int n = event.GetSelection();
-	if (n >= 0) {
-		listUserFilter->SetSelection(n);
-		my_view->ModUserFilter("", "ChangeFilter", listUserFilter, contentFilter);
-	}
+    int n = event.GetSelection();
+    if (n >= 0) {
+        listUserFilter->SetSelection(n);
+        my_view->ModUserFilter("", "ChangeFilter", listUserFilter, contentFilter);
+    }
 }
 void frmLog::OnSendMail(wxCommandEvent& event) {
-	//wxMessageBox("send mail");
-	wxDataViewItem item;
-	item = my_view->GetCurrentItem();
-	if (!item.IsOk() ) {
-		return;
-	}
-	wxVariant v, t;
-	StorageModel* m = dynamic_cast<StorageModel*>(my_view->GetModel());
-	Storage* st = m->getStorage();
-	wxArrayString a;
-	int r = m->GetRow(item);
-	if (r != -1) {
-		a=st->GetAllFields(r, st->IsFilter());
-	}
-	else return;
+    //wxMessageBox("send mail");
+    wxDataViewItem item;
+    item = my_view->GetCurrentItem();
+    if (!item.IsOk() ) {
+        return;
+    }
+    wxVariant v, t;
+    StorageModel* m = dynamic_cast<StorageModel*>(my_view->GetModel());
+    Storage* st = m->getStorage();
+    wxArrayString a;
+    int r = m->GetRow(item);
+    if (r != -1) {
+        a=st->GetAllFields(r, st->IsFilter());
+    }
+    else return;
 
-	wxString str = "";
+    wxString str = "";
 #ifdef DEBUG
-	wxString fn = "C:\\Users\\lsv\\Source\\Repos\\pgadmin64\\pgadmin\\x64\\Debug_(3.0)\\testhtml.txt" ;
+    wxString fn = "C:\\Users\\lsv\\Source\\Repos\\pgadmin64\\pgadmin\\x64\\Debug_(3.0)\\testhtml.txt" ;
 #else
-	wxString fn = "mail.template";
+    wxString fn = "mail.template";
 #endif // DEBUG
-	wxUtfFile file(fn, wxFile::read, wxFONTENCODING_UTF8);
-	if (file.IsOpened())
-	{
-		file.Read(str);
-		file.Close();
-		wxStringTokenizer tk(str, "\n", wxTOKEN_DEFAULT);
-		wxString cc;
-		wxString to;
-		wxString html;
-		wxString templat;
-		while (tk.HasMoreTokens())
-		{
-			wxString l = tk.GetNextToken();
-			if (l.StartsWith("Cc=")) { cc = l.After('='); continue; }
-			if (l.StartsWith("To=")) { to = l.After('='); continue; }
-			if (l.StartsWith("<tr>")) {
-				wxString le;
-				wxString r;
-				for (int i = 0; i < a.Count(); i++) {
-					templat = l;
-					le = escapeHtml(a[i++],false);
-					r = escapeHtml(a[i],false);
-					int co = templat.Replace("$1", le);
-					co += templat.Replace("$2", r);
-					html.Append(templat);
-				}
-				continue;
-			}
-			html.Append(l);
-		}
-		#ifdef WIN32
-		wxAutomationObject oObject;
-		if (oObject.GetInstance("Outlook.Application")) {
-			wxAutomationObject msg;
-			wxVariant n[1];
-			wxString strI;
-			int i = 0;
-			strI << i;
-			n[0] = wxVariant(strI);
-			bool rez = oObject.GetObject(msg, "CreateItem", 1, n);
-			if (rez) {
-				//oObject.PutProperty("Visible", true);
-				msg.PutProperty("Subject", "Error ");
-				msg.PutProperty("BodyFormat", 2);
-				msg.PutProperty("To", to);
-				//
-				msg.PutProperty("Cc", cc);
-				msg.PutProperty("HTMLBody", html);
-				msg.CallMethod("Display");
-			}
-			//oObject.PutProperty("ActiveCell.Font.Bold", @true);
+    wxUtfFile file(fn, wxFile::read, wxFONTENCODING_UTF8);
+    if (file.IsOpened())
+    {
+        file.Read(str);
+        file.Close();
+        wxStringTokenizer tk(str, "\n", wxTOKEN_DEFAULT);
+        wxString cc;
+        wxString to;
+        wxString html;
+        wxString templat;
+        while (tk.HasMoreTokens())
+        {
+            wxString l = tk.GetNextToken();
+            if (l.StartsWith("Cc=")) { cc = l.After('='); continue; }
+            if (l.StartsWith("To=")) { to = l.After('='); continue; }
+            if (l.StartsWith("<tr>")) {
+                wxString le;
+                wxString r;
+                for (int i = 0; i < a.Count(); i++) {
+                    templat = l;
+                    le = escapeHtml(a[i++],false);
+                    r = escapeHtml(a[i],false);
+                    int co = templat.Replace("$1", le);
+                    co += templat.Replace("$2", r);
+                    html.Append(templat);
+                }
+                continue;
+            }
+            html.Append(l);
+        }
+        #ifdef WIN32
+        wxAutomationObject oObject;
+        if (oObject.GetInstance("Outlook.Application")) {
+            wxAutomationObject msg;
+            wxVariant n[1];
+            wxString strI;
+            int i = 0;
+            strI << i;
+            n[0] = wxVariant(strI);
+            bool rez = oObject.GetObject(msg, "CreateItem", 1, n);
+            if (rez) {
+                //oObject.PutProperty("Visible", true);
+                msg.PutProperty("Subject", "Error ");
+                msg.PutProperty("BodyFormat", 2);
+                msg.PutProperty("To", to);
+                //
+                msg.PutProperty("Cc", cc);
+                msg.PutProperty("HTMLBody", html);
+                msg.CallMethod("Display");
+            }
+            //oObject.PutProperty("ActiveCell.Font.Bold", @true);
 
-		}
-		#endif
-	}
+        }
+        #endif
+    }
 }
 void frmLog::OnFind(wxCommandEvent& event) {
 
 }
 void frmLog::OnHelp(wxCommandEvent& event) {
 
-	wxMessageBox(wxString::FromUTF8("Для включения фильтра нужно:\n"
-		" Щелкнуть правой кнопкой мыши по полю.Для инверсии фильтра нужно удерживать Ctrl.\n"
-		" Выбрать значение в контекстном меню заголовка колонки.\n"
-		" Там отображаются 20 самых частых значения в колонке с указанием количества этих значений.\n"
-		" Ввести в поле значения для фильтра, выделить это значение и нажать Enter.\n"
-		" Для фильтра используется только выделенный текст.\n"
-		" Такой фильтр будет работать на поиск выделенного вхождения в поле.\n"
-		" Если в выделенной строке первым символом будет \"!\" то фильтр инверсируется.\n"
-		"\n"
-		"Shift+KeyUP,Shift+KeyDOWN - переход на запись с тем же sql_state.\n"
-		"Alt+KeyUP,Alt+KeyDOWN     - переход на запись с другим sql_state.\n"
-		"Ctrl + S                  - отправка строки лога по почте Outlook. \n"
-		"                          Шаблон письма в файле mail.template в первых двух строках шаблона можно указать адреса которые будут подставляться в письмо.\n"
-	));
+    wxMessageBox(wxString::FromUTF8("Для включения фильтра нужно:\n"
+        " Щелкнуть правой кнопкой мыши по полю.Для инверсии фильтра нужно удерживать Ctrl.\n"
+        " Выбрать значение в контекстном меню заголовка колонки.\n"
+        " Там отображаются 20 самых частых значения в колонке с указанием количества этих значений.\n"
+        " Ввести в поле значения для фильтра, выделить это значение и нажать Enter.\n"
+        " Для фильтра используется только выделенный текст.\n"
+        " Такой фильтр будет работать на поиск выделенного вхождения в поле.\n"
+        " Если в выделенной строке первым символом будет \"!\" то фильтр инверсируется.\n"
+        "\n"
+        "Shift+KeyUP,Shift+KeyDOWN - переход на запись с тем же sql_state.\n"
+        "Alt+KeyUP,Alt+KeyDOWN     - переход на запись с другим sql_state.\n"
+        "Ctrl + S                  - отправка строки лога по почте Outlook. \n"
+        "                          Шаблон письма в файле mail.template в первых двух строках шаблона можно указать адреса которые будут подставляться в письмо.\n"
+    ));
 }
 
 void frmLog::OnSetGroup(wxCommandEvent& event)
@@ -262,30 +262,30 @@ void frmLog::OnSetGroup(wxCommandEvent& event)
     detail->Enable(event.IsChecked());
 }
 bool frmLog::CheckConn(wxString host,int port) {
-	for (size_t i = 0; i < conArray.GetCount(); i++)
-	{
-		if ((conArray[i].conn->GetHostName() == host)&&(conArray[i].conn->GetPort() == port))
-			return true;
-	}
-	return false;
+    for (size_t i = 0; i < conArray.GetCount(); i++)
+    {
+        if ((conArray[i].conn->GetHostName() == host)&&(conArray[i].conn->GetPort() == port))
+            return true;
+    }
+    return false;
 }
 pgConn* frmLog::createConn(pgServer* srv) {
-	pgConn* conn;
-	
-	if (!srv->GetConnected()) mainForm->ReconnectServer(srv, false);
-	conn = srv->CreateConn(wxEmptyString, 0, "Log conn");
+    pgConn* conn;
+    
+    if (!srv->GetConnected()) mainForm->ReconnectServer(srv, false);
+    conn = srv->CreateConn(wxEmptyString, 0, "Log conn");
 
-	return conn;
+    return conn;
 }
 void frmLog::AddNewConn(pgConn* con) {
-	if (con != NULL) {
-		if (!con->HasFeature(FEATURE_CSVLOG)) return;
-		//logfileName.Add("");
-		//savedPartialLine.Add("");
-		//logfileLength.Add(0);
-		//len.Add(0);
-		conArray.Add(new RemoteConn2(con));
-	}
+    if (con != NULL) {
+        if (!con->HasFeature(FEATURE_CSVLOG)) return;
+        //logfileName.Add("");
+        //savedPartialLine.Add("");
+        //logfileLength.Add(0);
+        //len.Add(0);
+        conArray.Add(new RemoteConn2(con));
+    }
 }
 void frmLog::OnSetDetailGroup(wxCommandEvent& event)
 {
@@ -301,751 +301,750 @@ void frmLog::OnSetDetailGroup(wxCommandEvent& event)
 }
 void* MyThread::Entry() {
 
-	while (!m_exit)
-	{
-		{
-			wxMutexLocker lock(s_mutexDBReading);
-			m_addNewRows.Clear();
-			m_serversName.Clear();
-			m_startRowsSevers.Clear();
-			getFilename();
-		}
-		
-		s_goRead.Wait();
-		if (m_exit) break;
-	}
+    while (!m_exit)
+    {
+        {
+            wxMutexLocker lock(s_mutexDBReading);
+            m_addNewRows.Clear();
+            m_serversName.Clear();
+            m_startRowsSevers.Clear();
+            getFilename();
+        }
+        
+        s_goRead.Wait();
+        if (m_exit) break;
+    }
 
-	return NULL;
+    return NULL;
 }
 void MyThread::ResetInfoFiles() {
-	readfiles.clear();
+    readfiles.clear();
 }
 bool MyThread::SetLimitFiles(int limit) {
-	if (limit != limitfiles) {
-		limitfiles = limit;
-		ResetInfoFiles();
-		return true;
-	}
-	return false;
+    if (limit != limitfiles) {
+        limitfiles = limit;
+        ResetInfoFiles();
+        return true;
+    }
+    return false;
 }
 wxString MyThread::AppendNewRows(MyDataViewCtrl* my_view, Storage* st) {
-	//Storage* st = m_storage_model->getStorage();
-	//int rows = st->getCountStore();
-	int ra, ri;
-	st->ClearRowsStat();
-	my_view->Freeze();
-	for (size_t i = 0; i < m_startRowsSevers.GetCount(); i++) {
-		if (m_exit) return "exit";
-		int sr = m_startRowsSevers[i];
-		int er = m_addNewRows.GetCount();
-		if ((i+1)< m_startRowsSevers.GetCount()) er= m_startRowsSevers[i+1];
-		if (sr == er) continue;
-		st->SetHost(m_serversName[i]);
-		for (int k = sr; k < er; k++) {
-			if (m_exit) return "exit";
-			wxString ss = m_addNewRows[k];
-			if (ss.IsEmpty())
-				continue;
-			my_view->AddRow(ss);
-		}
-	}
-	st->GetRowsStat(ra, ri);
-	my_view->Thaw();
-	//int newrows = st->getCountStore();
-	//if (loglen !=logfileLength) 
-	if (st->GetErrMsgFlag()) {
-		m_seticon=true;
-	}
-	return wxString::Format("Add rows %d ignore %d. View rows ", ra, ri);
+    //Storage* st = m_storage_model->getStorage();
+    //int rows = st->getCountStore();
+    int ra, ri;
+    st->ClearRowsStat();
+    my_view->Freeze();
+    for (size_t i = 0; i < m_startRowsSevers.GetCount(); i++) {
+        if (m_exit) return "exit";
+        int sr = m_startRowsSevers[i];
+        int er = m_addNewRows.GetCount();
+        if ((i+1)< m_startRowsSevers.GetCount()) er= m_startRowsSevers[i+1];
+        if (sr == er) continue;
+        st->SetHost(m_serversName[i]);
+        for (int k = sr; k < er; k++) {
+            if (m_exit) return "exit";
+            wxString ss = m_addNewRows[k];
+            if (ss.IsEmpty())
+                continue;
+            my_view->AddRow(ss);
+        }
+    }
+    st->GetRowsStat(ra, ri);
+    my_view->Thaw();
+    //int newrows = st->getCountStore();
+    //if (loglen !=logfileLength) 
+    if (st->GetErrMsgFlag()) {
+        m_seticon=true;
+    }
+    return wxString::Format("Add rows %d ignore %d. View rows ", ra, ri);
 
 }
 void MyThread::getFilename() {
-	pgSet* set;
-	namepage = "";
-	m_seticon = false;
-	wxString mask = ".csv$";
-	for (size_t i = 0; i < m_conArray.GetCount(); i++) {
-		if (m_exit) break;
-		RemoteConn2* po = (RemoteConn2*) m_conArray[i];
-		wxString dbname = po->conn->GetDbname();
-		if (!namepage.IsEmpty()) namepage += ",";
-		m_serversName.Add(po->conn->GetHostName());
-		m_startRowsSevers.Add(m_addNewRows.GetCount());
-		if (!po->conn->IsAlive()) {
-			wxDateTime n = wxDateTime::Now();
-			m_seticon = true;
-			if (po->nextrun < n) {
-				if (!po->conn->Reconnect(false))
-				{
-					wxTimeSpan sp(0, 2);
-					po->nextrun = wxDateTime::Now() + sp;
-					namepage += " " + dbname;
-					continue;
-				}
-			}
-			else {
-				namepage += " " + dbname;
-				continue;
-			}
+    pgSet* set;
+    namepage = "";
+    m_seticon = false;
+    wxString mask = ".csv$";
+    for (size_t i = 0; i < m_conArray.GetCount(); i++) {
+        if (m_exit) break;
+        RemoteConn2* po = (RemoteConn2*) m_conArray[i];
+        wxString dbname = po->conn->GetDbname();
+        if (!namepage.IsEmpty()) namepage += ",";
+        m_serversName.Add(po->conn->GetHostName());
+        m_startRowsSevers.Add(m_addNewRows.GetCount());
+        if (!po->conn->IsAlive()) {
+            wxDateTime n = wxDateTime::Now();
+            m_seticon = true;
+            if (po->nextrun < n) {
+                if (!po->conn->Reconnect(false))
+                {
+                    wxTimeSpan sp(0, 2);
+                    po->nextrun = wxDateTime::Now() + sp;
+                    namepage += " " + dbname;
+                    continue;
+                }
+            }
+            else {
+                namepage += " " + dbname;
+                continue;
+            }
 
 
-		}
-		wxString sql = wxString::Format(
-		"select * from ( \
-			select current_setting('log_directory') || '/' || name filename, modification filetime, size len \
-			FROM pg_ls_logdir()  where name ~ %s ORDER BY modification DESC limit %d) l order by  filetime ASC", po->conn->qtDbString(mask), limitfiles
-		);
+        }
+        wxString sql = wxString::Format(
+        "select * from ( \
+            select current_setting('log_directory') || '/' || name filename, modification filetime, size len \
+            FROM pg_ls_logdir()  where name ~ %s ORDER BY modification DESC limit %d) l order by  filetime ASC", po->conn->qtDbString(mask), limitfiles
+        );
 
 
-		set = po->conn->ExecuteSet(sql);
-		if (set)
-		{
+        set = po->conn->ExecuteSet(sql);
+        if (set)
+        {
 
-			//logfileTimestamp = set->GetDateTime(wxT("filetime"));
-			namepage += dbname;
-			while (!set->Eof()) {
-				
-				wxString fn = set->GetVal(wxT("filename"));
-				wxString key = wxString::Format("%i_server_%s",i,fn);
-				info_files inf;
-				long len= set->GetLong(wxT("len"));
-				if (auto it = readfiles.find(key); it != readfiles.end()) {
-					inf = it->second;
-				}
-				else {
-					inf.filename = fn;
-					inf.readlastposition = 0;
-					inf.size = len;
-				}
-				//len[i] = set->GetLong(wxT("len"));
-				
-				//m_storage_model->getStorage()->SetHost(m_conArray[i].conn->GetHostName());
-				//m_startRowsSevers[i] = m_addNewRows.GetCount();
-				
-				if (inf.readlastposition != len) {
-					inf.size = len;
-					readLogFile(inf, po->conn);
-					readfiles[key] = inf;
-				}
-				set->MoveNext();
-			}
-			delete set;
-			
-		}
-	}
-	sendText("LOAD OK");
+            //logfileTimestamp = set->GetDateTime(wxT("filetime"));
+            namepage += dbname;
+            while (!set->Eof()) {
+                
+                wxString fn = set->GetVal(wxT("filename"));
+                wxString key = wxString::Format("%lu_server_%s",i,fn);
+                info_files inf;
+                long len= set->GetLong(wxT("len"));
+                if (auto it = readfiles.find(key); it != readfiles.end()) {
+                    inf = it->second;
+                }
+                else {
+                    inf.filename = fn;
+                    inf.readlastposition = 0;
+                    inf.size = len;
+                }
+                //len[i] = set->GetLong(wxT("len"));
+                
+                //m_storage_model->getStorage()->SetHost(m_conArray[i].conn->GetHostName());
+                //m_startRowsSevers[i] = m_addNewRows.GetCount();
+                
+                if (inf.readlastposition != len) {
+                    inf.size = len;
+                    readLogFile(inf, po->conn);
+                    readfiles[key] = inf;
+                }
+                set->MoveNext();
+            }
+            delete set;
+            
+        }
+    }
+    sendText("LOAD OK");
 }
 void MyThread::readLogFile(info_files &inf,
-	//wxString logfileName, long& lenfile, long& logfileLength, wxString& savedPartialLine,
-	pgConn* conn) {
-	wxString line;
+    //wxString logfileName, long& lenfile, long& logfileLength, wxString& savedPartialLine,
+    pgConn* conn) {
+    wxString line;
 
-	// If GPDB 3.3 and later, log is normally in CSV format.  Let's get a whole log line before calling addLogLine,
-	// so we can do things smarter.
+    // If GPDB 3.3 and later, log is normally in CSV format.  Let's get a whole log line before calling addLogLine,
+    // so we can do things smarter.
 
-	// PostgreSQL can log in CSV format, as well as regular format.  Normally, we'd only see
-	// the regular format logs here, because pg_logdir_ls only returns those.  But if pg_logdir_ls is
-	// changed to return the csv format log files, we should handle it.
-	wxString logfileName = inf.filename;
-	long logfileLength = inf.readlastposition;
-	bool csv_log_format = logfileName.Right(4) == wxT(".csv");
+    // PostgreSQL can log in CSV format, as well as regular format.  Normally, we'd only see
+    // the regular format logs here, because pg_logdir_ls only returns those.  But if pg_logdir_ls is
+    // changed to return the csv format log files, we should handle it.
+    wxString logfileName = inf.filename;
+    long logfileLength = inf.readlastposition;
+    bool csv_log_format = logfileName.Right(4) == wxT(".csv");
 
-	if (csv_log_format && inf.savedPartialLine.length() > 0)
-	{
-		if (logfileLength == 0)  // Starting at beginning of log file
-			inf.savedPartialLine.clear();
-		else
-			line = inf.savedPartialLine;
-	}
-	wxString funcname = "pg_read_binary_file(";
-	while (inf.size > logfileLength)
-	{
-		//statusBar->SetStatusText(_("Reading log from server..."));
-		if (m_exit) return;
-		pgSet* set = conn->ExecuteSet(wxT("SELECT ") + funcname +
-			conn->qtDbString(logfileName) + wxT(", ") + NumToStr(logfileLength) + wxT(", 50000)"));
-		if (!set)
-		{
-			conn->IsAlive();
-			return;
-		}
-		char* raw1 = set->GetCharPtr(0);
+    if (csv_log_format && inf.savedPartialLine.length() > 0)
+    {
+        if (logfileLength == 0)  // Starting at beginning of log file
+            inf.savedPartialLine.clear();
+        else
+            line = inf.savedPartialLine;
+    }
+    wxString funcname = "pg_read_binary_file(";
+    while (inf.size > logfileLength)
+    {
+        //statusBar->SetStatusText(_("Reading log from server..."));
+        if (m_exit) return;
+        pgSet* set = conn->ExecuteSet(wxT("SELECT ") + funcname +
+            conn->qtDbString(logfileName) + wxT(", ") + NumToStr(logfileLength) + wxT(", 50000)"));
+        if (!set)
+        {
+            conn->IsAlive();
+            return;
+        }
+        char* raw1 = set->GetCharPtr(0);
 
-		if (!raw1 || !*raw1)
-		{
-			delete set;
-			break;
-		}
-		char* raw;
-		unsigned char m[50001];
-		if (true) {
+        if (!raw1 || !*raw1)
+        {
+            delete set;
+            break;
+        }
+        char* raw;
+        unsigned char m[50001];
+        if (true) {
 
-			raw = (char*)&m[0];
-			unsigned char c;
-			unsigned char* startChar;
-			int pos = 0;
-			raw1 = raw1 + 2;
-			int utf8charLen = 0;
-			while (*raw1 != 0) {
-				c = *raw1;
-				c = c - '0';
-				if (c > 9) c = *raw1 - 'a' + 10;
-				raw1++;
-				m[pos] = c << 4;
-				c = *raw1 - '0';
-				if (c > 9) c = *raw1 - 'a' + 10;
-				c = c | m[pos];
-				m[pos] = c;
-				// check utf-8 char
-				if (utf8charLen == 0) {
-					startChar = &m[pos];
-					if (c >> 7 == 0)
-						utf8charLen = 1;
-					else if (c >> 5 == 0x6)
-						utf8charLen = 2;
-					else if (c >> 4 == 0xE)
-						utf8charLen = 3;
-					else if (c >> 5 == 0x1E)
-						utf8charLen = 4;
-					else
-						utf8charLen = 0;
-					// bad utf8 format
-				}
-				pos++;
-				raw1++;
-				utf8charLen--;
-			}
-			// 
-			if (utf8charLen != 0) {
-				//read = startChar - &m[0];
-				// remove bad utf-8 char
-				*startChar = 0;
-			}
-			else
-				m[pos] = 0;
-		}
-		else {
-			raw = raw1;
-		}
-		int l = strlen(raw);
-		logfileLength += l;
-		wxString host = conn->GetHostName();
-		//status->SetLabelText(wxString::Format("%s Load bytes %ld", host, logfileLength));
-		sendText(wxString::Format("%s file: %s Load bytes %ld", host, logfileName, logfileLength));
-		wxString str;
-		str = line + wxTextBuffer::Translate(wxString(raw, set->GetConversion()), wxTextFileType_Unix);
-		//if (wxString(wxString(raw, wxConvLibc).wx_str(), wxConvUTF8).Len() > 0)
-		//	str = line + wxString(wxString(raw, wxConvLibc).wx_str(), wxConvUTF8);
-		//else {
-		//	str = line + wxTextBuffer::Translate(wxString(raw, set->GetConversion()), wxTextFileType_Unix);
-		//}
+            raw = (char*)&m[0];
+            unsigned char c;
+            unsigned char* startChar;
+            int pos = 0;
+            raw1 = raw1 + 2;
+            int utf8charLen = 0;
+            while (*raw1 != 0) {
+                c = *raw1;
+                c = c - '0';
+                if (c > 9) c = *raw1 - 'a' + 10;
+                raw1++;
+                m[pos] = c << 4;
+                c = *raw1 - '0';
+                if (c > 9) c = *raw1 - 'a' + 10;
+                c = c | m[pos];
+                m[pos] = c;
+                // check utf-8 char
+                if (utf8charLen == 0) {
+                    startChar = &m[pos];
+                    if (c >> 7 == 0)
+                        utf8charLen = 1;
+                    else if (c >> 5 == 0x6)
+                        utf8charLen = 2;
+                    else if (c >> 4 == 0xE)
+                        utf8charLen = 3;
+                    else if (c >> 5 == 0x1E)
+                        utf8charLen = 4;
+                    else
+                        utf8charLen = 0;
+                    // bad utf8 format
+                }
+                pos++;
+                raw1++;
+                utf8charLen--;
+            }
+            // 
+            if (utf8charLen != 0) {
+                //read = startChar - &m[0];
+                // remove bad utf-8 char
+                *startChar = 0;
+            }
+            else
+                m[pos] = 0;
+        }
+        else {
+            raw = raw1;
+        }
+        int l = strlen(raw);
+        logfileLength += l;
+        wxString host = conn->GetHostName();
+        //status->SetLabelText(wxString::Format("%s Load bytes %ld", host, logfileLength));
+        sendText(wxString::Format("%s file: %s Load bytes %ld", host, logfileName, logfileLength));
+        wxString str;
+        str = line + wxTextBuffer::Translate(wxString(raw, set->GetConversion()), wxTextFileType_Unix);
+        //if (wxString(wxString(raw, wxConvLibc).wx_str(), wxConvUTF8).Len() > 0)
+        //	str = line + wxString(wxString(raw, wxConvLibc).wx_str(), wxConvUTF8);
+        //else {
+        //	str = line + wxTextBuffer::Translate(wxString(raw, set->GetConversion()), wxTextFileType_Unix);
+        //}
 
 
-		delete set;
+        delete set;
 
-		if (str.Len() == 0)
-		{
-			wxString msgstr = host+" The server log contains entries in multiple encodings and cannot be displayed by pgAdmin.";
-			//wxMessageBox(msgstr);
-			sendText(msgstr);
-			return;
-		}
+        if (str.Len() == 0)
+        {
+            wxString msgstr = host+" The server log contains entries in multiple encodings and cannot be displayed by pgAdmin.";
+            //wxMessageBox(msgstr);
+            sendText(msgstr);
+            return;
+        }
 
-		if (csv_log_format)
-		{
-			// This will work for any DB using CSV format logs
+        if (csv_log_format)
+        {
+            // This will work for any DB using CSV format logs
 
 
-			CSVLineTokenizer tk(str);
+            CSVLineTokenizer tk(str);
 
 
-			//my_view->Freeze();
-			while (tk.HasMoreLines())
-			{
-				line.Clear();
+            //my_view->Freeze();
+            while (tk.HasMoreLines())
+            {
+                line.Clear();
 
-				bool partial;
-				str = tk.GetNextLine(partial);
-				if (partial)
-				{
-					line = str; // Start of a log line, but not complete.  Loop back, Read more data.
-					break;
-				}
+                bool partial;
+                str = tk.GetNextLine(partial);
+                if (partial)
+                {
+                    line = str; // Start of a log line, but not complete.  Loop back, Read more data.
+                    break;
+                }
 
 
-				// Looks like we have a good complete CSV log record.
+                // Looks like we have a good complete CSV log record.
 
 
-				//my_view->AddRow(str.Trim());
-				m_addNewRows.Add(str.Trim());
-			}
+                //my_view->AddRow(str.Trim());
+                m_addNewRows.Add(str.Trim());
+            }
 
-			//my_view->Thaw();
-		}
-		else
-		{
-		}
-	}
+            //my_view->Thaw();
+        }
+        else
+        {
+        }
+    }
 
-	inf.savedPartialLine.clear();
+    inf.savedPartialLine.clear();
 
-	if (!line.IsEmpty())
-	{
-		// We finished reading to the end of the log file, but still have some data left
-		if (csv_log_format)
-		{
-			inf.savedPartialLine = line;    // Save partial log line for next read of the data file.
-			line.Clear();
-		}
-		else
-			//my_view->AddRow(line.Trim());
-			m_addNewRows.Add(line.Trim());
-	}
-	inf.readlastposition = logfileLength;
+    if (!line.IsEmpty())
+    {
+        // We finished reading to the end of the log file, but still have some data left
+        if (csv_log_format)
+        {
+            inf.savedPartialLine = line;    // Save partial log line for next read of the data file.
+            line.Clear();
+        }
+        else
+            //my_view->AddRow(line.Trim());
+            m_addNewRows.Add(line.Trim());
+    }
+    inf.readlastposition = logfileLength;
 
 }
 
 void frmLog::OnAddLabelTextThread(wxThreadEvent& event) {
-	wxString s=event.GetString();
-	if (s == "LOAD OK") {
-		//m_timer.Stop();
-		//wxTimerEvent ev;
-	//	OnTimer(ev);
-		//m_timer.Start(timerInterval);
-		return;
-	}
-	if (!msgtext.IsEmpty() && !s.IsEmpty()) s += " : ";
-	s += msgtext;
-	status->SetLabelText(s);
+    wxString s=event.GetString();
+    if (s == "LOAD OK") {
+        //m_timer.Stop();
+        //wxTimerEvent ev;
+    //	OnTimer(ev);
+        //m_timer.Start(timerInterval);
+        return;
+    }
+    if (!msgtext.IsEmpty() && !s.IsEmpty()) s += " : ";
+    s += msgtext;
+    status->SetLabelText(s);
 }
 
 void frmLog::OnTimer(wxTimerEvent& event) {
+    
+    if (!DBthread->isReadyRows()) return;
+    wxString rez=DBthread->AppendNewRows(my_view, m_storage_model->getStorage());
+    msgtext = wxString::Format("%s%d", rez, m_storage_model->GetRowCount());
+    status->SetLabelText(msgtext);
+    if (DBthread->IsIconError()) {
+        seticon(true);
+    }
+    wxString namepage= DBthread->getNamePage();
 
-	if (!DBthread->isReadyRows()) return;
-
-	wxString rez=DBthread->AppendNewRows(my_view, m_storage_model->getStorage());
-	msgtext = wxString::Format("%s%d", rez, m_storage_model->GetRowCount());
-	status->SetLabelText(msgtext);
-	if (DBthread->IsIconError()) {
-		seticon(true);
-	}
-	wxString namepage= DBthread->getNamePage();
-
-	if (namepage.IsEmpty()) namepage = "not connect";
-	if (m_notebook->GetPageText(0) != namepage) m_notebook->SetPageText(0, namepage);
-	DBthread->GoReadRows();
+    if (namepage.IsEmpty()) namepage = "not connect";
+    if (m_notebook->GetPageText(0) != namepage) m_notebook->SetPageText(0, namepage);
+    DBthread->GoReadRows();
 
 }
 #include "log/log_xpm.xpm"
 #include "log/log_red_xpm.xpm"
 void frmLog::seticon(bool errflag) {
-	//wxImage img = *sql_32_png_img;
-	if (errflag) {
-		SetIcon(idefRed);
-	}
-	else {
-		SetIcon(idef);
-	}
-	return;
+    //wxImage img = *sql_32_png_img;
+    if (errflag) {
+        SetIcon(idefRed);
+    }
+    else {
+        SetIcon(idef);
+    }
+    return;
 
-	wxBitmap* b = new wxBitmap(log_xpm);
-	
-	//wxIcon ico=img.
-	wxMemoryDC dc(*b);
-	dc.SetBrush(*wxYELLOW_BRUSH);
-	
-	//dc.SetBackground(*wxYELLOW_BRUSH);
-	dc.SetBackground(*wxRED_BRUSH);
-	dc.SetBrush(*wxRED_BRUSH);
+    wxBitmap* b = new wxBitmap(log_xpm);
+    
+    //wxIcon ico=img.
+    wxMemoryDC dc(*b);
+    dc.SetBrush(*wxYELLOW_BRUSH);
+    
+    //dc.SetBackground(*wxYELLOW_BRUSH);
+    dc.SetBackground(*wxRED_BRUSH);
+    dc.SetBrush(*wxRED_BRUSH);
 
-	//dc.SetPen(*wxTRANSPARENT_PEN);
-	dc.SetTextForeground(*wxRED);
-	dc.SetPen(*wxRED_PEN);
-	wxRect rect(7,4,7, 7);
+    //dc.SetPen(*wxTRANSPARENT_PEN);
+    dc.SetTextForeground(*wxRED);
+    dc.SetPen(*wxRED_PEN);
+    wxRect rect(7,4,7, 7);
 
-	if (errflag) dc.DrawRoundedRectangle(rect, 0);
+    if (errflag) dc.DrawRoundedRectangle(rect, 0);
 
 //	wxFont font = wxFont(5, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
 //	wxFontStyle s;
 //	font.SetStyle(wxFONTFLAG_ANTIALIASED);
 //	dc.SetFont(font);
 
-	wxImage img = b->ConvertToImage();
-	dc.SelectObject(wxNullBitmap);
-	int w = img.GetWidth();
-	int h = img.GetHeight();
-	wxColor p;
-	wxColor c= wxColor(0,255,0);
-	for (int y = 0; y < h; y++)
-		for (int x = 0; x < w; x++) {
-			p = wxColour(img.GetRed(x, y),
-				img.GetGreen(x, y),
-				img.GetBlue(x, y));
-			//if (img.IsTransparent(x, y)) img.SetRGB(x, y, 255, 255, 255);
-			if (p == c) {
-				//img.SetTra
-				img.SetAlpha(x, y, 255);
-				img.SetRGB(x, y, img.GetMaskRed(), img.GetMaskGreen(), img.GetMaskBlue());
-				;
-			};
-		}
+    wxImage img = b->ConvertToImage();
+    dc.SelectObject(wxNullBitmap);
+    int w = img.GetWidth();
+    int h = img.GetHeight();
+    wxColor p;
+    wxColor c= wxColor(0,255,0);
+    for (int y = 0; y < h; y++)
+        for (int x = 0; x < w; x++) {
+            p = wxColour(img.GetRed(x, y),
+                img.GetGreen(x, y),
+                img.GetBlue(x, y));
+            //if (img.IsTransparent(x, y)) img.SetRGB(x, y, 255, 255, 255);
+            if (p == c) {
+                //img.SetTra
+                img.SetAlpha(x, y, 255);
+                img.SetRGB(x, y, img.GetMaskRed(), img.GetMaskGreen(), img.GetMaskBlue());
+                ;
+            };
+        }
 
-	//wxIcon* ico = new wxIcon();
-	wxIcon ico=GetIcon();
-	wxBitmap* bmp = new wxBitmap(img);
-	ico.CopyFromBitmap(*bmp);
-	//SetIcon(*sql_32_png_ico);
+    //wxIcon* ico = new wxIcon();
+    wxIcon ico=GetIcon();
+    wxBitmap* bmp = new wxBitmap(img);
+    ico.CopyFromBitmap(*bmp);
+    //SetIcon(*sql_32_png_ico);
 
-	SetIcon(ico);
+    SetIcon(ico);
 }
 wxSize MywxAuiDefaultTabArt::GetTabSize(wxDC& dc,
-	wxWindow* wnd,
-	const wxString& caption,
-	const wxBitmapBundle& bitmap,
-	bool WXUNUSED(active),
-	int close_button_state,
-	int* x_extent)
+    wxWindow* wnd,
+    const wxString& caption,
+    const wxBitmapBundle& bitmap,
+    bool WXUNUSED(active),
+    int close_button_state,
+    int* x_extent)
 {
-	wxCoord measured_textx, measured_texty, tmp;
+    wxCoord measured_textx, measured_texty, tmp;
 
-	dc.SetFont(m_normalFont);
-	dc.GetTextExtent(caption, &measured_textx, &measured_texty);
+    dc.SetFont(m_normalFont);
+    dc.GetTextExtent(caption, &measured_textx, &measured_texty);
 
-	dc.GetTextExtent(wxT("ABCDEFXj"), &tmp, &measured_texty);
+    dc.GetTextExtent(wxT("ABCDEFXj"), &tmp, &measured_texty);
 
-	// add padding around the text
-	wxCoord tab_width = measured_textx;
-	wxCoord tab_height = measured_texty;
+    // add padding around the text
+    wxCoord tab_width = measured_textx;
+    wxCoord tab_height = measured_texty;
 
-	// if the close button is showing, add space for it
-	if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN)
-	{
-		// increase by button size plus the padding
-		tab_width += m_activeCloseBmp.GetBitmapFor(wnd).GetLogicalWidth() + wnd->FromDIP(3);
-	}
+    // if the close button is showing, add space for it
+    if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN)
+    {
+        // increase by button size plus the padding
+        tab_width += m_activeCloseBmp.GetBitmapFor(wnd).GetLogicalWidth() + wnd->FromDIP(3);
+    }
 
-	// if there's a bitmap, add space for it
-	if (bitmap.IsOk())
-	{
-		// we need the correct size of the bitmap to be used on this window in
-		// logical dimensions for drawing
-		const wxSize bitmapSize = bitmap.GetPreferredLogicalSizeFor(wnd);
+    // if there's a bitmap, add space for it
+    if (bitmap.IsOk())
+    {
+        // we need the correct size of the bitmap to be used on this window in
+        // logical dimensions for drawing
+        const wxSize bitmapSize = bitmap.GetPreferredLogicalSizeFor(wnd);
 
-		// increase by bitmap plus right side bitmap padding
-		tab_width += bitmapSize.x + wnd->FromDIP(3);
-		tab_height = wxMax(tab_height, bitmapSize.y);
-	}
+        // increase by bitmap plus right side bitmap padding
+        tab_width += bitmapSize.x + wnd->FromDIP(3);
+        tab_height = wxMax(tab_height, bitmapSize.y);
+    }
 
-	// add padding
-	wxSize padding = wnd->FromDIP(wxSize(16, 10));
-	tab_width += padding.x;
-	tab_height += padding.y;
+    // add padding
+    wxSize padding = wnd->FromDIP(wxSize(16, 10));
+    tab_width += padding.x;
+    tab_height += padding.y;
 
-	if (m_flags & wxAUI_NB_TAB_FIXED_WIDTH)
-	{
-		tab_width = m_fixedTabWidth;
-	}
+    if (m_flags & wxAUI_NB_TAB_FIXED_WIDTH)
+    {
+        tab_width = m_fixedTabWidth;
+    }
 
-	*x_extent = tab_width;
+    *x_extent = tab_width;
 
-	return wxSize(tab_width, tab_height);
+    return wxSize(tab_width, tab_height);
 }
 
 void MywxAuiDefaultTabArt::DrawTab(wxDC& dc,
-	wxWindow* wnd,
-	const wxAuiNotebookPage& page,
-	const wxRect& in_rect,
-	int close_button_state,
-	wxRect* out_tab_rect,
-	wxRect* out_button_rect,
-	int* x_extent)
+    wxWindow* wnd,
+    const wxAuiNotebookPage& page,
+    const wxRect& in_rect,
+    int close_button_state,
+    wxRect* out_tab_rect,
+    wxRect* out_button_rect,
+    int* x_extent)
 {
-	wxCoord normal_textx, normal_texty;
-	wxCoord selected_textx, selected_texty;
-	wxCoord texty;
+    wxCoord normal_textx, normal_texty;
+    wxCoord selected_textx, selected_texty;
+    wxCoord texty;
 
-	// if the caption is empty, measure some temporary text
-	wxString caption = page.caption;
-	if (caption.empty())
-		caption = wxT("Xj");
+    // if the caption is empty, measure some temporary text
+    wxString caption = page.caption;
+    if (caption.empty())
+        caption = wxT("Xj");
 
-	dc.SetFont(m_normalFont);
-	dc.GetTextExtent(caption, &selected_textx, &selected_texty);
+    dc.SetFont(m_normalFont);
+    dc.GetTextExtent(caption, &selected_textx, &selected_texty);
 
-	dc.SetFont(m_normalFont);
-	dc.GetTextExtent(caption, &normal_textx, &normal_texty);
+    dc.SetFont(m_normalFont);
+    dc.GetTextExtent(caption, &normal_textx, &normal_texty);
 
-	// figure out the size of the tab
-	wxSize tab_size = GetTabSize(dc,
-		wnd,
-		page.caption,
-		page.bitmap,
-		page.active,
-		close_button_state,
-		x_extent);
+    // figure out the size of the tab
+    wxSize tab_size = GetTabSize(dc,
+        wnd,
+        page.caption,
+        page.bitmap,
+        page.active,
+        close_button_state,
+        x_extent);
 
-	wxCoord tab_height = m_tabCtrlHeight - 3;
-	wxCoord tab_width = tab_size.x;
-	wxCoord tab_x = in_rect.x;
-	wxCoord tab_y = in_rect.y + in_rect.height - tab_height;
+    wxCoord tab_height = m_tabCtrlHeight - 3;
+    wxCoord tab_width = tab_size.x;
+    wxCoord tab_x = in_rect.x;
+    wxCoord tab_y = in_rect.y + in_rect.height - tab_height;
 
 
-	caption = page.caption;
+    caption = page.caption;
 
 
-	// select pen, brush and font for the tab to be drawn
+    // select pen, brush and font for the tab to be drawn
 
-	if (page.active)
-	{
-		dc.SetFont(m_normalFont);
-		texty = selected_texty;
-	}
-	else
-	{
-		dc.SetFont(m_normalFont);
-		texty = normal_texty;
-	}
+    if (page.active)
+    {
+        dc.SetFont(m_normalFont);
+        texty = selected_texty;
+    }
+    else
+    {
+        dc.SetFont(m_normalFont);
+        texty = normal_texty;
+    }
 
 
-	// create points that will make the tab outline
+    // create points that will make the tab outline
 
-	int clip_width = tab_width;
-	if (tab_x + clip_width > in_rect.x + in_rect.width)
-		clip_width = (in_rect.x + in_rect.width) - tab_x;
+    int clip_width = tab_width;
+    if (tab_x + clip_width > in_rect.x + in_rect.width)
+        clip_width = (in_rect.x + in_rect.width) - tab_x;
 
-	// since the above code above doesn't play well with WXDFB or WXCOCOA,
-	// we'll just use a rectangle for the clipping region for now --
-	dc.SetClippingRegion(tab_x, tab_y, clip_width + 1, tab_height - 3);
+    // since the above code above doesn't play well with WXDFB or WXCOCOA,
+    // we'll just use a rectangle for the clipping region for now --
+    dc.SetClippingRegion(tab_x, tab_y, clip_width + 1, tab_height - 3);
 
 
-	wxPoint border_points[6];
-	
-		border_points[0] = wxPoint(tab_x, tab_y + tab_height - 4);
-		border_points[1] = wxPoint(tab_x, tab_y + 2);
-		border_points[2] = wxPoint(tab_x + 2, tab_y);
-		border_points[3] = wxPoint(tab_x + tab_width - 2, tab_y);
-		border_points[4] = wxPoint(tab_x + tab_width, tab_y + 2);
-		border_points[5] = wxPoint(tab_x + tab_width, tab_y + tab_height - 4);
-	
-	// TODO: else if (m_flags &wxAUI_NB_LEFT) {}
-	// TODO: else if (m_flags &wxAUI_NB_RIGHT) {}
+    wxPoint border_points[6];
+    
+        border_points[0] = wxPoint(tab_x, tab_y + tab_height - 4);
+        border_points[1] = wxPoint(tab_x, tab_y + 2);
+        border_points[2] = wxPoint(tab_x + 2, tab_y);
+        border_points[3] = wxPoint(tab_x + tab_width - 2, tab_y);
+        border_points[4] = wxPoint(tab_x + tab_width, tab_y + 2);
+        border_points[5] = wxPoint(tab_x + tab_width, tab_y + tab_height - 4);
+    
+    // TODO: else if (m_flags &wxAUI_NB_LEFT) {}
+    // TODO: else if (m_flags &wxAUI_NB_RIGHT) {}
 
-	int drawn_tab_yoff = border_points[1].y;
-	int drawn_tab_height = border_points[0].y - border_points[1].y;
+    int drawn_tab_yoff = border_points[1].y;
+    int drawn_tab_height = border_points[0].y - border_points[1].y;
 
-	bool isdark = wxSystemSettings::GetAppearance().IsUsingDarkBackground();
+    bool isdark = wxSystemSettings::GetAppearance().IsUsingDarkBackground();
 
-	wxColor back_color = m_baseColour;
-	if (page.active)
-	{
-		// draw active tab
+    wxColor back_color = m_baseColour;
+    if (page.active)
+    {
+        // draw active tab
 
-		// draw base background color
-		wxRect r(tab_x, tab_y, tab_width, tab_height);
-		dc.SetPen(wxPen(m_activeColour));
-		dc.SetBrush(wxBrush(m_activeColour));
-		dc.DrawRectangle(r.x + 1, r.y + 1, r.width - 1, r.height - 4);
+        // draw base background color
+        wxRect r(tab_x, tab_y, tab_width, tab_height);
+        dc.SetPen(wxPen(m_activeColour));
+        dc.SetBrush(wxBrush(m_activeColour));
+        dc.DrawRectangle(r.x + 1, r.y + 1, r.width - 1, r.height - 4);
 
-		// this white helps fill out the gradient at the top of the tab
-		wxColor gradient = *wxWHITE;
-		if (isdark)
-		{
-			//dark mode, we go darker
-			gradient = m_activeColour.ChangeLightness(70);
-		}
-		back_color = gradient;
+        // this white helps fill out the gradient at the top of the tab
+        wxColor gradient = *wxWHITE;
+        if (isdark)
+        {
+            //dark mode, we go darker
+            gradient = m_activeColour.ChangeLightness(70);
+        }
+        back_color = gradient;
 
-		dc.SetPen(wxPen(gradient));
-		dc.SetBrush(wxBrush(gradient));
-		dc.DrawRectangle(r.x + 2, r.y + 1, r.width - 3, r.height - 4);
+        dc.SetPen(wxPen(gradient));
+        dc.SetBrush(wxBrush(gradient));
+        dc.DrawRectangle(r.x + 2, r.y + 1, r.width - 3, r.height - 4);
 
-		// these two points help the rounded corners appear more antialiased
-		dc.SetPen(wxPen(m_activeColour));
-		dc.DrawPoint(r.x + 2, r.y + 1);
-		dc.DrawPoint(r.x + r.width - 2, r.y + 1);
+        // these two points help the rounded corners appear more antialiased
+        dc.SetPen(wxPen(m_activeColour));
+        dc.DrawPoint(r.x + 2, r.y + 1);
+        dc.DrawPoint(r.x + r.width - 2, r.y + 1);
 
-		// set rectangle down a bit for gradient drawing
-		r.SetHeight(r.GetHeight() / 2);
-		r.x += 2;
-		r.width -= 3;
-		r.y += r.height;
-		r.y -= 2;
+        // set rectangle down a bit for gradient drawing
+        r.SetHeight(r.GetHeight() / 2);
+        r.x += 2;
+        r.width -= 3;
+        r.y += r.height;
+        r.y -= 2;
 
-		// draw gradient background
-		wxColor top_color = gradient;
-		wxColor bottom_color = m_activeColour;
-		dc.GradientFillLinear(r, bottom_color, top_color, wxNORTH);
-	}
-	else
-	{
-		// draw inactive tab
+        // draw gradient background
+        wxColor top_color = gradient;
+        wxColor bottom_color = m_activeColour;
+        dc.GradientFillLinear(r, bottom_color, top_color, wxNORTH);
+    }
+    else
+    {
+        // draw inactive tab
 
-		wxRect r(tab_x, tab_y + 1, tab_width, tab_height - 3);
+        wxRect r(tab_x, tab_y + 1, tab_width, tab_height - 3);
 
-		// start the gradient up a bit and leave the inside border inset
-		// by a pixel for a 3D look.  Only the top half of the inactive
-		// tab will have a slight gradient
-		r.x += 3;
-		r.y++;
-		r.width -= 4;
-		r.height /= 2;
-		r.height--;
+        // start the gradient up a bit and leave the inside border inset
+        // by a pixel for a 3D look.  Only the top half of the inactive
+        // tab will have a slight gradient
+        r.x += 3;
+        r.y++;
+        r.width -= 4;
+        r.height /= 2;
+        r.height--;
 
-		// -- draw top gradient fill for glossy look
-		wxColor top_color = m_baseColour;
-		wxColor bottom_color = top_color.ChangeLightness(160);
-		if (isdark)
-		{
-			//dark mode, we go darker
-			top_color = m_activeColour.ChangeLightness(70);
-			bottom_color = m_baseColour;
-		}
+        // -- draw top gradient fill for glossy look
+        wxColor top_color = m_baseColour;
+        wxColor bottom_color = top_color.ChangeLightness(160);
+        if (isdark)
+        {
+            //dark mode, we go darker
+            top_color = m_activeColour.ChangeLightness(70);
+            bottom_color = m_baseColour;
+        }
 
-		dc.GradientFillLinear(r, bottom_color, top_color, wxNORTH);
+        dc.GradientFillLinear(r, bottom_color, top_color, wxNORTH);
 
-		r.y += r.height;
-		r.y--;
+        r.y += r.height;
+        r.y--;
 
-		// -- draw bottom fill for glossy look
-		top_color = m_baseColour;
-		bottom_color = m_baseColour;
-		dc.GradientFillLinear(r, top_color, bottom_color, wxSOUTH);
-	}
+        // -- draw bottom fill for glossy look
+        top_color = m_baseColour;
+        bottom_color = m_baseColour;
+        dc.GradientFillLinear(r, top_color, bottom_color, wxSOUTH);
+    }
 
-	// draw tab outline
-	dc.SetPen(m_borderPen);
-	dc.SetBrush(*wxTRANSPARENT_BRUSH);
-	dc.DrawPolygon(WXSIZEOF(border_points), border_points);
+    // draw tab outline
+    dc.SetPen(m_borderPen);
+    dc.SetBrush(*wxTRANSPARENT_BRUSH);
+    dc.DrawPolygon(WXSIZEOF(border_points), border_points);
 
-	// there are two horizontal grey lines at the bottom of the tab control,
-	// this gets rid of the top one of those lines in the tab control
-	if (page.active)
-	{
-		if (m_flags & wxAUI_NB_BOTTOM)
-			dc.SetPen(wxPen(m_baseColour.ChangeLightness(170)));
-		// TODO: else if (m_flags &wxAUI_NB_LEFT) {}
-		// TODO: else if (m_flags &wxAUI_NB_RIGHT) {}
-		else //for wxAUI_NB_TOP
-			dc.SetPen(m_baseColourPen);
-		dc.DrawLine(border_points[0].x + 1,
-			border_points[0].y,
-			border_points[5].x,
-			border_points[5].y);
-	}
+    // there are two horizontal grey lines at the bottom of the tab control,
+    // this gets rid of the top one of those lines in the tab control
+    if (page.active)
+    {
+        if (m_flags & wxAUI_NB_BOTTOM)
+            dc.SetPen(wxPen(m_baseColour.ChangeLightness(170)));
+        // TODO: else if (m_flags &wxAUI_NB_LEFT) {}
+        // TODO: else if (m_flags &wxAUI_NB_RIGHT) {}
+        else //for wxAUI_NB_TOP
+            dc.SetPen(m_baseColourPen);
+        dc.DrawLine(border_points[0].x + 1,
+            border_points[0].y,
+            border_points[5].x,
+            border_points[5].y);
+    }
 
 
-	int text_offset;
-	int bitmap_offset = 0;
-	if (page.bitmap.IsOk())
-	{
-		bitmap_offset = tab_x + wnd->FromDIP(8);
+    int text_offset;
+    int bitmap_offset = 0;
+    if (page.bitmap.IsOk())
+    {
+        bitmap_offset = tab_x + wnd->FromDIP(8);
 
-		const wxBitmap bitmap = page.bitmap.GetBitmapFor(wnd);
+        const wxBitmap bitmap = page.bitmap.GetBitmapFor(wnd);
 
-		// draw bitmap
-		dc.DrawBitmap(bitmap,
-			bitmap_offset,
-			drawn_tab_yoff + (drawn_tab_height / 2) - (bitmap.GetLogicalHeight() / 2),
-			true);
+        // draw bitmap
+        dc.DrawBitmap(bitmap,
+            bitmap_offset,
+            drawn_tab_yoff + (drawn_tab_height / 2) - (bitmap.GetLogicalHeight() / 2),
+            true);
 
-		text_offset = bitmap_offset + bitmap.GetLogicalWidth();
-		text_offset += wnd->FromDIP(3); // bitmap padding
-	}
-	else
-	{
-		text_offset = tab_x + wnd->FromDIP(8);
-	}
+        text_offset = bitmap_offset + bitmap.GetLogicalWidth();
+        text_offset += wnd->FromDIP(3); // bitmap padding
+    }
+    else
+    {
+        text_offset = tab_x + wnd->FromDIP(8);
+    }
 
-	// draw close button if necessary
-	int close_button_width = 0;
+    // draw close button if necessary
+    int close_button_width = 0;
 
-	wxString draw_text = caption;
+    wxString draw_text = caption;
 
-	// 
-	size_t pos = 0; size_t poss = 0;
-	int x = text_offset;
-	int ttx, tty;
-	int y = drawn_tab_yoff + (drawn_tab_height) / 2 - (texty / 2) - 1;
-	{
-		wxDCBrushChanger setBrush(dc, *wxYELLOW_BRUSH);
-		while ((pos = draw_text.find(' ', poss)) != wxString::npos) {
-			dc.GetTextExtent(draw_text.SubString(poss, pos), &ttx, &tty);
-			x += ttx;
-			size_t en=draw_text.find(',', pos + 1);
-			if (en == wxString::npos) en = draw_text.Len();
-			dc.GetTextExtent(draw_text.SubString(pos+1, en-1), &ttx, &tty);
-			wxRect r(x, y, ttx, tty);
-			dc.DrawRoundedRectangle(r, 2);
-			x += ttx;
-			poss = en;
+    // 
+    size_t pos = 0; size_t poss = 0;
+    int x = text_offset;
+    int ttx, tty;
+    int y = drawn_tab_yoff + (drawn_tab_height) / 2 - (texty / 2) - 1;
+    {
+        wxDCBrushChanger setBrush(dc, *wxYELLOW_BRUSH);
+        while ((pos = draw_text.find(' ', poss)) != wxString::npos) {
+            dc.GetTextExtent(draw_text.SubString(poss, pos), &ttx, &tty);
+            x += ttx;
+            size_t en=draw_text.find(',', pos + 1);
+            if (en == wxString::npos) en = draw_text.Len();
+            dc.GetTextExtent(draw_text.SubString(pos+1, en-1), &ttx, &tty);
+            wxRect r(x, y, ttx, tty);
+            dc.DrawRoundedRectangle(r, 2);
+            x += ttx;
+            poss = en;
 
-		}
-		//
-	}
-	// draw tab text
-	wxColor sys_color = wxSystemSettings::GetColour(
-		page.active ? wxSYS_COLOUR_CAPTIONTEXT : wxSYS_COLOUR_INACTIVECAPTIONTEXT);
-	dc.SetTextForeground(sys_color);
-	dc.DrawText(draw_text,
-		text_offset,
-		drawn_tab_yoff + (drawn_tab_height) / 2 - (texty / 2) - 1);
+        }
+        //
+    }
+    // draw tab text
+    wxColor sys_color = wxSystemSettings::GetColour(
+        page.active ? wxSYS_COLOUR_CAPTIONTEXT : wxSYS_COLOUR_INACTIVECAPTIONTEXT);
+    dc.SetTextForeground(sys_color);
+    dc.DrawText(draw_text,
+        text_offset,
+        drawn_tab_yoff + (drawn_tab_height) / 2 - (texty / 2) - 1);
 
-	// draw focus rectangle except under macOS where it looks out of place
+    // draw focus rectangle except under macOS where it looks out of place
 #ifndef __WXOSX__
-	if (page.active && (wnd->FindFocus() == wnd))
-	{
-		wxRect focusRectText(text_offset, (drawn_tab_yoff + (drawn_tab_height) / 2 - (texty / 2) - 1),
-			selected_textx, selected_texty);
+    if (page.active && (wnd->FindFocus() == wnd))
+    {
+        wxRect focusRectText(text_offset, (drawn_tab_yoff + (drawn_tab_height) / 2 - (texty / 2) - 1),
+            selected_textx, selected_texty);
 
-		wxRect focusRect;
-		wxRect focusRectBitmap;
+        wxRect focusRect;
+        wxRect focusRectBitmap;
 
-		if (page.bitmap.IsOk())
-		{
-			const wxBitmap bitmap = page.bitmap.GetBitmapFor(wnd);
+        if (page.bitmap.IsOk())
+        {
+            const wxBitmap bitmap = page.bitmap.GetBitmapFor(wnd);
 
-			focusRectBitmap = wxRect(bitmap_offset, drawn_tab_yoff + (drawn_tab_height / 2) - (bitmap.GetLogicalHeight() / 2),
-				bitmap.GetLogicalWidth(), bitmap.GetLogicalHeight());
-		}
+            focusRectBitmap = wxRect(bitmap_offset, drawn_tab_yoff + (drawn_tab_height / 2) - (bitmap.GetLogicalHeight() / 2),
+                bitmap.GetLogicalWidth(), bitmap.GetLogicalHeight());
+        }
 
-		if (page.bitmap.IsOk() && draw_text.IsEmpty())
-			focusRect = focusRectBitmap;
-		else if (!page.bitmap.IsOk() && !draw_text.IsEmpty())
-			focusRect = focusRectText;
-		else if (page.bitmap.IsOk() && !draw_text.IsEmpty())
-			focusRect = focusRectText.Union(focusRectBitmap);
+        if (page.bitmap.IsOk() && draw_text.IsEmpty())
+            focusRect = focusRectBitmap;
+        else if (!page.bitmap.IsOk() && !draw_text.IsEmpty())
+            focusRect = focusRectText;
+        else if (page.bitmap.IsOk() && !draw_text.IsEmpty())
+            focusRect = focusRectText.Union(focusRectBitmap);
 
-		focusRect.Inflate(2, 2);
+        focusRect.Inflate(2, 2);
 
-		wxRendererNative::Get().DrawFocusRect(wnd, dc, focusRect, 0);
-	}
+        wxRendererNative::Get().DrawFocusRect(wnd, dc, focusRect, 0);
+    }
 #endif // !__WXOSX__
 
-	* out_tab_rect = wxRect(tab_x, tab_y, tab_width, tab_height);
+    * out_tab_rect = wxRect(tab_x, tab_y, tab_width, tab_height);
 
-	dc.DestroyClippingRegion();
+    dc.DestroyClippingRegion();
 
 }
 frmLog::frmLog(frmMain *form, const wxString &_title, pgServer *srv) : pgFrame(NULL, _title)
 {
 
-	dlgName = wxT("frmLog");
-	RestorePosition(-1, -1, 700, 500, 700, 500);
-	//SetIcon(wxIcon(log_xpm));
-	idef = wxIcon(log_xpm);
-	idefRed = wxIcon(log_red_xpm);
-	seticon(false);
-	mainForm = form;
-	// Setup accelerators
-	wxAcceleratorEntry entries[2];
-	entries[0].Set(wxACCEL_CTRL, (int)'F', MNU_FIND);
-	entries[1].Set(wxACCEL_CTRL, (int)'S', MNU_SEND_MAIL);
-	wxAcceleratorTable accel(2, entries);
-	SetAcceleratorTable(accel);
-	SetAcceleratorTable(accel);
+    dlgName = wxT("frmLog");
+    RestorePosition(-1, -1, 700, 500, 700, 500);
+    //SetIcon(wxIcon(log_xpm));
+    idef = wxIcon(log_xpm);
+    idefRed = wxIcon(log_red_xpm);
+    seticon(false);
+    mainForm = form;
+    // Setup accelerators
+    wxAcceleratorEntry entries[2];
+    entries[0].Set(wxACCEL_CTRL, (int)'F', MNU_FIND);
+    entries[1].Set(wxACCEL_CTRL, (int)'S', MNU_SEND_MAIL);
+    wxAcceleratorTable accel(2, entries);
+    SetAcceleratorTable(accel);
+    SetAcceleratorTable(accel);
 
     m_notebook = new wxAuiNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize,0 );
-	MywxAuiDefaultTabArt* art = new MywxAuiDefaultTabArt();
+    MywxAuiDefaultTabArt* art = new MywxAuiDefaultTabArt();
     wxPanel* testPanel = new wxPanel(m_notebook, wxID_ANY);
     //BuildDataViewCtrl(testPanel, Page_Test);
     my_view = new MyDataViewCtrl(testPanel, wxID_ANY, wxDefaultPosition,
@@ -1066,14 +1065,14 @@ frmLog::frmLog(frmMain *form, const wxString &_title, pgServer *srv) : pgFrame(N
 
     my_view->Bind(wxEVT_MENU, &MyDataViewCtrl::OnEVT_DATAVIEW_CONTEXT_MENU, my_view);
     m_storage_model = new StorageModel(my_view);
-	//wxObjectDataPtr<StorageModel> m_storage_model(new StorageModel(my_view));
+    //wxObjectDataPtr<StorageModel> m_storage_model(new StorageModel(my_view));
     my_view->AssociateModel(m_storage_model.get());
     
     m_storage_model->BuildColumns(my_view);
-	wxString s;
-	s=settings->Read(dlgName + "/ColsWidth","");
-	if (s.Len()>0) my_view->setSettingString(s);
-	//settings->Write(dlgName + "/ColsWidth", s);
+    wxString s;
+    s=settings->Read(dlgName + "/ColsWidth","");
+    if (s.Len()>0) my_view->setSettingString(s);
+    //settings->Write(dlgName + "/ColsWidth", s);
 
     wxSizer* zeroPanelSz = new wxBoxSizer(wxVERTICAL);
     my_view->SetMinSize(wxSize(-1, 200));
@@ -1096,191 +1095,193 @@ frmLog::frmLog(frmMain *form, const wxString &_title, pgServer *srv) : pgFrame(N
     const wxSizerFlags border1 = wxSizerFlags().DoubleBorder();
 
     //wxBoxSizer* button_sizer = new wxBoxSizer(wxHORIZONTAL);
-	sSizer->Add(new wxButton(testPanel, ID_EXTENDED_LOG, "Clear table"), border1);
-	sSizer->Add(new wxStaticText(testPanel, wxID_ANY, "Load last file counts:"), border1);
-	sSizer->Add(new wxTextCtrl(testPanel, ID_COUNT_FILES, "1",wxDefaultPosition,wxDefaultSize, wxTE_PROCESS_ENTER), border1);
+    sSizer->Add(new wxButton(testPanel, ID_EXTENDED_LOG, "Clear table"), border1);
+    sSizer->Add(new wxStaticText(testPanel, wxID_ANY, "Load last file counts:"), border1);
+    sSizer->Add(new wxTextCtrl(testPanel, ID_COUNT_FILES, "1",wxDefaultPosition,wxDefaultSize, wxTE_PROCESS_ENTER), border1);
 
     sSizer->Add(new wxButton(testPanel, ID_CLEAR_ALL_FILTER, "Clear All Filter"), border1);
     //sSizer->Add(new wxButton(testPanel, ID_DELETE_SEL, "Delete selected"), border);
-	sSizer->Add(new wxButton(testPanel, ID_ADD_FILTER, "Add Filter Ignore"), border1);
-	sSizer->Add(new wxButton(testPanel, ID_HELP_LOG, "Help"), border1);
-	smart = new wxComboBox(testPanel, ID_CBOX_SMART, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, 0);
-	//smart->SetWindowStyle(smart->GetWindowStyle()|wxCB_READONLY);
-	
-	smart->SetMinSize(wxSize(300,-1));
-	//listUserFilter = new wxComboBox(testPanel, ID_CBOX_UFilter, wxT("Combo!"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0);
-	sSizer->Add(smart, border1);
-	my_view->smart = smart;
+    sSizer->Add(new wxButton(testPanel, ID_ADD_FILTER, "Add Filter Ignore"), border1);
+    sSizer->Add(new wxButton(testPanel, ID_HELP_LOG, "Help"), border1);
+    smart = new wxComboBox(testPanel, ID_CBOX_SMART, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, 0);
+    //smart->SetWindowStyle(smart->GetWindowStyle()|wxCB_READONLY);
+    
+    smart->SetMinSize(wxSize(300,-1));
+    //listUserFilter = new wxComboBox(testPanel, ID_CBOX_UFilter, wxT("Combo!"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0);
+    sSizer->Add(smart, border1);
+    my_view->smart = smart;
 
     zeroPanelSz->Add(sSizer);
     testPanel->SetSizerAndFit(zeroPanelSz);
 
     m_notebook->AddPage(testPanel, "Log");
-	wxBoxSizer* setingSZ = new wxBoxSizer(wxHORIZONTAL);
-	setingSZ->Add(m_notebook);
+    wxBoxSizer* setingSZ = new wxBoxSizer(wxHORIZONTAL);
+    setingSZ->Add(m_notebook);
 
-	wxPanel* settingPanel = new wxPanel(m_notebook, wxID_ANY);
-	lb = new wxCheckListBox(settingPanel,wxID_ANY);
-	wxTreeItemIdValue foldercookie, servercookie;
-	wxTreeItemId folderitem, serveritem;
-	pgObject* object;
-	pgServer* server;
-	std::vector<wxString> vec;
-	folderitem = mainForm->GetBrowser()->GetFirstChild(mainForm->GetBrowser()->GetRootItem(), foldercookie);
-	while (folderitem)
-	{
-		if (mainForm->GetBrowser()->ItemHasChildren(folderitem))
-		{
-			serveritem = mainForm->GetBrowser()->GetFirstChild(folderitem, servercookie);
-			while (serveritem)
-			{
-				object = mainForm->GetBrowser()->GetObject(serveritem);
-				if (object && object->IsCreatedBy(serverFactory))
-				{
-					server = (pgServer*)object;
-					wxString srvname = wxString::Format("%s:%d", server->GetName(), server->GetPort());
-					vec.push_back(srvname);
-					
-				}
-				serveritem = mainForm->GetBrowser()->GetNextChild(folderitem, servercookie);
-			}
-		}
-		folderitem = mainForm->GetBrowser()->GetNextChild(mainForm->GetBrowser()->GetRootItem(), foldercookie);
-	}
-	lb->Append(vec);
-	wxString srvs;
-	wxString srvname = wxString::Format("%s:%d", srv->GetName(), srv->GetPort());
-	bool onlyOne = srv->GetConnected();
-	if (onlyOne) {
-		SetTitle(_title + wxString::Format("(%s)", srvname));
-		lb->Enable(false);
-	}
-	settings->Read(dlgName + "/AutoConnect", &srvs, "");
-	if (!srvs.IsEmpty()) srvs += ";";
-	srvs += srvname;
-	wxStringTokenizer tk(srvs, ";", wxTOKEN_RET_EMPTY_ALL);
-	while (tk.HasMoreTokens())
-	{
-		wxString l = tk.GetNextToken();
-		pgServer* s = getServer(l);
-		if (s != NULL) {
-			if (!CheckConn(s->GetName(), s->GetPort())) {
-				if (!onlyOne || (onlyOne && srvname == l)) {
-					pgConn* conn = createConn(s);
-						AddNewConn(conn);
-				}
-				for (unsigned int x = 0; x < lb->GetCount(); x++)
-					if (l==lb->GetString(x)) lb->Check(x, true);
-			}
-		}
-		
-	}
+    wxPanel* settingPanel = new wxPanel(m_notebook, wxID_ANY);
+    lb = new wxCheckListBox(settingPanel,wxID_ANY);
+    wxTreeItemIdValue foldercookie, servercookie;
+    wxTreeItemId folderitem, serveritem;
+    pgObject* object;
+    pgServer* server;
+    std::vector<wxString> vec;
+    folderitem = mainForm->GetBrowser()->GetFirstChild(mainForm->GetBrowser()->GetRootItem(), foldercookie);
+    while (folderitem)
+    {
+        if (mainForm->GetBrowser()->ItemHasChildren(folderitem))
+        {
+            serveritem = mainForm->GetBrowser()->GetFirstChild(folderitem, servercookie);
+            while (serveritem)
+            {
+                object = mainForm->GetBrowser()->GetObject(serveritem);
+                if (object && object->IsCreatedBy(serverFactory))
+                {
+                    server = (pgServer*)object;
+                    wxString srvname = wxString::Format("%s:%d", server->GetName(), server->GetPort());
+                    vec.push_back(srvname);
+                    
+                }
+                serveritem = mainForm->GetBrowser()->GetNextChild(folderitem, servercookie);
+            }
+        }
+        folderitem = mainForm->GetBrowser()->GetNextChild(mainForm->GetBrowser()->GetRootItem(), foldercookie);
+    }
+    lb->Append(vec);
+    wxString srvs;
+    wxString srvname = wxString::Format("%s:%d", srv->GetName(), srv->GetPort());
+    bool onlyOne = srv->GetConnected();
+    if (onlyOne) {
+        SetTitle(_title + wxString::Format("(%s)", srvname));
+        lb->Enable(false);
+    }
+    settings->Read(dlgName + "/AutoConnect", &srvs, "");
+    if (!srvs.IsEmpty()) srvs += ";";
+    srvs += srvname;
+    wxStringTokenizer tk(srvs, ";", wxTOKEN_RET_EMPTY_ALL);
+    while (tk.HasMoreTokens())
+    {
+        wxString l = tk.GetNextToken();
+        pgServer* s = getServer(l);
+        if (s != NULL) {
+            if (!CheckConn(s->GetName(), s->GetPort())) {
+                if (!onlyOne || (onlyOne && srvname == l)) {
+                    pgConn* conn = createConn(s);
+                        AddNewConn(conn);
+                }
+                for (unsigned int x = 0; x < lb->GetCount(); x++)
+                    if (l==lb->GetString(x)) lb->Check(x, true);
+            }
+        }
+        
+    }
 
-	wxSizer* zeroPanelSz2 = new wxBoxSizer(wxHORIZONTAL);
-	lb->SetMinSize(wxSize(-1, 200));
-	zeroPanelSz2->Add(lb, 1, wxGROW | wxALL, 5);
+    wxSizer* zeroPanelSz2 = new wxBoxSizer(wxHORIZONTAL);
+    lb->SetMinSize(wxSize(-1, 200));
+    zeroPanelSz2->Add(lb, 1, wxGROW | wxALL, 5);
 
-	wxPanel *m_panel2 = new wxPanel(settingPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
+    wxPanel *m_panel2 = new wxPanel(settingPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
 
-	zeroPanelSz2->Add(m_panel2, 1, wxEXPAND | wxALL, 5);
+    zeroPanelSz2->Add(m_panel2, 1, wxEXPAND | wxALL, 5);
 
-	wxBoxSizer* bSizer3;
-	bSizer3 = new wxBoxSizer(wxVERTICAL);
+    wxBoxSizer* bSizer3;
+    bSizer3 = new wxBoxSizer(wxVERTICAL);
 
-	wxBoxSizer* bSizer2;
-	bSizer2 = new wxBoxSizer(wxHORIZONTAL);
-	listUserFilter = new wxComboBox(m_panel2, ID_CBOX_UFilter, wxT("Combo!"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0);
-	bSizer2->Add(listUserFilter, 1, wxALL | wxEXPAND, 2);
-	wxButton *m_button1 = new wxButton(m_panel2, ID_ADD_UFilter, wxT("Add"), wxDefaultPosition, wxDefaultSize, 0);
-	m_button1->SetMaxSize(wxSize(30, -1));
-	bSizer2->Add(m_button1, 0, wxALL, 2);
-	wxButton *m_button2 = new wxButton(m_panel2, ID_DEL_UFilter, wxT("Del"), wxDefaultPosition, wxDefaultSize, 0);
-	m_button2->SetMaxSize(wxSize(30, -1));
-	bSizer2->Add(m_button2, 0, wxALL, 2);
-	bSizer3->Add(bSizer2, 0, wxEXPAND, 5);
+    wxBoxSizer* bSizer2;
+    bSizer2 = new wxBoxSizer(wxHORIZONTAL);
+    listUserFilter = new wxComboBox(m_panel2, ID_CBOX_UFilter, wxT("Combo!"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0);
+    bSizer2->Add(listUserFilter, 1, wxALL | wxEXPAND, 2);
+    wxButton *m_button1 = new wxButton(m_panel2, ID_ADD_UFilter, wxT("Add"), wxDefaultPosition, wxDefaultSize, 0);
+    m_button1->SetMaxSize(wxSize(30, -1));
+    bSizer2->Add(m_button1, 0, wxALL, 2);
+    wxButton *m_button2 = new wxButton(m_panel2, ID_DEL_UFilter, wxT("Del"), wxDefaultPosition, wxDefaultSize, 0);
+    m_button2->SetMaxSize(wxSize(30, -1));
+    bSizer2->Add(m_button2, 0, wxALL, 2);
+    bSizer3->Add(bSizer2, 0, wxEXPAND, 5);
 
-	wxBoxSizer* bSizer5;
-	bSizer5 = new wxBoxSizer(wxVERTICAL);
+    wxBoxSizer* bSizer5;
+    bSizer5 = new wxBoxSizer(wxVERTICAL);
 
-	contentFilter = new wxTextCtrl(m_panel2, ID_TEXT_UFilter, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);
-	bSizer5->Add(contentFilter, 1, wxALL | wxEXPAND, 2);
-	bSizer3->Add(bSizer5, 1, wxEXPAND, 2);
-	m_panel2->SetSizer(bSizer3);
+    contentFilter = new wxTextCtrl(m_panel2, ID_TEXT_UFilter, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);
+    bSizer5->Add(contentFilter, 1, wxALL | wxEXPAND, 2);
+    bSizer3->Add(bSizer5, 1, wxEXPAND, 2);
+    m_panel2->SetSizer(bSizer3);
 
-	//listUserFilter->Bind();
-	
-	settingPanel->SetSizerAndFit(zeroPanelSz2);
-	m_notebook->AddPage(settingPanel, "Settings");
-	m_notebook->SetArtProvider(art);
-	//m_notebook->SetSelectedFont(settings->GetSystemFont());
-	//m_notebook->SetNormalFont(settings->GetSystemFont());
-	m_notebook->SetFont(settings->GetSystemFont());
-	bool b=true;
-	settings->Read(dlgName + "/Mode",&b, false);
-	group->SetValue(b);
-	my_view->setGroupMode(b);
-	my_view->ModUserFilter("","Init", listUserFilter, contentFilter);
+    //listUserFilter->Bind();
+    
+    settingPanel->SetSizerAndFit(zeroPanelSz2);
+    m_notebook->AddPage(settingPanel, "Settings");
+    m_notebook->SetArtProvider(art);
+    //m_notebook->SetSelectedFont(settings->GetSystemFont());
+    //m_notebook->SetNormalFont(settings->GetSystemFont());
+    m_notebook->SetFont(settings->GetSystemFont());
+    my_view->SetFont(settings->GetSystemFont());
+    bool b=true;
+    settings->Read(dlgName + "/Mode",&b, false);
+    group->SetValue(b);
+    my_view->setGroupMode(b);
+    my_view->ModUserFilter("","Init", listUserFilter, contentFilter);
 //	if (mainForm) getFilename();
-	Connect(wxID_ANY, wxEVT_THREAD, wxThreadEventHandler(frmLog::OnAddLabelTextThread), NULL, this);
-	DBthread = new MyThread(conArray,this,1);
-	if (DBthread->Create() != wxTHREAD_NO_ERROR)
-	{
-		wxLogError(wxT("Can’t create thread!"));
-	}
-	DBthread->Run();
-	m_timer.Start(timerInterval);
+    Connect(wxID_ANY, wxEVT_THREAD, wxThreadEventHandler(frmLog::OnAddLabelTextThread), NULL, this);
+    DBthread = new MyThread(conArray,this,1);
+    if (DBthread->Create() != wxTHREAD_NO_ERROR)
+    {
+        wxLogError(wxT("Can’t create thread!"));
+    }
+    DBthread->Run();
+    m_timer.Start(timerInterval);
 }
 pgServer* frmLog::getServer(wxString& strserver) {
-	wxTreeItemIdValue foldercookie, servercookie;
-	wxTreeItemId folderitem, serveritem;
-	pgObject* object;
-	pgServer* server;
-	folderitem = mainForm->GetBrowser()->GetFirstChild(mainForm->GetBrowser()->GetRootItem(), foldercookie);
-	while (folderitem)
-	{
-		if (mainForm->GetBrowser()->ItemHasChildren(folderitem))
-		{
-			serveritem = mainForm->GetBrowser()->GetFirstChild(folderitem, servercookie);
-			while (serveritem)
-			{
-				object = mainForm->GetBrowser()->GetObject(serveritem);
-				if (object && object->IsCreatedBy(serverFactory))
-				{
-					server = (pgServer*)object;
-					wxString srvname = wxString::Format("%s:%d", server->GetName(), server->GetPort());
-					if (srvname == strserver) {
-						return server;
-					}
-				}
-				serveritem = mainForm->GetBrowser()->GetNextChild(folderitem, servercookie);
-			}
-		}
-		folderitem = mainForm->GetBrowser()->GetNextChild(mainForm->GetBrowser()->GetRootItem(), foldercookie);
-	}
-	return 0;
+    wxTreeItemIdValue foldercookie, servercookie;
+    wxTreeItemId folderitem, serveritem;
+    pgObject* object;
+    pgServer* server;
+    folderitem = mainForm->GetBrowser()->GetFirstChild(mainForm->GetBrowser()->GetRootItem(), foldercookie);
+    while (folderitem)
+    {
+        if (mainForm->GetBrowser()->ItemHasChildren(folderitem))
+        {
+            serveritem = mainForm->GetBrowser()->GetFirstChild(folderitem, servercookie);
+            while (serveritem)
+            {
+                object = mainForm->GetBrowser()->GetObject(serveritem);
+                if (object && object->IsCreatedBy(serverFactory))
+                {
+                    server = (pgServer*)object;
+                    wxString srvname = wxString::Format("%s:%d", server->GetName(), server->GetPort());
+                    if (srvname == strserver) {
+                        return server;
+                    }
+                }
+                serveritem = mainForm->GetBrowser()->GetNextChild(folderitem, servercookie);
+            }
+        }
+        folderitem = mainForm->GetBrowser()->GetNextChild(mainForm->GetBrowser()->GetRootItem(), foldercookie);
+    }
+    return 0;
 }
 
 frmLog::~frmLog()
 {
+    m_timer.Stop();
     // If connection is still available, delete it
-	SavePosition();
-	wxString srvs;
-	for (unsigned int x = 0; x < lb->GetCount(); x++)
-		if (lb->IsChecked(x)) {
-			if (!srvs.IsEmpty()) srvs += ";";
-			srvs += lb->GetString(x);
-		}
-	settings->Write(dlgName + "/AutoConnect", srvs);
-	wxString s = my_view->getSettingString();
-	settings->Write(dlgName+"/ColsWidth",s);
-	settings->WriteBool(dlgName + "/Mode", group->IsChecked());
-	Storage *st=m_storage_model->getStorage();
-	st->saveFilters();
-	// If the status window wasn't launched in standalone mode...
-	if (mainForm)
-		mainForm->RemoveFrame(this);
+    SavePosition();
+    wxString srvs;
+    for (unsigned int x = 0; x < lb->GetCount(); x++)
+        if (lb->IsChecked(x)) {
+            if (!srvs.IsEmpty()) srvs += ";";
+            srvs += lb->GetString(x);
+        }
+    settings->Write(dlgName + "/AutoConnect", srvs);
+    wxString s = my_view->getSettingString();
+    settings->Write(dlgName+"/ColsWidth",s);
+    settings->WriteBool(dlgName + "/Mode", group->IsChecked());
+    Storage *st=m_storage_model->getStorage();
+    st->saveFilters();
+    // If the status window wasn't launched in standalone mode...
+    if (mainForm)
+        mainForm->RemoveFrame(this);
 
-	mainForm->Logfrm = NULL;
+    mainForm->Logfrm = NULL;
 }
 void frmLog::Go()
 {
@@ -1289,44 +1290,44 @@ void frmLog::Go()
 }
 LogFactory::LogFactory(menuFactoryList* list, wxMenu* mnu, ctlMenuToolbar* toolbar) : contextActionFactory(list)
 {
-	mnu->Append(id, _("Log view..."), _("Log view CSV format"));
+    mnu->Append(id, _("Log view..."), _("Log view CSV format"));
 }
 
 
 wxWindow* LogFactory::StartDialog(frmMain* form, pgObject* obj)
 {
-	pgServer* srv = (pgServer *) obj;
-	wxString txt = "";
-	if (form->Logfrm != NULL) {
-		if (!form->Logfrm->CheckConn(srv->GetName(), srv->GetPort())) {
-			pgConn* conn = form->Logfrm->createConn(srv);
-			form->Logfrm->AddNewConn(conn);
-		}
-	}
-	else {
-		form->Logfrm = new frmLog(form, txt, srv);
-		if (form->Logfrm!=NULL)
-			form->AddFrame(form->Logfrm);
+    pgServer* srv = (pgServer *) obj;
+    wxString txt = "";
+    if (form->Logfrm != NULL) {
+        if (!form->Logfrm->CheckConn(srv->GetName(), srv->GetPort())) {
+            pgConn* conn = form->Logfrm->createConn(srv);
+            form->Logfrm->AddNewConn(conn);
+        }
+    }
+    else {
+        form->Logfrm = new frmLog(form, txt, srv);
+        if (form->Logfrm!=NULL)
+            form->AddFrame(form->Logfrm);
 
-	}
-	//frmLog* frm = new frmLog(form, obj);
+    }
+    //frmLog* frm = new frmLog(form, obj);
 
-	form->Logfrm->Go();
-	return 0;
+    form->Logfrm->Go();
+    return 0;
 }
 
 
 bool LogFactory::CheckEnable(pgObject* obj)
 {
-	if (!obj)
-		return false;
+    if (!obj)
+        return false;
 
-	if (obj->GetMetaType() == PGM_SERVER) {
+    if (obj->GetMetaType() == PGM_SERVER) {
 //		if (!((pgServer*)obj)->GetConnected())
 //			return false;
-		return true;
-	}
-	return false;
+        return true;
+    }
+    return false;
 }
 
 
diff --git a/utils/log/StorageModel.cpp b/utils/log/StorageModel.cpp
index 0f1c875..3b9e409 100644
--- a/utils/log/StorageModel.cpp
+++ b/utils/log/StorageModel.cpp
@@ -36,6 +36,7 @@ public:
     Storage* st;
     int row;
     int countRows = 0;
+    wxColour quoteselcolor;
     // This renderer can be either activatable or editable, for demonstration
     // purposes. In real programs, you should select whether the user should be
     // able to activate or edit the cell and it doesn't make sense to switch
@@ -46,12 +47,25 @@ public:
         EnableEllipsize(wxELLIPSIZE_END);
         col = column;
         st = NULL;
+        wxColour textColour;
+#ifdef __WXGTK__
+        textColour = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+#else
+        textColour = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOXTEXT);
+#endif // __WXGTK__
+        if (ContrastColorBlackOrWhite(textColour) == "#000000") {
+            quoteselcolor = wxColour(wxString("#7f7f7f"));
+        }
+        else quoteselcolor = *wxYELLOW;
     }
 
     virtual bool Render(wxRect rect, wxDC* dc, int state) wxOVERRIDE
     {
         //dc->SetBrush( *wxLIGHT_GREY_BRUSH );
-        dc->SetBrush(*wxYELLOW_BRUSH);
+        if (state & wxDATAVIEW_CELL_SELECTED)
+            dc->SetBrush(quoteselcolor);
+        else
+            dc->SetBrush(*wxYELLOW_BRUSH);
         dc->SetPen(*wxTRANSPARENT_PEN);
         rect.Deflate(2);
         wxRect orig = rect;
@@ -71,7 +85,6 @@ public:
         int startX = 0;
 
         wxRect rectCol;
-
         while (i < s.Len()) {
 
             t = "";
@@ -105,16 +118,12 @@ public:
                 t += s[i];
                 i++;
             }
-            RenderText(t,
-                x, // no offset
-                //wxRect(dc->GetTextExtent(m_value)).CentreIn(rect),
-                rect,
-                dc,
-                state);
+            RenderText(t, x, rect, dc, state);
             rect.y = rect.y + h.GetHeight() + 0;
             rect.height = rect.height - (h.GetHeight() + 0);
-
+            ex = true;
         }
+        if (!ex) RenderText(t, x, rect, dc, state);
 
         if (countRows > 0 && col == StorageModel::cols::Col_Host) {
             dc->SetBrush(*wxGREEN_BRUSH);
@@ -170,8 +179,12 @@ public:
         if (lines > 1) {
             wxString position;
             position = wxString::Format("lines %d,hieght 1 row %d full h=%d", lines, txtSize.GetHeight(), txtSize.GetHeight() * lines + 1 * lines);
-            // wxLogMessage("MyCustomRendererText GetSize() %s", position);
+#ifdef __WXGTK__
+            wxSize charSize = GetTextExtent("H");
+            txtSize.SetHeight(txtSize.GetHeight() + charSize.GetHeight()/2);
+#else
             txtSize.SetHeight(txtSize.GetHeight() * lines + 1 * lines);
+#endif
         }
         else
             txtSize.SetHeight(-1);