diff --git a/src/chatlog/chatmessage.cpp b/src/chatlog/chatmessage.cpp
index aece1a4d8..8d600cd5e 100644
--- a/src/chatlog/chatmessage.cpp
+++ b/src/chatlog/chatmessage.cpp
@@ -58,7 +58,7 @@ ChatMessage::Ptr ChatMessage::createChatMessage(const QString &sender, const QSt
msg->addColumn(new Text(isAction ? "*
" : sender, isMe ? Style::getFont(Style::BigBold) : Style::getFont(Style::Big), isAction ? false : true, sender), ColumnFormat(NAME_COL_WIDTH, ColumnFormat::FixedSize, ColumnFormat::Right));
msg->addColumn(new Text(text, Style::getFont(Style::Big), false, isAction ? QString("*%1 %2*").arg(sender, rawMessage) : rawMessage), ColumnFormat(1.0, ColumnFormat::VariableSize));
- msg->addColumn(new Spinner(QSizeF(16, 16)), ColumnFormat(TIME_COL_WIDTH, ColumnFormat::FixedSize, ColumnFormat::Right));
+ msg->addColumn(new Spinner(":/ui/chatArea/spinner.png", QSizeF(16, 16), 8.0), ColumnFormat(TIME_COL_WIDTH, ColumnFormat::FixedSize, ColumnFormat::Right));
if(!date.isNull())
msg->markAsSent(date);
@@ -78,7 +78,7 @@ ChatMessage::Ptr ChatMessage::createChatInfoMessage(const QString &rawMessage, S
case TYPING: img = ":/ui/chatArea/typing.png"; break;
}
- msg->addColumn(new Image(QSizeF(20, 20), img), ColumnFormat(NAME_COL_WIDTH, ColumnFormat::FixedSize, ColumnFormat::Right));
+ msg->addColumn(new Image(QSizeF(18, 18), img), ColumnFormat(NAME_COL_WIDTH, ColumnFormat::FixedSize, ColumnFormat::Right));
msg->addColumn(new Text(rawMessage, Style::getFont(Style::Big), false, ""), ColumnFormat(1.0, ColumnFormat::VariableSize, ColumnFormat::Center));
msg->addColumn(new Text(date.toString(Settings::getInstance().getTimestampFormat()), Style::getFont(Style::Big)), ColumnFormat(TIME_COL_WIDTH, ColumnFormat::FixedSize, ColumnFormat::Right));
@@ -96,6 +96,16 @@ ChatMessage::Ptr ChatMessage::createFileTransferMessage(const QString& sender, T
return msg;
}
+ChatMessage::Ptr ChatMessage::createTypingNotification()
+{
+ ChatMessage::Ptr msg = ChatMessage::Ptr(new ChatMessage);
+
+ msg->addColumn(new Spinner(":/ui/chatArea/typing.png", QSizeF(18, 18), 6.0), ColumnFormat(NAME_COL_WIDTH, ColumnFormat::FixedSize, ColumnFormat::Right));
+ msg->addColumn(new Text("%1 ...", Style::getFont(Style::Big), false, ""), ColumnFormat(1.0, ColumnFormat::VariableSize, ColumnFormat::Left));
+
+ return msg;
+}
+
void ChatMessage::markAsSent(const QDateTime &time)
{
// remove the spinner and replace it by $time
diff --git a/src/chatlog/chatmessage.h b/src/chatlog/chatmessage.h
index c03ed8991..2fba9e68b 100644
--- a/src/chatlog/chatmessage.h
+++ b/src/chatlog/chatmessage.h
@@ -40,6 +40,7 @@ public:
static ChatMessage::Ptr createChatMessage(const QString& sender, const QString& rawMessage, bool isAction, bool alert, bool isMe, const QDateTime& date = QDateTime());
static ChatMessage::Ptr createChatInfoMessage(const QString& rawMessage, SystemMessageType type, const QDateTime& date);
static ChatMessage::Ptr createFileTransferMessage(const QString& sender, ToxFile file, bool isMe, const QDateTime& date);
+ static ChatMessage::Ptr createTypingNotification();
void markAsSent(const QDateTime& time);
QString toString() const;
diff --git a/src/widget/form/chatform.cpp b/src/widget/form/chatform.cpp
index 8e5138a4a..805bf5c8a 100644
--- a/src/widget/form/chatform.cpp
+++ b/src/widget/form/chatform.cpp
@@ -59,7 +59,7 @@ ChatForm::ChatForm(Friend* chatFriend)
netcam = new NetCamView();
timer = nullptr;
- chatWidget->setTypingNotification(ChatMessage::createChatInfoMessage("", ChatMessage::TYPING, QDateTime()));
+ chatWidget->setTypingNotification(ChatMessage::createTypingNotification());
headTextLayout->addWidget(statusMessageLabel);
headTextLayout->addStretch();
diff --git a/ui/chatArea/error.png b/ui/chatArea/error.png
index 06686cd6c..52f96da3f 100644
Binary files a/ui/chatArea/error.png and b/ui/chatArea/error.png differ
diff --git a/ui/chatArea/info.png b/ui/chatArea/info.png
index 47e7b0f3d..67a1e255d 100644
Binary files a/ui/chatArea/info.png and b/ui/chatArea/info.png differ
diff --git a/ui/chatArea/innerStyle.css b/ui/chatArea/innerStyle.css
index cc67f1f7c..4c7b95b2c 100644
--- a/ui/chatArea/innerStyle.css
+++ b/ui/chatArea/innerStyle.css
@@ -9,8 +9,8 @@ div.action {
}
div.typing {
- color: @black;
- font: @bigBold;
+ color: @mediumGreyLight;
+ font: @big;
}
span.quote {
diff --git a/ui/chatArea/symbols.svg b/ui/chatArea/symbols.svg
index 2f98a2d74..23c0538f3 100644
--- a/ui/chatArea/symbols.svg
+++ b/ui/chatArea/symbols.svg
@@ -25,6 +25,13 @@
+
@@ -46,7 +53,7 @@
id="flowPara2994">!
+ id="info">
i
+ id="error">
i
+
+
+
+
+ id="notification">
-
-
+ d="m 494.05192,469.82629 a 2.5618966,2.5618966 0 1 1 -5.1238,0 2.5618966,2.5618966 0 1 1 5.1238,0 z"
+ transform="matrix(8.782556,0,0,8.782556,-3756.8812,-3871.6691)"
+ id="path3806-4"
+ style="fill:#6bc260;fill-opacity:1;stroke:none" />
+
+
diff --git a/ui/chatArea/typing.png b/ui/chatArea/typing.png
index 8e0f08478..d103baa5b 100644
Binary files a/ui/chatArea/typing.png and b/ui/chatArea/typing.png differ