/////////////////////////////////////////////////////////////////////////////
-// Name: logg.cpp
+// Name: src/generic/logg.cpp
// Purpose: wxLog-derived classes which need GUI support (the rest is in
// src/common/log.cpp)
// Author: Vadim Zeitlin
// Created: 20.09.99 (extracted from src/common/log.cpp)
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-// no #pragma implementation "log.h" because it's already in src/common/log.cpp
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+ #pragma implementation "logg.h"
+#endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#pragma hdrstop
#endif
-#if !wxUSE_GUI
- #error "This file can't be compiled without GUI!"
-#endif
-
#ifndef WX_PRECOMP
#include "wx/app.h"
+ #include "wx/button.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/menu.h"
#include "wx/textctrl.h"
#include "wx/sizer.h"
#include "wx/statbmp.h"
+ #include "wx/button.h"
+ #include "wx/settings.h"
#endif // WX_PRECOMP
+#if wxUSE_LOGGUI || wxUSE_LOGWINDOW
+
#include "wx/file.h"
#include "wx/textfile.h"
+#include "wx/statline.h"
+#include "wx/artprov.h"
#ifdef __WXMSW__
// for OutputDebugString()
#include "wx/msw/private.h"
#endif // Windows
-// may be defined to 0 for old behavior (using wxMessageBox) - shouldn't be
-// changed normally (that's why it's here and not in setup.h)
-#define wxUSE_LOG_DIALOG 1
+#ifdef __WXPM__
+ #include <time.h>
+#endif
#if wxUSE_LOG_DIALOG
- #include "wx/datetime.h"
#include "wx/listctrl.h"
#include "wx/imaglist.h"
#include "wx/image.h"
-#else // !wxUSE_TEXTFILE
+#else // !wxUSE_LOG_DIALOG
#include "wx/msgdlg.h"
#endif // wxUSE_LOG_DIALOG/!wxUSE_LOG_DIALOG
+#if defined(__MWERKS__) && wxUSE_UNICODE
+ #include <wtime.h>
+#endif
+
+#include "wx/datetime.h"
+
+// the suffix we add to the button to show that the dialog can be expanded
+#define EXPAND_SUFFIX _T(" >>")
+
// ----------------------------------------------------------------------------
// private classes
// ----------------------------------------------------------------------------
#if wxUSE_LOG_DIALOG
+// this function is a wrapper around strftime(3)
+// allows to exclude the usage of wxDateTime
+static wxString TimeStamp(const wxChar *format, time_t t)
+{
+#ifdef __WXWINCE__
+ // FIXME
+ return wxEmptyString;
+#else
+ wxChar buf[4096];
+ if ( !wxStrftime(buf, WXSIZEOF(buf), format, localtime(&t)) )
+ {
+ // buffer is too small?
+ wxFAIL_MSG(_T("strftime() failed"));
+ }
+ return wxString(buf);
+#endif
+}
+
+
class wxLogDialog : public wxDialog
{
public:
// event handlers
void OnOk(wxCommandEvent& event);
void OnDetails(wxCommandEvent& event);
+#if wxUSE_FILE
+ void OnSave(wxCommandEvent& event);
+#endif // wxUSE_FILE
void OnListSelect(wxListEvent& event);
private:
+ // create controls needed for the details display
+ void CreateDetailsControls();
+
// the data for the listctrl
wxArrayString m_messages;
wxArrayInt m_severity;
wxButton *m_btnDetails;
bool m_showingDetails;
- // the listctrl (not shown initially)
+ // the controls which are not shown initially (but only when details
+ // button is pressed)
wxListCtrl *m_listctrl;
+#if wxUSE_STATLINE
+ wxStaticLine *m_statline;
+#endif // wxUSE_STATLINE
+#if wxUSE_FILE
+ wxButton *m_btnSave;
+#endif // wxUSE_FILE
// the translated "Details" string
static wxString ms_details;
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxLogDialog)
};
BEGIN_EVENT_TABLE(wxLogDialog, wxDialog)
- EVT_BUTTON(wxID_OK, wxLogDialog::OnOk)
+ EVT_BUTTON(wxID_OK, wxLogDialog::OnOk)
EVT_BUTTON(wxID_MORE, wxLogDialog::OnDetails)
- EVT_LIST_ITEM_SELECTED(-1, wxLogDialog::OnListSelect)
+#if wxUSE_FILE
+ EVT_BUTTON(wxID_SAVE, wxLogDialog::OnSave)
+#endif // wxUSE_FILE
+ EVT_LIST_ITEM_SELECTED(wxID_ANY, wxLogDialog::OnListSelect)
END_EVENT_TABLE()
#endif // wxUSE_LOG_DIALOG
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+#if wxUSE_FILE && wxUSE_FILEDLG
+
+// pass an uninitialized file object, the function will ask the user for the
+// filename and try to open it, returns true on success (file was opened),
+// false if file couldn't be opened/created and -1 if the file selection
+// dialog was cancelled
+static int OpenLogFile(wxFile& file, wxString *filename = NULL, wxWindow *parent = NULL);
+
+#endif // wxUSE_FILE
+
// ----------------------------------------------------------------------------
// global variables
// ----------------------------------------------------------------------------
// we use a global variable to store the frame pointer for wxLogStatus - bad,
-// but it's he easiest way
-static wxFrame *gs_pFrame; // FIXME MT-unsafe
+// but it's the easiest way
+static wxFrame *gs_pFrame = NULL; // FIXME MT-unsafe
// ============================================================================
// implementation
// accepts an additional argument which tells to which frame the output should
// be directed
-void wxLogStatus(wxFrame *pFrame, const wxChar *szFormat, ...)
+void wxVLogStatus(wxFrame *pFrame, const wxChar *szFormat, va_list argptr)
{
wxString msg;
wxLog *pLog = wxLog::GetActiveTarget();
if ( pLog != NULL ) {
- va_list argptr;
- va_start(argptr, szFormat);
msg.PrintfV(szFormat, argptr);
- va_end(argptr);
wxASSERT( gs_pFrame == NULL ); // should be reset!
gs_pFrame = pFrame;
+#ifdef __WXWINCE__
+ wxLog::OnLog(wxLOG_Status, msg, 0);
+#else
wxLog::OnLog(wxLOG_Status, msg, time(NULL));
+#endif
gs_pFrame = (wxFrame *) NULL;
}
}
-// ----------------------------------------------------------------------------
-// wxLogTextCtrl implementation
-// ----------------------------------------------------------------------------
-
-wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
-{
- m_pTextCtrl = pTextCtrl;
-}
-
-void wxLogTextCtrl::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
+void wxLogStatus(wxFrame *pFrame, const wxChar *szFormat, ...)
{
- wxString msg;
- TimeStamp(&msg);
- msg << szString << wxT('\n');
-
- m_pTextCtrl->AppendText(msg);
+ va_list argptr;
+ va_start(argptr, szFormat);
+ wxVLogStatus(pFrame, szFormat, argptr);
+ va_end(argptr);
}
// ----------------------------------------------------------------------------
// wxLogGui implementation (FIXME MT-unsafe)
// ----------------------------------------------------------------------------
+#if wxUSE_LOGGUI
+
wxLogGui::wxLogGui()
{
- // we must translate them here in the very beginning or we risk to have
- // reentrancy problems when called from inside wxGetTranslation() leading
- // to inifnite recursion
- m_error = _("Error");
- m_warning = _("Warning");
- m_info = _("Information");
-
Clear();
}
{
m_bErrors =
m_bWarnings =
- m_bHasMessages = FALSE;
+ m_bHasMessages = false;
m_aMessages.Empty();
m_aSeverity.Empty();
return;
// do it right now to block any new calls to Flush() while we're here
- m_bHasMessages = FALSE;
+ m_bHasMessages = false;
- wxString title = wxTheApp->GetAppName();
- if ( !!title )
- {
- title[0u] = wxToupper(title[0u]);
- title += _T(' ');
- }
+ wxString appName = wxTheApp->GetAppName();
+ if ( !appName.empty() )
+ appName[0u] = (wxChar)wxToupper(appName[0u]);
long style;
+ wxString titleFormat;
if ( m_bErrors ) {
- title += m_error;
+ titleFormat = _("%s Error");
style = wxICON_STOP;
}
else if ( m_bWarnings ) {
- title += m_warning;
+ titleFormat = _("%s Warning");
style = wxICON_EXCLAMATION;
}
else {
- title += m_info;
+ titleFormat = _("%s Information");
style = wxICON_INFORMATION;
}
- // this is the best we can do here
- wxWindow *parent = wxTheApp->GetTopWindow();
+ wxString title;
+ title.Printf(titleFormat, appName.c_str());
size_t nMsgCount = m_aMessages.Count();
+ // avoid showing other log dialogs until we're done with the dialog we're
+ // showing right now: nested modal dialogs make for really bad UI!
+ Suspend();
+
wxString str;
if ( nMsgCount == 1 )
{
else // more than one message
{
#if wxUSE_LOG_DIALOG
- wxLogDialog dlg(parent,
+
+ wxLogDialog dlg(NULL,
m_aMessages, m_aSeverity, m_aTimes,
title, style);
// this catches both cases of 1 message with wxUSE_LOG_DIALOG and any
// situation without it
- if ( !!str )
+ if ( !str.empty() )
{
- wxMessageBox(str, title, wxOK | style, parent);
+ wxMessageBox(str, title, wxOK | style);
// no undisplayed messages whatsoever
Clear();
}
+
+ // allow flushing the logs again
+ Resume();
}
// log all kinds of messages
if ( GetVerbose() )
case wxLOG_Message:
{
- if ( !m_bErrors ) {
- m_aMessages.Add(szString);
- m_aSeverity.Add(wxLOG_Message);
- m_aTimes.Add((long)t);
- m_bHasMessages = TRUE;
- }
+ m_aMessages.Add(szString);
+ m_aSeverity.Add(wxLOG_Message);
+ m_aTimes.Add((long)t);
+ m_bHasMessages = true;
}
break;
case wxLOG_Debug:
#ifdef __WXDEBUG__
{
- #ifdef __WXMSW__
+ wxString str;
+ TimeStamp(&str);
+ str += szString;
+
+ #if defined(__WXMSW__) && !defined(__WXMICROWIN__)
// don't prepend debug/trace here: it goes to the
- // debug window anyhow, but do put a timestamp
- wxString str;
- TimeStamp(&str);
- str << szString << wxT("\n\r");
+ // debug window anyhow
+ str += wxT("\r\n");
OutputDebugString(str);
#else
// send them to stderr
- wxFprintf(stderr, wxT("%s: %s\n"),
+ wxFprintf(stderr, wxT("[%s] %s\n"),
level == wxLOG_Trace ? wxT("Trace")
: wxT("Debug"),
- szString);
+ str.c_str());
fflush(stderr);
#endif
}
m_aSeverity.Empty();
m_aTimes.Empty();
#endif // wxUSE_LOG_DIALOG
- m_bErrors = TRUE;
+ m_bErrors = true;
}
// fall through
case wxLOG_Warning:
if ( !m_bErrors ) {
// for the warning we don't discard the info messages
- m_bWarnings = TRUE;
+ m_bWarnings = true;
}
m_aMessages.Add(szString);
m_aSeverity.Add((int)level);
m_aTimes.Add((long)t);
- m_bHasMessages = TRUE;
+ m_bHasMessages = true;
break;
}
}
+#endif // wxUSE_LOGGUI
+
// ----------------------------------------------------------------------------
// wxLogWindow and wxLogFrame implementation
// ----------------------------------------------------------------------------
{
public:
// ctor & dtor
- wxLogFrame(wxFrame *pParent, wxLogWindow *log, const wxChar *szTitle);
+ wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxChar *szTitle);
virtual ~wxLogFrame();
// menu callbacks
#endif // wxUSE_FILE
void OnClear(wxCommandEvent& event);
- void OnIdle(wxIdleEvent&);
-
// accessors
wxTextCtrl *TextCtrl() const { return m_pTextCtrl; }
Menu_Clear = wxID_CLEAR
};
- // instead of closing just hide the window to be able to Show() it later
- void DoClose() { Show(FALSE); }
+ // common part of OnClose() and OnCloseWindow()
+ void DoClose();
wxTextCtrl *m_pTextCtrl;
wxLogWindow *m_log;
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxLogFrame)
};
BEGIN_EVENT_TABLE(wxLogFrame, wxFrame)
EVT_CLOSE(wxLogFrame::OnCloseWindow)
END_EVENT_TABLE()
-wxLogFrame::wxLogFrame(wxFrame *pParent, wxLogWindow *log, const wxChar *szTitle)
- : wxFrame(pParent, -1, szTitle)
+wxLogFrame::wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxChar *szTitle)
+ : wxFrame(pParent, wxID_ANY, szTitle)
{
m_log = log;
- m_pTextCtrl = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition,
+ m_pTextCtrl = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition,
wxDefaultSize,
wxTE_MULTILINE |
wxHSCROLL |
+ // needed for Win32 to avoid 65Kb limit but it doesn't work well
+ // when using RichEdit 2.0 which we always do in the Unicode build
+#if !wxUSE_UNICODE
+ wxTE_RICH |
+#endif // !wxUSE_UNICODE
wxTE_READONLY);
+#if wxUSE_MENUS
// create menu
wxMenuBar *pMenuBar = new wxMenuBar;
wxMenu *pMenu = new wxMenu;
pMenu->Append(Menu_Close, _("&Close"), _("Close this window"));
pMenuBar->Append(pMenu, _("&Log"));
SetMenuBar(pMenuBar);
+#endif // wxUSE_MENUS
#if wxUSE_STATUSBAR
// status bar for menu prompts
m_log->OnFrameCreate(this);
}
+void wxLogFrame::DoClose()
+{
+ if ( m_log->OnFrameClose(this) )
+ {
+ // instead of closing just hide the window to be able to Show() it
+ // later
+ Show(false);
+ }
+}
+
void wxLogFrame::OnClose(wxCommandEvent& WXUNUSED(event))
{
DoClose();
#if wxUSE_FILE
void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
{
- // get the file name
- // -----------------
- const wxChar *szFileName = wxSaveFileSelector(wxT("log"), wxT("txt"), wxT("log.txt"));
- if ( szFileName == NULL ) {
+#if wxUSE_FILEDLG
+ wxString filename;
+ wxFile file;
+ int rc = OpenLogFile(file, &filename, this);
+ if ( rc == -1 )
+ {
// cancelled
return;
}
- // open file
- // ---------
- wxFile file;
- bool bOk = FALSE;
- if ( wxFile::Exists(szFileName) ) {
- bool bAppend = FALSE;
- wxString strMsg;
- strMsg.Printf(_("Append log to file '%s' "
- "(choosing [No] will overwrite it)?"), szFileName);
- switch ( wxMessageBox(strMsg, _("Question"), wxYES_NO | wxCANCEL) ) {
- case wxYES:
- bAppend = TRUE;
- break;
-
- case wxNO:
- bAppend = FALSE;
- break;
-
- case wxCANCEL:
- return;
-
- default:
- wxFAIL_MSG(_("invalid message box return value"));
- }
-
- if ( bAppend ) {
- bOk = file.Open(szFileName, wxFile::write_append);
- }
- else {
- bOk = file.Create(szFileName, TRUE /* overwrite */);
- }
- }
- else {
- bOk = file.Create(szFileName);
- }
+ bool bOk = rc != 0;
// retrieve text and save it
// -------------------------
int nLines = m_pTextCtrl->GetNumberOfLines();
for ( int nLine = 0; bOk && nLine < nLines; nLine++ ) {
bOk = file.Write(m_pTextCtrl->GetLineText(nLine) +
- // we're not going to pull in the whole wxTextFile if all we need is this...
-#if wxUSE_TEXTFILE
- wxTextFile::GetEOL()
-#else // !wxUSE_TEXTFILE
- '\n'
-#endif // wxUSE_TEXTFILE
- );
+ wxTextFile::GetEOL());
}
if ( bOk )
wxLogError(_("Can't save log contents to file."));
}
else {
- wxLogStatus(this, _("Log saved to the file '%s'."), szFileName);
+ wxLogStatus(this, _("Log saved to the file '%s'."), filename.c_str());
}
+#endif
}
#endif // wxUSE_FILE
// wxLogWindow
// -----------
-wxLogWindow::wxLogWindow(wxFrame *pParent,
+
+wxLogWindow::wxLogWindow(wxWindow *pParent,
const wxChar *szTitle,
bool bShow,
bool bDoPass)
{
- m_bPassMessages = bDoPass;
+ PassMessages(bDoPass);
m_pLogFrame = new wxLogFrame(pParent, this, szTitle);
- m_pOldLog = wxLog::SetActiveTarget(this);
if ( bShow )
- m_pLogFrame->Show(TRUE);
+ m_pLogFrame->Show();
}
void wxLogWindow::Show(bool bShow)
m_pLogFrame->Show(bShow);
}
-void wxLogWindow::Flush()
-{
- if ( m_pOldLog != NULL )
- m_pOldLog->Flush();
-
- m_bHasMessages = FALSE;
-}
-
void wxLogWindow::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
{
// first let the previous logger show it
- if ( m_pOldLog != NULL && m_bPassMessages ) {
- // bogus cast just to access protected DoLog
- ((wxLogWindow *)m_pOldLog)->DoLog(level, szString, t);
- }
+ wxLogPassThrough::DoLog(level, szString, t);
if ( m_pLogFrame ) {
switch ( level ) {
wxLog::DoLog(level, szString, t);
}
}
-
- m_bHasMessages = TRUE;
}
void wxLogWindow::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
// remove selection (WriteText is in fact ReplaceSelection)
#ifdef __WXMSW__
- long nLen = pText->GetLastPosition();
+ wxTextPos nLen = pText->GetLastPosition();
pText->SetSelection(nLen, nLen);
#endif // Windows
{
}
+bool wxLogWindow::OnFrameClose(wxFrame * WXUNUSED(frame))
+{
+ // allow to close
+ return true;
+}
+
void wxLogWindow::OnFrameDelete(wxFrame * WXUNUSED(frame))
{
m_pLogFrame = (wxLogFrame *)NULL;
wxLogWindow::~wxLogWindow()
{
- delete m_pOldLog;
-
// may be NULL if log frame already auto destroyed itself
delete m_pLogFrame;
}
const wxArrayLong& times,
const wxString& caption,
long style)
- : wxDialog(parent, -1, caption )
+ : wxDialog(parent, wxID_ANY, caption,
+ wxDefaultPosition, wxDefaultSize,
+ wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
{
- if ( ms_details.IsEmpty() )
+ if ( ms_details.empty() )
{
- // ensure that we won't try to call wxGetTranslation() twice
- ms_details = _T("&Details");
+ // ensure that we won't loop here if wxGetTranslation()
+ // happens to pop up a Log message while translating this :-)
+ ms_details = wxTRANSLATE("&Details");
ms_details = wxGetTranslation(ms_details);
}
for ( size_t n = 0; n < count; n++ )
{
wxString msg = messages[n];
- do
- {
- m_messages.Add(msg.BeforeFirst(_T('\n')));
- msg = msg.AfterFirst(_T('\n'));
-
- m_severity.Add(severity[n]);
- m_times.Add(times[n]);
- }
- while ( !!msg );
+ msg.Replace(wxT("\n"), wxT(" "));
+ m_messages.Add(msg);
+ m_severity.Add(severity[n]);
+ m_times.Add(times[n]);
}
- m_showingDetails = FALSE; // not initially
+ m_showingDetails = false; // not initially
m_listctrl = (wxListCtrl *)NULL;
+#if wxUSE_STATLINE
+ m_statline = (wxStaticLine *)NULL;
+#endif // wxUSE_STATLINE
+
+#if wxUSE_FILE
+ m_btnSave = (wxButton *)NULL;
+#endif // wxUSE_FILE
+
+ bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
+
// create the controls which are always shown and layout them: we use
// sizers even though our window is not resizeable to calculate the size of
// the dialog properly
wxBoxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
- wxBoxSizer *sizerButtons = new wxBoxSizer(wxVERTICAL);
- wxBoxSizer *sizerAll = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer *sizerButtons = new wxBoxSizer(isPda ? wxHORIZONTAL : wxVERTICAL);
+ wxBoxSizer *sizerAll = new wxBoxSizer(isPda ? wxVERTICAL : wxHORIZONTAL);
- wxButton *btnOk = new wxButton(this, wxID_OK, _("OK"));
- sizerButtons->Add(btnOk, 0, wxCENTRE|wxBOTTOM, MARGIN/2);
- m_btnDetails = new wxButton(this, wxID_MORE, ms_details + _T(" >>"));
- sizerButtons->Add(m_btnDetails, 0, wxCENTRE|wxTOP, MARGIN/2 - 1);
+ wxButton *btnOk = new wxButton(this, wxID_OK);
+ sizerButtons->Add(btnOk, 0, isPda ? wxCENTRE : wxCENTRE|wxBOTTOM, MARGIN/2);
+ m_btnDetails = new wxButton(this, wxID_MORE, ms_details + EXPAND_SUFFIX);
+ sizerButtons->Add(m_btnDetails, 0, isPda ? wxCENTRE|wxLEFT : wxCENTRE | wxTOP, MARGIN/2 - 1);
-#ifndef __WIN16__
- wxIcon icon = wxTheApp->GetStdIcon((int)(style & wxICON_MASK));
- sizerAll->Add(new wxStaticBitmap(this, -1, icon), 0, wxCENTRE);
+ wxBitmap bitmap;
+ switch ( style & wxICON_MASK )
+ {
+ case wxICON_ERROR:
+ bitmap = wxArtProvider::GetIcon(wxART_ERROR, wxART_MESSAGE_BOX);
+#ifdef __WXPM__
+ bitmap.SetId(wxICON_SMALL_ERROR);
#endif
+ break;
+
+ case wxICON_INFORMATION:
+ bitmap = wxArtProvider::GetIcon(wxART_INFORMATION, wxART_MESSAGE_BOX);
+#ifdef __WXPM__
+ bitmap.SetId(wxICON_SMALL_INFO);
+#endif
+ break;
+
+ case wxICON_WARNING:
+ bitmap = wxArtProvider::GetIcon(wxART_WARNING, wxART_MESSAGE_BOX);
+#ifdef __WXPM__
+ bitmap.SetId(wxICON_SMALL_WARNING);
+#endif
+ break;
+
+ default:
+ wxFAIL_MSG(_T("incorrect log style"));
+ }
+
+ if (!isPda)
+ sizerAll->Add(new wxStaticBitmap(this, wxID_ANY, bitmap), 0,
+ wxALIGN_CENTRE_VERTICAL);
const wxString& message = messages.Last();
- sizerAll->Add(CreateTextSizer(message), 0, wxCENTRE|wxLEFT|wxRIGHT, MARGIN);
- sizerAll->Add(sizerButtons, 0, wxALIGN_RIGHT|wxLEFT, MARGIN);
+ sizerAll->Add(CreateTextSizer(message), 1,
+ wxALIGN_CENTRE_VERTICAL | wxLEFT | wxRIGHT, MARGIN);
+ sizerAll->Add(sizerButtons, 0, isPda ? wxCENTRE|wxTOP|wxBOTTOM : (wxALIGN_RIGHT | wxLEFT), MARGIN);
- sizerTop->Add(sizerAll, 0, wxCENTRE|wxALL, MARGIN);
+ sizerTop->Add(sizerAll, 0, wxALL | wxEXPAND, MARGIN);
- SetAutoLayout(TRUE);
SetSizer(sizerTop);
- sizerTop->SetSizeHints(this);
- sizerTop->Fit(this);
+ // see comments in OnDetails()
+ //
+ // Note: Doing this, this way, triggered a nasty bug in
+ // wxTopLevelWindowGTK::GtkOnSize which took -1 literally once
+ // either of maxWidth or maxHeight was set. This symptom has been
+ // fixed there, but it is a problem that remains as long as we allow
+ // unchecked access to the internal size members. We really need to
+ // encapuslate window sizes more cleanly and make it clear when -1 will
+ // be substituted and when it will not.
+
+ wxSize size = sizerTop->Fit(this);
+ m_maxHeight = size.y;
+ SetSizeHints(size.x, size.y, m_maxWidth, m_maxHeight);
btnOk->SetFocus();
- // this can't happen any more as we don't use this dialog in this case
-#if 0
- if ( count == 1 )
+ Centre();
+
+ if (isPda)
{
- // no details... it's easier to disable a button than to change the
- // dialog layout depending on whether we have details or not
- m_btnDetails->Disable();
+ // Move up the screen so that when we expand the dialog,
+ // there's enough space.
+ Move(wxPoint(GetPosition().x, GetPosition().y / 2));
}
-#endif // 0
+}
- Centre();
+void wxLogDialog::CreateDetailsControls()
+{
+ // create the save button and separator line if possible
+#if wxUSE_FILE
+ m_btnSave = new wxButton(this, wxID_SAVE);
+#endif // wxUSE_FILE
+
+#if wxUSE_STATLINE
+ m_statline = new wxStaticLine(this, wxID_ANY);
+#endif // wxUSE_STATLINE
+
+ // create the list ctrl now
+ m_listctrl = new wxListCtrl(this, wxID_ANY,
+ wxDefaultPosition, wxDefaultSize,
+ wxSUNKEN_BORDER |
+ wxLC_REPORT |
+ wxLC_NO_HEADER |
+ wxLC_SINGLE_SEL);
+#ifdef __WXWINCE__
+ // This maks a big aesthetic difference on WinCE but I
+ // don't want to risk problems on other platforms
+ m_listctrl->Hide();
+#endif
+
+ // no need to translate these strings as they're not shown to the
+ // user anyhow (we use wxLC_NO_HEADER style)
+ m_listctrl->InsertColumn(0, _T("Message"));
+ m_listctrl->InsertColumn(1, _T("Time"));
+
+ // prepare the imagelist
+ static const int ICON_SIZE = 16;
+ wxImageList *imageList = new wxImageList(ICON_SIZE, ICON_SIZE);
+
+ // order should be the same as in the switch below!
+ static const wxChar* icons[] =
+ {
+ wxART_ERROR,
+ wxART_WARNING,
+ wxART_INFORMATION
+ };
+
+ bool loadedIcons = true;
+
+ for ( size_t icon = 0; icon < WXSIZEOF(icons); icon++ )
+ {
+ wxBitmap bmp = wxArtProvider::GetBitmap(icons[icon], wxART_MESSAGE_BOX,
+ wxSize(ICON_SIZE, ICON_SIZE));
+
+ // This may very well fail if there are insufficient colours available.
+ // Degrade gracefully.
+ if ( !bmp.Ok() )
+ {
+ loadedIcons = false;
+
+ break;
+ }
+
+ imageList->Add(bmp);
+ }
+
+ m_listctrl->SetImageList(imageList, wxIMAGE_LIST_SMALL);
+
+ // and fill it
+ wxString fmt = wxLog::GetTimestamp();
+ if ( !fmt )
+ {
+ // default format
+ fmt = wxDefaultDateTimeFormat;
+ }
+
+ size_t count = m_messages.GetCount();
+ for ( size_t n = 0; n < count; n++ )
+ {
+ int image;
+
+ if ( loadedIcons )
+ {
+ switch ( m_severity[n] )
+ {
+ case wxLOG_Error:
+ image = 0;
+ break;
+
+ case wxLOG_Warning:
+ image = 1;
+ break;
+
+ default:
+ image = 2;
+ }
+ }
+ else // failed to load images
+ {
+ image = -1;
+ }
+
+ m_listctrl->InsertItem(n, m_messages[n], image);
+ m_listctrl->SetItem(n, 1, TimeStamp(fmt, (time_t)m_times[n]));
+ }
+
+ // let the columns size themselves
+ m_listctrl->SetColumnWidth(0, wxLIST_AUTOSIZE);
+ m_listctrl->SetColumnWidth(1, wxLIST_AUTOSIZE);
+
+ // calculate an approximately nice height for the listctrl
+ int height = GetCharHeight()*(count + 4);
+
+ // but check that the dialog won't fall fown from the screen
+ //
+ // we use GetMinHeight() to get the height of the dialog part without the
+ // details and we consider that the "Save" button below and the separator
+ // line (and the margins around it) take about as much, hence double it
+ int heightMax = wxGetDisplaySize().y - GetPosition().y - 2*GetMinHeight();
+
+ // we should leave a margin
+ heightMax *= 9;
+ heightMax /= 10;
+
+ m_listctrl->SetSize(wxDefaultCoord, wxMin(height, heightMax));
}
void wxLogDialog::OnListSelect(wxListEvent& event)
EndModal(wxID_OK);
}
+#if wxUSE_FILE
+
+void wxLogDialog::OnSave(wxCommandEvent& WXUNUSED(event))
+{
+#if wxUSE_FILEDLG
+ wxFile file;
+ int rc = OpenLogFile(file, NULL, this);
+ if ( rc == -1 )
+ {
+ // cancelled
+ return;
+ }
+
+ bool ok = rc != 0;
+
+ wxString fmt = wxLog::GetTimestamp();
+ if ( !fmt )
+ {
+ // default format
+ fmt = wxDefaultDateTimeFormat;
+ }
+
+ size_t count = m_messages.GetCount();
+ for ( size_t n = 0; ok && (n < count); n++ )
+ {
+ wxString line;
+ line << TimeStamp(fmt, (time_t)m_times[n])
+ << _T(": ")
+ << m_messages[n]
+ << wxTextFile::GetEOL();
+
+ ok = file.Write(line);
+ }
+
+ if ( ok )
+ ok = file.Close();
+
+ if ( !ok )
+ wxLogError(_("Can't save log contents to file."));
+#endif // wxUSE_FILEDLG
+}
+
+#endif // wxUSE_FILE
+
void wxLogDialog::OnDetails(wxCommandEvent& WXUNUSED(event))
{
wxSizer *sizer = GetSizer();
if ( m_showingDetails )
{
- m_btnDetails->SetLabel(ms_details + _T(">>"));
+ m_btnDetails->SetLabel(ms_details + EXPAND_SUFFIX);
+
+ sizer->Detach( m_listctrl );
+
+#if wxUSE_STATLINE
+ sizer->Detach( m_statline );
+#endif // wxUSE_STATLINE
- sizer->Remove(m_listctrl);
+#if wxUSE_FILE
+ sizer->Detach( m_btnSave );
+#endif // wxUSE_FILE
}
else // show details now
{
if ( !m_listctrl )
{
- // create it now
- m_listctrl = new wxListCtrl(this, -1,
- wxDefaultPosition, wxDefaultSize,
- wxSUNKEN_BORDER |
- wxLC_REPORT |
- wxLC_NO_HEADER |
- wxLC_SINGLE_SEL);
- // no need to translate these strings as they're not shown to the
- // user anyhow (we use wxLC_NO_HEADER style)
- m_listctrl->InsertColumn(0, _T("Message"));
- m_listctrl->InsertColumn(1, _T("Time"));
-
- // prepare the imagelist
- static const int ICON_SIZE = 16;
- wxImageList *imageList = new wxImageList(ICON_SIZE, ICON_SIZE);
-
- // order should be the same as in the switch below!
- static const int icons[] =
- {
- wxICON_ERROR,
- wxICON_EXCLAMATION,
- wxICON_INFORMATION
- };
+ CreateDetailsControls();
+ }
-#ifndef __WIN16__
- for ( size_t icon = 0; icon < WXSIZEOF(icons); icon++ )
- {
- wxBitmap bmp = wxTheApp->GetStdIcon(icons[icon]);
- imageList->Add(wxImage(bmp).
- Rescale(ICON_SIZE, ICON_SIZE).
- ConvertToBitmap());
- }
+#if wxUSE_STATLINE
+ bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
+ if (!isPda)
+ sizer->Add(m_statline, 0, wxEXPAND | (wxALL & ~wxTOP), MARGIN);
+#endif // wxUSE_STATLINE
- m_listctrl->SetImageList(imageList, wxIMAGE_LIST_SMALL);
-#endif
+ sizer->Add(m_listctrl, 1, wxEXPAND | (wxALL & ~wxTOP), MARGIN);
- // and fill it
- wxString fmt = wxLog::GetTimestamp();
- if ( !fmt )
- {
- // default format
- fmt = _T("%X");
- }
+ // VZ: this doesn't work as this becomes the initial (and not only
+ // minimal) listctrl height as well - why?
+#if 0
+ // allow the user to make the dialog shorter than its initial height -
+ // without this it wouldn't work as the list ctrl would have been
+ // incompressible
+ sizer->SetItemMinSize(m_listctrl, 100, 3*GetCharHeight());
+#endif // 0
- size_t count = m_messages.GetCount();
- for ( size_t n = 0; n < count; n++ )
- {
- int image = -1;
-#ifndef __WIN16__
- switch ( m_severity[n] )
- {
- case wxLOG_Error:
- image = 0;
- break;
+#if wxUSE_FILE
+ sizer->Add(m_btnSave, 0, wxALIGN_RIGHT | (wxALL & ~wxTOP), MARGIN);
+#endif // wxUSE_FILE
+ }
- case wxLOG_Warning:
- image = 1;
- break;
+ m_showingDetails = !m_showingDetails;
- default:
- image = 2;
- }
-#endif
+ // in any case, our size changed - relayout everything and set new hints
+ // ---------------------------------------------------------------------
- m_listctrl->InsertItem(n, m_messages[n], image);
- m_listctrl->SetItem(n, 1,
- wxDateTime((time_t)m_times[n]).Format(fmt));
- }
+ // we have to reset min size constraints or Fit() would never reduce the
+ // dialog size when collapsing it and we have to reset max constraint
+ // because it wouldn't expand it otherwise
- // let the columns size themselves
- m_listctrl->SetColumnWidth(0, wxLIST_AUTOSIZE);
- m_listctrl->SetColumnWidth(1, wxLIST_AUTOSIZE);
+ m_minHeight =
+ m_maxHeight = -1;
- // get the approx height of the listctrl
- wxFont font = GetFont();
- if ( !font.Ok() )
- font = *wxSWISS_FONT;
+ // wxSizer::FitSize() is private, otherwise we might use it directly...
+ wxSize sizeTotal = GetSize(),
+ sizeClient = GetClientSize();
- int y;
- GetTextExtent(_T("H"), (int*)NULL, &y, (int*)NULL, (int*)NULL, &font);
- int height = wxMin(y*(count + 3), 100);
- m_listctrl->SetSize(-1, height);
- }
+ wxSize size = sizer->GetMinSize();
+ size.x += sizeTotal.x - sizeClient.x;
+ size.y += sizeTotal.y - sizeClient.y;
- sizer->Add(m_listctrl, 1, wxEXPAND|(wxALL & ~wxTOP), MARGIN);
- }
+ // we don't want to allow expanding the dialog in vertical direction as
+ // this would show the "hidden" details but we can resize the dialog
+ // vertically while the details are shown
+ if ( !m_showingDetails )
+ m_maxHeight = size.y;
- m_showingDetails = !m_showingDetails;
+ SetSizeHints(size.x, size.y, m_maxWidth, m_maxHeight);
+
+#ifdef __WXWINCE__
+ if (m_showingDetails)
+ m_listctrl->Show();
+#endif
- // in any case, our size changed - update
- sizer->SetSizeHints(this);
- sizer->Fit(this);
+ // don't change the width when expanding/collapsing
+ SetSize(wxDefaultCoord, size.y);
+
+#ifdef __WXGTK__
+ // VS: this is neccessary in order to force frame redraw under
+ // WindowMaker or fvwm2 (and probably other broken WMs).
+ // Otherwise, detailed list wouldn't be displayed.
+ Show();
+#endif // wxGTK
}
wxLogDialog::~wxLogDialog()
}
#endif // wxUSE_LOG_DIALOG
+
+#if wxUSE_FILE && wxUSE_FILEDLG
+
+// pass an uninitialized file object, the function will ask the user for the
+// filename and try to open it, returns true on success (file was opened),
+// false if file couldn't be opened/created and -1 if the file selection
+// dialog was cancelled
+static int OpenLogFile(wxFile& file, wxString *pFilename, wxWindow *parent)
+{
+ // get the file name
+ // -----------------
+ wxString filename = wxSaveFileSelector(wxT("log"), wxT("txt"), wxT("log.txt"), parent);
+ if ( !filename ) {
+ // cancelled
+ return -1;
+ }
+
+ // open file
+ // ---------
+ bool bOk;
+ if ( wxFile::Exists(filename) ) {
+ bool bAppend = false;
+ wxString strMsg;
+ strMsg.Printf(_("Append log to file '%s' (choosing [No] will overwrite it)?"),
+ filename.c_str());
+ switch ( wxMessageBox(strMsg, _("Question"),
+ wxICON_QUESTION | wxYES_NO | wxCANCEL) ) {
+ case wxYES:
+ bAppend = true;
+ break;
+
+ case wxNO:
+ bAppend = false;
+ break;
+
+ case wxCANCEL:
+ return -1;
+
+ default:
+ wxFAIL_MSG(_("invalid message box return value"));
+ }
+
+ if ( bAppend ) {
+ bOk = file.Open(filename, wxFile::write_append);
+ }
+ else {
+ bOk = file.Create(filename, true /* overwrite */);
+ }
+ }
+ else {
+ bOk = file.Create(filename);
+ }
+
+ if ( pFilename )
+ *pFilename = filename;
+
+ return bOk;
+}
+
+#endif // wxUSE_FILE
+
+#endif // !(wxUSE_LOGGUI || wxUSE_LOGWINDOW)
+
+#if wxUSE_LOG && wxUSE_TEXTCTRL
+
+// ----------------------------------------------------------------------------
+// wxLogTextCtrl implementation
+// ----------------------------------------------------------------------------
+
+wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
+{
+ m_pTextCtrl = pTextCtrl;
+}
+
+void wxLogTextCtrl::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
+{
+ wxString msg;
+ TimeStamp(&msg);
+
+ msg << szString << wxT('\n');
+ m_pTextCtrl->AppendText(msg);
+}
+
+#endif // wxUSE_LOG && wxUSE_TEXTCTRL
+
projects / wxWidgets.git / blobdiff