diff --git a/src/CharacterColor.h b/src/CharacterColor.h index 10bfa1bc2..47731ba49 100644 --- a/src/CharacterColor.h +++ b/src/CharacterColor.h @@ -113,11 +113,6 @@ public: #define DEFAULT_FORE_COLOR 0 #define DEFAULT_BACK_COLOR 1 -//a standard set of colors using black text on a white background. -//defined in TerminalDisplay.cpp - -extern const ColorEntry base_color_table[TABLE_COLORS] KDE_NO_EXPORT; - /* CharacterColor is a union of the various color spaces. Assignment is as follows: diff --git a/src/ColorScheme.h b/src/ColorScheme.h index 367236c6e..bfb73c701 100644 --- a/src/ColorScheme.h +++ b/src/ColorScheme.h @@ -169,6 +169,8 @@ public: /** Returns true if the background color is randomized. */ bool randomizedBackgroundColor() const; + static const ColorEntry defaultTable[]; // table of default color entries + static QString colorNameForIndex(int index); static QString translatedColorNameForIndex(int index); @@ -221,8 +223,6 @@ private: static const char* const colorNames[TABLE_COLORS]; static const char* const translatedColorNames[TABLE_COLORS]; - - static const ColorEntry defaultTable[]; // table of default color entries }; /** diff --git a/src/TerminalCharacterDecoder.cpp b/src/TerminalCharacterDecoder.cpp index 475711cdd..0af2d3042 100644 --- a/src/TerminalCharacterDecoder.cpp +++ b/src/TerminalCharacterDecoder.cpp @@ -28,6 +28,7 @@ // Konsole #include "konsole_wcwidth.h" #include "ExtendedCharTable.h" +#include "ColorScheme.h" using namespace Konsole; PlainTextDecoder::PlainTextDecoder() @@ -137,7 +138,7 @@ void PlainTextDecoder::decodeLine(const Character* const characters, int count, HTMLDecoder::HTMLDecoder() : _output(0) - , _colorTable(base_color_table) + , _colorTable(ColorScheme::defaultTable) , _innerSpanOpen(false) , _lastRendition(DEFAULT_RENDITION) { diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp index 043be80b6..f7f88a2c3 100644 --- a/src/TerminalDisplay.cpp +++ b/src/TerminalDisplay.cpp @@ -76,25 +76,6 @@ using namespace Konsole; "abcdefgjijklmnopqrstuvwxyz" \ "0123456789./+@" -// The following are almost IBM standard color codes, with some slight -// gamma correction for the dim colors to compensate for bright X screens. -// It contains the 8 ansiterm/xterm colors in 2 intensities. -const ColorEntry Konsole::base_color_table[TABLE_COLORS] = { - // Fixme: could add faint colors here, also. - // normal - ColorEntry(QColor(0x00, 0x00, 0x00), 0), ColorEntry(QColor(0xB2, 0xB2, 0xB2), 1), // Dfore, Dback - ColorEntry(QColor(0x00, 0x00, 0x00), 0), ColorEntry(QColor(0xB2, 0x18, 0x18), 0), // Black, Red - ColorEntry(QColor(0x18, 0xB2, 0x18), 0), ColorEntry(QColor(0xB2, 0x68, 0x18), 0), // Green, Yellow - ColorEntry(QColor(0x18, 0x18, 0xB2), 0), ColorEntry(QColor(0xB2, 0x18, 0xB2), 0), // Blue, Magenta - ColorEntry(QColor(0x18, 0xB2, 0xB2), 0), ColorEntry(QColor(0xB2, 0xB2, 0xB2), 0), // Cyan, White - // intensiv - ColorEntry(QColor(0x00, 0x00, 0x00), 0), ColorEntry(QColor(0xFF, 0xFF, 0xFF), 1), - ColorEntry(QColor(0x68, 0x68, 0x68), 0), ColorEntry(QColor(0xFF, 0x54, 0x54), 0), - ColorEntry(QColor(0x54, 0xFF, 0x54), 0), ColorEntry(QColor(0xFF, 0xFF, 0x54), 0), - ColorEntry(QColor(0x54, 0x54, 0xFF), 0), ColorEntry(QColor(0xFF, 0x54, 0xFF), 0), - ColorEntry(QColor(0x54, 0xFF, 0xFF), 0), ColorEntry(QColor(0xFF, 0xFF, 0xFF), 0) -}; - // we use this to force QPainter to display text in LTR mode // more information can be found in: http://unicode.org/reports/tr9/ const QChar LTR_OVERRIDE_CHAR(0x202D); @@ -359,7 +340,7 @@ TerminalDisplay::TerminalDisplay(QWidget* parent) setUsesMouse(true); - setColorTable(base_color_table); + setColorTable(ColorScheme::defaultTable); // Enable drag and drop support setAcceptDrops(true);