diff --git a/frm/frmOptions.cpp b/frm/frmOptions.cpp index 9ddcbbf..d0519e8 100644 --- a/frm/frmOptions.cpp +++ b/frm/frmOptions.cpp @@ -107,6 +107,7 @@ #define pickerSlowProcessColour CTRL_COLOURPICKER("pickerSlowProcessColour") #define pickerBlockedProcessColour CTRL_COLOURPICKER("pickerBlockedProcessColour") #define pickerBlockedbyProcessColour CTRL_COLOURPICKER("pickerBlockedbyProcessColour") +#define pickerIdle_in_transaction_session_timeoutProcessColour CTRL_COLOURPICKER("pickerIdle_in_transaction_session_timeoutProcessColour") #define pickerFavouritesFile CTRL_FILEPICKER("pickerFavouritesFile") #define pickerMacrosFile CTRL_FILEPICKER("pickerMacrosFile") #define pickerHistoryFile CTRL_FILEPICKER("pickerHistoryFile") @@ -359,6 +360,7 @@ frmOptions::frmOptions(frmMain *parent) pickerSlowProcessColour->SetColour(settings->GetSlowProcessColour()); pickerBlockedProcessColour->SetColour(settings->GetBlockedProcessColour()); pickerBlockedbyProcessColour->SetColour(settings->GetBlockedbyProcessColour()); + pickerIdle_in_transaction_session_timeoutProcessColour->SetColour(settings->GetIdle_in_transaction_session_timeoutProcessColour()); pickerFavouritesFile->SetPath(settings->GetFavouritesFile()); pickerMacrosFile->SetPath(settings->GetMacrosFile()); @@ -845,7 +847,10 @@ void frmOptions::OnOK(wxCommandEvent &ev) settings->SetBlockedbyProcessColour(pickerBlockedProcessColour->GetColourString()); if (pickerBlockedbyProcessColour->GetColourString() != settings->GetBlockedbyProcessColour()) changed = true; - settings->SetBlockedbyProcessColour(pickerBlockedbyProcessColour->GetColourString()); + settings->SetIdle_in_transaction_session_timeoutProcessColour(pickerIdle_in_transaction_session_timeoutProcessColour->GetColourString()); + if (pickerIdle_in_transaction_session_timeoutProcessColour->GetColourString() != settings->GetIdle_in_transaction_session_timeoutProcessColour()) + changed = true; + settings->SetIdle_in_transaction_session_timeoutProcessColour(pickerIdle_in_transaction_session_timeoutProcessColour->GetColourString()); // Change files' location settings->SetFavouritesFile(pickerFavouritesFile->GetPath()); diff --git a/frm/frmStatus.cpp b/frm/frmStatus.cpp index c5b76e8..ad6db8f 100644 --- a/frm/frmStatus.cpp +++ b/frm/frmStatus.cpp @@ -51,6 +51,8 @@ #include "images/down.pngc" #include "images/up.pngc" #include "images/server_status.pngc" +#include "images/warning_amber_48dp.pngc" + #include #include "utils/FunctionPGHelper.h" #include "utils/PreviewHtml.h" @@ -96,6 +98,7 @@ BEGIN_EVENT_TABLE(frmStatus, pgFrame) EVT_MENU(MNU_COMMIT, frmStatus::OnCommit) EVT_MENU(MNU_ROLLBACK, frmStatus::OnRollback) EVT_MENU(MNU_CLEAR_FILTER_SERVER_STATUS, frmStatus::OnClearFilter) + EVT_MENU(MNU_SET_FILTER_HIGHLIGHT_STATUS, frmStatus::OnSetHighlightFilter) EVT_MENU(CMD_EVENT_FIND_STR, frmStatus::OnCmdFindStrLog) EVT_COMBOBOX(CTL_LOGCBO, frmStatus::OnLoadLogfile) EVT_BUTTON(CTL_ROTATEBTN, frmStatus::OnRotateLogfile) @@ -274,6 +277,7 @@ frmStatus::frmStatus(frmMain *form, const wxString &_title, pgConn *conn) : pgFr wxString q = "select pg_is_in_recovery() recovery, \ (select setting from pg_settings s where name = 'pg_wait_sampling.history_size')::integer hsize, \ (select setting from pg_settings s where name = 'pg_wait_sampling.history_period')::integer hperiod, \ + EXTRACT(epoch FROM coalesce(current_setting('idle_in_transaction_session_timeout',true),'30s')::interval)::integer idle_in_transaction_session_timeout,\ (select pg_table_is_visible(viewname::regclass) and has_table_privilege(viewname::regclass,'select') from pg_views where viewname = 'pg_wait_sampling_history') as wsh, \ (select pg_table_is_visible(viewname::regclass) and has_table_privilege(viewname::regclass,'select') from pg_views v where viewname='pgpro_stats_statements') as pro, \ (select pg_table_is_visible(viewname::regclass) and has_table_privilege(viewname::regclass,'select') from pg_views v where viewname='pg_stat_statements') as std, \ @@ -293,6 +297,7 @@ frmStatus::frmStatus(frmMain *form, const wxString &_title, pgConn *conn) : pgFr pro= dataSet1->GetBool(wxT("pro")); std = dataSet1->GetBool(wxT("std")); is_read_log = dataSet1->GetBool(wxT("isreadlog")); + idle_in_transaction_session_timeout= dataSet1->GetLong(wxT("idle_in_transaction_session_timeout")); isrecovery = (v == wxT("t")); track_commit_timestamp = connection->HasFeature(FEATURE_TRACK_COMMIT_TS); long sz = dataSet1->GetLong(wxT("hsize")); @@ -415,6 +420,7 @@ frmStatus::frmStatus(frmMain *form, const wxString &_title, pgConn *conn) : pgFr toolBar->AddTool(MNU_ROLLBACK, wxEmptyString, GetBundleSVG(delete_png_bmp, "drop.svg", wxSize(16, 16)), _("Rollback transaction"), wxITEM_NORMAL); toolBar->AddSeparator(); toolBar->AddTool(MNU_CLEAR_FILTER_SERVER_STATUS, wxEmptyString, GetBundleSVG(sortfilterclear_png_bmp, "sortfilterclear.svg", wxSize(16, 16)), _("Clear filter"), wxITEM_NORMAL); + toolBar->AddTool(MNU_SET_FILTER_HIGHLIGHT_STATUS, wxEmptyString, GetBundleSVG(warning_amber_48dp_png_bmp, "warning_amber_48dp.svg", wxSize(16, 16)), _("Highlight items only"), wxITEM_NORMAL); toolBar->AddSeparator(); cbLogfiles = new wxComboBox(toolBar, CTL_LOGCBO, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY | wxCB_DROPDOWN); @@ -1377,13 +1383,15 @@ void frmStatus::OnCopyQuery(wxCommandEvent &ev) // Get the database row = list->GetFirstSelected(); - col = connection->BackendMinimumVersion(9, 0) ? 2 : 1; - dbname.Append(list->GetText(row, col)); - - // Get the actual query - row = list->GetFirstSelected(); - text.Append(queries.Item(row)); + if (row != -1) { + col = connection->BackendMinimumVersion(9, 0) ? 2 : 1; + dbname.Append(list->GetText(row, col)); + // Get the actual query + row = list->GetFirstSelected(); + text.Append(queries.Item(row)); + } + else return; // Check if we have a query whose length is maximum maxlength = 1024; if (connection->BackendMinimumVersion(8, 4)) @@ -1923,6 +1931,7 @@ void frmStatus::OnRefreshStatusTimer(wxTimerEvent &event) wxString slinfo=wxEmptyString; wxString backend_xid; wxDateTime start_transaction; + wxTimeSpan deltaidle; if (iswalsend) { slinfo = dataSet1->GetVal(wxT("slotinfo")); } @@ -2000,6 +2009,9 @@ void frmStatus::OnRefreshStatusTimer(wxTimerEvent &event) if (connection->BackendMinimumVersion(8, 3)) { start_transaction= dataSet1->GetDateTime("xact_start_full"); statusList->SetItem(row, colpos++, dataSet1->GetVal(wxT("xact_start"))); + if (start_transaction.IsValid()) { + deltaidle = wxDateTime::Now() - start_transaction; + } } if (connection->BackendMinimumVersion(9, 2)) @@ -2074,6 +2086,11 @@ void frmStatus::OnRefreshStatusTimer(wxTimerEvent &event) blocked += blockedby; blocked += wxT(","); } + else if (deltaidle.GetSeconds() > idle_in_transaction_session_timeout) { + statusList->SetItemBackgroundColour(row, + wxColour(settings->GetIdle_in_transaction_session_timeoutProcessColour())); + + } if (!slinfo.IsEmpty()) { // walsender long xmindelta = dataSet1->GetLong(wxT("xminslotdelta")); @@ -2141,6 +2158,30 @@ void frmStatus::OnRefreshStatusTimer(wxTimerEvent &event) blocked=str.Clone(); numstr=blocked.BeforeFirst(',',&str); } + if (onlyhightligth) { + wxArrayString newquerys; + long r = statusList->GetItemCount(); + //wxColour bg = *WHITE; + wxColour bgidle=wxColour(settings->GetIdleProcessColour()); + long rr = 0; + int nquery = 0; + //long selrow = -1; + //selrow = statusList->GetFirstSelected(); + while ((rr) < statusList->GetItemCount() && rrGetItemBackgroundColour(rr) != bgidle) { + newquerys.Add(queries[nquery]); + rr++; + } + else { + statusList->DeleteItem(rr); + row--; + } + nquery++; + } + if (newquerys.Count() < queries.Count()) queries = newquerys; + } + } if (tt.IsValid() && wait_sample && wait_enable) { WS.EndSeriosSample(); @@ -4466,14 +4507,26 @@ void frmStatus::OnRightClickStatusItem(wxListEvent& event) filterValue.Add(val); toolBar->SetToolShortHelp(MNU_CLEAR_FILTER_SERVER_STATUS, hint); toolBar->EnableTool(MNU_CLEAR_FILTER_SERVER_STATUS, true); + toolBar->EnableTool(MNU_SET_FILTER_HIGHLIGHT_STATUS, false); + wxTimerEvent evt; OnRefreshStatusTimer(evt); } + +void frmStatus::OnSetHighlightFilter(wxCommandEvent& event) { + toolBar->SetToolShortHelp(MNU_CLEAR_FILTER_SERVER_STATUS, ""); + toolBar->EnableTool(MNU_CLEAR_FILTER_SERVER_STATUS, true); + toolBar->EnableTool(MNU_SET_FILTER_HIGHLIGHT_STATUS, false); + onlyhightligth = true; +} void frmStatus::OnClearFilter(wxCommandEvent& event) { toolBar->EnableTool(MNU_CLEAR_FILTER_SERVER_STATUS, false); + toolBar->EnableTool(MNU_SET_FILTER_HIGHLIGHT_STATUS, true); + toolBar->SetToolShortHelp(MNU_CLEAR_FILTER_SERVER_STATUS, "Clear filter"); filterColumn.Clear(); filterValue.Clear(); + onlyhightligth = false; wxTimerEvent evt; OnRefreshStatusTimer(evt); diff --git a/include/frm/frmStatus.h b/include/frm/frmStatus.h index 5787a1f..d605c1f 100644 --- a/include/frm/frmStatus.h +++ b/include/frm/frmStatus.h @@ -30,49 +30,7 @@ #include "utils/WaitSample.h" #include "ctl/wxTopActivity.h" -enum -{ - CTL_RATECBO = 250, - CTL_REFRESHBTN, - CTL_CANCELBTN, - CTL_TERMINATEBTN, - CTL_COMMITBTN, - CTL_ROLLBACKBTN, - CTL_LOGCBO, - CTL_ROTATEBTN, - CTL_STATUSLIST, - CTL_LOCKLIST, - CTL_XACTLIST, - CTL_LOGLIST, - CTL_QUERYSTATELIST, - MNU_STATUSPAGE, - MNU_LOCKPAGE, - MNU_XACTPAGE, - MNU_LOGPAGE, - MNU_QUERYSTATEPAGE, - MNU_TERMINATE, - MNU_COMMIT, - MNU_ROLLBACK, - MNU_COPY_QUERY, - MNU_CLEAR_FILTER_SERVER_STATUS, - MNU_COPY_QUERY_PLAN, - MNU_HIGHLIGHTSTATUS, - MNU_QUERYSTATEVERBOSE, - MNU_QUERYSTATETIME, - MNU_QUERYSTATEBUFFER, - MNU_QUERYSTATETRIGGER, - MNU_WAITENABLE, - MNU_WAITSAVE, - CMD_EVENT_FIND_STR, - TIMER_REFRESHUI_ID, - TIMER_STATUS_ID, - TIMER_LOCKS_ID, - TIMER_XACT_ID, - TIMER_LOG_ID, - TIMER_QUERYSTATE_ID, - TIMER_LOGHINT_ID -}; - +#include "frm/menuServerStatus.h" enum { @@ -212,6 +170,7 @@ private: bool showCurrent, isCurrent; long backend_pid; + long idle_in_transaction_session_timeout=30; int wait_event_type_col; bool isrecovery,track_commit_timestamp, is_read_log; bool wait_sample, wait_enable, wait_save,std,pro; @@ -259,6 +218,7 @@ private: wxArrayString queries; wxArrayInt filterColumn; wxArrayString filterValue; + bool onlyhightligth = false; int statusColWidth[12], lockColWidth[10], xactColWidth[5], querystateColWidth[5]; popuphelp* m_Popup = NULL; @@ -350,6 +310,7 @@ private: void OnCommit(wxCommandEvent &event); void OnRollback(wxCommandEvent &event); void OnClearFilter(wxCommandEvent& event); + void OnSetHighlightFilter(wxCommandEvent& event); void OnLogKeyUp(wxKeyEvent& event); void OnAddLabelTextThread(wxThreadEvent& event); void ActivatePane(wxString name); diff --git a/include/frm/menuServerStatus.h b/include/frm/menuServerStatus.h new file mode 100644 index 0000000..4fde6aa --- /dev/null +++ b/include/frm/menuServerStatus.h @@ -0,0 +1,45 @@ +#pragma once + +enum +{ + CTL_RATECBO = 250, + CTL_REFRESHBTN, + CTL_CANCELBTN, + CTL_TERMINATEBTN, + CTL_COMMITBTN, + CTL_ROLLBACKBTN, + CTL_LOGCBO, + CTL_ROTATEBTN, + CTL_STATUSLIST, + CTL_LOCKLIST, + CTL_XACTLIST, + CTL_LOGLIST, + CTL_QUERYSTATELIST, + MNU_STATUSPAGE, + MNU_LOCKPAGE, + MNU_XACTPAGE, + MNU_LOGPAGE, + MNU_QUERYSTATEPAGE, + MNU_TERMINATE, + MNU_COMMIT, + MNU_ROLLBACK, + MNU_COPY_QUERY, + MNU_CLEAR_FILTER_SERVER_STATUS, + MNU_COPY_QUERY_PLAN, + MNU_HIGHLIGHTSTATUS, + MNU_QUERYSTATEVERBOSE, + MNU_QUERYSTATETIME, + MNU_QUERYSTATEBUFFER, + MNU_QUERYSTATETRIGGER, + MNU_WAITENABLE, + MNU_WAITSAVE, + CMD_EVENT_FIND_STR, + TIMER_REFRESHUI_ID, + TIMER_STATUS_ID, + TIMER_LOCKS_ID, + TIMER_XACT_ID, + TIMER_LOG_ID, + TIMER_QUERYSTATE_ID, + TIMER_LOGHINT_ID, + MNU_SET_FILTER_HIGHLIGHT_STATUS +}; diff --git a/include/images/warning_amber_48dp.png b/include/images/warning_amber_48dp.png new file mode 100644 index 0000000..064fcd0 Binary files /dev/null and b/include/images/warning_amber_48dp.png differ diff --git a/include/images/warning_amber_48dp.pngc b/include/images/warning_amber_48dp.pngc new file mode 100644 index 0000000..d73babd --- /dev/null +++ b/include/images/warning_amber_48dp.pngc @@ -0,0 +1,119 @@ +#ifndef WARNING_AMBER_48DP_PNG_H +#define WARNING_AMBER_48DP_PNG_H + +static const unsigned char warning_amber_48dp_png_data[] = { +0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, +0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, +0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, +0x08, 0x03, 0x00, 0x00, 0x00, 0x60, 0xdc, 0x09, +0xb5, 0x00, 0x00, 0x00, 0x20, 0x63, 0x48, 0x52, +0x4d, 0x00, 0x00, 0x7a, 0x26, 0x00, 0x00, 0x80, +0x84, 0x00, 0x00, 0xfa, 0x00, 0x00, 0x00, 0x80, +0xe8, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, 0xea, +0x60, 0x00, 0x00, 0x3a, 0x98, 0x00, 0x00, 0x17, +0x70, 0x9c, 0xba, 0x51, 0x3c, 0x00, 0x00, 0x00, +0x90, 0x50, 0x4c, 0x54, 0x45, 0xff, 0xc1, 0x07, +0xff, 0xc1, 0x07, 0xff, 0xc1, 0x07, 0xff, 0xc1, +0x07, 0xff, 0xc1, 0x07, 0xff, 0xc1, 0x07, 0xff, +0xc1, 0x07, 0xff, 0xc1, 0x07, 0xff, 0xc1, 0x07, +0xff, 0xc1, 0x07, 0xff, 0xc1, 0x07, 0xff, 0xc1, +0x07, 0xff, 0xc1, 0x07, 0xff, 0xc1, 0x07, 0xff, +0xc1, 0x07, 0xff, 0xc1, 0x07, 0xff, 0xc1, 0x07, +0xff, 0xc1, 0x07, 0xff, 0xc1, 0x07, 0xff, 0xc1, +0x07, 0xff, 0xc1, 0x07, 0xff, 0xc1, 0x07, 0xff, +0xc1, 0x07, 0xff, 0xc1, 0x07, 0xff, 0xc1, 0x07, +0xff, 0xc1, 0x07, 0xff, 0xc1, 0x07, 0xff, 0xc1, +0x07, 0xff, 0xc1, 0x07, 0xff, 0xc1, 0x07, 0xff, +0xc1, 0x07, 0xff, 0xc1, 0x07, 0xff, 0xc1, 0x07, +0xff, 0xc1, 0x07, 0xff, 0xc1, 0x07, 0xff, 0xc1, +0x07, 0xff, 0xc1, 0x07, 0xff, 0xc1, 0x07, 0xff, +0xc1, 0x07, 0xff, 0xc1, 0x07, 0xff, 0xc1, 0x07, +0xff, 0xc1, 0x07, 0xff, 0xc1, 0x07, 0xff, 0xc1, +0x07, 0xff, 0xc1, 0x07, 0xff, 0xc1, 0x07, 0xff, +0xc1, 0x07, 0xff, 0xff, 0xff, 0xdb, 0x67, 0x40, +0xe1, 0x00, 0x00, 0x00, 0x2e, 0x74, 0x52, 0x4e, +0x53, 0x00, 0x4a, 0x05, 0xd9, 0xd8, 0x73, 0x72, +0x16, 0xf0, 0x15, 0x9b, 0x9a, 0x32, 0xfd, 0x31, +0xc3, 0xc2, 0x58, 0x57, 0x09, 0xe2, 0xe1, 0x80, +0x7f, 0x1e, 0xf6, 0x1d, 0xa9, 0xa8, 0x3d, 0x3c, +0x02, 0xce, 0xcd, 0x65, 0x64, 0x0f, 0xea, 0xe9, +0x8e, 0x8d, 0x27, 0xfa, 0x26, 0xb6, 0xb5, 0x29, +0xe1, 0x4f, 0x6b, 0x00, 0x00, 0x00, 0x01, 0x62, +0x4b, 0x47, 0x44, 0x2f, 0x23, 0xd4, 0x20, 0x11, +0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, +0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, 0x0b, 0x13, +0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, +0xf5, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xed, +0x93, 0xc9, 0x12, 0x82, 0x30, 0x10, 0x05, 0x01, +0x45, 0x71, 0x05, 0x71, 0xc5, 0x0d, 0x15, 0xdc, +0xf5, 0xfd, 0xff, 0xe7, 0x29, 0x8a, 0x08, 0x61, +0x92, 0x0c, 0x57, 0xcb, 0x3e, 0x4d, 0x55, 0x5e, +0x1f, 0x72, 0x68, 0xc3, 0xf8, 0x5d, 0x4c, 0xb3, +0xda, 0xde, 0xaa, 0xd5, 0xad, 0x4a, 0x82, 0x0d, +0x34, 0xaa, 0xec, 0x9b, 0x0e, 0xe0, 0xb4, 0x2a, +0x08, 0x6d, 0x3c, 0xe9, 0xf0, 0xf7, 0xdd, 0x5e, +0x22, 0xf4, 0xfa, 0x6c, 0xc1, 0xc5, 0x0b, 0x8f, +0xbb, 0x1f, 0x20, 0xc5, 0xe7, 0xed, 0x87, 0xa3, +0x8f, 0x30, 0x1e, 0xb2, 0x84, 0x09, 0x32, 0xa6, +0x9c, 0xfd, 0x2c, 0xf8, 0x0a, 0xc1, 0x9c, 0x21, +0x2c, 0x90, 0x63, 0xa9, 0xdf, 0xaf, 0x50, 0x60, +0xad, 0xdb, 0x87, 0x9b, 0xa2, 0xb0, 0x0d, 0x35, +0xc2, 0x0e, 0x02, 0x91, 0x7a, 0x1f, 0xef, 0x45, +0xe1, 0x10, 0x2b, 0x85, 0x63, 0x3a, 0x4b, 0xee, +0xf4, 0x3c, 0xa9, 0xf6, 0xe7, 0x4b, 0x59, 0xb8, +0x5c, 0x15, 0xc2, 0x0d, 0x65, 0x01, 0x77, 0x45, +0x97, 0xa0, 0x04, 0x98, 0xf2, 0x2e, 0x69, 0x41, +0x5a, 0xab, 0x0d, 0x5a, 0x90, 0xd5, 0x9a, 0x74, +0x49, 0x0b, 0x92, 0x5a, 0xdb, 0x90, 0x09, 0x74, +0xad, 0xef, 0x2e, 0x69, 0xc8, 0x5a, 0x5d, 0x28, +0xf0, 0x14, 0x5d, 0xd2, 0xf8, 0xf2, 0x2e, 0x69, +0x4a, 0xb5, 0x4e, 0x8a, 0xef, 0xc2, 0xa7, 0xcb, +0xb5, 0xe6, 0xbb, 0xa4, 0x05, 0xa1, 0xd6, 0x05, +0x74, 0x42, 0xb1, 0xd6, 0x15, 0xf4, 0x42, 0xbe, +0x56, 0xb1, 0x4b, 0x9a, 0x5c, 0xad, 0x3b, 0xb0, +0x88, 0xe4, 0x5d, 0xd2, 0x64, 0xb5, 0x1e, 0xc1, +0xe4, 0x24, 0x74, 0xa9, 0x25, 0xad, 0xf5, 0x06, +0x36, 0x77, 0xe3, 0x0f, 0x8b, 0x07, 0x57, 0xd6, +0x8d, 0x5d, 0x2c, 0xc0, 0xb6, 0xeb, 0x00, 0x00, +0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, +0x60, 0x82, +}; + +#include "wx/mstream.h" + +static wxImage *warning_amber_48dp_png_img() +{ + if (!wxImage::FindHandler(wxT("PNG file"))) + wxImage::AddHandler(new wxPNGHandler()); + static wxImage *img_warning_amber_48dp_png = new wxImage(); + if (!img_warning_amber_48dp_png || !img_warning_amber_48dp_png->IsOk()) + { + wxMemoryInputStream img_warning_amber_48dp_pngIS(warning_amber_48dp_png_data, sizeof(warning_amber_48dp_png_data)); + img_warning_amber_48dp_png->LoadFile(img_warning_amber_48dp_pngIS, wxBITMAP_TYPE_PNG); + } + return img_warning_amber_48dp_png; +} +#define warning_amber_48dp_png_img warning_amber_48dp_png_img() + +static wxBitmap *warning_amber_48dp_png_bmp() +{ + static wxBitmap *bmp_warning_amber_48dp_png; + if (!bmp_warning_amber_48dp_png || !bmp_warning_amber_48dp_png->IsOk()) + bmp_warning_amber_48dp_png = new wxBitmap(*warning_amber_48dp_png_img); + return bmp_warning_amber_48dp_png; +} +#define warning_amber_48dp_png_bmp warning_amber_48dp_png_bmp() + +static wxIcon *warning_amber_48dp_png_ico() +{ + static wxIcon *ico_warning_amber_48dp_png; + if (!ico_warning_amber_48dp_png || !ico_warning_amber_48dp_png->IsOk()) + { + ico_warning_amber_48dp_png = new wxIcon(); + ico_warning_amber_48dp_png->CopyFromBitmap(*warning_amber_48dp_png_bmp); + } + return ico_warning_amber_48dp_png; +} +#define warning_amber_48dp_png_ico warning_amber_48dp_png_ico() + +#endif // WARNING_AMBER_48DP_PNG_H diff --git a/include/utils/popuphelp.h b/include/utils/popuphelp.h index 1c98c9f..3d9d8f0 100644 --- a/include/utils/popuphelp.h +++ b/include/utils/popuphelp.h @@ -9,6 +9,7 @@ #include #include #include "wx/display.h" +#include "frm/menuServerStatus.h" class popuphelp : public wxPopupTransientWindow @@ -155,7 +156,7 @@ public: wxString wname = GetParent()->GetName(); if (wname == "frmStatus") { //CMD_EVENT_FIND_STR - wxCommandEvent event(wxEVT_MENU, 281); + wxCommandEvent event(wxEVT_MENU, CMD_EVENT_FIND_STR); event.SetEventObject(this); // Give it some contents event.SetString(ctext); diff --git a/include/utils/sysSettings.h b/include/utils/sysSettings.h index 16ab1a0..8582d75 100644 --- a/include/utils/sysSettings.h +++ b/include/utils/sysSettings.h @@ -584,6 +584,16 @@ public: { Write(wxT("SlowProcessColour"), newval); } + void SetIdle_in_transaction_session_timeoutProcessColour(const wxString& newval) + { + Write(wxT("Idle_in_transaction_session_timeoutProcessColour"), newval); + } + wxString GetIdle_in_transaction_session_timeoutProcessColour() const + { + wxString s; + Read(wxT("Idle_in_transaction_session_timeoutProcessColour"), &s, wxT("#ad5bff")); + return s; + } wxString GetBlockedProcessColour() const { wxString s; diff --git a/pgAdmin3.vcxproj b/pgAdmin3.vcxproj index 7067212..73c4b47 100644 --- a/pgAdmin3.vcxproj +++ b/pgAdmin3.vcxproj @@ -968,6 +968,7 @@ + @@ -1753,6 +1754,7 @@ + diff --git a/pgAdmin3.vcxproj.filters b/pgAdmin3.vcxproj.filters index c4f1430..089b94d 100644 --- a/pgAdmin3.vcxproj.filters +++ b/pgAdmin3.vcxproj.filters @@ -3647,9 +3647,6 @@ include\utils - - include\ctl - include\utils @@ -3686,6 +3683,9 @@ include\utils + + include\frm + @@ -4644,6 +4644,9 @@ + + include\images + diff --git a/ui/frmOptions.xrc b/ui/frmOptions.xrc index bbb0836..3523eba 100644 --- a/ui/frmOptions.xrc +++ b/ui/frmOptions.xrc @@ -1344,6 +1344,20 @@ wxEXPAND|wxTOP|wxLEFT|wxRIGHT 4 + + + + + wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT + 4 + + + + 70,12d + + wxEXPAND|wxTOP|wxLEFT|wxRIGHT + 4 + wxEXPAND|wxTOP|wxLEFT|wxRIGHT diff --git a/ui/xrcDialogs.cpp b/ui/xrcDialogs.cpp index ca69594..bed1eba 100644 --- a/ui/xrcDialogs.cpp +++ b/ui/xrcDialogs.cpp @@ -36333,7 +36333,7 @@ static unsigned char xml_res_file_80[] = { 47,111,98,106,101,99,116,62,10,60,47,114,101,115,111,117,114,99,101,62, 10}; -static size_t xml_res_size_81 = 75702; +static size_t xml_res_size_81 = 76508; static unsigned char xml_res_file_81[] = { 60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101, 110,99,111,100,105,110,103,61,34,73,83,79,45,56,56,53,57,45,49,34,63,62, @@ -39382,210 +39382,60 @@ static unsigned char xml_res_file_81[] = { 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,98,111,114,100,101,114, 62,52,60,47,98,111,114,100,101,114,62,10,32,32,32,32,32,32,32,32,32,32, 32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99, +116,32,99,108,97,115,115,61,34,115,105,122,101,114,105,116,101,109,34,62, +10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60, +111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,83,116,97,116, +105,99,84,101,120,116,34,32,110,97,109,101,61,34,115,116,73,100,108,101, +95,105,110,95,116,114,97,110,115,97,99,116,105,111,110,95,115,101,115,115, +105,111,110,95,116,105,109,101,111,117,116,80,114,111,99,101,115,115,67, +111,108,111,117,114,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,73,100,108,101,95, +105,110,95,116,114,97,110,115,97,99,116,105,111,110,95,115,101,115,115, +105,111,110,95,116,105,109,101,111,117,116,32,80,114,111,99,101,115,115, +32,67,111,108,111,117,114,60,47,108,97,98,101,108,62,10,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101, +99,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,60,102,108,97,103,62,119,120,65,76,73,71,78,95,67,69,78,84,69,82, +95,86,69,82,84,73,67,65,76,124,119,120,84,79,80,124,119,120,76,69,70,84, +124,119,120,82,73,71,72,84,60,47,102,108,97,103,62,10,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,98,111,114,100,101,114, +62,52,60,47,98,111,114,100,101,114,62,10,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99, +116,32,99,108,97,115,115,61,34,115,105,122,101,114,105,116,101,109,34,62, +10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60, +111,98,106,101,99,116,32,99,108,97,115,115,61,34,99,116,108,67,111,108, +111,117,114,80,105,99,107,101,114,34,32,110,97,109,101,61,34,112,105,99, +107,101,114,73,100,108,101,95,105,110,95,116,114,97,110,115,97,99,116,105, +111,110,95,115,101,115,115,105,111,110,95,116,105,109,101,111,117,116,80, +114,111,99,101,115,115,67,111,108,111,117,114,34,62,10,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,115,105,122,101, +62,55,48,44,49,50,100,60,47,115,105,122,101,62,10,32,32,32,32,32,32,32, 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116, -62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106, -101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,102, -108,97,103,62,119,120,69,88,80,65,78,68,124,119,120,84,79,80,124,119,120, -76,69,70,84,124,119,120,82,73,71,72,84,60,47,102,108,97,103,62,10,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,98,111,114,100,101,114,62, -52,60,47,98,111,114,100,101,114,62,10,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,115,105, -122,101,114,105,116,101,109,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120, -80,97,110,101,108,34,32,110,97,109,101,61,34,112,110,108,68,97,116,97,98, -97,115,101,68,101,115,105,103,110,101,114,34,62,10,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,60,104,105,100,100,101,110,62,49,60,47, -104,105,100,100,101,110,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120, -70,108,101,120,71,114,105,100,83,105,122,101,114,34,62,10,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,99,111,108,115,62,49,60, -47,99,111,108,115,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,60,118,103,97,112,62,53,60,47,118,103,97,112,62,10,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,104,103,97,112,62, -53,60,47,104,103,97,112,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,60,103,114,111,119,97,98,108,101,99,111,108,115,62,48, -60,47,103,114,111,119,97,98,108,101,99,111,108,115,62,10,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32, -99,108,97,115,115,61,34,115,105,122,101,114,105,116,101,109,34,62,10,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98, -106,101,99,116,32,99,108,97,115,115,61,34,119,120,70,108,101,120,71,114, -105,100,83,105,122,101,114,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,60,99,111,108,115,62,50,60,47,99,111, -108,115,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,60,118,103,97,112,62,53,60,47,118,103,97,112,62,10,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,104, -103,97,112,62,53,60,47,104,103,97,112,62,10,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,103,114,111,119,97,98,108, -101,99,111,108,115,62,49,60,47,103,114,111,119,97,98,108,101,99,111,108, -115,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,115,105,122, -101,114,105,116,101,109,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108, -97,115,115,61,34,119,120,83,116,97,116,105,99,84,101,120,116,34,32,110, -97,109,101,61,34,115,116,70,111,110,116,68,68,34,62,10,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,108, -97,98,101,108,62,70,111,110,116,60,47,108,97,98,101,108,62,10,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60, -47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,60,102,108,97,103,62,119,120,65,76, -73,71,78,95,67,69,78,84,69,82,95,86,69,82,84,73,67,65,76,124,119,120,84, -79,80,124,119,120,76,69,70,84,124,119,120,82,73,71,72,84,60,47,102,108, -97,103,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,60,98,111,114,100,101,114,62,52,60,47,98,111,114,100, -101,114,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116, -32,99,108,97,115,115,61,34,115,105,122,101,114,105,116,101,109,34,62,10, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,70,111, -110,116,80,105,99,107,101,114,67,116,114,108,34,32,110,97,109,101,61,34, -112,105,99,107,101,114,70,111,110,116,68,68,34,47,62,10,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,102,108, -97,103,62,119,120,69,88,80,65,78,68,124,119,120,84,79,80,124,119,120,76, -69,70,84,124,119,120,82,73,71,72,84,60,47,102,108,97,103,62,10,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60, +62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +60,102,108,97,103,62,119,120,69,88,80,65,78,68,124,119,120,84,79,80,124, +119,120,76,69,70,84,124,119,120,82,73,71,72,84,60,47,102,108,97,103,62, +10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60, 98,111,114,100,101,114,62,52,60,47,98,111,114,100,101,114,62,10,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,47,111, -98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,102,108,97,103,62,119,120, -69,88,80,65,78,68,124,119,120,84,79,80,124,119,120,76,69,70,84,124,119, -120,82,73,71,72,84,60,47,102,108,97,103,62,10,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,60,98,111,114,100,101,114,62,52, -60,47,98,111,114,100,101,114,62,10,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101, -99,116,32,99,108,97,115,115,61,34,119,120,80,97,110,101,108,34,32,110,97, -109,101,61,34,112,110,108,80,103,65,103,101,110,116,34,62,10,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,104,105,100,100,101, -110,62,49,60,47,104,105,100,100,101,110,62,10,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101, +99,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,47, +111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,60,102,108,97,103,62,119,120,69,88,80,65,78,68,124,119,120, +84,79,80,124,119,120,76,69,70,84,124,119,120,82,73,71,72,84,60,47,102,108, +97,103,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,98,111, +114,100,101,114,62,52,60,47,98,111,114,100,101,114,62,10,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115, +115,61,34,115,105,122,101,114,105,116,101,109,34,62,10,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115, +115,61,34,119,120,80,97,110,101,108,34,32,110,97,109,101,61,34,112,110, +108,68,97,116,97,98,97,115,101,68,101,115,105,103,110,101,114,34,62,10, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,104,105,100,100, +101,110,62,49,60,47,104,105,100,100,101,110,62,10,32,32,32,32,32,32,32, 32,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97, 115,115,61,34,119,120,70,108,101,120,71,114,105,100,83,105,122,101,114, -34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,60,99,111,108,115,62,50,60,47,99,111,108,115,62,10,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,118,103,97,112,62,53, -60,47,118,103,97,112,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,60,104,103,97,112,62,53,60,47,104,103,97,112,62,10, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,103, -114,111,119,97,98,108,101,99,111,108,115,62,49,60,47,103,114,111,119,97, -98,108,101,99,111,108,115,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115, -61,34,115,105,122,101,114,105,116,101,109,34,62,10,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99, -116,32,99,108,97,115,115,61,34,119,120,83,116,97,116,105,99,84,101,120, -116,34,32,110,97,109,101,61,34,108,98,108,77,97,120,82,111,119,115,34,62, -10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,60,108,97,98,101,108,62,77,97,120,105,109,117,109,32,114,111,119, -115,32,116,111,32,114,101,116,114,105,101,118,101,60,47,108,97,98,101,108, -62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,60,102,108,97,103,62,119,120,65, -76,73,71,78,95,67,69,78,84,69,82,95,86,69,82,84,73,67,65,76,124,119,120, -84,79,80,124,119,120,76,69,70,84,124,119,120,82,73,71,72,84,60,47,102,108, -97,103,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,60,98,111,114,100,101,114,62,52,60,47,98,111,114,100,101,114, -62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115, -61,34,115,105,122,101,114,105,116,101,109,34,62,10,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99, -116,32,99,108,97,115,115,61,34,119,120,84,101,120,116,67,116,114,108,34, -32,110,97,109,101,61,34,116,120,116,77,97,120,82,111,119,115,34,62,10,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,60,118,97,108,117,101,62,49,48,48,60,47,118,97,108,117,101,62,10,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,60,116,111,111,108,116,105,112,62,77,97,120,105,109,117,109,115,32,114, -111,119,115,32,116,111,32,114,101,116,114,105,101,118,101,32,105,110,116, -111,32,111,117,116,112,117,116,32,119,105,110,100,111,119,59,32,48,32,61, -32,117,110,108,105,109,105,116,101,100,60,47,116,111,111,108,116,105,112, -62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,60,102,108,97,103,62,119,120,69, -88,80,65,78,68,124,119,120,84,79,80,124,119,120,76,69,70,84,124,119,120, -82,73,71,72,84,60,47,102,108,97,103,62,10,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,98,111,114,100,101,114,62, -52,60,47,98,111,114,100,101,114,62,10,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106, -101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,60,102,108,97,103,62,119,120,69,88,80,65,78,68,124,119,120, -84,79,80,124,119,120,76,69,70,84,124,119,120,82,73,71,72,84,60,47,102,108, -97,103,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,98, -111,114,100,101,114,62,52,60,47,98,111,114,100,101,114,62,10,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,102,108,97,103,62,119,120, -69,88,80,65,78,68,124,119,120,84,79,80,124,119,120,76,69,70,84,124,119, -120,82,73,71,72,84,60,47,102,108,97,103,62,10,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,60,98,111,114,100,101,114,62,52,60,47,98,111,114,100, -101,114,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106, -101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106, -101,99,116,32,99,108,97,115,115,61,34,115,105,122,101,114,105,116,101,109, -34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106, -101,99,116,32,99,108,97,115,115,61,34,119,120,80,97,110,101,108,34,32,110, -97,109,101,61,34,112,110,108,77,105,115,99,71,117,114,117,72,105,110,116, -115,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,104, -105,100,100,101,110,62,49,60,47,104,105,100,100,101,110,62,10,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32, -99,108,97,115,115,61,34,119,120,70,108,101,120,71,114,105,100,83,105,122, -101,114,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,60,99,111,108,115,62,49,60,47,99,111,108,115,62,10,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,118,103,97,112,62,53,60, -47,118,103,97,112,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,60,104,103,97,112,62,53,60,47,104,103,97,112,62,10,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,103,114,111,119,97, -98,108,101,99,111,108,115,62,48,60,47,103,114,111,119,97,98,108,101,99, -111,108,115,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,115,105,122,101, -114,105,116,101,109,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61, -34,119,120,67,104,101,99,107,66,111,120,34,32,110,97,109,101,61,34,99,104, -107,83,117,112,112,114,101,115,115,72,105,110,116,115,34,62,10,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97, -98,101,108,62,68,111,32,110,111,116,32,115,104,111,119,32,103,117,114,117, -32,104,105,110,116,115,59,32,73,39,109,32,111,110,101,32,109,121,115,101, -108,102,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,102,108, -97,103,62,119,120,69,88,80,65,78,68,124,119,120,84,79,80,124,119,120,76, -69,70,84,124,119,120,82,73,71,72,84,60,47,102,108,97,103,62,10,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,98,111,114, -100,101,114,62,52,60,47,98,111,114,100,101,114,62,10,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62, -10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98, -106,101,99,116,32,99,108,97,115,115,61,34,115,105,122,101,114,105,116,101, -109,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,67,104, -101,99,107,66,111,120,34,32,110,97,109,101,61,34,99,104,107,82,101,115, -101,116,72,105,110,116,115,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,82,101,115, -101,116,32,103,117,114,117,32,104,105,110,116,115,60,47,108,97,98,101,108, -62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,60,102,108,97,103,62,119,120,69,88,80,65,78, -68,124,119,120,84,79,80,124,119,120,76,69,70,84,124,119,120,82,73,71,72, -84,60,47,102,108,97,103,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,60,98,111,114,100,101,114,62,52,60,47,98,111,114, -100,101,114,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,60,102,108,97,103,62,119,120,69, -88,80,65,78,68,124,119,120,84,79,80,124,119,120,76,69,70,84,124,119,120, -82,73,71,72,84,60,47,102,108,97,103,62,10,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,60,98,111,114,100,101,114,62,52,60,47,98,111,114,100, -101,114,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106, -101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106, -101,99,116,32,99,108,97,115,115,61,34,115,105,122,101,114,105,116,101,109, -34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106, -101,99,116,32,99,108,97,115,115,61,34,119,120,80,97,110,101,108,34,32,110, -97,109,101,61,34,112,110,108,77,105,115,99,76,111,103,103,105,110,103,34, -62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,104,105, -100,100,101,110,62,49,60,47,104,105,100,100,101,110,62,10,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108, -97,115,115,61,34,119,120,70,108,101,120,71,114,105,100,83,105,122,101,114, 34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60, 99,111,108,115,62,49,60,47,99,111,108,115,62,10,32,32,32,32,32,32,32,32, 32,32,32,32,32,32,32,32,32,32,32,32,60,118,103,97,112,62,53,60,47,118,103, @@ -39597,175 +39447,363 @@ static unsigned char xml_res_file_81[] = { 98,106,101,99,116,32,99,108,97,115,115,61,34,115,105,122,101,114,105,116, 101,109,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, 32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120, -83,116,97,116,105,99,84,101,120,116,34,32,110,97,109,101,61,34,108,98,108, -76,111,103,102,105,108,101,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,76,111,103, -102,105,108,101,32,40,37,73,68,32,119,105,108,108,32,98,101,32,114,101, -112,108,97,99,101,100,32,119,105,116,104,32,116,104,101,32,80,114,111,99, -101,115,115,32,73,68,41,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99, -116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,60,102,108,97,103,62,119,120,69,88,80,65,78,68,124,119,120,84,79,80, -124,119,120,76,69,70,84,124,119,120,82,73,71,72,84,60,47,102,108,97,103, -62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -60,98,111,114,100,101,114,62,52,60,47,98,111,114,100,101,114,62,10,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106, -101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,115,105,122,101, -114,105,116,101,109,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61, -34,119,120,70,105,108,101,80,105,99,107,101,114,67,116,114,108,34,32,110, -97,109,101,61,34,112,105,99,107,101,114,76,111,103,102,105,108,101,34,62, -10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,60,109,101,115,115,97,103,101,62,83,101,108,101,99,116,32,108,111,103, -32,102,105,108,101,60,47,109,101,115,115,97,103,101,62,10,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,115,116,121, -108,101,62,119,120,70,76,80,95,79,80,69,78,124,119,120,70,76,80,95,85,83, -69,95,84,69,88,84,67,84,82,76,60,47,115,116,121,108,101,62,10,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,116,111, -111,108,116,105,112,62,69,110,116,101,114,32,97,32,102,105,108,101,110, -97,109,101,32,116,111,32,119,114,105,116,101,32,97,112,112,108,105,99,97, -116,105,111,110,32,108,111,103,115,32,116,111,46,60,47,116,111,111,108, -116,105,112,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,60,102,108,97,103,62,119,120,69, -88,80,65,78,68,124,119,120,84,79,80,124,119,120,76,69,70,84,124,119,120, -82,73,71,72,84,60,47,102,108,97,103,62,10,32,32,32,32,32,32,32,32,32,32, +70,108,101,120,71,114,105,100,83,105,122,101,114,34,62,10,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,99,111,108, +115,62,50,60,47,99,111,108,115,62,10,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,60,118,103,97,112,62,53,60,47,118,103, +97,112,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,60,104,103,97,112,62,53,60,47,104,103,97,112,62,10,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,103,114, +111,119,97,98,108,101,99,111,108,115,62,49,60,47,103,114,111,119,97,98, +108,101,99,111,108,115,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115, +115,61,34,115,105,122,101,114,105,116,101,109,34,62,10,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106, +101,99,116,32,99,108,97,115,115,61,34,119,120,83,116,97,116,105,99,84,101, +120,116,34,32,110,97,109,101,61,34,115,116,70,111,110,116,68,68,34,62,10, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,60,108,97,98,101,108,62,70,111,110,116,60,47,108,97,98,101, +108,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,102,108,97,103, +62,119,120,65,76,73,71,78,95,67,69,78,84,69,82,95,86,69,82,84,73,67,65, +76,124,119,120,84,79,80,124,119,120,76,69,70,84,124,119,120,82,73,71,72, +84,60,47,102,108,97,103,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32, 32,32,32,32,32,32,32,32,32,32,32,32,60,98,111,114,100,101,114,62,52,60, 47,98,111,114,100,101,114,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99, -108,97,115,115,61,34,115,105,122,101,114,105,116,101,109,34,62,10,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106, -101,99,116,32,99,108,97,115,115,61,34,119,120,82,97,100,105,111,66,111, -120,34,32,110,97,109,101,61,34,114,97,100,76,111,103,108,101,118,101,108, -34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,60,108,97,98,101,108,62,76,111,103,32,76,101,118,101,108,60,47, -108,97,98,101,108,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,60,99,111,110,116,101,110,116,62,10,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,105, -116,101,109,62,38,97,109,112,59,78,111,32,108,111,103,103,105,110,103,60, -47,105,116,101,109,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,60,105,116,101,109,62,38,97,109,112,59,69, -114,114,111,114,115,32,111,110,108,121,60,47,105,116,101,109,62,10,32,32, +32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111, +98,106,101,99,116,32,99,108,97,115,115,61,34,115,105,122,101,114,105,116, +101,109,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61, +34,119,120,70,111,110,116,80,105,99,107,101,114,67,116,114,108,34,32,110, +97,109,101,61,34,112,105,99,107,101,114,70,111,110,116,68,68,34,47,62,10, 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -60,105,116,101,109,62,69,114,114,111,114,115,32,97,110,100,32,78,38,97, -109,112,59,111,116,105,99,101,115,60,47,105,116,101,109,62,10,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60, -105,116,101,109,62,69,114,114,111,114,115,44,32,78,111,116,105,99,101,115, -44,32,38,97,109,112,59,83,81,76,60,47,105,116,101,109,62,10,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,105, -116,101,109,62,38,97,109,112,59,68,101,98,117,103,32,40,110,111,116,32, -114,101,99,111,109,109,101,110,100,101,100,32,102,111,114,32,110,111,114, -109,97,108,32,117,115,101,41,60,47,105,116,101,109,62,10,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,47,99,111,110, -116,101,110,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,60,115,101,108,101,99,116,105,111,110,62,50,60,47, -115,101,108,101,99,116,105,111,110,62,10,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,100,105,109,101,110,115,105, -111,110,62,49,60,47,100,105,109,101,110,115,105,111,110,62,10,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,115,116, -121,108,101,62,119,120,82,65,95,83,80,69,67,73,70,89,95,67,79,76,83,60, -47,115,116,121,108,101,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,60,116,111,111,108,116,105,112,62,83,101, -108,101,99,116,32,116,104,101,32,108,101,118,101,108,32,111,102,32,100, -101,116,97,105,108,32,116,111,32,114,101,99,111,114,100,32,105,110,32,116, -104,101,32,108,111,103,102,105,108,101,46,60,47,116,111,111,108,116,105, -112,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,60,102,108,97,103,62,119,120,69,88,80,65, -78,68,124,119,120,84,79,80,124,119,120,76,69,70,84,124,119,120,82,73,71, -72,84,60,47,102,108,97,103,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,60,98,111,114,100,101,114,62,52,60,47,98,111, -114,100,101,114,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,60,102,108,97,103,62,119,120,69,88,80,65,78,68,124,119,120,84,79, +80,124,119,120,76,69,70,84,124,119,120,82,73,71,72,84,60,47,102,108,97, +103,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,60,98,111,114,100,101,114,62,52,60,47,98,111,114,100,101, +114,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, 32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,102,108,97,103,62,119,120, -69,88,80,65,78,68,124,119,120,84,79,80,124,119,120,76,69,70,84,124,119, -120,82,73,71,72,84,60,47,102,108,97,103,62,10,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,60,98,111,114,100,101,114,62,52,60,47,98,111,114,100, -101,114,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106, -101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101, -99,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,102,108,97,103,62,119, -120,69,88,80,65,78,68,124,119,120,65,76,76,60,47,102,108,97,103,62,10,32, -32,32,32,32,32,32,32,32,32,32,32,60,98,111,114,100,101,114,62,51,60,47, -98,111,114,100,101,114,62,10,32,32,32,32,32,32,32,32,32,32,60,47,111,98, -106,101,99,116,62,10,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116, -62,10,32,32,32,32,32,32,32,32,60,102,108,97,103,62,119,120,69,88,80,65, -78,68,124,119,120,84,79,80,124,119,120,76,69,70,84,124,119,120,82,73,71, -72,84,60,47,102,108,97,103,62,10,32,32,32,32,32,32,32,32,60,98,111,114, -100,101,114,62,51,60,47,98,111,114,100,101,114,62,10,32,32,32,32,32,32, -60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,60,111,98,106,101,99, -116,32,99,108,97,115,115,61,34,115,105,122,101,114,105,116,101,109,34,62, -10,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115, -61,34,119,120,70,108,101,120,71,114,105,100,83,105,122,101,114,34,62,10, -32,32,32,32,32,32,32,32,32,32,60,99,111,108,115,62,52,60,47,99,111,108, -115,62,10,32,32,32,32,32,32,32,32,32,32,60,103,114,111,119,97,98,108,101, -99,111,108,115,62,49,60,47,103,114,111,119,97,98,108,101,99,111,108,115, -62,10,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108, +32,32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,102,108, +97,103,62,119,120,69,88,80,65,78,68,124,119,120,84,79,80,124,119,120,76, +69,70,84,124,119,120,82,73,71,72,84,60,47,102,108,97,103,62,10,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,98,111,114, +100,101,114,62,52,60,47,98,111,114,100,101,114,62,10,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62, +10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106, +101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,80,97,110,101, +108,34,32,110,97,109,101,61,34,112,110,108,80,103,65,103,101,110,116,34, +62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,104, +105,100,100,101,110,62,49,60,47,104,105,100,100,101,110,62,10,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99, +116,32,99,108,97,115,115,61,34,119,120,70,108,101,120,71,114,105,100,83, +105,122,101,114,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,60,99,111,108,115,62,50,60,47,99,111,108,115,62,10,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,118,103, +97,112,62,53,60,47,118,103,97,112,62,10,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,60,104,103,97,112,62,53,60,47,104,103, +97,112,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,60,103,114,111,119,97,98,108,101,99,111,108,115,62,49,60,47,103,114, +111,119,97,98,108,101,99,111,108,115,62,10,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108, 97,115,115,61,34,115,105,122,101,114,105,116,101,109,34,62,10,32,32,32, -32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115, -61,34,119,120,66,117,116,116,111,110,34,32,110,97,109,101,61,34,119,120, -73,68,95,72,69,76,80,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -60,108,97,98,101,108,62,72,101,108,112,60,47,108,97,98,101,108,62,10,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98, +106,101,99,116,32,99,108,97,115,115,61,34,119,120,83,116,97,116,105,99, +84,101,120,116,34,32,110,97,109,101,61,34,108,98,108,77,97,120,82,111,119, +115,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,60,108,97,98,101,108,62,77,97,120,105,109,117,109,32, +114,111,119,115,32,116,111,32,114,101,116,114,105,101,118,101,60,47,108, +97,98,101,108,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,102,108,97,103, +62,119,120,65,76,73,71,78,95,67,69,78,84,69,82,95,86,69,82,84,73,67,65, +76,124,119,120,84,79,80,124,119,120,76,69,70,84,124,119,120,82,73,71,72, +84,60,47,102,108,97,103,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,60,98,111,114,100,101,114,62,52,60,47,98, +111,114,100,101,114,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116, +32,99,108,97,115,115,61,34,115,105,122,101,114,105,116,101,109,34,62,10, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,84,101,120, +116,67,116,114,108,34,32,110,97,109,101,61,34,116,120,116,77,97,120,82, +111,119,115,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,60,118,97,108,117,101,62,49,48,48,60,47,118, +97,108,117,101,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,60,116,111,111,108,116,105,112,62,77,97,120, +105,109,117,109,115,32,114,111,119,115,32,116,111,32,114,101,116,114,105, +101,118,101,32,105,110,116,111,32,111,117,116,112,117,116,32,119,105,110, +100,111,119,59,32,48,32,61,32,117,110,108,105,109,105,116,101,100,60,47, +116,111,111,108,116,105,112,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32, 32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32, -32,32,32,32,32,32,32,32,32,32,60,102,108,97,103,62,119,120,69,88,80,65, -78,68,124,119,120,65,76,76,60,47,102,108,97,103,62,10,32,32,32,32,32,32, -32,32,32,32,32,32,60,98,111,114,100,101,114,62,51,60,47,98,111,114,100, -101,114,62,10,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116, -62,10,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108, -97,115,115,61,34,115,112,97,99,101,114,34,62,10,32,32,32,32,32,32,32,32, -32,32,32,32,60,115,105,122,101,62,48,44,48,100,60,47,115,105,122,101,62, -10,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,102, +108,97,103,62,119,120,69,88,80,65,78,68,124,119,120,84,79,80,124,119,120, +76,69,70,84,124,119,120,82,73,71,72,84,60,47,102,108,97,103,62,10,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,98, +111,114,100,101,114,62,52,60,47,98,111,114,100,101,114,62,10,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106, +101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,60,102,108,97,103,62,119,120,69,88, +80,65,78,68,124,119,120,84,79,80,124,119,120,76,69,70,84,124,119,120,82, +73,71,72,84,60,47,102,108,97,103,62,10,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,60,98,111,114,100,101,114,62,52,60,47,98,111,114,100, +101,114,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,47,111, +98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +60,102,108,97,103,62,119,120,69,88,80,65,78,68,124,119,120,84,79,80,124, +119,120,76,69,70,84,124,119,120,82,73,71,72,84,60,47,102,108,97,103,62, +10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,98,111,114,100,101, +114,62,52,60,47,98,111,114,100,101,114,62,10,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,115, +105,122,101,114,105,116,101,109,34,62,10,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119, +120,80,97,110,101,108,34,32,110,97,109,101,61,34,112,110,108,77,105,115, +99,71,117,114,117,72,105,110,116,115,34,62,10,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,60,104,105,100,100,101,110,62,49,60,47,104,105, +100,100,101,110,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,70,108,101, +120,71,114,105,100,83,105,122,101,114,34,62,10,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,60,99,111,108,115,62,49,60,47,99,111, +108,115,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,60,118,103,97,112,62,53,60,47,118,103,97,112,62,10,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,104,103,97,112,62,53,60,47, +104,103,97,112,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,60,103,114,111,119,97,98,108,101,99,111,108,115,62,48,60,47,103, +114,111,119,97,98,108,101,99,111,108,115,62,10,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108, +97,115,115,61,34,115,105,122,101,114,105,116,101,109,34,62,10,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106, +101,99,116,32,99,108,97,115,115,61,34,119,120,67,104,101,99,107,66,111, +120,34,32,110,97,109,101,61,34,99,104,107,83,117,112,112,114,101,115,115, +72,105,110,116,115,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,68,111,32,110,111,116, +32,115,104,111,119,32,103,117,114,117,32,104,105,110,116,115,59,32,73,39, +109,32,111,110,101,32,109,121,115,101,108,102,60,47,108,97,98,101,108,62, +10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60, +47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,60,102,108,97,103,62,119,120,69,88,80,65,78,68, +124,119,120,84,79,80,124,119,120,76,69,70,84,124,119,120,82,73,71,72,84, +60,47,102,108,97,103,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,60,98,111,114,100,101,114,62,52,60,47,98,111,114,100, +101,114,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32, 32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61, 34,115,105,122,101,114,105,116,101,109,34,62,10,32,32,32,32,32,32,32,32, -32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120, -66,117,116,116,111,110,34,32,110,97,109,101,61,34,119,120,73,68,95,79,75, -34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108, -62,38,97,109,112,59,79,75,60,47,108,97,98,101,108,62,10,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,60,100,101,102,97,117,108,116,62,49,60,47,100, -101,102,97,117,108,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -60,116,111,111,108,116,105,112,62,65,99,99,101,112,116,32,116,104,101,32, -99,117,114,114,101,110,116,32,115,101,116,116,105,110,103,115,32,97,110, -100,32,99,108,111,115,101,32,116,104,101,32,100,105,97,108,111,103,117, -101,46,60,47,116,111,111,108,116,105,112,62,10,32,32,32,32,32,32,32,32, -32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32, -32,32,32,60,102,108,97,103,62,119,120,69,88,80,65,78,68,124,119,120,65, -76,76,60,47,102,108,97,103,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60, -98,111,114,100,101,114,62,51,60,47,98,111,114,100,101,114,62,10,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99, +108,97,115,115,61,34,119,120,67,104,101,99,107,66,111,120,34,32,110,97, +109,101,61,34,99,104,107,82,101,115,101,116,72,105,110,116,115,34,62,10, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +60,108,97,98,101,108,62,82,101,115,101,116,32,103,117,114,117,32,104,105, +110,116,115,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,102,108, +97,103,62,119,120,69,88,80,65,78,68,124,119,120,84,79,80,124,119,120,76, +69,70,84,124,119,120,82,73,71,72,84,60,47,102,108,97,103,62,10,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,98,111,114, +100,101,114,62,52,60,47,98,111,114,100,101,114,62,10,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62, +10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106, +101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,47, +111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,60,102,108,97,103,62,119,120,69,88,80,65,78,68,124,119,120,84,79,80, +124,119,120,76,69,70,84,124,119,120,82,73,71,72,84,60,47,102,108,97,103, +62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,98,111,114,100, +101,114,62,52,60,47,98,111,114,100,101,114,62,10,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34, +115,105,122,101,114,105,116,101,109,34,62,10,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34, +119,120,80,97,110,101,108,34,32,110,97,109,101,61,34,112,110,108,77,105, +115,99,76,111,103,103,105,110,103,34,62,10,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,60,104,105,100,100,101,110,62,49,60,47,104,105, +100,100,101,110,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,70,108,101, +120,71,114,105,100,83,105,122,101,114,34,62,10,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,60,99,111,108,115,62,49,60,47,99,111, +108,115,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,60,118,103,97,112,62,53,60,47,118,103,97,112,62,10,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,104,103,97,112,62,53,60,47, +104,103,97,112,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,60,103,114,111,119,97,98,108,101,99,111,108,115,62,48,60,47,103, +114,111,119,97,98,108,101,99,111,108,115,62,10,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108, +97,115,115,61,34,115,105,122,101,114,105,116,101,109,34,62,10,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106, +101,99,116,32,99,108,97,115,115,61,34,119,120,83,116,97,116,105,99,84,101, +120,116,34,32,110,97,109,101,61,34,108,98,108,76,111,103,102,105,108,101, +34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,60,108,97,98,101,108,62,76,111,103,102,105,108,101,32,40,37,73, +68,32,119,105,108,108,32,98,101,32,114,101,112,108,97,99,101,100,32,119, +105,116,104,32,116,104,101,32,80,114,111,99,101,115,115,32,73,68,41,60, +47,108,97,98,101,108,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, 32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,102,108,97,103,62,119, +120,69,88,80,65,78,68,124,119,120,84,79,80,124,119,120,76,69,70,84,124, +119,120,82,73,71,72,84,60,47,102,108,97,103,62,10,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,98,111,114,100,101,114, +62,52,60,47,98,111,114,100,101,114,62,10,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99, +116,32,99,108,97,115,115,61,34,115,105,122,101,114,105,116,101,109,34,62, +10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60, +111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,70,105,108,101, +80,105,99,107,101,114,67,116,114,108,34,32,110,97,109,101,61,34,112,105, +99,107,101,114,76,111,103,102,105,108,101,34,62,10,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,109,101,115,115,97, +103,101,62,83,101,108,101,99,116,32,108,111,103,32,102,105,108,101,60,47, +109,101,115,115,97,103,101,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,60,115,116,121,108,101,62,119,120,70,76, +80,95,79,80,69,78,124,119,120,70,76,80,95,85,83,69,95,84,69,88,84,67,84, +82,76,60,47,115,116,121,108,101,62,10,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,60,116,111,111,108,116,105,112,62, +69,110,116,101,114,32,97,32,102,105,108,101,110,97,109,101,32,116,111,32, +119,114,105,116,101,32,97,112,112,108,105,99,97,116,105,111,110,32,108, +111,103,115,32,116,111,46,60,47,116,111,111,108,116,105,112,62,10,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,47,111,98, +106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,60,102,108,97,103,62,119,120,69,88,80,65,78,68,124,119,120, +84,79,80,124,119,120,76,69,70,84,124,119,120,82,73,71,72,84,60,47,102,108, +97,103,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,60,98,111,114,100,101,114,62,52,60,47,98,111,114,100,101,114,62,10, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,47,111,98, +106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,115,105,122, +101,114,105,116,101,109,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115, +61,34,119,120,82,97,100,105,111,66,111,120,34,32,110,97,109,101,61,34,114, +97,100,76,111,103,108,101,118,101,108,34,62,10,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,62, +76,111,103,32,76,101,118,101,108,60,47,108,97,98,101,108,62,10,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,99,111, +110,116,101,110,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,60,105,116,101,109,62,38,97,109,112,59, +78,111,32,108,111,103,103,105,110,103,60,47,105,116,101,109,62,10,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +60,105,116,101,109,62,38,97,109,112,59,69,114,114,111,114,115,32,111,110, +108,121,60,47,105,116,101,109,62,10,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,105,116,101,109,62,69,114, +114,111,114,115,32,97,110,100,32,78,38,97,109,112,59,111,116,105,99,101, +115,60,47,105,116,101,109,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,60,105,116,101,109,62,69,114,114, +111,114,115,44,32,78,111,116,105,99,101,115,44,32,38,97,109,112,59,83,81, +76,60,47,105,116,101,109,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,60,105,116,101,109,62,38,97,109,112, +59,68,101,98,117,103,32,40,110,111,116,32,114,101,99,111,109,109,101,110, +100,101,100,32,102,111,114,32,110,111,114,109,97,108,32,117,115,101,41, +60,47,105,116,101,109,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,60,47,99,111,110,116,101,110,116,62,10,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,115, +101,108,101,99,116,105,111,110,62,50,60,47,115,101,108,101,99,116,105,111, +110,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,60,100,105,109,101,110,115,105,111,110,62,49,60,47,100,105,109, +101,110,115,105,111,110,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,60,115,116,121,108,101,62,119,120,82,65,95, +83,80,69,67,73,70,89,95,67,79,76,83,60,47,115,116,121,108,101,62,10,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60, +116,111,111,108,116,105,112,62,83,101,108,101,99,116,32,116,104,101,32, +108,101,118,101,108,32,111,102,32,100,101,116,97,105,108,32,116,111,32, +114,101,99,111,114,100,32,105,110,32,116,104,101,32,108,111,103,102,105, +108,101,46,60,47,116,111,111,108,116,105,112,62,10,32,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116, +62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +60,102,108,97,103,62,119,120,69,88,80,65,78,68,124,119,120,84,79,80,124, +119,120,76,69,70,84,124,119,120,82,73,71,72,84,60,47,102,108,97,103,62, +10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60, +98,111,114,100,101,114,62,52,60,47,98,111,114,100,101,114,62,10,32,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101, +99,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,47, +111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32, +32,32,32,32,60,102,108,97,103,62,119,120,69,88,80,65,78,68,124,119,120, +84,79,80,124,119,120,76,69,70,84,124,119,120,82,73,71,72,84,60,47,102,108, +97,103,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,98,111, +114,100,101,114,62,52,60,47,98,111,114,100,101,114,62,10,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32, +32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32, +32,32,32,32,32,32,32,60,102,108,97,103,62,119,120,69,88,80,65,78,68,124, +119,120,65,76,76,60,47,102,108,97,103,62,10,32,32,32,32,32,32,32,32,32, +32,32,32,60,98,111,114,100,101,114,62,51,60,47,98,111,114,100,101,114,62, +10,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32, +32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32, +32,60,102,108,97,103,62,119,120,69,88,80,65,78,68,124,119,120,84,79,80, +124,119,120,76,69,70,84,124,119,120,82,73,71,72,84,60,47,102,108,97,103, +62,10,32,32,32,32,32,32,32,32,60,98,111,114,100,101,114,62,51,60,47,98, +111,114,100,101,114,62,10,32,32,32,32,32,32,60,47,111,98,106,101,99,116, +62,10,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61, +34,115,105,122,101,114,105,116,101,109,34,62,10,32,32,32,32,32,32,32,32, +60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,70,108,101, +120,71,114,105,100,83,105,122,101,114,34,62,10,32,32,32,32,32,32,32,32, +32,32,60,99,111,108,115,62,52,60,47,99,111,108,115,62,10,32,32,32,32,32, +32,32,32,32,32,60,103,114,111,119,97,98,108,101,99,111,108,115,62,49,60, +47,103,114,111,119,97,98,108,101,99,111,108,115,62,10,32,32,32,32,32,32, 32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,115,105, 122,101,114,105,116,101,109,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32, 60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,117,116, -116,111,110,34,32,110,97,109,101,61,34,119,120,73,68,95,67,65,78,67,69, -76,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101, -108,62,38,97,109,112,59,67,97,110,99,101,108,60,47,108,97,98,101,108,62, -10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,116,111,111,108,116,105, -112,62,67,97,110,99,101,108,32,97,110,121,32,99,104,97,110,103,101,115, -32,97,110,100,32,99,108,111,115,101,32,116,104,101,32,100,105,97,108,111, -103,117,101,46,60,47,116,111,111,108,116,105,112,62,10,32,32,32,32,32,32, +116,111,110,34,32,110,97,109,101,61,34,119,120,73,68,95,72,69,76,80,34, +62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,62, +72,101,108,112,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,32,32,32, +32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32, +32,32,60,102,108,97,103,62,119,120,69,88,80,65,78,68,124,119,120,65,76, +76,60,47,102,108,97,103,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,98, +111,114,100,101,114,62,51,60,47,98,111,114,100,101,114,62,10,32,32,32,32, 32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32, -32,32,32,32,32,60,102,108,97,103,62,119,120,69,88,80,65,78,68,124,119,120, -65,76,76,60,47,102,108,97,103,62,10,32,32,32,32,32,32,32,32,32,32,32,32, -60,98,111,114,100,101,114,62,51,60,47,98,111,114,100,101,114,62,10,32,32, -32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32, -32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,60,102, -108,97,103,62,119,120,69,88,80,65,78,68,124,119,120,84,79,80,124,119,120, -76,69,70,84,124,119,120,82,73,71,72,84,60,47,102,108,97,103,62,10,32,32, -32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,60,111, +32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,115,112,97, +99,101,114,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,105,122, +101,62,48,44,48,100,60,47,115,105,122,101,62,10,32,32,32,32,32,32,32,32, +32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,60, +111,98,106,101,99,116,32,99,108,97,115,115,61,34,115,105,122,101,114,105, +116,101,109,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106, +101,99,116,32,99,108,97,115,115,61,34,119,120,66,117,116,116,111,110,34, +32,110,97,109,101,61,34,119,120,73,68,95,79,75,34,62,10,32,32,32,32,32, +32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,38,97,109,112,59,79, +75,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32, +32,60,100,101,102,97,117,108,116,62,49,60,47,100,101,102,97,117,108,116, +62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,116,111,111,108,116, +105,112,62,65,99,99,101,112,116,32,116,104,101,32,99,117,114,114,101,110, +116,32,115,101,116,116,105,110,103,115,32,97,110,100,32,99,108,111,115, +101,32,116,104,101,32,100,105,97,108,111,103,117,101,46,60,47,116,111,111, +108,116,105,112,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,47,111,98, +106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,102,108,97, +103,62,119,120,69,88,80,65,78,68,124,119,120,65,76,76,60,47,102,108,97, +103,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,98,111,114,100,101,114, +62,51,60,47,98,111,114,100,101,114,62,10,32,32,32,32,32,32,32,32,32,32, +60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,60,111, 98,106,101,99,116,32,99,108,97,115,115,61,34,115,105,122,101,114,105,116, -101,109,34,62,10,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99, -108,97,115,115,61,34,119,120,83,116,97,116,117,115,66,97,114,34,32,110, -97,109,101,61,34,117,110,107,83,116,97,116,117,115,66,97,114,34,62,10,32, -32,32,32,32,32,32,32,32,32,60,115,116,121,108,101,62,119,120,83,84,95,83, -73,90,69,71,82,73,80,60,47,115,116,121,108,101,62,10,32,32,32,32,32,32, -32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,60,102, -108,97,103,62,119,120,69,88,80,65,78,68,60,47,102,108,97,103,62,10,32,32, -32,32,32,32,32,32,60,98,111,114,100,101,114,62,51,60,47,98,111,114,100, -101,114,62,10,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32, -32,32,60,47,111,98,106,101,99,116,62,10,32,32,60,47,111,98,106,101,99,116, -62,10,60,47,114,101,115,111,117,114,99,101,62,10}; +101,109,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101, +99,116,32,99,108,97,115,115,61,34,119,120,66,117,116,116,111,110,34,32, +110,97,109,101,61,34,119,120,73,68,95,67,65,78,67,69,76,34,62,10,32,32, +32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,38,97,109,112, +59,67,97,110,99,101,108,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32, +32,32,32,32,32,32,32,32,60,116,111,111,108,116,105,112,62,67,97,110,99, +101,108,32,97,110,121,32,99,104,97,110,103,101,115,32,97,110,100,32,99, +108,111,115,101,32,116,104,101,32,100,105,97,108,111,103,117,101,46,60, +47,116,111,111,108,116,105,112,62,10,32,32,32,32,32,32,32,32,32,32,32,32, +60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60, +102,108,97,103,62,119,120,69,88,80,65,78,68,124,119,120,65,76,76,60,47, +102,108,97,103,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,98,111,114, +100,101,114,62,51,60,47,98,111,114,100,101,114,62,10,32,32,32,32,32,32, +32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,60, +47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,60,102,108,97,103, +62,119,120,69,88,80,65,78,68,124,119,120,84,79,80,124,119,120,76,69,70, +84,124,119,120,82,73,71,72,84,60,47,102,108,97,103,62,10,32,32,32,32,32, +32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,60,111,98,106,101, +99,116,32,99,108,97,115,115,61,34,115,105,122,101,114,105,116,101,109,34, +62,10,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115, +115,61,34,119,120,83,116,97,116,117,115,66,97,114,34,32,110,97,109,101, +61,34,117,110,107,83,116,97,116,117,115,66,97,114,34,62,10,32,32,32,32, +32,32,32,32,32,32,60,115,116,121,108,101,62,119,120,83,84,95,83,73,90,69, +71,82,73,80,60,47,115,116,121,108,101,62,10,32,32,32,32,32,32,32,32,60, +47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,60,102,108,97,103, +62,119,120,69,88,80,65,78,68,60,47,102,108,97,103,62,10,32,32,32,32,32, +32,32,32,60,98,111,114,100,101,114,62,51,60,47,98,111,114,100,101,114,62, +10,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,60,47, +111,98,106,101,99,116,62,10,32,32,60,47,111,98,106,101,99,116,62,10,60, +47,114,101,115,111,117,114,99,101,62,10}; static size_t xml_res_size_82 = 1417; static unsigned char xml_res_file_82[] = { diff --git a/x64/Release/pgAdmin3.exe b/x64/Release/pgAdmin3.exe index 5c9fa71..13606de 100644 Binary files a/x64/Release/pgAdmin3.exe and b/x64/Release/pgAdmin3.exe differ