Browse Source

added some missing "color" definitions and uisng basic charset for logger "icons"

cl-refactor
Jan Willem Penterman 10 years ago
parent
commit
6f1bfcb232
  1. 9
      libdevcore/Log.cpp
  2. 111
      libdevcore/Terminal.h

9
libdevcore/Log.cpp

@ -34,12 +34,21 @@ using namespace dev;
int dev::g_logVerbosity = 5; int dev::g_logVerbosity = 5;
map<type_info const*, bool> dev::g_logOverride; map<type_info const*, bool> dev::g_logOverride;
#ifdef _WIN32
const char* LogChannel::name() { return EthGray "..."; }
const char* LeftChannel::name() { return EthNavy "<--"; }
const char* RightChannel::name() { return EthGreen "-->"; }
const char* WarnChannel::name() { return EthOnRed EthBlackBold " X"; }
const char* NoteChannel::name() { return EthBlue " i"; }
const char* DebugChannel::name() { return EthWhite " D"; }
#else
const char* LogChannel::name() { return EthGray "···"; } const char* LogChannel::name() { return EthGray "···"; }
const char* LeftChannel::name() { return EthNavy "◀▬▬"; } const char* LeftChannel::name() { return EthNavy "◀▬▬"; }
const char* RightChannel::name() { return EthGreen "▬▬▶"; } const char* RightChannel::name() { return EthGreen "▬▬▶"; }
const char* WarnChannel::name() { return EthOnRed EthBlackBold ""; } const char* WarnChannel::name() { return EthOnRed EthBlackBold ""; }
const char* NoteChannel::name() { return EthBlue ""; } const char* NoteChannel::name() { return EthBlue ""; }
const char* DebugChannel::name() { return EthWhite ""; } const char* DebugChannel::name() { return EthWhite ""; }
#endif
LogOutputStreamBase::LogOutputStreamBase(char const* _id, std::type_info const* _info, unsigned _v) LogOutputStreamBase::LogOutputStreamBase(char const* _id, std::type_info const* _info, unsigned _v)
{ {

111
libdevcore/Terminal.h

@ -7,77 +7,72 @@ namespace con
#ifdef _WIN32 #ifdef _WIN32
#define EthReset "" // Text Reset
#define EthReset "" // Text Reset #define EthReset "" // Text Reset
// Regular Colors // Regular Colors
#define EthBlack "" // Black #define EthBlack "" // Black
#define EthCoal "" // Black
#define EthGray "" // White
#define EthWhite "" // White
#define EthMaroon "" // Red
#define EthRed "" // Red #define EthRed "" // Red
#define EthGreen "" // Green #define EthGreen "" // Green
#define EthLime "" // Green
#define EthOrange "" // Yellow
#define EthYellow "" // Yellow #define EthYellow "" // Yellow
#define EthNavy "" // Blue
#define EthBlue "" // Blue #define EthBlue "" // Blue
#define EthViolet "" // Purple
#define EthPurple "" // Purple #define EthPurple "" // Purple
#define EthTeal "" // Cyan
#define EthCyan "" // Cyan #define EthCyan "" // Cyan
#define EthWhite "" // White
// Bold #define EthBlackBold "" // Black
#define EthBlackB "" // Black #define EthCoalBold "" // Black
#define EthRedB "" // Red #define EthGrayBold "" // White
#define EthGreenB "" // Green #define EthWhiteBold "" // White
#define EthYellowB "" // Yellow #define EthMaroonBold "" // Red
#define EthBlueB "" // Blue #define EthRedBold "" // Red
#define EthPurpleB "" // Purple #define EthGreenBold "" // Green
#define EthCyanB "" // Cyan #define EthLimeBold "" // Green
#define EthWhiteB "" // White #define EthOrangeBold "" // Yellow
#define EthYellowBold "" // Yellow
// Underline #define EthNavyBold "" // Blue
#define EthBlackU "" // Black #define EthBlueBold "" // Blue
#define EthRedU "" // Red #define EthVioletBold "" // Purple
#define EthGreenU "" // Green #define EthPurpleBold "" // Purple
#define EthYellowU "" // Yellow #define EthTealBold "" // Cyan
#define EthBlueU "" // Blue #define EthCyanBold "" // Cyan
#define EthPurpleU "" // Purple
#define EthCyanU "" // Cyan
#define EthWhiteU "" // White
// Background // Background
#define EthBlackOn "" // Black #define EthOnBlack "" // Black
#define EthRedOn "" // Red #define EthOnCoal "" // Black
#define EthGreenOn "" // Green #define EthOnGray "" // White
#define EthYellowOn "" // Yellow #define EthOnWhite "" // White
#define EthBlueOn "" // Blue #define EthOnMaroon "" // Red
#define EthPurpleOn "" // Purple #define EthOnRed "" // Red
#define EthCyanOn "" // Cyan #define EthOnGreen "" // Green
#define EthWhiteOn "" // White #define EthOnLime "" // Green
#define EthOnOrange "" // Yellow
// High Intensity #define EthOnYellow "" // Yellow
#define EthCoal "" // Black #define EthOnNavy "" // Blue
#define EthRedI "" // Red #define EthOnBlue "" // Blue
#define EthLime "" // Green #define EthOnViolet "" // Purple
#define EthYellowI "" // Yellow #define EthOnPurple "" // Purple
#define EthBlueI "" // Blue #define EthOnTeal "" // Cyan
#define EthPurpleI "" // Purple #define EthOnCyan "" // Cyan
#define EthCyanI "" // Cyan
#define EthWhiteI "" // White // Underline
#define EthBlackUnder "" // Black
// Bold High Intensity #define EthGrayUnder "" // White
#define EthBlackBI "" // Black #define EthMaroonUnder "" // Red
#define EthRedBI "" // Red #define EthGreenUnder "" // Green
#define EthGreenBI "" // Green #define EthOrangeUnder "" // Yellow
#define EthYellowBI "" // Yellow #define EthNavyUnder "" // Blue
#define EthBlueBI "" // Blue #define EthVioletUnder "" // Purple
#define EthPurpleBI "" // Purple #define EthTealUnder "" // Cyan
#define EthCyanBI "" // Cyan
#define EthWhiteBI "" // White
// High Intensity backgrounds
#define EthBlackOnI "" // Black
#define EthRedOnI "" // Red
#define EthGreenOnI "" // Green
#define EthYellowOnI "" // Yellow
#define EthBlueOnI "" // Blue
#define EthPurpleOnI "" // Purple
#define EthCyanOnI "" // Cyan
#define EthWhiteOnI "" // White
#else #else

Loading…
Cancel
Save