1 files changed, 64 insertions, 11 deletions
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp
index 1a909fd..326660f 100644
--- a/Swift/QtUI/QtChatWindow.cpp
+++ b/Swift/QtUI/QtChatWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Kevin Smith
+ * Copyright (c) 2010-2011 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -17,6 +17,7 @@
 
 #include "SwifTools/TabComplete.h"
 
+#include <QLabel>
 #include <QApplication>
 #include <QBoxLayout>
 #include <QCloseEvent>
@@ -35,12 +36,13 @@ QtChatWindow::QtChatWindow(const QString &contact, QtChatTheme* theme, UIEventSt
 	inputEnabled_ = true;
 	completer_ = NULL;
 	theme_ = theme;
+	isCorrection_ = false;
 	updateTitleWithUnreadCount();
 
 	QBoxLayout *layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
 	layout->setContentsMargins(0,0,0,0);
 	layout->setSpacing(2);
-	
+
 
 	QSplitter *logRosterSplitter = new QSplitter(this);
 	logRosterSplitter->setAutoFillBackground(true);
@@ -69,10 +71,18 @@ QtChatWindow::QtChatWindow(const QString &contact, QtChatTheme* theme, UIEventSt
 	labelsWidget_->setSizeAdjustPolicy(QComboBox::AdjustToContents);
 	midBarLayout->addWidget(labelsWidget_,0);
 
+	QWidget* inputBar = new QWidget(this);
+	layout->addWidget(inputBar);
+	QHBoxLayout* inputBarLayout = new QHBoxLayout(inputBar);
+	inputBarLayout->setContentsMargins(0,0,0,0);
+	inputBarLayout->setSpacing(2);
 	input_ = new QtTextEdit(this);
 	input_->setAcceptRichText(false);
-	layout->addWidget(input_);
-	
+	inputBarLayout->addWidget(input_);
+	correctingLabel_ = new QLabel(tr("Correcting"), this);
+	inputBarLayout->addWidget(correctingLabel_);
+	correctingLabel_->hide();
+
 	inputClearing_ = false;
 	contactIsTyping_ = false;
 
@@ -118,11 +128,33 @@ void QtChatWindow::handleKeyPressEvent(QKeyEvent* event) {
 		emit requestActiveTab();
 	} else if (key == Qt::Key_Tab) {
 		tabComplete();
+	} else if ((key == Qt::Key_Up) && input_->toPlainText().isEmpty() && !(lastSentMessage_.isEmpty())) {
+		beginCorrection();
+	} else if (key == Qt::Key_Down && isCorrection_ && input_->textCursor().atBlockEnd()) {
+		cancelCorrection();
 	} else {
 		messageLog_->handleKeyPressEvent(event);
 	}
 }
 
+void QtChatWindow::beginCorrection() {
+	QTextCursor cursor = input_->textCursor();
+	cursor.select(QTextCursor::Document);
+	cursor.beginEditBlock();
+	cursor.insertText(QString(lastSentMessage_));
+	cursor.endEditBlock();
+	isCorrection_ = true;
+	correctingLabel_->show();
+}
+
+void QtChatWindow::cancelCorrection() {
+	QTextCursor cursor = input_->textCursor();
+	cursor.select(QTextCursor::Document);
+	cursor.removeSelectedText();
+	isCorrection_ = false;
+	correctingLabel_->hide();
+}
+
 void QtChatWindow::tabComplete() {
 	if (!completer_) {
 		return;
@@ -150,7 +182,7 @@ void QtChatWindow::tabComplete() {
 }
 
 void QtChatWindow::setRosterModel(Roster* roster) {
-	treeWidget_->setRosterModel(roster);	
+	treeWidget_->setRosterModel(roster);
 }
 
 void QtChatWindow::setAvailableSecurityLabels(const std::vector<SecurityLabelsCatalog::Item>& labels) {
@@ -204,10 +236,13 @@ void QtChatWindow::qAppFocusChanged(QWidget *old, QWidget *now) {
 	Q_UNUSED(old);
 	Q_UNUSED(now);
 	if (isWidgetSelected()) {
+		lastLineTracker_.setHasFocus(true);
 		input_->setFocus();
 		onAllMessagesRead();
 	}
-	
+	else {
+		lastLineTracker_.setHasFocus(false);
+	}
 }
 
 void QtChatWindow::setInputEnabled(bool enabled) {
@@ -236,7 +271,7 @@ void QtChatWindow::setContactChatState(ChatState::ChatStateType state) {
 QtTabbable::AlertType QtChatWindow::getWidgetAlertState() {
 	if (contactIsTyping_) {
 		return ImpendingActivity;
-	} 
+	}
 	if (unreadCount_ > 0) {
 		return WaitingActivity;
 	}
@@ -265,7 +300,6 @@ std::string QtChatWindow::addMessage(const std::string &message, const std::stri
 	if (isWidgetSelected()) {
 		onAllMessagesRead();
 	}
-
 	QString scaledAvatarPath = QtScaledAvatarCache(32).getScaledAvatarPath(avatarPath.c_str());
 
 	QString htmlString;
@@ -281,6 +315,12 @@ std::string QtChatWindow::addMessage(const std::string &message, const std::stri
 	htmlString += styleSpanStart + messageHTML + styleSpanEnd;
 
 	bool appendToPrevious = !previousMessageWasSystem_ && !previousMessageWasPresence_ && ((senderIsSelf && previousMessageWasSelf_) || (!senderIsSelf && !previousMessageWasSelf_ && previousSenderName_ == P2QSTRING(senderName)));
+	if (lastLineTracker_.getShouldMoveLastLine()) {
+		/* should this be queued? */
+		messageLog_->addLastSeenLine();
+		/* if the line is added we should break the snippet */
+		appendToPrevious = false;
+	}
 	QString qAvatarPath =  scaledAvatarPath.isEmpty() ? "qrc:/icons/avatar.png" : QUrl::fromLocalFile(scaledAvatarPath).toEncoded();
 	std::string id = id_.generateID();
 	messageLog_->addMessage(boost::shared_ptr<ChatSnippet>(new MessageSnippet(htmlString, Qt::escape(P2QSTRING(senderName)), B2QDATE(time), qAvatarPath, senderIsSelf, appendToPrevious, theme_, P2QSTRING(id))));
@@ -343,6 +383,15 @@ void QtChatWindow::addSystemMessage(const std::string& message) {
 	previousMessageWasPresence_ = false;
 }
 
+void QtChatWindow::replaceMessage(const std::string& message, const std::string& id, const boost::posix_time::ptime& time) {
+	if (!id.empty()) {
+		QString messageHTML(Qt::escape(P2QSTRING(message)));
+		messageHTML = P2QSTRING(Linkify::linkify(Q2PSTRING(messageHTML)));
+		messageHTML.replace("\n","<br/>");
+		messageLog_->replaceMessage(messageHTML, P2QSTRING(id), B2QDATE(time));
+	}
+}
+
 void QtChatWindow::addPresenceMessage(const std::string& message) {
 	if (isWidgetSelected()) {
 		onAllMessagesRead();
@@ -364,9 +413,11 @@ void QtChatWindow::returnPressed() {
 		return;
 	}
 	messageLog_->scrollToBottom();
-	onSendMessageRequest(Q2PSTRING(input_->toPlainText()));
+	lastSentMessage_ = QString(input_->toPlainText());
+	onSendMessageRequest(Q2PSTRING(input_->toPlainText()), isCorrection_);
 	inputClearing_ = true;
 	input_->clear();
+	cancelCorrection();
 	inputClearing_ = false;
 }
 
@@ -382,7 +433,9 @@ void QtChatWindow::handleInputChanged() {
 }
 
 void QtChatWindow::show() {
-	QWidget::show();
+	if (parentWidget() == NULL) {
+		QWidget::show();
+	}
 	emit windowOpening();
 }
 
@@ -399,7 +452,7 @@ void QtChatWindow::resizeEvent(QResizeEvent*) {
 }
 
 void QtChatWindow::moveEvent(QMoveEvent*) {
-	emit geometryChanged();	
+	emit geometryChanged();
 }
 
 void QtChatWindow::replaceLastMessage(const std::string& message) {