2000-02-12 14:11:17 +00:00
|
|
|
//----------------------------------------------------------------------------------------
|
2001-02-01 20:24:44 +00:00
|
|
|
// Name: pgmctrl.cpp
|
2000-01-28 15:25:32 +00:00
|
|
|
// Purpose: Programm Control with a Tree
|
|
|
|
// Author: Mark Johnson
|
|
|
|
// Modified by: 19990806.mj10777
|
|
|
|
// Created: 19991010
|
2000-01-31 13:20:36 +00:00
|
|
|
// RCS-ID: $Id$
|
2001-02-12 19:23:44 +00:00
|
|
|
// Copyright: (c) Mark Johnson, Berlin Germany
|
2000-01-28 15:25:32 +00:00
|
|
|
// Licence: wxWindows license
|
2000-02-12 14:11:17 +00:00
|
|
|
//----------------------------------------------------------------------------------------
|
|
|
|
//-- all #ifdefs that the whole Project needs. -------------------------------------------
|
|
|
|
//----------------------------------------------------------------------------------------
|
2000-01-28 15:25:32 +00:00
|
|
|
#ifdef __GNUG__
|
2000-01-31 10:43:24 +00:00
|
|
|
#pragma implementation
|
|
|
|
#pragma interface
|
2000-01-28 15:25:32 +00:00
|
|
|
#endif
|
2000-02-12 14:11:17 +00:00
|
|
|
//----------------------------------------------------------------------------------------
|
2000-01-28 15:25:32 +00:00
|
|
|
// For compilers that support precompilation, includes "wx/wx.h".
|
|
|
|
#include "wx/wxprec.h"
|
2000-02-12 14:11:17 +00:00
|
|
|
//----------------------------------------------------------------------------------------
|
2000-01-28 15:25:32 +00:00
|
|
|
#ifdef __BORLANDC__
|
2000-01-31 10:43:24 +00:00
|
|
|
#pragma hdrstop
|
2000-01-28 15:25:32 +00:00
|
|
|
#endif
|
2000-02-12 14:11:17 +00:00
|
|
|
//----------------------------------------------------------------------------------------
|
2000-01-28 15:25:32 +00:00
|
|
|
#ifndef WX_PRECOMP
|
2000-01-31 10:43:24 +00:00
|
|
|
#include "wx/wx.h"
|
2000-01-28 15:25:32 +00:00
|
|
|
#endif
|
2000-02-12 14:11:17 +00:00
|
|
|
//----------------------------------------------------------------------------------------
|
2000-01-28 15:25:32 +00:00
|
|
|
#ifndef __WXMSW__
|
2000-01-31 10:43:24 +00:00
|
|
|
#include "bitmaps/d_closed.xpm"
|
|
|
|
#include "bitmaps/d_open.xpm"
|
|
|
|
#include "bitmaps/f_closed.xpm"
|
|
|
|
#include "bitmaps/f_open.xpm"
|
|
|
|
#include "bitmaps/logo.xpm"
|
|
|
|
#include "bitmaps/dsnclose.xpm"
|
|
|
|
#include "bitmaps/dsnopen.xpm"
|
2000-01-28 15:25:32 +00:00
|
|
|
#endif
|
2000-02-12 14:11:17 +00:00
|
|
|
//----------------------------------------------------------------------------------------
|
|
|
|
//-- all #includes that every .cpp needs --- 19990807.mj10777 ----------------
|
|
|
|
//----------------------------------------------------------------------------------------
|
2000-01-28 15:25:32 +00:00
|
|
|
#include "std.h" // sorgsam Pflegen !
|
2001-02-01 20:24:44 +00:00
|
|
|
|
2000-02-12 14:11:17 +00:00
|
|
|
//----------------------------------------------------------------------------------------
|
|
|
|
//-- Global functions --------------------------------------------------------------------
|
|
|
|
//----------------------------------------------------------------------------------------
|
2004-01-11 22:08:25 +00:00
|
|
|
static inline const wxChar *bool2String(bool b)
|
2000-01-28 15:25:32 +00:00
|
|
|
{
|
2004-01-11 22:08:25 +00:00
|
|
|
return b ? _T("") : _T("not ");
|
2000-01-28 15:25:32 +00:00
|
|
|
}
|
2001-02-01 20:24:44 +00:00
|
|
|
|
2000-02-12 14:11:17 +00:00
|
|
|
//----------------------------------------------------------------------------------------
|
2000-01-28 15:25:32 +00:00
|
|
|
BEGIN_EVENT_TABLE(PgmCtrl, wxTreeCtrl)
|
2001-02-01 20:24:44 +00:00
|
|
|
EVT_MOTION (PgmCtrl::OnMouseMove)
|
|
|
|
EVT_LEFT_DCLICK(PgmCtrl::OnSelChanged)
|
|
|
|
EVT_TREE_ITEM_RIGHT_CLICK(TREE_CTRL_PGM,PgmCtrl::OnRightSelect)
|
|
|
|
EVT_MENU(PGMCTRL_ODBC_USER,PgmCtrl::OnUserPassword)
|
2000-02-12 14:11:17 +00:00
|
|
|
END_EVENT_TABLE()
|
2001-02-01 20:24:44 +00:00
|
|
|
|
2000-02-12 14:11:17 +00:00
|
|
|
//----------------------------------------------------------------------------------------
|
|
|
|
// PgmCtrl implementation
|
|
|
|
//----------------------------------------------------------------------------------------
|
|
|
|
IMPLEMENT_DYNAMIC_CLASS(PgmCtrl, wxTreeCtrl)
|
2001-02-01 20:24:44 +00:00
|
|
|
|
2000-02-12 14:11:17 +00:00
|
|
|
//----------------------------------------------------------------------------------------
|
|
|
|
PgmCtrl::PgmCtrl(wxWindow *parent) : wxTreeCtrl(parent)
|
2000-01-28 15:25:32 +00:00
|
|
|
{
|
|
|
|
}
|
2001-02-01 20:24:44 +00:00
|
|
|
|
2000-02-12 14:11:17 +00:00
|
|
|
//----------------------------------------------------------------------------------------
|
2000-01-28 15:25:32 +00:00
|
|
|
PgmCtrl::PgmCtrl(wxWindow *parent, const wxWindowID id,const wxPoint& pos, const wxSize& size, long style)
|
2001-02-01 20:24:44 +00:00
|
|
|
: wxTreeCtrl(parent, id, pos, size, style)
|
2000-01-28 15:25:32 +00:00
|
|
|
{
|
2004-01-11 22:08:25 +00:00
|
|
|
const int image_size = 16;
|
2001-02-01 20:24:44 +00:00
|
|
|
// Make an image list containing small icons
|
2004-01-11 22:08:25 +00:00
|
|
|
p_imageListNormal = new wxImageList(image_size, image_size, TRUE);
|
2001-02-01 20:24:44 +00:00
|
|
|
// should correspond to TreeIc_xxx enum
|
2004-01-11 22:08:25 +00:00
|
|
|
p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(aLogo)).ConvertToImage().Rescale(image_size, image_size)));
|
|
|
|
p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(DsnClosed)).ConvertToImage().Rescale(image_size, image_size)));
|
|
|
|
p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(DsnOpen)).ConvertToImage().Rescale(image_size, image_size)));
|
|
|
|
p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(DocClosed)).ConvertToImage().Rescale(image_size, image_size)));
|
|
|
|
p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(DocOpen)).ConvertToImage().Rescale(image_size, image_size)));
|
|
|
|
p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(FolderClosed)).ConvertToImage().Rescale(image_size, image_size)));
|
|
|
|
p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(FolderOpen)).ConvertToImage().Rescale(image_size, image_size)));
|
2001-02-01 20:24:44 +00:00
|
|
|
SetImageList(p_imageListNormal);
|
2000-01-28 15:25:32 +00:00
|
|
|
}
|
2001-02-01 20:24:44 +00:00
|
|
|
|
2000-02-12 14:11:17 +00:00
|
|
|
//----------------------------------------------------------------------------------------
|
2000-01-28 15:25:32 +00:00
|
|
|
PgmCtrl::~PgmCtrl()
|
|
|
|
{
|
2001-02-01 20:24:44 +00:00
|
|
|
delete p_imageListNormal;
|
|
|
|
delete popupMenu1;
|
2000-01-28 15:25:32 +00:00
|
|
|
}
|
2001-02-01 20:24:44 +00:00
|
|
|
|
2000-02-12 14:11:17 +00:00
|
|
|
//----------------------------------------------------------------------------------------
|
2000-01-28 15:25:32 +00:00
|
|
|
#undef TREE_EVENT_HANDLER
|
2001-02-01 20:24:44 +00:00
|
|
|
|
2000-02-12 14:11:17 +00:00
|
|
|
//----------------------------------------------------------------------------------------
|
2000-01-28 15:25:32 +00:00
|
|
|
int PgmCtrl::OnPopulate()
|
|
|
|
{
|
2001-02-01 20:24:44 +00:00
|
|
|
SetFont(* pDoc->ft_Doc);
|
|
|
|
wxTreeItemId Root, Folder, Docu;
|
|
|
|
//---------------------------------------------------------------------------------------
|
|
|
|
int i;
|
|
|
|
double dTmp = 1234567.89;
|
|
|
|
Temp0.Printf(_("%s Functions"),p_ProgramCfg->GetAppName().c_str());
|
2004-01-11 22:08:25 +00:00
|
|
|
Root = AddRoot(Temp0,TreeIc_Logo,TreeIc_Logo, new TreeData(_T("Root")));
|
2001-02-01 20:24:44 +00:00
|
|
|
//---------------------------------------------------------------------------------------
|
2004-01-11 22:08:25 +00:00
|
|
|
Folder = AppendItem(Root, _("Program settings") ,TreeIc_FolderClosed, TreeIc_FolderOpen, new TreeData(_T("Settings")));
|
|
|
|
p_ProgramCfg->Read(_T("/Local/langid"),&Temp0); p_ProgramCfg->Read(_T("/Local/language"),&Temp2);
|
2001-02-01 20:24:44 +00:00
|
|
|
Temp1.Printf(_("locale (%s) ; Language (%s) ; Number(%2.2f)"),Temp0.c_str(), Temp2.c_str(), dTmp); Temp0.Empty(); Temp2.Empty();
|
2004-01-11 22:08:25 +00:00
|
|
|
Docu = AppendItem(Folder, Temp1,TreeIc_DocClosed,TreeIc_DocOpen,new TreeData(_T("Setting Language")));
|
|
|
|
p_ProgramCfg->Read(_T("/Paths/Work"),&Temp0); Temp1.Printf(_("Work Path : %s"),Temp0.c_str()); Temp0.Empty();
|
|
|
|
Docu = AppendItem(Folder,Temp1,TreeIc_DocClosed,TreeIc_DocOpen,new TreeData(_T("Path Work")));
|
|
|
|
Docu = AppendItem(Folder, _("Change the language to English") ,TreeIc_DocClosed,TreeIc_DocOpen,new TreeData(_T("Language English")));
|
|
|
|
Docu = AppendItem(Folder, _("Change the language to German") ,TreeIc_DocClosed,TreeIc_DocOpen,new TreeData(_T("Language German")));
|
|
|
|
Docu = AppendItem(Folder, _("Delete all wxConfigBase Entry's"),TreeIc_DocClosed,TreeIc_DocOpen,new TreeData(_T("wxConfigBase Delete")));
|
|
|
|
Folder = AppendItem(Root, _T("ODBC DSN"),TreeIc_FolderClosed,TreeIc_FolderOpen,new TreeData(_T("ODBC-DSN")));
|
2001-02-01 20:24:44 +00:00
|
|
|
for (i=0;i<pDoc->i_DSN;i++)
|
|
|
|
{
|
2004-01-11 22:08:25 +00:00
|
|
|
Temp0.Printf(_T("ODBC-%s"),(pDoc->p_DSN+i)->Dsn.c_str());
|
2001-02-01 20:24:44 +00:00
|
|
|
Docu = AppendItem(Folder,(pDoc->p_DSN+i)->Dsn ,TreeIc_DsnClosed,TreeIc_DsnOpen, new TreeData(Temp0));
|
|
|
|
}
|
|
|
|
//---------------------------------------------------------------------------------------
|
|
|
|
popupMenu1 = NULL;
|
2004-01-11 22:08:25 +00:00
|
|
|
popupMenu1 = new wxMenu(_T(""));
|
2001-02-01 20:24:44 +00:00
|
|
|
popupMenu1->Append(PGMCTRL_ODBC_USER, _("Set Username and Password"));
|
|
|
|
// popupMenu1->AppendSeparator();
|
|
|
|
//---------------------------------------------------------------------------------------
|
|
|
|
Expand(Root);
|
|
|
|
Expand(Folder);
|
|
|
|
//---------------------------------------------------------------------------------------
|
|
|
|
return 0;
|
2000-01-28 15:25:32 +00:00
|
|
|
}
|
2001-02-01 20:24:44 +00:00
|
|
|
|
2000-02-12 14:11:17 +00:00
|
|
|
//----------------------------------------------------------------------------------------
|
2000-03-15 18:52:23 +00:00
|
|
|
void PgmCtrl::OnSelChanged(wxMouseEvent& WXUNUSED(event))
|
2000-01-28 15:25:32 +00:00
|
|
|
{
|
2001-02-01 20:24:44 +00:00
|
|
|
int i;
|
|
|
|
Temp0.Empty(); Temp1.Empty();
|
|
|
|
pDoc->p_MainFrame->SetStatusText(Temp0,0);
|
|
|
|
// Get the Information that we need
|
|
|
|
wxTreeItemId itemId = GetSelection();
|
|
|
|
TreeData *item = (TreeData *)GetItemData(itemId);
|
|
|
|
if (item != NULL )
|
2000-01-28 15:25:32 +00:00
|
|
|
{
|
2001-02-01 20:24:44 +00:00
|
|
|
int Treffer = 0;
|
2004-01-11 22:08:25 +00:00
|
|
|
Temp1.Printf(_T("%s"),item->m_desc.c_str());
|
2001-02-01 20:24:44 +00:00
|
|
|
//--------------------------------------------------------------------------------------
|
2004-01-11 22:08:25 +00:00
|
|
|
if (Temp1 == _T("Language English"))
|
2001-02-01 20:24:44 +00:00
|
|
|
{
|
2004-01-11 22:08:25 +00:00
|
|
|
Temp0 = _T("std");
|
|
|
|
p_ProgramCfg->Write(_T("/Local/langid"),Temp0);
|
2001-02-01 20:24:44 +00:00
|
|
|
Temp0 = _("-I-> After a programm restart, the language will be changed to English.");
|
|
|
|
wxMessageBox(Temp0);
|
|
|
|
}
|
2004-01-11 22:08:25 +00:00
|
|
|
if (Temp1 == _T("Language German"))
|
2001-02-01 20:24:44 +00:00
|
|
|
{
|
2004-01-11 22:08:25 +00:00
|
|
|
Temp0 = _T("de");
|
|
|
|
p_ProgramCfg->Write(_T("/Local/langid"),Temp0);
|
2001-02-01 20:24:44 +00:00
|
|
|
Temp0 = _("-I-> After a programm restart, the language will be changed to German.");
|
|
|
|
wxMessageBox(Temp0);
|
|
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------
|
2004-01-11 22:08:25 +00:00
|
|
|
if (Temp1 == _T("wxConfigBase Delete"))
|
2001-02-01 20:24:44 +00:00
|
|
|
{
|
|
|
|
if (p_ProgramCfg->DeleteAll()) // Default Diretory for wxFileSelector
|
|
|
|
Temp0 = _("-I-> wxConfigBase.p_ProgramCfg->DeleteAll() was succesfull.");
|
|
|
|
else
|
|
|
|
Temp0 = _("-E-> wxConfigBase.p_ProgramCfg->DeleteAll() was not succesfull !");
|
|
|
|
wxBell(); // Ding_a_Ling
|
|
|
|
Treffer++;
|
|
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------
|
2004-01-11 22:08:25 +00:00
|
|
|
if (Temp1.Contains(_T("ODBC-")))
|
2001-02-01 20:24:44 +00:00
|
|
|
{
|
|
|
|
Temp1 = Temp1.Mid(5,wxSTRING_MAXLEN);
|
|
|
|
for (i=0;i<pDoc->i_DSN;i++)
|
|
|
|
{
|
|
|
|
if (Temp1 == (pDoc->p_DSN+i)->Dsn)
|
|
|
|
{
|
|
|
|
pDoc->OnChosenDSN(i);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Treffer++;
|
|
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------
|
|
|
|
if (Treffer == 0)
|
|
|
|
{
|
|
|
|
//-------------------------------------------------------------------------------------
|
2004-01-11 22:08:25 +00:00
|
|
|
Temp0.Printf(_("Item '%s': %sselected, %sexpanded, %sbold, %u children (%u immediately under this item)."),
|
2001-02-01 20:24:44 +00:00
|
|
|
item->m_desc.c_str(),
|
|
|
|
bool2String(IsSelected(itemId)),
|
|
|
|
bool2String(IsExpanded(itemId)),
|
|
|
|
bool2String(IsBold(itemId)),
|
|
|
|
GetChildrenCount(itemId),
|
|
|
|
GetChildrenCount(itemId));
|
2004-01-11 22:08:25 +00:00
|
|
|
LogBuf.Printf(_T("-I-> PgmCtrl::OnSelChanged - %s"),Temp0.c_str());
|
|
|
|
wxLogMessage( _T("%s"), LogBuf.c_str() );
|
2001-02-01 20:24:44 +00:00
|
|
|
//-------------------------------------------------------------------------------------
|
|
|
|
}
|
2000-01-31 10:43:24 +00:00
|
|
|
}
|
2000-01-28 15:25:32 +00:00
|
|
|
}
|
2001-02-01 20:24:44 +00:00
|
|
|
|
2000-02-12 14:11:17 +00:00
|
|
|
//----------------------------------------------------------------------------------------
|
2000-01-28 15:25:32 +00:00
|
|
|
void PgmCtrl::OnRightSelect(wxTreeEvent& WXUNUSED(event))
|
|
|
|
{
|
2001-02-01 20:24:44 +00:00
|
|
|
int i;
|
|
|
|
Temp0.Empty();
|
|
|
|
// Get the Information that we need
|
|
|
|
wxTreeItemId itemId = GetSelection();
|
|
|
|
DBTreeData *item = (DBTreeData *)GetItemData(itemId);
|
|
|
|
SaveDSN.Empty();
|
|
|
|
if ( item != NULL )
|
2000-01-28 15:25:32 +00:00
|
|
|
{
|
2001-02-01 20:24:44 +00:00
|
|
|
int Treffer = 0;
|
2004-01-11 22:08:25 +00:00
|
|
|
Temp1.Printf(_T("%s"),item->m_desc.c_str());
|
2001-02-01 20:24:44 +00:00
|
|
|
//--------------------------------------------------------------------------------------
|
2004-01-11 22:08:25 +00:00
|
|
|
if (Temp1.Contains(_T("ODBC-")))
|
2001-02-01 20:24:44 +00:00
|
|
|
{
|
|
|
|
Temp1 = Temp1.Mid(5,wxSTRING_MAXLEN);
|
|
|
|
for (i=0;i<pDoc->i_DSN;i++)
|
|
|
|
{
|
|
|
|
if (Temp1 == (pDoc->p_DSN+i)->Dsn)
|
|
|
|
{
|
|
|
|
SaveDSN = Temp1;
|
|
|
|
PopupMenu(popupMenu1,TreePos.x,TreePos.y);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Treffer++;
|
|
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------
|
|
|
|
if (Treffer == 0)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
Temp0.Printf(_("Item '%s': %sselected, %sexpanded, %sbold,"
|
|
|
|
"%u children (%u immediately under this item)."),
|
|
|
|
item->m_desc.c_str(),
|
|
|
|
bool2String(IsSelected(itemId)),
|
|
|
|
bool2String(IsExpanded(itemId)),
|
|
|
|
bool2String(IsBold(itemId)),
|
|
|
|
GetChildrenCount(itemId),
|
|
|
|
GetChildrenCount(itemId));
|
|
|
|
LogBuf.Printf("-I-> DBTree::OnSelChanged - %s",Temp0.c_str());
|
|
|
|
wxLogMessage( "%s", LogBuf.c_str() );
|
|
|
|
*/
|
|
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------
|
2000-02-12 14:11:17 +00:00
|
|
|
}
|
2000-07-25 12:15:55 +00:00
|
|
|
} // void PgmCtrl::OnRightSelect(wxTreeEvent& WXUNUSED(event))
|
2001-02-01 20:24:44 +00:00
|
|
|
|
2000-02-12 14:11:17 +00:00
|
|
|
//----------------------------------------------------------------------------------------
|
2000-01-28 15:25:32 +00:00
|
|
|
void PgmCtrl::OnMouseMove(wxMouseEvent &event)
|
|
|
|
{
|
2001-02-01 20:24:44 +00:00
|
|
|
TreePos = event.GetPosition();
|
2000-01-28 15:25:32 +00:00
|
|
|
}
|
2001-02-01 20:24:44 +00:00
|
|
|
|
2000-02-12 14:11:17 +00:00
|
|
|
//----------------------------------------------------------------------------------------
|
2000-03-15 18:52:23 +00:00
|
|
|
void PgmCtrl::OnUserPassword(wxCommandEvent& WXUNUSED(event))
|
2000-01-28 15:25:32 +00:00
|
|
|
{
|
2001-02-01 20:24:44 +00:00
|
|
|
// wxMessageBox(SaveDSN);
|
|
|
|
int i;
|
|
|
|
//--------------------------------------------
|
2004-01-11 22:08:25 +00:00
|
|
|
DlgUser *p_Dlg = new DlgUser(this,pDoc,_T(""));
|
2001-02-01 20:24:44 +00:00
|
|
|
//-------------------------------------------
|
|
|
|
for (i=0;i<pDoc->i_DSN;i++)
|
|
|
|
{
|
|
|
|
wxYield();
|
|
|
|
if (SaveDSN == (pDoc->p_DSN+i)->Dsn)
|
|
|
|
{
|
|
|
|
p_Dlg->pDoc = pDoc;
|
|
|
|
p_Dlg->s_DSN = (pDoc->p_DSN+i)->Dsn;
|
|
|
|
p_Dlg->s_User = (pDoc->p_DSN+i)->Usr;
|
|
|
|
p_Dlg->s_Password = (pDoc->p_DSN+i)->Pas;
|
|
|
|
p_Dlg->OnInit();
|
|
|
|
p_Dlg->Fit();
|
|
|
|
//--------------------
|
|
|
|
// Temp0.Printf("i(%d) ; s_DSN(%s) ; s_User(%s) ; s_Password(%s)",i,p_Dlg.s_DSN,p_Dlg.s_User,p_Dlg.s_Password);
|
|
|
|
// wxMessageBox(Temp0);
|
|
|
|
bool OK = FALSE;
|
|
|
|
if (p_Dlg->ShowModal() == wxID_OK)
|
|
|
|
{
|
|
|
|
(pDoc->p_DSN+i)->Usr = p_Dlg->s_User;
|
|
|
|
(pDoc->p_DSN+i)->Pas = p_Dlg->s_Password;
|
|
|
|
(pDoc->db_Br+i)->UserName = (pDoc->p_DSN+i)->Usr;
|
|
|
|
(pDoc->db_Br+i)->Password = (pDoc->p_DSN+i)->Pas;
|
|
|
|
OK = TRUE;
|
|
|
|
}
|
|
|
|
delete p_Dlg;
|
|
|
|
if (!OK)
|
|
|
|
return;
|
|
|
|
//--------------------
|
|
|
|
break; // We have what we want, leave
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//-------------------------------------------
|
|
|
|
SaveDSN.Empty();
|
2000-01-28 15:25:32 +00:00
|
|
|
}
|
2000-02-12 14:11:17 +00:00
|
|
|
//----------------------------------------------------------------------------------------
|