browsedb.cpp dbtree.cpp dlguser.cpp dlguser.h pgmctrl.cpp

de/dbbrowse.mo de/dbbrowse.po


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mark Johnson
2000-02-14 09:07:41 +00:00
parent 07296f0b12
commit b54f1155cb
7 changed files with 80 additions and 61 deletions

View File

@@ -121,8 +121,8 @@ bool BrowserDB::OnStartDB(int Quite)
//--------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------
// Connect to datasource // Connect to datasource
//--------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------
DlgUser *p_Dlg = new DlgUser(pDoc->p_MainFrame, "Username and Password"); DlgUser *p_Dlg = new DlgUser(pDoc->p_MainFrame,pDoc,"");
p_Dlg->pDoc = pDoc; // p_Dlg->pDoc = pDoc;
p_Dlg->s_DSN = ODBCSource; p_Dlg->s_DSN = ODBCSource;
p_Dlg->s_User = UserName; p_Dlg->s_User = UserName;
p_Dlg->s_Password = Password; p_Dlg->s_Password = Password;

View File

@@ -107,7 +107,7 @@ DBTree::~DBTree()
int DBTree::OnPopulate() int DBTree::OnPopulate()
{ {
wxTreeItemId Root, Folder, Docu, Funkt; wxTreeItemId Root, Folder, Docu, Funkt;
int i,x,y, TableType; int i,x,y,z=0, TableType;
wxString SQL_TYPE, DB_TYPE; wxString SQL_TYPE, DB_TYPE;
SetFont(* pDoc->ft_Doc); SetFont(* pDoc->ft_Doc);
//--------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------
@@ -154,7 +154,10 @@ int DBTree::OnPopulate()
if (((ct_BrowserDB->pTableInf+x)->pColInf+y)->PkCol != 0) // Primary Key if (((ct_BrowserDB->pTableInf+x)->pColInf+y)->PkCol != 0) // Primary Key
{ {
Docu = AppendItem(Folder,((ct_BrowserDB->pTableInf+x)->pColInf+y)->colName,TreeIc_KEY,TreeIc_KEY,new DBTreeData(Temp1)); Docu = AppendItem(Folder,((ct_BrowserDB->pTableInf+x)->pColInf+y)->colName,TreeIc_KEY,TreeIc_KEY,new DBTreeData(Temp1));
Temp2.Printf(_("This Key is used in the following Tables : %s"),((ct_BrowserDB->pTableInf+x)->pColInf+y)->PkTableName); Temp2 = ((ct_BrowserDB->pTableInf+x)->pColInf+y)->PkTableName;
if (Temp2 == "")
Temp2 = _("None");
Temp2.Printf(_("This Key is used in the following Tables : %s"),Temp2);
Funkt = AppendItem(Docu,Temp2,TreeIc_DocClosed,TreeIc_DocOpen,new DBTreeData("KEY")); Funkt = AppendItem(Docu,Temp2,TreeIc_DocClosed,TreeIc_DocOpen,new DBTreeData("KEY"));
} }
else else
@@ -193,6 +196,12 @@ int DBTree::OnPopulate()
} // if ((ct_BrowserDB->pTableInf+x)->pColInf) } // if ((ct_BrowserDB->pTableInf+x)->pColInf)
else else
Folder = AppendItem(Root,Temp0,TreeIc_FolderClosed,TreeIc_FolderOpen, new DBTreeData(Temp1)); Folder = AppendItem(Root,Temp0,TreeIc_FolderClosed,TreeIc_FolderOpen, new DBTreeData(Temp1));
z++;
if (z % 10 == 0)
{
Temp0.Printf(_("-I-> DBTree::OnPopulate(%s) - Table %6d has been read."),(ct_BrowserDB->pTableInf+x)->tableName,z);
pDoc->p_MainFrame->SetStatusText(Temp0, 0);
}
} // if ((ct_BrowserDB->pTableInf+x)->tableType == "TABLE" or VIEW) } // if ((ct_BrowserDB->pTableInf+x)->tableType == "TABLE" or VIEW)
// else // else
// wxLogMessage(_("\n-I-> if ! TABLE or VIEW >%s<"),(ct_BrowserDB->pTableInf+x)->tableType); // wxLogMessage(_("\n-I-> if ! TABLE or VIEW >%s<"),(ct_BrowserDB->pTableInf+x)->tableType);
@@ -201,6 +210,8 @@ int DBTree::OnPopulate()
else else
wxLogMessage(_("\n-E-> DBTree::OnPopulate() : Invalid Catalog Pointer : Failed")); wxLogMessage(_("\n-E-> DBTree::OnPopulate() : Invalid Catalog Pointer : Failed"));
wxEndBusyCursor(); wxEndBusyCursor();
Temp0.Printf(_("-I-> DBTree::OnPopulate(%s) - Tables %6d have been read."),(ct_BrowserDB->pTableInf+x)->tableName,z);
pDoc->p_MainFrame->SetStatusText(Temp0, 0);
} // if((pDoc->db_Br+i_Which)->Initialize(FALSE)) } // if((pDoc->db_Br+i_Which)->Initialize(FALSE))
else else
{ {

Binary file not shown.

View File

@@ -194,6 +194,10 @@ msgstr "Zeit"
msgid "OK" msgid "OK"
msgstr "" msgstr ""
#: ../BrowserDB.cpp:47
msgid "None"
msgstr "Keine"
#: ../BrowserDB.cpp:47 #: ../BrowserDB.cpp:47
msgid "Message" msgid "Message"
msgstr "Nachricht" msgstr "Nachricht"

View File

@@ -30,71 +30,77 @@
//---------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------
#include "std.h" #include "std.h"
//---------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------
DlgUser::DlgUser(wxWindow *parent, const wxString& title) : DlgUser::DlgUser(wxWindow *parent, mjDoc *p_Doc, const wxString& title) :
wxDialog(parent, ID_DIALOG_DSN, title) wxDialog(parent, ID_DIALOG_DSN, title)
{ {
int chSize; // Height of Font * 1.4 = Height of wxTextCtrl
SetBackgroundColour("wheat"); SetBackgroundColour("wheat");
pDoc = p_Doc;
wxLayoutConstraints* layout; wxLayoutConstraints* layout;
SetAutoLayout(TRUE); SetAutoLayout(TRUE);
m_Label1 = new wxStaticText(this, -1, _("User ID:")); m_Label1 = new wxStaticText(this, -1, _("User ID:"));
layout = new wxLayoutConstraints; m_Label1->SetFont(* pDoc->ft_Doc);
layout->left.SameAs(this, wxLeft, 10); layout = new wxLayoutConstraints;
layout->top.SameAs(this, wxTop, 10); layout->left.SameAs(this, wxLeft, 10);
layout->height.AsIs(); layout->top.SameAs(this, wxTop, 10);
layout->width.Absolute(75); layout->height.AsIs();
m_Label1->SetConstraints(layout); layout->width.Absolute(75);
m_Label1->SetConstraints(layout);
m_UserName = new wxTextCtrl(this, -1, ""); m_UserName = new wxTextCtrl(this, -1, "");
layout = new wxLayoutConstraints; m_UserName->SetFont(* pDoc->ft_Doc);
layout->left.SameAs(m_Label1, wxRight, 10); chSize = m_UserName->GetCharHeight()*1.4;
// layout->top.SameAs(m_Label1, wxTop); layout = new wxLayoutConstraints;
layout->centreY.SameAs(m_Label1,wxCentreY); layout->left.SameAs(m_Label1, wxRight, 10);
layout->width.Absolute(200); layout->centreY.SameAs(m_Label1,wxCentreY);
layout->height.AsIs(); layout->width.Absolute(200);
m_UserName->SetConstraints(layout); layout->height.Absolute(chSize);
m_UserName->SetConstraints(layout);
m_Label2 = new wxStaticText(this, -1, _("Password:")); m_Label2 = new wxStaticText(this, -1, _("Password:"));
layout = new wxLayoutConstraints; m_Label2->SetFont(* pDoc->ft_Doc);
layout->left.SameAs(m_Label1, wxLeft); layout = new wxLayoutConstraints;
layout->top.SameAs(m_Label1, wxBottom, 10); layout->left.SameAs(m_Label1, wxLeft);
layout->height.AsIs(); layout->top.SameAs(m_Label1, wxBottom, 10);
layout->width.SameAs(m_Label1, wxWidth); layout->height.AsIs();
m_Label2->SetConstraints(layout); layout->width.SameAs(m_Label1, wxWidth);
m_Label2->SetConstraints(layout);
m_Password = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD); m_Password = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD);
layout = new wxLayoutConstraints; m_Password->SetFont(* pDoc->ft_Doc);
layout->left.SameAs(m_UserName, wxLeft); layout = new wxLayoutConstraints;
layout->width.SameAs(m_UserName, wxWidth); layout->left.SameAs(m_UserName, wxLeft);
// layout->top.SameAs(m_Label2, wxTop); layout->width.SameAs(m_UserName, wxWidth);
layout->centreY.SameAs(m_Label2,wxCentreY); layout->centreY.SameAs(m_Label2,wxCentreY);
layout->height.AsIs(); layout->height.Absolute(chSize);
m_Password->SetConstraints(layout); m_Password->SetConstraints(layout);
m_OK = new wxButton(this, wxID_OK, _("OK")); m_OK = new wxButton(this, wxID_OK, _("OK"));
layout = new wxLayoutConstraints; m_OK->SetFont(* pDoc->ft_Doc);
layout->left.SameAs(this, wxLeft, 10); layout = new wxLayoutConstraints;
layout->top.SameAs(m_Label2, wxBottom,10); layout->left.SameAs(this, wxLeft, 10);
layout->height.AsIs(); layout->top.SameAs(m_Label2, wxBottom,10);
layout->width.Absolute(75); layout->height.AsIs();
m_OK->SetConstraints(layout); layout->width.Absolute(75);
m_OK->SetConstraints(layout);
m_Cancel = new wxButton(this, wxID_CANCEL, _("Cancel")); m_Cancel = new wxButton(this, wxID_CANCEL, _("Cancel"));
layout = new wxLayoutConstraints; m_Cancel->SetFont(* pDoc->ft_Doc);
layout->left.SameAs(m_OK, wxRight, 10); layout = new wxLayoutConstraints;
layout->top.SameAs(m_OK, wxTop); layout->left.SameAs(m_OK, wxRight, 10);
layout->height.AsIs(); layout->top.SameAs(m_OK, wxTop);
layout->width.SameAs(m_OK, wxWidth); layout->height.AsIs();
m_Cancel->SetConstraints(layout); layout->width.SameAs(m_OK, wxWidth);
m_Cancel->SetConstraints(layout);
m_OK->SetDefault(); m_OK->SetDefault();
m_UserName->SetFocus(); m_UserName->SetFocus();
s_User = ""; s_User = "";
s_Password = ""; s_Password = "";
Layout(); Layout();
} }
//---------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------
void DlgUser::OnInit() void DlgUser::OnInit()
@@ -103,9 +109,6 @@ void DlgUser::OnInit()
SetTitle(Temp); SetTitle(Temp);
m_UserName->SetLabel(s_User); m_UserName->SetLabel(s_User);
m_Password->SetLabel(s_Password); m_Password->SetLabel(s_Password);
m_Label1->SetFont(* pDoc->ft_Doc); m_Label2->SetFont(* pDoc->ft_Doc);
m_UserName->SetFont(* pDoc->ft_Doc); m_Password->SetFont(* pDoc->ft_Doc);
m_OK->SetFont(* pDoc->ft_Doc); m_Cancel->SetFont(* pDoc->ft_Doc);
} }
//---------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------
BEGIN_EVENT_TABLE(DlgUser, wxDialog) BEGIN_EVENT_TABLE(DlgUser, wxDialog)

View File

@@ -27,7 +27,7 @@ class DlgUser: public wxDialog
wxButton *m_OK, *m_Cancel; wxButton *m_OK, *m_Cancel;
mjDoc *pDoc; mjDoc *pDoc;
//--------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------
DlgUser(wxWindow *parent, const wxString& title); DlgUser(wxWindow *parent,mjDoc *pDoc, const wxString& title);
void OnInit(); void OnInit();
void OnOk(wxCommandEvent& event); void OnOk(wxCommandEvent& event);
//--------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------

View File

@@ -253,13 +253,14 @@ void PgmCtrl::OnUserPassword()
{ {
// wxMessageBox(SaveDSN); // wxMessageBox(SaveDSN);
int i; int i;
//------------------------------------------- //--------------------------------------------
DlgUser *p_Dlg = new DlgUser(this, "Username and Password"); DlgUser *p_Dlg = new DlgUser(this,pDoc,"");
//------------------------------------------- //-------------------------------------------
for (i=0;i<pDoc->i_DSN;i++) for (i=0;i<pDoc->i_DSN;i++)
{ {
if (SaveDSN == (pDoc->p_DSN+i)->Dsn) if (SaveDSN == (pDoc->p_DSN+i)->Dsn)
{ {
p_Dlg->pDoc = pDoc;
p_Dlg->s_DSN = (pDoc->p_DSN+i)->Dsn; p_Dlg->s_DSN = (pDoc->p_DSN+i)->Dsn;
p_Dlg->s_User = (pDoc->p_DSN+i)->Usr; p_Dlg->s_User = (pDoc->p_DSN+i)->Usr;
p_Dlg->s_Password = (pDoc->p_DSN+i)->Pas; p_Dlg->s_Password = (pDoc->p_DSN+i)->Pas;