browsedb.cpp dbbrowse.cpp dbgrid.cpp dbtree.cpp doc.cpp

 	de/dbbrowse.mo de/dbbrowse.po

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/demos/dbbrowse/browsedb.cpp b/demos/dbbrowse/browsedb.cpp
index b2cf5db39c9a1e6378e822dae1ba3041a463108d..d3150e7401ab59cd554950fe322a9a68af51241c 100644 (file)
--- a/demos/dbbrowse/browsedb.cpp
+++ b/demos/dbbrowse/browsedb.cpp
@@ -103,6 +103,7 @@ bool BrowserDB::Initialize(int Quite)
 //----------------------------------------------------------------------------------------
 bool BrowserDB::OnStartDB(int Quite)
 {
+ wxStopWatch sw;
  if (!Quite)
   wxLogMessage(_("\n-I-> BrowserDB::OnStartDB(%s) : Begin "),ODBCSource.c_str());
  if (db_BrowserDB != NULL)
@@ -155,7 +156,7 @@ bool BrowserDB::OnStartDB(int Quite)
    if (!Quite)
    {
     wxLogMessage(_("\n-E-> BrowserDB::OnConnectDataSource() DB CONNECTION ERROR : Unable to connect to the data source.\n\nCheck the name of your data source to verify it has been correctly entered/spelled.\n\nWith some databases, the user name and password must\nbe created with full rights to the table prior to making a connection\n(using tools provided by the database manufacturer)"));
-    wxLogMessage(_("-I-> BrowserDB::OnStartDB(%s) : End "),ODBCSource.c_str());
+    wxLogMessage(_("-I-> BrowserDB::OnStartDB(%s) : End  - Time needed : %ld ms"),ODBCSource.c_str(),sw.Time());
    }
    return FALSE;
   }
@@ -165,7 +166,7 @@ bool BrowserDB::OnStartDB(int Quite)
    Temp1 = db_BrowserDB->GetDatabaseName();
    Temp2 = db_BrowserDB->GetDataSource();
    wxLogMessage(_("-I-> BrowserDB::OnGetDataSourceODBC() - DatabaseName(%s) ; DataSource(%s)"),Temp1.c_str(),Temp2.c_str());
-   wxLogMessage(_("-I-> BrowserDB::OnStartDB(%s) : End "),ODBCSource.c_str());
+   wxLogMessage(_("-I-> BrowserDB::OnStartDB(%s) : End - Time needed : %ld ms"),ODBCSource.c_str(),sw.Time());
   }
   return TRUE;
  } else return FALSE;
@@ -328,6 +329,7 @@ bool BrowserDB::OnGetNext(int Cols,int Quite)
 //----------------------------------------------------------------------------------------
 bool BrowserDB::OnSelect(wxString tb_Name, int Quite)
 {
+ wxStopWatch sw;
  wxString SQLStmt;
  i_Records = 0;
  //---------------------------------------------------------------------------------------
@@ -358,7 +360,7 @@ bool BrowserDB::OnSelect(wxString tb_Name, int Quite)
  //---------------------------------------------------------------------------------------
  if (!Quite)
  {
-  wxLogMessage(_("\n-I-> BrowserDB::OnSelect(%s) Records(%d): End "),tb_Name.c_str(),i_Records);
+  wxLogMessage(_("\n-I-> BrowserDB::OnSelect(%s) Records(%d): End - Time needed : %ld ms"),tb_Name.c_str(),i_Records,sw.Time());
  }
  return TRUE;
 }
@@ -378,7 +380,7 @@ bool BrowserDB::OnExecSql(wxString SQLStmt, int Quite)
  }
  if (!Quite)
  {
-  // wxLogMessage(_("\n-I-> BrowserDB::OnExecSql(%s) - End "),SQLStmt.c_str());
+  // wxLogMessage(_("\n-I-> BrowserDB::OnExecSql(%s) - End - Time needed : %ld ms"),SQLStmt.c_str(),sw.Time());
  }
  return TRUE;
 }

diff --git a/demos/dbbrowse/dbbrowse.cpp b/demos/dbbrowse/dbbrowse.cpp
index 2f44733d7d2d50ccfa561bca5ffae8d5cfe8bb1a..89b4c659a4041efbf9b0a069063ac8ede67d9cc0 100644 (file)
--- a/demos/dbbrowse/dbbrowse.cpp
+++ b/demos/dbbrowse/dbbrowse.cpp
@@ -179,7 +179,8 @@ bool MainApp::OnInit(void)  // Does everything needed for a program start
      w = p_ProgramCfg->Read("/MainFrame/w", 750), h = p_ProgramCfg->Read("/MainFrame/h", 600);
  //---------------------------------------------------------------------------------------
  // Create the main frame window
- frame = new MainFrame((wxFrame *) NULL, (char *) _("DBBrowser - mj10777"),wxPoint(x,y),wxSize(w,h));
+ Temp0.Printf("%s - %s",GetAppName().c_str(),GetVendorName().c_str());
+ frame = new MainFrame((wxFrame *) NULL,(char *) Temp0.c_str(),wxPoint(x,y),wxSize(w,h));
  //---------------------------------------------------------------------------------------
  // Set the Backgroundcolour (only need if your are NOT using wxSYS_COLOUR_BACKGROUND)
  frame->SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BACKGROUND));
@@ -283,7 +284,8 @@ MainFrame::~MainFrame(void)
  // we want here!)
  // delete wxConfigBase::Set((wxConfigBase *) NULL);
  p_ProgramCfg->Flush(TRUE);        // saves   Objekt
- delete frame->pDoc;               // Cleanup (mjDoc::~mjDoc)
+ if (!frame->pDoc)                 // If we have a Valid Document
+  delete frame->pDoc;              // Cleanup (mjDoc::~mjDoc)
 } // MainFrame::~MainFrame(void)
 //----------------------------------------------------------------------------------------
 void MainFrame::OnQuit(wxCommandEvent& WXUNUSED(event))

diff --git a/demos/dbbrowse/dbgrid.cpp b/demos/dbbrowse/dbgrid.cpp
index 2834e102d31e2e5de54157dd5b209c407d3caa0a..9902576797d8584be265b0b5ab4cf2edfa9d022c 100644 (file)
--- a/demos/dbbrowse/dbgrid.cpp
+++ b/demos/dbbrowse/dbgrid.cpp
@@ -73,14 +73,12 @@ DBGrid::~DBGrid()
 //----------------------------------------------------------------------------------------
 int  DBGrid::OnTableView(wxString Table)
 {
+ wxStopWatch sw;
  //---------------------------------------------------------------------------------------
  int  i=0,x,y,z, ValidTable=0;
  wxString Temp0;
  wxBeginBusyCursor();
  SetFont(* pDoc->ft_Doc);
- // wxFont *ft_Temp;
- // ft_Temp = new wxFont(wxSystemSettings::GetSystemFont(wxSYS_SYSTEM_FONT));
- // SetFont(*ft_Temp);
  //---------------------------------------------------------------------------------------
  ct_BrowserDB = (db_Br+i_Which)->ct_BrowserDB;                       // Get the DSN Pointer
  //---------------------------------------------------------------------------------------
@@ -123,7 +121,8 @@ int  DBGrid::OnTableView(wxString Table)
        pDoc->p_MainFrame->SetStatusText(Temp0, 0);
       }
      }  // for (z=0;z<(db_Br+i_Which)->i_Records;z++)
-     Temp0.Printf(_("-I-> DBGrid::OnTableView(%s) - %6d Records have been read."),Table.c_str(),z);
+     Temp0.Printf(_("-I-> DBGrid::OnTableView(%s) - %6d Records have been read. - Time needed : %ld ms"),Table.c_str(),z,sw.Time());
+     wxLogMessage(Temp0);
      pDoc->p_MainFrame->SetStatusText(Temp0, 0);
      // The Grid has been filled, now leave
      goto Weiter;

diff --git a/demos/dbbrowse/dbtree.cpp b/demos/dbbrowse/dbtree.cpp
index 40928755d236ac6918aa3bb75974d4b930911356..89d7546c06deda7d540e55fe4bcc0f318165d1f1 100644 (file)
--- a/demos/dbbrowse/dbtree.cpp
+++ b/demos/dbbrowse/dbtree.cpp
@@ -106,6 +106,7 @@ DBTree::~DBTree()
 //----------------------------------------------------------------------------------------
 int  DBTree::OnPopulate()
 {
+ wxStopWatch sw;
  wxTreeItemId Root, Folder, Docu, Funkt;
  int i,x,y,z=0, TableType;
  wxString SQL_TYPE, DB_TYPE;
@@ -210,7 +211,8 @@ int  DBTree::OnPopulate()
   else
    wxLogMessage(_("\n-E-> DBTree::OnPopulate() : Invalid Catalog Pointer : Failed"));
   wxEndBusyCursor();
-  Temp0.Printf(_("-I-> DBTree::OnPopulate(%s) - Tables %6d have been read."),(ct_BrowserDB->pTableInf+x)->tableName,z);
+  Temp0.Printf(_("-I-> DBTree::OnPopulate(%s) - %6d Tables have been read. - Time needed : %ld ms"),(ct_BrowserDB->pTableInf+x)->tableName,z,sw.Time());
+  wxLogMessage(Temp0);
   pDoc->p_MainFrame->SetStatusText(Temp0, 0);
  }       // if((pDoc->db_Br+i_Which)->Initialize(FALSE))
  else

diff --git a/demos/dbbrowse/de/dbbrowse.mo b/demos/dbbrowse/de/dbbrowse.mo
index fa55b54541caf2f12a1b2eb017b14eac331c69b4..d51941a7c33edd30019e4c7affd59ec12d8aca06 100644 (file)
Binary files a/demos/dbbrowse/de/dbbrowse.mo and b/demos/dbbrowse/de/dbbrowse.mo differ

diff --git a/demos/dbbrowse/de/dbbrowse.po b/demos/dbbrowse/de/dbbrowse.po
index 80c43cfbc0dde0f874c9bb32520ad30a1a25734f..04f90bce4fb2f9d0b406b5ebec2fca0cbb2d3124 100644 (file)
--- a/demos/dbbrowse/de/dbbrowse.po
+++ b/demos/dbbrowse/de/dbbrowse.po
@@ -145,9 +145,9 @@ msgstr  "\n"
 #: ../BrowserDB.cpp:303 ../BrowserDB.cpp:331
 #, c-format
 msgid   "\n"
-        "-I-> BrowserDB::OnSelect(%s) Records(%d): End "
+        "-I-> BrowserDB::OnSelect(%s) Records(%d): End - Time needed : %ld ms"
 msgstr  "\n"
-        "-I-> BrowserDB::OnSelect(%s) Sätze(%d): Ende "
+        "-I-> BrowserDB::OnSelect(%s) Sätze(%d): Ende - Dauer : %ld ms"
 
 #: ../BrowserDB.cpp:104
 #, c-format
@@ -159,9 +159,9 @@ msgstr  "\n"
 #: ../BrowserDB.cpp:140
 #, c-format
 msgid   "\n"
-        "-I-> BrowserDB::OnStartDB(%s) : End "
+        "-I-> BrowserDB::OnStartDB(%s) : End - Time needed : %ld ms"
 msgstr  "\n"
-        "-I-> BrowserDB::OnStartDB(%s) : Ende "
+        "-I-> BrowserDB::OnStartDB(%s) : Ende - Dauer : %ld ms"
 
 #: ../BrowserDB.cpp:108
 msgid   "\n"
@@ -190,6 +190,10 @@ msgstr  "   Zeile: "
 msgid   "Time"
 msgstr  "Zeit"
 
+#: ../BrowserDB.cpp:47
+msgid   "-I-> mjDoc::OnNewDocument() - End - Time needed : %ld ms"
+msgstr  "-I-> mjDoc::OnNewDocument() - Ende - Dauer : %ld ms"
+
 #: ../BrowserDB.cpp:47
 msgid   "OK"
 msgstr  ""
@@ -339,19 +343,30 @@ msgstr  "-I-> BrowserDB::OnGetDataSourceODBC() - DatabaseName(%s) ; DataSource(%
 
 #: ../BrowserDB.cpp:140
 #, c-format
-msgid   "-I-> BrowserDB::OnStartDB(%s) : End "
-msgstr  "-I-> BrowserDB::OnStartDB(%s) : Ende"
+msgid   "-I-> BrowserDB::OnStartDB(%s) : End - Time needed : %ld ms"
+msgstr  "-I-> BrowserDB::OnStartDB(%s) : Ende - Dauer : %ld ms"
 
 #: ../DBGrid.cpp:114
 #, c-format
-msgid   "-I-> DBGrid::OnTableView(%s) - %6d Records have been read."
-msgstr  "-I-> DBGrid::OnTableView(%s) - %6d Sätze wurde insgesamt gelesen."
+msgid   "-I-> DBGrid::OnTableView(%s) - %6d Records have been read. - Time needed : %ld ms"
+msgstr  "-I-> DBGrid::OnTableView(%s) - %6d Sätze wurde insgesamt gelesen. - Dauer : %ld ms"
 
 #: ../DBGrid.cpp:110
 #, c-format
 msgid   "-I-> DBGrid::OnTableView(%s) - Record %6d has been read."
 msgstr  "-I-> DBGrid::OnTableView(%s) - Satz %6d wurde gelesen."
 
+#: ../DBTree.cpp:110
+#, c-format
+msgid   "-I-> DBTree::OnPopulate(%s) - %6d Tables have been read. - Time needed : %ld ms"
+msgstr  "-I-> DBTree::OnPopulate(%s) - %6d Tabellen wurde gelesen. - Dauer : %ld ms"
+
+#: ../DBTree.cpp:110
+#, c-format
+msgid   "-I-> DBTree::OnPopulate(%s) - Table %6d has been read."
+msgstr  "-I-> DBTree::OnPopulate(%s) - Tabelle %6d wurde gelesen."
+
+
 #: ../DBGrid.cpp:129
 msgid   "-I-> DBGrid::OnTableView() - End"
 msgstr  "-I-> DBGrid::OnTableView() - Ende"
@@ -364,7 +379,7 @@ msgstr  "-I-> PgmCtrl::OnSelChanged - %s"
 #: ../Doc.cpp:126
 #, c-format
 msgid   "-I-> mjDoc::OnInitView() - End - %d DSN's found"
-msgstr  "-I-> mjDoc::OnInitView() - Ende - %d DSN's found"
+msgstr  "-I-> mjDoc::OnInitView() - Ende - %d DSN's gefunden"
 
 #: ../PgmCtrl.cpp:160 ../PgmCtrl.cpp:163
 msgid   "-I-> wxConfigBase.p_ProgramCfg->DeleteAll() was succesfull."
@@ -661,13 +676,9 @@ msgstr  ""
 msgid   "ODBC-%s"
 msgstr  ""
 
-#: ../PgmCtrl.cpp:119
-msgid   "ODBC-DSN"
-msgstr  ""
-
 #: ../PgmCtrl.cpp:115
 msgid   "Path Work"
-msgstr  ""
+msgstr  "Arbeitspfad"
 
 #: ../Doc.cpp:94 ../Doc.cpp:96
 msgid   "PgmCtrl"

diff --git a/demos/dbbrowse/doc.cpp b/demos/dbbrowse/doc.cpp
index 256a200505004dff873f13c24f8c80a2be60575b..afe107b74cfdd6157a5eb52558ac6721c7967bef 100644 (file)
--- a/demos/dbbrowse/doc.cpp
+++ b/demos/dbbrowse/doc.cpp
@@ -80,13 +80,13 @@ mjDoc::~mjDoc()
 //----------------------------------------------------------------------------------------
 bool mjDoc::OnNewDocument()
 {
+ wxStopWatch sw;
  //---------------------------------------------------------------------------------------
  if (!OnInitView())
- {
   return FALSE;
- }
  p_PgmCtrl->OnPopulate();
  //---------------------------------------------------------------------------------------
+ wxLogMessage(_("-I-> mjDoc::OnNewDocument() - End - Time needed : %ld ms"),sw.Time());
  return TRUE;
 }
 //----------------------------------------------------------------------------------------
@@ -116,9 +116,7 @@ bool mjDoc::OnInitView()
  //---------------------------------------------------------------------------------------
  p_LogWin = new wxTextCtrl(p_PageArea,-1,wxEmptyString,
       wxDefaultPosition, wxDefaultSize,wxTE_MULTILINE );
- //wxFont* ft_Temp = new wxFont(10,wxSWISS,wxNORMAL,wxBOLD,FALSE,"Comic Sans MS");
- wxFont* ft_Temp = new wxFont(wxSystemSettings::GetSystemFont(wxSYS_SYSTEM_FONT));
- p_LogWin->SetFont(* ft_Temp);
+ p_LogWin->SetFont(* ft_Doc);
  // Don't forget ! This is always : i_TabArt = 0 ; i_ViewNr = 1;
  //---------------------------------------------------------------------------------------
  p_LogBook = new wxLogTextCtrl(p_LogWin); // make p_LogWin the LogBook
@@ -136,9 +134,9 @@ bool mjDoc::OnInitView()
  p_Splitter->SplitHorizontally(p_TabArea,p_PageArea,Sash);
  //---------------------------------------------------------------------------------------
  if (!OnInitODBC())
-   return FALSE;
+  return FALSE;
  //---------------------------------------------------------------------------------------
- Temp0.Printf("-I-> mjDoc::OnInitView() - End - %d DSN's found",i_DSN);
+ Temp0.Printf(_("-I-> mjDoc::OnInitView() - End - %d DSN's found"),i_DSN);
  p_MainFrame->SetStatusText(Temp0, 0);
  wxLogMessage(Temp0);
  return TRUE;