SVN Commit by andreas: r4839 - in trunk/pgadmin3: . src/dlg src/frm src/include src/ui

Author: andreas
Date: 2005-12-11 23:08:20 +0000 (Sun, 11 Dec 2005)
New Revision: 4839

Modified:
trunk/pgadmin3/CHANGELOG.txt
trunk/pgadmin3/src/dlg/dlgLanguage.cpp
trunk/pgadmin3/src/frm/frmQuery.cpp
trunk/pgadmin3/src/include/dlgLanguage.h
trunk/pgadmin3/src/ui/dlgLanguage.xrc
trunk/pgadmin3/src/ui/xrcDialogs.cpp
Log:
support 8.1 language templates

Modified: trunk/pgadmin3/CHANGELOG.txt
===================================================================
--- trunk/pgadmin3/CHANGELOG.txt 2005-12-11 22:22:49 UTC (rev 4838)
+++ trunk/pgadmin3/CHANGELOG.txt 2005-12-11 23:08:20 UTC (rev 4839)
@@ -18,6 +18,7 @@
</ul>
<br>
<ul>
+ <li>2005-12-11 AP support 8.1 language templates
<li>2005-12-11 AP 1.4.2 Fix: Unsubscribe set on receiver
<li>2005-12-11 AP 1.4.2 Another wxComboBox(2.6.2) related fix
<li>2005-12-09 DP 1.4.1 Default the encoding of new databases to the cluster encoding, per Peter Eisentraut.

Modified: trunk/pgadmin3/src/dlg/dlgLanguage.cpp
===================================================================
--- trunk/pgadmin3/src/dlg/dlgLanguage.cpp 2005-12-11 22:22:49 UTC (rev 4838)
+++ trunk/pgadmin3/src/dlg/dlgLanguage.cpp 2005-12-11 23:08:20 UTC (rev 4839)
@@ -22,6 +22,7 @@


// pointer to controls
+#define cbName CTRL_COMBOBOX("cbName")
#define chkTrusted CTRL_CHECKBOX("chkTrusted")
#define cbHandler CTRL_COMBOBOX("cbHandler")
#define cbValidator CTRL_COMBOBOX("cbValidator")
@@ -34,6 +35,8 @@


BEGIN_EVENT_TABLE(dlgLanguage, dlgSecurityProperty)
+ EVT_TEXT(XRCID("cbName"), dlgLanguage::OnChangeName)
+ EVT_COMBOBOX(XRCID("cbName"), dlgLanguage::OnChangeName)
EVT_TEXT(XRCID("cbHandler"), dlgProperty::OnChange)
EVT_COMBOBOX(XRCID("cbHandler"), dlgProperty::OnChange)
END_EVENT_TABLE();
@@ -81,6 +84,23 @@
else
{
// create mode
+ if (connection->BackendMinimumVersion(8, 1))
+ {
+ pgSetIterator languages(connection,
+ wxT("SELECT tmplname FROM pg_pltemplate\n")
+ wxT(" LEFT JOIN pg_language ON tmplname=lanname\n")
+ wxT(" WHERE lanname IS NULL\n")
+ wxT(" ORDER BY tmplname"));
+
+ while (languages.RowsLeft())
+ cbName->Append(languages.GetVal(wxT("tmplname")));
+ }
+ else
+ {
+ // to clear drop down list
+ cbName->Append(wxT(" "));
+ cbName->Delete(0);
+ }
cbValidator->Append(wxT(""));
pgSet *set=connection->ExecuteSet(
wxT("SELECT nspname, proname, prorettype\n")
@@ -110,16 +130,29 @@

pgObject *dlgLanguage::CreateObject(pgCollection *collection)
{
- wxString name=GetName();
+ wxString name=cbName->wxComboBox::GetValue();

pgObject *obj=languageFactory.CreateObjects(collection, 0, wxT("\n AND lanname ILIKE ") + qtString(name));
return obj;
}


+void dlgLanguage::OnChangeName(wxCommandEvent &ev)
+{
+ if (connection->BackendMinimumVersion(8, 1))
+ {
+ bool useTemplate = (cbName->FindString(cbName->wxComboBox::GetValue()) >= 0);
+ chkTrusted->Enable(!useTemplate);
+ cbHandler->Enable(!useTemplate);
+ cbValidator->Enable(!useTemplate);
+ }
+ OnChange(ev);
+}
+
+
void dlgLanguage::CheckChange()
{
- wxString name=GetName();
+ wxString name=cbName->wxComboBox::GetValue();
if (language)
{
EnableOK(name != language->GetName() || txtComment->GetValue() != language->GetComment());
@@ -128,8 +161,10 @@
{

bool enable=true;
+ bool useTemplate = (cbName->FindString(name) >= 0);
+
CheckValid(enable, !name.IsEmpty(), _("Please specify name."));
- CheckValid(enable, !cbHandler->GetValue().IsEmpty(), _("Please specify language handler."));
+ CheckValid(enable, useTemplate || !cbHandler->GetValue().IsEmpty(), _("Please specify language handler."));
EnableOK(enable);
}
}
@@ -139,7 +174,7 @@
wxString dlgLanguage::GetSql()
{
wxString sql, name;
- name=GetName();
+ name=cbName->wxComboBox::GetValue();

if (language)
{
@@ -149,13 +184,19 @@
else
{
// create mode
- sql = wxT("CREATE ");
- if (chkTrusted->GetValue())
- sql += wxT("TRUSTED ");
- sql += wxT("LANGUAGE ") + qtIdent(name) + wxT("\n HANDLER ") + qtIdent(cbHandler->GetValue());
- AppendIfFilled(sql, wxT("\n VALIDATOR "), qtIdent(cbValidator->GetValue()));
- sql += wxT(";\n");
-
+ if (connection->BackendMinimumVersion(8, 1) && cbName->FindString(name) >= 0)
+ {
+ sql = wxT("CREATE LANGUAGE ") + qtIdent(name) + wxT(";\n");
+ }
+ else
+ {
+ sql = wxT("CREATE ");
+ if (chkTrusted->GetValue())
+ sql += wxT("TRUSTED ");
+ sql += wxT("LANGUAGE ") + qtIdent(name) + wxT("\n HANDLER ") + qtIdent(cbHandler->GetValue());
+ AppendIfFilled(sql, wxT("\n VALIDATOR "), qtIdent(cbValidator->GetValue()));
+ sql += wxT(";\n");
+ }
}

sql += GetGrant(wxT("X"), wxT("LANGUAGE ") + qtIdent(name));

Modified: trunk/pgadmin3/src/frm/frmQuery.cpp
===================================================================
--- trunk/pgadmin3/src/frm/frmQuery.cpp 2005-12-11 22:22:49 UTC (rev 4838)
+++ trunk/pgadmin3/src/frm/frmQuery.cpp 2005-12-11 23:08:20 UTC (rev 4839)
@@ -200,7 +200,6 @@
toolBar->AddSeparator();

cbConnection = new ctlComboBoxFix(toolBar, CTRLID_CONNECTION, wxDefaultPosition, wxSize(GetCharWidth()*30, -1), wxCB_READONLY|wxCB_DROPDOWN);
-// cbConnection = (ctlComboBoxFix*)new wxComboBox(toolBar, CTRLID_CONNECTION, wxEmptyString, wxDefaultPosition, wxSize(GetCharWidth()*30, -1), 0, 0, wxCB_READONLY|wxCB_DROPDOWN);
cbConnection->Append(conn->GetName(), (void*)conn);
cbConnection->Append(_("<new connection>"), (void*)0);
toolBar->AddControl(cbConnection);

Modified: trunk/pgadmin3/src/include/dlgLanguage.h
===================================================================
--- trunk/pgadmin3/src/include/dlgLanguage.h 2005-12-11 22:22:49 UTC (rev 4838)
+++ trunk/pgadmin3/src/include/dlgLanguage.h 2005-12-11 23:08:20 UTC (rev 4839)
@@ -30,6 +30,7 @@

private:
pgLanguage *language;
+ void OnChangeName(wxCommandEvent &ev);

DECLARE_EVENT_TABLE();
};

Modified: trunk/pgadmin3/src/ui/dlgLanguage.xrc
===================================================================
--- trunk/pgadmin3/src/ui/dlgLanguage.xrc 2005-12-11 22:22:49 UTC (rev 4838)
+++ trunk/pgadmin3/src/ui/dlgLanguage.xrc 2005-12-11 23:08:20 UTC (rev 4839)
@@ -8,100 +8,140 @@
<object class="wxPanel" name="pnlProperties">
<object class="wxStaticText" name="stName">

+
<label>Name</label>

+
<pos>5,7d</pos>
</object>
- <object class="wxTextCtrl" name="txtName">
+ <object class="wxComboBox" name="cbName">

+
<pos>70,5d</pos>

- <size>135,-1d</size>
+
+ <size>135,12d</size>
+
+ <content/>
+ <style>wxCB_DROPDOWN</style>
</object>
<object class="wxStaticText" name="stOID">

+
<label>OID</label>

+
<pos>5,22d</pos>
</object>
<object class="wxTextCtrl" name="txtOID">

+
<pos>70,20d</pos>

+
<size>135,-1d</size>
</object>
<object class="wxStaticText" name="stTrusted">

+
<label>Trusted</label>

+
<pos>5,37d</pos>
</object>
<object class="wxCheckBox" name="chkTrusted">

+
<label></label>

+
<checked>1</checked>

+
<pos>70,35d</pos>

+
<size>13,12d</size>
</object>
<object class="wxStaticText" name="stHandler">

+
<label>Handler</label>

+
<pos>5,52d</pos>
</object>
<object class="wxComboBox" name="cbHandler">

+
<content/>

+
<pos>70,50d</pos>

+
<size>135,12d</size>

+
<style>wxCB_READONLY|wxCB_DROPDOWN</style>
</object>
<object class="wxStaticText" name="stValidator">

+
<label>Validator</label>

+
<pos>5,67d</pos>
</object>
<object class="wxComboBox" name="cbValidator">

+
<content/>

+
<pos>70,65d</pos>

+
<size>135,12d</size>

+
<style>wxCB_READONLY|wxCB_DROPDOWN</style>
</object>
<object class="wxStaticText" name="stComment">

+
<label>Comment</label>

+
<pos>5,82d</pos>
</object>
<object class="wxTextCtrl" name="txtComment">

+
<pos>70,80d</pos>

+
<size>135,100d</size>
</object>
<object class="wxStaticText" name="stClusterSet">
+
<label>Use replication</label>
+
<pos>5,185d</pos>
</object>
<object class="wxComboBox" name="cbClusterSet">
+
<content/>
+
<pos>70,183d</pos>
+
<size>135,12d</size>
+
<style>wxCB_READONLY|wxCB_DROPDOWN</style>
</object>
</object>

+
<selected>1</selected>
</object>
<pos>2,2d</pos>
@@ -109,22 +149,29 @@
</object>
<object class="wxButton" name="wxID_HELP">

+
<label>Help</label>

+
<pos>2,220d</pos>
</object>
<object class="wxButton" name="wxID_OK">

+
<label>OK</label>

+
<default>1</default>

+
<pos>113,220d</pos>
</object>
<object class="wxButton" name="wxID_CANCEL">

+
<label>Cancel</label>

+
<pos>166,220d</pos>
</object>
<size>218,238d</size>

Modified: trunk/pgadmin3/src/ui/xrcDialogs.cpp
===================================================================
--- trunk/pgadmin3/src/ui/xrcDialogs.cpp 2005-12-11 22:22:49 UTC (rev 4838)
+++ trunk/pgadmin3/src/ui/xrcDialogs.cpp 2005-12-11 23:08:20 UTC (rev 4839)
@@ -8,6 +8,9 @@
#pragma hdrstop
#endif

+#ifndef WX_PRECOMP
+ #include <wx/wx.h>
+#endif
#include <wx/filesys.h>
#include <wx/fs_mem.h>
#include <wx/xrc/xmlres.h>
@@ -3878,7 +3881,7 @@
32,60,115,116,121,108,101,47,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_16 = 3089;
+static size_t xml_res_size_16 = 3152;
static unsigned char xml_res_file_16[] = {
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,
@@ -3901,128 +3904,131 @@
32,32,32,32,32,32,32,60,112,111,115,62,53,44,55,100,60,47,112,111,115,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,119,120,67,111,109,98,111,66,111,120,34,32,110,97,109,101,61,34,99,98,
+78,97,109,101,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,115,
+62,55,48,44,53,100,60,47,112,111,115,62,10,32,32,32,32,32,32,32,32,32,32,
+32,32,60,115,105,122,101,62,49,51,53,44,49,50,100,60,47,115,105,122,101,
+62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,99,111,110,116,101,110,116,
+47,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,116,121,108,101,62,
+119,120,67,66,95,68,82,79,80,68,79,87,78,60,47,115,116,121,108,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,
+119,120,83,116,97,116,105,99,84,101,120,116,34,32,110,97,109,101,61,34,
+115,116,79,73,68,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,
+98,101,108,62,79,73,68,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,
+32,32,32,32,32,32,60,112,111,115,62,53,44,50,50,100,60,47,112,111,115,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,119,120,84,101,120,116,67,116,114,108,34,32,110,97,109,101,61,34,116,
-120,116,78,97,109,101,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,
-111,115,62,55,48,44,53,100,60,47,112,111,115,62,10,32,32,32,32,32,32,32,
+120,116,79,73,68,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,
+115,62,55,48,44,50,48,100,60,47,112,111,115,62,10,32,32,32,32,32,32,32,
32,32,32,32,32,60,115,105,122,101,62,49,51,53,44,45,49,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,119,120,83,116,97,116,105,99,84,101,120,116,34,32,110,
-97,109,101,61,34,115,116,79,73,68,34,62,10,32,32,32,32,32,32,32,32,32,32,
-32,32,60,108,97,98,101,108,62,79,73,68,60,47,108,97,98,101,108,62,10,32,
-32,32,32,32,32,32,32,32,32,32,32,60,112,111,115,62,53,44,50,50,100,60,47,
-112,111,115,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,119,120,84,101,120,116,67,116,114,108,34,32,110,97,
-109,101,61,34,116,120,116,79,73,68,34,62,10,32,32,32,32,32,32,32,32,32,
-32,32,32,60,112,111,115,62,55,48,44,50,48,100,60,47,112,111,115,62,10,32,
-32,32,32,32,32,32,32,32,32,32,32,60,115,105,122,101,62,49,51,53,44,45,49,
+97,109,101,61,34,115,116,84,114,117,115,116,101,100,34,62,10,32,32,32,32,
+32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,84,114,117,115,116,101,
+100,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,
+112,111,115,62,53,44,51,55,100,60,47,112,111,115,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,119,120,67,104,101,
+99,107,66,111,120,34,32,110,97,109,101,61,34,99,104,107,84,114,117,115,
+116,101,100,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,
+108,47,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,99,104,101,99,107,101,
+100,62,49,60,47,99,104,101,99,107,101,100,62,10,32,32,32,32,32,32,32,32,
+32,32,32,32,60,112,111,115,62,55,48,44,51,53,100,60,47,112,111,115,62,10,
+32,32,32,32,32,32,32,32,32,32,32,32,60,115,105,122,101,62,49,51,44,49,50,
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,119,120,83,116,97,116,105,99,84,101,120,
-116,34,32,110,97,109,101,61,34,115,116,84,114,117,115,116,101,100,34,62,
-10,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,84,114,117,
-115,116,101,100,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,32,32,32,
-32,32,32,60,112,111,115,62,53,44,51,55,100,60,47,112,111,115,62,10,32,32,
+116,34,32,110,97,109,101,61,34,115,116,72,97,110,100,108,101,114,34,62,
+10,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,72,97,110,
+100,108,101,114,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,32,32,32,
+32,32,32,60,112,111,115,62,53,44,53,50,100,60,47,112,111,115,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,119,
-120,67,104,101,99,107,66,111,120,34,32,110,97,109,101,61,34,99,104,107,
-84,114,117,115,116,101,100,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,
-60,108,97,98,101,108,47,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,99,
-104,101,99,107,101,100,62,49,60,47,99,104,101,99,107,101,100,62,10,32,32,
-32,32,32,32,32,32,32,32,32,32,60,112,111,115,62,55,48,44,51,53,100,60,47,
-112,111,115,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,105,122,101,
-62,49,51,44,49,50,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,119,120,83,116,97,116,
-105,99,84,101,120,116,34,32,110,97,109,101,61,34,115,116,72,97,110,100,
-108,101,114,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,
-108,62,72,97,110,100,108,101,114,60,47,108,97,98,101,108,62,10,32,32,32,
-32,32,32,32,32,32,32,32,32,60,112,111,115,62,53,44,53,50,100,60,47,112,
-111,115,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,119,120,67,111,109,98,111,66,111,120,34,32,110,97,109,
-101,61,34,99,98,72,97,110,100,108,101,114,34,62,10,32,32,32,32,32,32,32,
-32,32,32,32,32,60,99,111,110,116,101,110,116,47,62,10,32,32,32,32,32,32,
-32,32,32,32,32,32,60,112,111,115,62,55,48,44,53,48,100,60,47,112,111,115,
-62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,105,122,101,62,49,51,53,
-44,49,50,100,60,47,115,105,122,101,62,10,32,32,32,32,32,32,32,32,32,32,
-32,32,60,115,116,121,108,101,62,119,120,67,66,95,82,69,65,68,79,78,76,89,
-124,119,120,67,66,95,68,82,79,80,68,79,87,78,60,47,115,116,121,108,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,119,120,83,116,97,116,105,99,84,101,120,116,34,32,110,97,109,101,
-61,34,115,116,86,97,108,105,100,97,116,111,114,34,62,10,32,32,32,32,32,
-32,32,32,32,32,32,32,60,108,97,98,101,108,62,86,97,108,105,100,97,116,111,
-114,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,
-112,111,115,62,53,44,54,55,100,60,47,112,111,115,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,119,120,67,111,109,
-98,111,66,111,120,34,32,110,97,109,101,61,34,99,98,86,97,108,105,100,97,
-116,111,114,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,99,111,110,
-116,101,110,116,47,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,
-115,62,55,48,44,54,53,100,60,47,112,111,115,62,10,32,32,32,32,32,32,32,
-32,32,32,32,32,60,115,105,122,101,62,49,51,53,44,49,50,100,60,47,115,105,
-122,101,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,116,121,108,101,
-62,119,120,67,66,95,82,69,65,68,79,78,76,89,124,119,120,67,66,95,68,82,
-79,80,68,79,87,78,60,47,115,116,121,108,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,119,120,83,116,97,116,
-105,99,84,101,120,116,34,32,110,97,109,101,61,34,115,116,67,111,109,109,
-101,110,116,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,
-108,62,67,111,109,109,101,110,116,60,47,108,97,98,101,108,62,10,32,32,32,
-32,32,32,32,32,32,32,32,32,60,112,111,115,62,53,44,56,50,100,60,47,112,
-111,115,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,119,120,84,101,120,116,67,116,114,108,34,32,110,97,109,
-101,61,34,116,120,116,67,111,109,109,101,110,116,34,62,10,32,32,32,32,32,
-32,32,32,32,32,32,32,60,112,111,115,62,55,48,44,56,48,100,60,47,112,111,
-115,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,105,122,101,62,49,
-51,53,44,49,48,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,119,120,83,116,97,116,
-105,99,84,101,120,116,34,32,110,97,109,101,61,34,115,116,67,108,117,115,
-116,101,114,83,101,116,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,
-108,97,98,101,108,62,85,115,101,32,114,101,112,108,105,99,97,116,105,111,
-110,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,
-112,111,115,62,53,44,49,56,53,100,60,47,112,111,115,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,119,120,67,111,
-109,98,111,66,111,120,34,32,110,97,109,101,61,34,99,98,67,108,117,115,116,
-101,114,83,101,116,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,99,111,
-110,116,101,110,116,47,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,
-111,115,62,55,48,44,49,56,51,100,60,47,112,111,115,62,10,32,32,32,32,32,
+120,67,111,109,98,111,66,111,120,34,32,110,97,109,101,61,34,99,98,72,97,
+110,100,108,101,114,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,99,
+111,110,116,101,110,116,47,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,
+112,111,115,62,55,48,44,53,48,100,60,47,112,111,115,62,10,32,32,32,32,32,
32,32,32,32,32,32,32,60,115,105,122,101,62,49,51,53,44,49,50,100,60,47,
115,105,122,101,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,116,121,
108,101,62,119,120,67,66,95,82,69,65,68,79,78,76,89,124,119,120,67,66,95,
68,82,79,80,68,79,87,78,60,47,115,116,121,108,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,
-60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,60,115,101,108,
-101,99,116,101,100,62,49,60,47,115,101,108,101,99,116,101,100,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,112,
-111,115,62,50,44,50,100,60,47,112,111,115,62,10,32,32,32,32,32,32,60,115,
-105,122,101,62,50,49,52,44,50,49,53,100,60,47,115,105,122,101,62,10,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,86,97,108,
+105,100,97,116,111,114,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,
+108,97,98,101,108,62,86,97,108,105,100,97,116,111,114,60,47,108,97,98,101,
+108,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,115,62,53,44,54,
+55,100,60,47,112,111,115,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,119,120,67,111,109,98,111,66,111,120,
+34,32,110,97,109,101,61,34,99,98,86,97,108,105,100,97,116,111,114,34,62,
+10,32,32,32,32,32,32,32,32,32,32,32,32,60,99,111,110,116,101,110,116,47,
+62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,115,62,55,48,44,54,
+53,100,60,47,112,111,115,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,
+105,122,101,62,49,51,53,44,49,50,100,60,47,115,105,122,101,62,10,32,32,
+32,32,32,32,32,32,32,32,32,32,60,115,116,121,108,101,62,119,120,67,66,95,
+82,69,65,68,79,78,76,89,124,119,120,67,66,95,68,82,79,80,68,79,87,78,60,
+47,115,116,121,108,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,119,120,83,116,97,116,105,99,84,101,120,
+116,34,32,110,97,109,101,61,34,115,116,67,111,109,109,101,110,116,34,62,
+10,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,67,111,109,
+109,101,110,116,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,32,32,32,
+32,32,32,60,112,111,115,62,53,44,56,50,100,60,47,112,111,115,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,119,
+120,84,101,120,116,67,116,114,108,34,32,110,97,109,101,61,34,116,120,116,
+67,111,109,109,101,110,116,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,
+60,112,111,115,62,55,48,44,56,48,100,60,47,112,111,115,62,10,32,32,32,32,
+32,32,32,32,32,32,32,32,60,115,105,122,101,62,49,51,53,44,49,48,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,119,120,83,116,97,116,105,99,84,101,120,
+116,34,32,110,97,109,101,61,34,115,116,67,108,117,115,116,101,114,83,101,
+116,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,
+85,115,101,32,114,101,112,108,105,99,97,116,105,111,110,60,47,108,97,98,
+101,108,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,115,62,53,
+44,49,56,53,100,60,47,112,111,115,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,119,120,67,111,109,98,111,66,
+111,120,34,32,110,97,109,101,61,34,99,98,67,108,117,115,116,101,114,83,
+101,116,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,99,111,110,116,
+101,110,116,47,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,115,
+62,55,48,44,49,56,51,100,60,47,112,111,115,62,10,32,32,32,32,32,32,32,32,
+32,32,32,32,60,115,105,122,101,62,49,51,53,44,49,50,100,60,47,115,105,122,
+101,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,116,121,108,101,62,
+119,120,67,66,95,82,69,65,68,79,78,76,89,124,119,120,67,66,95,68,82,79,
+80,68,79,87,78,60,47,115,116,121,108,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,60,47,111,
+98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,60,115,101,108,101,99,116,
+101,100,62,49,60,47,115,101,108,101,99,116,101,100,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,112,111,115,62,
+50,44,50,100,60,47,112,111,115,62,10,32,32,32,32,32,32,60,115,105,122,101,
+62,50,49,52,44,50,49,53,100,60,47,115,105,122,101,62,10,32,32,32,32,60,
+47,111,98,106,101,99,116,62,10,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,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,60,112,111,115,62,50,44,50,50,48,100,60,47,112,111,115,62,10,32,
32,32,32,60,47,111,98,106,101,99,116,62,10,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,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,60,112,111,115,62,50,44,50,50,48,100,60,47,112,111,
-115,62,10,32,32,32,32,60,47,111,98,106,101,99,116,62,10,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,60,108,97,98,101,108,62,79,75,60,47,108,97,98,101,108,62,10,
-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,60,112,111,115,62,49,49,51,44,50,
-50,48,100,60,47,112,111,115,62,10,32,32,32,32,60,47,111,98,106,101,99,116,
-62,10,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,60,108,97,98,101,108,62,67,
-97,110,99,101,108,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,60,112,
-111,115,62,49,54,54,44,50,50,48,100,60,47,112,111,115,62,10,32,32,32,32,
-60,47,111,98,106,101,99,116,62,10,32,32,32,32,60,115,105,122,101,62,50,
-49,56,44,50,51,56,100,60,47,115,105,122,101,62,10,32,32,32,32,60,115,116,
-121,108,101,47,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};
+110,97,109,101,61,34,119,120,73,68,95,79,75,34,62,10,32,32,32,32,32,32,
+60,108,97,98,101,108,62,79,75,60,47,108,97,98,101,108,62,10,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,60,112,111,115,62,49,49,51,44,50,50,48,100,
+60,47,112,111,115,62,10,32,32,32,32,60,47,111,98,106,101,99,116,62,10,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,60,108,97,98,101,108,62,67,97,110,99,
+101,108,60,47,108,97,98,101,108,62,10,32,32,32,32,32,32,60,112,111,115,
+62,49,54,54,44,50,50,48,100,60,47,112,111,115,62,10,32,32,32,32,60,47,111,
+98,106,101,99,116,62,10,32,32,32,32,60,115,105,122,101,62,50,49,56,44,50,
+51,56,100,60,47,115,105,122,101,62,10,32,32,32,32,60,115,116,121,108,101,
+47,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_17 = 1764;
static unsigned char xml_res_file_17[] = {