%1 %2
").arg(sender, text);
+ msg->setAsAction();
+ }
+ else if(alert)
+ {
+ text = "" + text + "
";
+ }
+
+ 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(":/ui/chatArea/spinner.svg", QSize(16, 16), 360.0/1.6), ColumnFormat(TIME_COL_WIDTH, ColumnFormat::FixedSize, ColumnFormat::Right));
+
+ if(!date.isNull())
+ msg->markAsSent(date);
+
+ return msg;
+}
+
+ChatMessage::Ptr ChatMessage::createChatInfoMessage(const QString &rawMessage, SystemMessageType type, const QDateTime &date)
+{
+ ChatMessage::Ptr msg = ChatMessage::Ptr(new ChatMessage);
+ QString text = toHtmlChars(rawMessage);
+
+ QString img;
+ switch(type)
+ {
+ case INFO: img = ":/ui/chatArea/info.svg"; break;
+ case ERROR: img = ":/ui/chatArea/error.svg"; break;
+ case TYPING: img = ":/ui/chatArea/typing.svg"; break;
+ }
+
+ msg->addColumn(new Image(QSize(18, 18), img), ColumnFormat(NAME_COL_WIDTH, ColumnFormat::FixedSize, ColumnFormat::Right));
+ msg->addColumn(new Text("" + text + "", Style::getFont(Style::Big), false, ""), ColumnFormat(1.0, ColumnFormat::VariableSize, ColumnFormat::Left));
+ msg->addColumn(new Timestamp(date, Settings::getInstance().getTimestampFormat(), Style::getFont(Style::Big)), ColumnFormat(TIME_COL_WIDTH, ColumnFormat::FixedSize, ColumnFormat::Right));
+
+ return msg;
+}
+
+ChatMessage::Ptr ChatMessage::createFileTransferMessage(const QString& sender, ToxFile file, bool isMe, const QDateTime& date)
+{
+ ChatMessage::Ptr msg = ChatMessage::Ptr(new ChatMessage);
+
+ msg->addColumn(new Text(sender, isMe ? Style::getFont(Style::BigBold) : Style::getFont(Style::Big), true), ColumnFormat(NAME_COL_WIDTH, ColumnFormat::FixedSize, ColumnFormat::Right));
+ msg->addColumn(new ChatLineContentProxy(new FileTransferWidget(0, file), 350, 0.6f), ColumnFormat(1.0, ColumnFormat::VariableSize));
+ msg->addColumn(new Timestamp(date, Settings::getInstance().getTimestampFormat(), Style::getFont(Style::Big)), ColumnFormat(TIME_COL_WIDTH, ColumnFormat::FixedSize, ColumnFormat::Right));
+
+ return msg;
+}
+
+ChatMessage::Ptr ChatMessage::createTypingNotification()
+{
+ ChatMessage::Ptr msg = ChatMessage::Ptr(new ChatMessage);
+
+ // Note: "[user]..." is just a placeholder. The actual text is set in ChatForm::setFriendTyping()
+ msg->addColumn(new NotificationIcon(QSize(18, 18)), ColumnFormat(NAME_COL_WIDTH, ColumnFormat::FixedSize, ColumnFormat::Right));
+ msg->addColumn(new Text("[user]...", Style::getFont(Style::Big), false, ""), ColumnFormat(1.0, ColumnFormat::VariableSize, ColumnFormat::Left));
+
+ return msg;
+}
+
+ChatMessage::Ptr ChatMessage::createBusyNotification()
+{
+ ChatMessage::Ptr msg = ChatMessage::Ptr(new ChatMessage);
+
+ // TODO: Bigger font
+ msg->addColumn(new Text(QObject::tr("Busy..."), Style::getFont(Style::ExtraBig), false, ""), ColumnFormat(1.0, ColumnFormat::VariableSize, ColumnFormat::Center));
+
+ return msg;
+}
+
+void ChatMessage::markAsSent(const QDateTime &time)
+{
+ // remove the spinner and replace it by $time
+ replaceContent(2, new Timestamp(time, Settings::getInstance().getTimestampFormat(), Style::getFont(Style::Big)));
+}
+
+QString ChatMessage::toString() const
+{
+ ChatLineContent* c = getContent(1);
+ if(c)
+ return c->getText();
+
+ return QString();
+}
+
+bool ChatMessage::isAction() const
+{
+ return action;
+}
+
+void ChatMessage::setAsAction()
+{
+ action = true;
+}
+
+void ChatMessage::hideSender()
+{
+ ChatLineContent* c = getContent(0);
+ if(c)
+ c->hide();
+}
+
+void ChatMessage::hideDate()
+{
+ ChatLineContent* c = getContent(2);
+ if(c)
+ c->hide();
+}
+
+QString ChatMessage::detectAnchors(const QString &str)
+{
+ QString out = str;
+
+ // detect urls
+ QRegExp exp("(?:\\b)(www\\.|http[s]?:\\/\\/|ftp:\\/\\/|tox:\\/\\/|tox:)\\S+");
+ int offset = 0;
+ while ((offset = exp.indexIn(out, offset)) != -1)
+ {
+ QString url = exp.cap();
+
+ // If there's a trailing " it's a HTML attribute, e.g. a smiley img's title=":tox:"
+ if (url == "tox:\"")
+ {
+ offset += url.length();
+ continue;
+ }
+
+ // add scheme if not specified
+ if (exp.cap(1) == "www.")
+ url.prepend("http://");
+
+ QString htmledUrl = QString("%1").arg(url);
+ out.replace(offset, exp.cap().length(), htmledUrl);
+
+ offset += htmledUrl.length();
+ }
+
+ return out;
+}
+
+QString ChatMessage::detectQuotes(const QString& str)
+{
+ // detect text quotes
+ QStringList messageLines = str.split("\n");
+ QString quotedText;
+ for (int i=0;i"; + } + + return quotedText; +} + +QString ChatMessage::toHtmlChars(const QString &str) +{ + static QList
" + toHtmlChars(message) + " |
*
");
+ if(documents.empty())
+ documents.push(new CustomTextDocument);
+
+ return documents.pop();
}
-QString ActionAction::getMessage()
+void DocumentCache::push(QTextDocument *doc)
{
- return MessageAction::getMessage("action");
+ if(doc)
+ {
+ doc->clear();
+ documents.push(doc);
+ }
}
-QString ActionAction::getRawMessage()
+DocumentCache &DocumentCache::getInstance()
{
- return rawMessage;
+ static DocumentCache instance;
+ return instance;
}
diff --git a/src/widget/tool/chatactions/actionaction.h b/src/chatlog/documentcache.h
similarity index 55%
rename from src/widget/tool/chatactions/actionaction.h
rename to src/chatlog/documentcache.h
index 62b101ef0..f2ea962ce 100644
--- a/src/widget/tool/chatactions/actionaction.h
+++ b/src/chatlog/documentcache.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2014 by Project Tox " + filenameElided + "
" + size + "
"; - - return wrapIntoForm(content, type, imgAStr, imgBStr); -} - -QString FileTransferInstance::insertMiniature(const QString &type) -{ - if (pic == QImage()) - return QString(); - - QString widgetId = QString::number(getId()); - - QString res; - res = "\n";
- res += "![](\"data:mini.")
";
- res += "
\n";
- res += "
" + filenameElided + "
"; - content += "| " + size + " | "; - content += "" + speed + " | "; - content += "" + tr("ETA") + ": " + eta + " | "; - content += "
| "; - content += progrBar; - content += " | ||
| \n"; - res += "\n"; - res += " | \n"; - res += insertMiniature(type); - res += "\n";
- res += " ";
- res += content;
- res += " \n";
- res += " | \n";
- res += "\n"; - res += "\n"; - res += " | \n"; - res += "\n"; - res += "\n"; - res += " | \n"; - res += "
" + QString("%1 is typing").arg(f->getDisplayedName()) + "
");
}
void ChatForm::show(Ui::MainWindow &ui)
diff --git a/src/widget/form/chatform.h b/src/widget/form/chatform.h
index d93c7c62b..ea211fdcf 100644
--- a/src/widget/form/chatform.h
+++ b/src/widget/form/chatform.h
@@ -91,7 +91,6 @@ private slots:
void onHangupCallTriggered();
void onCancelCallTriggered();
void onRejectCallTriggered();
- void onFileTansBtnClicked(QString widgetName, QString buttonName);
void onFileSendFailed(int FriendId, const QString &fname);
void onLoadHistory();
void onUpdateTime();
@@ -101,6 +100,7 @@ protected:
// drag & drop
void dragEnterEvent(QDragEnterEvent* ev);
void dropEvent(QDropEvent* ev);
+ void registerReceipt(int receipt, int messageID, ChatMessage::Ptr msg);
virtual void hideEvent(QHideEvent* event);
private:
@@ -113,7 +113,6 @@ private:
QTimer typingTimer;
QTimer *disableCallButtonsTimer;
QElapsedTimer timeElapsed;
- QLabel *isTypingLabel;
OfflineMsgEngine *offlineEngine;
QHash%2
").arg("name_me").arg(toHtmlChars(name));
- else
- return QString("%2
").arg("name").arg(toHtmlChars(name));
-}
-
-QString ChatAction::getDate()
-{
- if (isMe)
- return QString("" + toHtmlChars(date) + "
");
- else
- return QString("" + toHtmlChars(date) + "
");
-}
-
-void ChatAction::assignPlace(QTextTable *position, QTextEdit *te)
-{
- textTable = position;
- cur = position->cellAt(0, 2).firstCursorPosition();
- cur.clearSelection();
- cur.setKeepPositionOnInsert(true);
- textEdit = te;
-}
-
-void ChatAction::dispaly()
-{
- textTable->cellAt(0, 0).firstCursorPosition().setBlockFormat(nameFormat);
- textTable->cellAt(0, 0).firstCursorPosition().insertHtml(getName());
- textTable->cellAt(0, 2).firstCursorPosition().insertHtml(getMessage());
- textTable->cellAt(0, 4).firstCursorPosition().setBlockFormat(dateFormat);
- textTable->cellAt(0, 4).firstCursorPosition().insertHtml(getDate());
-
- cur.setKeepPositionOnInsert(true);
- int end=cur.selectionEnd();
- cur.setPosition(cur.position());
- cur.setPosition(end, QTextCursor::KeepAnchor);
-
- featureUpdate();
-}
-
-void ChatAction::setupFormat()
-{
- nameFormat.setAlignment(Qt::AlignRight);
- nameFormat.setNonBreakableLines(true);
- dateFormat.setAlignment(Qt::AlignLeft);
- dateFormat.setNonBreakableLines(true);
-}
-
-void ChatAction::updateContent()
-{
- if (cur.isNull() || !textEdit)
- return;
-
- int vSliderVal = textEdit->verticalScrollBar()->value();
-
- // update content
- int pos = cur.selectionStart();
- cur.removeSelectedText();
- cur.setKeepPositionOnInsert(false);
- cur.insertHtml(getMessage());
- cur.setKeepPositionOnInsert(true);
- int end = cur.position();
- cur.setPosition(pos);
- cur.setPosition(end, QTextCursor::KeepAnchor);
-
- // restore old slider value
- textEdit->verticalScrollBar()->setValue(vSliderVal);
-
- featureUpdate();
-}
diff --git a/src/widget/tool/chatactions/chataction.h b/src/widget/tool/chatactions/chataction.h
deleted file mode 100644
index 95062c29d..000000000
--- a/src/widget/tool/chatactions/chataction.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- Copyright (C) 2014 by Project Tox EMPTY CONTENT
";
- return widgetHtml;
-}
-
-/*
-void FileTransferAction::setup(QTextCursor cursor, QTextEdit *textEdit)
-{
- cur = cursor;
- cur.setKeepPositionOnInsert(true);
- int end=cur.selectionEnd();
- cur.setPosition(cur.position());
- cur.setPosition(end, QTextCursor::KeepAnchor);
-
- edit = textEdit;
-}
-*/
-/*
-void FileTransferAction::updateHtml()
-{
- if (cur.isNull() || !edit)
- return;
-
- // save old slider value
- int vSliderVal = edit->verticalScrollBar()->value();
-
- // update content
- int pos = cur.selectionStart();
- cur.removeSelectedText();
- cur.setKeepPositionOnInsert(false);
- cur.insertHtml(getMessage());
- cur.setKeepPositionOnInsert(true);
- int end = cur.position();
- cur.setPosition(pos);
- cur.setPosition(end, QTextCursor::KeepAnchor);
-
- // restore old slider value
- edit->verticalScrollBar()->setValue(vSliderVal);
-}
-*/
-bool FileTransferAction::isInteractive()
-{
- if (w->getState() == FileTransferInstance::TransfState::tsCanceled
- || w->getState() == FileTransferInstance::TransfState::tsFinished)
- {
- return false;
- }
-
- return true;
-}
diff --git a/src/widget/tool/chatactions/messageaction.cpp b/src/widget/tool/chatactions/messageaction.cpp
deleted file mode 100644
index 0bfddea76..000000000
--- a/src/widget/tool/chatactions/messageaction.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- Copyright (C) 2014 by Project Tox "; - else - message_ += s + "
"; - } - message_ = message_.left(message_.length()-4); - - return QString(QString("
").arg(div) + message_ + "
");
-}
-
-QString MessageAction::getMessage()
-{
- if (isMe)
- return getMessage("message_me");
- else
- return getMessage("message");
-}
-
-void MessageAction::featureUpdate()
-{
- QTextTableCell cell = textTable->cellAt(0,3);
- QTextTableCellFormat format;
- if (!isProcessed)
- format.setBackground(QColor(Qt::red));
- else
- format.setBackground(QColor(Qt::white));
- cell.setFormat(format);
-}
-
-void MessageAction::markAsSent()
-{
- isProcessed = true;
-}
-
-QString MessageAction::getRawMessage()
-{
- return message;
-}
diff --git a/src/widget/tool/chatactions/messageaction.h b/src/widget/tool/chatactions/messageaction.h
deleted file mode 100644
index 9c11bbda4..000000000
--- a/src/widget/tool/chatactions/messageaction.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- Copyright (C) 2014 by Project Tox