projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
client: Fix text format shortcuts edge case
[quassel.git]
/
src
/
qtui
/
inputwidget.cpp
diff --git
a/src/qtui/inputwidget.cpp
b/src/qtui/inputwidget.cpp
index
8d84233
..
48d9bc6
100644
(file)
--- a/
src/qtui/inputwidget.cpp
+++ b/
src/qtui/inputwidget.cpp
@@
-554,16
+554,16
@@
void InputWidget::changeNick(const QString &newNick) const
void InputWidget::onTextEntered(const QString &text)
{
Client::userInput(currentBufferInfo(), text);
void InputWidget::onTextEntered(const QString &text)
{
Client::userInput(currentBufferInfo(), text);
- ui.boldButton->setChecked(false);
- ui.underlineButton->setChecked(false);
- ui.italicButton->setChecked(false);
+ // Remove formatting from entered text
+ // TODO: Offer a way to convert pasted text to mIRC formatting codes
setFormatClear(true);
}
void InputWidget::setFormatClear(const bool global)
{
setFormatClear(true);
}
void InputWidget::setFormatClear(const bool global)
{
+ // Apply formatting
QTextCharFormat fmt;
fmt.setFontWeight(QFont::Normal);
fmt.setFontUnderline(false);
QTextCharFormat fmt;
fmt.setFontWeight(QFont::Normal);
fmt.setFontUnderline(false);
@@
-575,30
+575,44
@@
void InputWidget::setFormatClear(const bool global)
} else {
setFormatOnSelection(fmt);
}
} else {
setFormatOnSelection(fmt);
}
+
+ // Make sure UI state follows
+ ui.boldButton->setChecked(false);
+ ui.italicButton->setChecked(false);
+ ui.underlineButton->setChecked(false);
}
void InputWidget::setFormatBold(const bool bold)
{
}
void InputWidget::setFormatBold(const bool bold)
{
+ // Apply formatting
QTextCharFormat fmt;
fmt.setFontWeight(bold ? QFont::Bold : QFont::Normal);
mergeFormatOnSelection(fmt);
QTextCharFormat fmt;
fmt.setFontWeight(bold ? QFont::Bold : QFont::Normal);
mergeFormatOnSelection(fmt);
+ // Make sure UI state follows
+ ui.boldButton->setChecked(bold);
}
void InputWidget::setFormatItalic(const bool italic)
{
}
void InputWidget::setFormatItalic(const bool italic)
{
+ // Apply formatting
QTextCharFormat fmt;
fmt.setFontItalic(italic);
mergeFormatOnSelection(fmt);
QTextCharFormat fmt;
fmt.setFontItalic(italic);
mergeFormatOnSelection(fmt);
+ // Make sure UI state follows
+ ui.italicButton->setChecked(italic);
}
void InputWidget::setFormatUnderline(const bool underline)
{
}
void InputWidget::setFormatUnderline(const bool underline)
{
+ // Apply formatting
QTextCharFormat fmt;
fmt.setFontUnderline(underline);
mergeFormatOnSelection(fmt);
QTextCharFormat fmt;
fmt.setFontUnderline(underline);
mergeFormatOnSelection(fmt);
+ // Make sure UI state follows
+ ui.underlineButton->setChecked(underline);
}
}