From c59a3e641c7b068cdae5f2be254424658eb4c0ff Mon Sep 17 00:00:00 2001 From: skyjake Date: Sat, 25 May 2013 20:58:15 +0300 Subject: [PATCH] Client|LogWidget: Adjusted log entry styling --- doomsday/client/client.pro | 1 + .../ui/widgets/styledlogsinkformatter.h | 9 ++--- .../src/ui/widgets/styledlogsinkformatter.cpp | 35 +++++++++++++++++++ 3 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 doomsday/client/src/ui/widgets/styledlogsinkformatter.cpp diff --git a/doomsday/client/client.pro b/doomsday/client/client.pro index 6ff8334a37..6e9da6cf6e 100644 --- a/doomsday/client/client.pro +++ b/doomsday/client/client.pro @@ -643,6 +643,7 @@ SOURCES += \ src/ui/widgets/legacywidget.cpp \ src/ui/widgets/lineeditwidget.cpp \ src/ui/widgets/logwidget.cpp \ + src/ui/widgets/styledlogsinkformatter.cpp \ src/ui/widgets/taskbarwidget.cpp \ src/ui/widgets/widgetactions.cpp \ src/ui/windowsystem.cpp \ diff --git a/doomsday/client/include/ui/widgets/styledlogsinkformatter.h b/doomsday/client/include/ui/widgets/styledlogsinkformatter.h index 15bb3f1849..ad8c0feab8 100644 --- a/doomsday/client/include/ui/widgets/styledlogsinkformatter.h +++ b/doomsday/client/include/ui/widgets/styledlogsinkformatter.h @@ -28,12 +28,7 @@ class StyledLogSinkFormatter : public de::LogSink::IFormatter { public: - Lines logEntryToTextLines(de::LogEntry const &entry) - { - // This will form a single long line. The line wrapper will - // then determine how to wrap it onto the available width. - return Lines() << entry.asText(de::LogEntry::Styled | de::LogEntry::OmitLevel); - } + Lines logEntryToTextLines(de::LogEntry const &entry); }; -#endif // STYLEDLOGSINKFORMATTER_H +#endif // DENG_CLIENT_STYLEDLOGSINKFORMATTER_H diff --git a/doomsday/client/src/ui/widgets/styledlogsinkformatter.cpp b/doomsday/client/src/ui/widgets/styledlogsinkformatter.cpp new file mode 100644 index 0000000000..d9067bd0a7 --- /dev/null +++ b/doomsday/client/src/ui/widgets/styledlogsinkformatter.cpp @@ -0,0 +1,35 @@ +/** @file styledlogsinkformatter.cpp + * + * @authors Copyright (c) 2013 Jaakko Keränen + * + * @par License + * GPL: http://www.gnu.org/licenses/gpl.html + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. This program is distributed in the hope that it + * will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General + * Public License for more details. You should have received a copy of the GNU + * General Public License along with this program; if not, see: + * http://www.gnu.org/licenses + */ + +#include "ui/widgets/styledlogsinkformatter.h" + +using namespace de; + +LogSink::IFormatter::Lines StyledLogSinkFormatter::logEntryToTextLines(LogEntry const &entry) +{ + LogEntry::Flags flags = LogEntry::Styled | LogEntry::OmitLevel; + +#ifndef _DEBUG + // No metadata in release builds. + flags |= LogEntry::Simple; +#endif + + // This will form a single long line. The line wrapper will + // then determine how to wrap it onto the available width. + return Lines() << entry.asText(flags); +}