|
|
|
@ -98,7 +98,6 @@ bool isCtrlCode(char c) |
|
|
|
|
case CtrlBold: |
|
|
|
|
case CtrlUnderline: |
|
|
|
|
case CtrlColor: |
|
|
|
|
case CtrlItalic: |
|
|
|
|
case CtrlReverse: |
|
|
|
|
case CtrlStriketrhough: |
|
|
|
|
case CtrlReset: |
|
|
|
@ -314,6 +313,7 @@ void IIRCView::resetView() |
|
|
|
|
|
|
|
|
|
void IIRCView::formatSpaces(QString& text) |
|
|
|
|
{ |
|
|
|
|
text.replace("\t", " "); |
|
|
|
|
if (text.length() < 3) |
|
|
|
|
return; |
|
|
|
|
|
|
|
|
@ -333,19 +333,16 @@ void IIRCView::ctrlFormat(QString& text) |
|
|
|
|
struct { |
|
|
|
|
bool bold{ false }; |
|
|
|
|
bool underline{ false }; |
|
|
|
|
bool italic{ false }; |
|
|
|
|
bool reverse{ false }; |
|
|
|
|
bool strikethrough{ false }; |
|
|
|
|
std::optional<QColor> fgColor; |
|
|
|
|
std::optional<QColor> bgColor; |
|
|
|
|
bool has() { |
|
|
|
|
return bold || underline || strikethrough || italic |
|
|
|
|
|| fgColor.has_value() || bgColor.has_value(); |
|
|
|
|
return bold || underline || strikethrough || fgColor.has_value() || bgColor.has_value(); |
|
|
|
|
} |
|
|
|
|
void reset() { |
|
|
|
|
bold = false; |
|
|
|
|
underline = false; |
|
|
|
|
italic = false; |
|
|
|
|
reverse = false; |
|
|
|
|
strikethrough = false; |
|
|
|
|
fgColor.reset(); |
|
|
|
@ -409,9 +406,6 @@ void IIRCView::ctrlFormat(QString& text) |
|
|
|
|
case CtrlColor: |
|
|
|
|
parseColor(i); |
|
|
|
|
break; |
|
|
|
|
case CtrlItalic: |
|
|
|
|
state.italic = !state.italic; |
|
|
|
|
break; |
|
|
|
|
case CtrlReverse: |
|
|
|
|
state.reverse = !state.reverse; |
|
|
|
|
break; |
|
|
|
@ -454,16 +448,14 @@ void IIRCView::ctrlFormat(QString& text) |
|
|
|
|
textDecoration << "underline"; |
|
|
|
|
if (state.strikethrough) |
|
|
|
|
textDecoration << "line-through"; |
|
|
|
|
if (state.italic) |
|
|
|
|
style += "font-style:italic;"; |
|
|
|
|
if (state.fgColor) |
|
|
|
|
fgColor = QStringLiteral("color: %1;").arg(state.fgColor->name()); |
|
|
|
|
if (state.bgColor) |
|
|
|
|
bgColor = QStringLiteral("background-color: %1;").arg(state.bgColor->name()); |
|
|
|
|
if (state.reverse) { |
|
|
|
|
ConfigMgr& conf = ConfigMgr::instance(); |
|
|
|
|
fgColor = conf.color("TextviewBackground"); |
|
|
|
|
bgColor = conf.color("Normal"); |
|
|
|
|
fgColor = QStringLiteral("color: %1;").arg( conf.color("TextviewBackground") ); |
|
|
|
|
bgColor = QStringLiteral("background-color: %1;").arg( conf.color("Normal") ); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (!textDecoration.isEmpty()) |
|
|
|
|