mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Make the log dialog not insane and crashy

Browse source 
Originally committed to SVN as r5958.
This commit is contained in:
Thomas Goyne 2011-12-02 04:36:06 +00:00
parent 95a329a1e2
commit 48d412468e
2 changed files with 57 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

139
aegisub/src/dialog_log.cpp
View file

@ -34,108 +34,73 @@
/// @ingroup libaegisub /// @ingroup libaegisub
/// ///
////////////
// Includes
#include "config.h" #include "config.h"
#include "dialog_log.h"
#ifndef AGI_PRE #ifndef AGI_PRE
#include <ctime>
#include <functional>
#include <string> #include <string>
#include <wx/button.h> #include <wx/button.h>
#include <wx/panel.h>
#include <wx/sizer.h> #include <wx/sizer.h>
#include <wx/statline.h>
#include <wx/stattext.h> #include <wx/stattext.h>
#include <wx/textctrl.h>
#endif #endif
#include <time.h> class EmitLog : public agi::log::Emitter {
#include "dialog_log.h" wxTextCtrl *text_ctrl;
public:
EmitLog(wxTextCtrl *t)
: text_ctrl(t)
{
const agi::log::Sink *sink = agi::log::log->GetSink();
for_each(sink->begin(), sink->end(), bind(&EmitLog::log, this, std::tr1::placeholders::_1));
}
void log(agi::log::SinkMessage *sm) {
#ifndef _WIN32
tm tmtime;
localtime_r(&sm->tv.tv_sec, &tmtime);
wxString log = wxString::Format("%c %02d:%02d:%02d %-6ld <%-25s> [%s:%s:%d] %s\n",
agi::log::Severity_ID[sm->severity],
tmtime.tm_hour,
tmtime.tm_min,
tmtime.tm_sec,
sm->tv.tv_usec,
sm->section,
sm->file,
sm->func,
sm->line,
std::string(sm->message, sm->len));
#else
wxString log = wxString::Format("%c %-6ld <%-25s> [%s:%s:%d] %s\n",
agi::log::Severity_ID[sm->severity],
sm->tv.tv_usec,
sm->section,
sm->file,
sm->func,
sm->line,
std::string(sm->message, sm->len));
#endif
text_ctrl->AppendText(log);
}
};
/// @brief Constructor
/// @param parent Parent frame.
LogWindow::LogWindow(wxWindow *parent) LogWindow::LogWindow(wxWindow *parent)
: wxDialog (parent, -1, _("Log window"), wxDefaultPosition, wxSize(700,300), wxCAPTION | wxCLOSE_BOX | wxRESIZE_BORDER, _("Log window")) : wxDialog (parent, -1, _("Log window"), wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX | wxRESIZE_BORDER)
{ {
// Text sizer wxTextCtrl *text_ctrl = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxSize(700,300), wxTE_MULTILINE|wxTE_READONLY);
wxSizer *sizer_text = new wxBoxSizer(wxVERTICAL); text_ctrl->SetDefaultStyle(wxTextAttr(wxNullColour, wxNullColour, wxFont(8, wxMODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL)));
wxTextCtrl *text_ctrl = new wxTextCtrl(this, wxID_ANY, wxEmptyString ,wxDefaultPosition, wxSize(700,300), wxTE_MULTILINE|wxTE_READONLY);
wxTextAttr attr;
attr.SetFont(wxFont(8, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL));
text_ctrl->SetDefaultStyle(attr);
sizer_text->Add(text_ctrl, 1, wxEXPAND);
wxSizer *sizer_button = new wxBoxSizer(wxHORIZONTAL);
sizer_button->Add(new wxButton(this, wxID_OK), 0, wxALIGN_RIGHT | wxALL, 2);
wxSizer *sizer = new wxBoxSizer(wxVERTICAL); wxSizer *sizer = new wxBoxSizer(wxVERTICAL);
sizer->Add(sizer_text, 1 ,wxEXPAND|wxALL, 0); sizer->Add(text_ctrl, wxSizerFlags(1).Expand().Border());
sizer->Add(sizer_button, 0 ,wxEXPAND|wxALL, 0); sizer->Add(new wxButton(this, wxID_OK), wxSizerFlags(0).Border().Right());
sizer->SetSizeHints(this); SetSizerAndFit(sizer);
SetSizer(sizer);
emit_log = new EmitLog(text_ctrl); emit_log.reset(new EmitLog(text_ctrl));
emit_log->Enable(); emit_log->Enable();
Bind(wxEVT_CLOSE_WINDOW, std::tr1::bind(&wxDialog::Destroy, this));
} }
/// @brief Destructor
LogWindow::~LogWindow() {
delete emit_log;
}
LogWindow::EmitLog::EmitLog(wxTextCtrl *t): text_ctrl(t) {
const agi::log::Sink *sink = agi::log::log->GetSink();
for (unsigned int i=0; i < sink->size(); i++) {
Write((*sink)[i]);
}
}
void LogWindow::EmitLog::Write(agi::log::SinkMessage *sm) {
#ifndef _WIN32
tm tmtime;
localtime_r(&sm->tv.tv_sec, &tmtime);
wxString log = wxString::Format("%c %02d:%02d:%02d %-6ld <%-25s> [%s:%s:%d] %s\n",
agi::log::Severity_ID[sm->severity],
tmtime.tm_hour,
tmtime.tm_min,
tmtime.tm_sec,
sm->tv.tv_usec,
sm->section,
sm->file,
sm->func,
sm->line,
std::string(sm->message, sm->len));
#else
wxString log = wxString::Format("%c %-6ld <%-25s> [%s:%s:%d] %s\n",
agi::log::Severity_ID[sm->severity],
sm->tv.tv_usec,
sm->section,
sm->file,
sm->func,
sm->line,
std::string(sm->message, sm->len));
#endif
text_ctrl->AppendText(log);
}
void LogWindow::EmitLog::log(agi::log::SinkMessage *sm) {
delete text_ctrl;
Write(sm);
}
void LogWindow::OnClose(wxCloseEvent &WXUNUSED(event)) {
Destroy();
}
BEGIN_EVENT_TABLE(LogWindow, wxDialog)
EVT_CLOSE(LogWindow::OnClose)
END_EVENT_TABLE()

32
aegisub/src/dialog_log.h
View file

@ -34,40 +34,18 @@
/// @ingroup libaegisub /// @ingroup libaegisub
/// ///
////////////
// Includes
#ifndef AGI_PRE #ifndef AGI_PRE
#include <wx/dialog.h> #include <wx/dialog.h>
#include <wx/textctrl.h>
#endif #endif
#include <libaegisub/log.h> #include <libaegisub/log.h>
#include <libaegisub/scoped_ptr.h>
/// @class AboutScreen
/// @brief About dialogue.
class LogWindow: public wxDialog { class LogWindow: public wxDialog {
agi::scoped_ptr<agi::log::Emitter> emit_log;
public: public:
/// @brief Constructor
class EmitLog: public agi::log::Emitter { /// @param parent Parent frame.
wxTextCtrl *text_ctrl;
void Write(agi::log::SinkMessage *sm);
public:
EmitLog(wxTextCtrl *t);
void Prime();
void Set(wxTextCtrl *text_ctrl_p) { text_ctrl = text_ctrl_p; }
void log(agi::log::SinkMessage *sm);
};
LogWindow(wxWindow *parent); LogWindow(wxWindow *parent);
~LogWindow();
DECLARE_EVENT_TABLE()
private:
void OnClose(wxCloseEvent &event);
EmitLog *emit_log;
}; };