1 files changed, 32 insertions, 5 deletions
diff --git a/Swift/QtUI/QtChatWindow.h b/Swift/QtUI/QtChatWindow.h
index 910019b..bc1045d 100644
--- a/Swift/QtUI/QtChatWindow.h
+++ b/Swift/QtUI/QtChatWindow.h
@@ -1,21 +1,25 @@
 /*
- * 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.
  */
 
-#ifndef SWIFT_QtChatWindow_H
-#define SWIFT_QtChatWindow_H
+#pragma once
 
 #include "Swift/Controllers/UIInterfaces/ChatWindow.h"
 
 #include "QtTabbable.h"
 
+#include "SwifTools/LastLineTracker.h"
+
 #include "Swiften/Base/IDGenerator.h"
 
 class QTextEdit;
 class QLineEdit;
 class QComboBox;
+class QLabel;
+class QSplitter;
+class QPushButton;
 
 namespace Swift {
 	class QtChatView;
@@ -35,6 +39,7 @@ namespace Swift {
 			void addSystemMessage(const std::string& message);
 			void addPresenceMessage(const std::string& message);
 			void addErrorMessage(const std::string& errorMessage);
+			void replaceMessage(const std::string& message, const std::string& id, const boost::posix_time::ptime& time);
 			void show();
 			void activate();
 			void setUnreadMessageCount(int count);
@@ -54,9 +59,19 @@ namespace Swift {
 			void replaceLastMessage(const std::string& message);
 			void setAckState(const std::string& id, AckState state);
 			void flash();
+			QByteArray getSplitterState();
+
+		public slots:
+			void handleChangeSplitterState(QByteArray state);
+			void handleFontResized(int fontSizeSteps);
+			void setAlert(const std::string& alertText, const std::string& buttonText = "");
+			void cancelAlert();
+			void setCorrectionEnabled(Tristate enabled);
 
 		signals:
 			void geometryChanged();
+			void splitterMoved();
+			void fontResized(int);
 
 		protected slots:
 			void qAppFocusChanged(QWidget* old, QWidget* now);
@@ -71,22 +86,33 @@ namespace Swift {
 			void returnPressed();
 			void handleInputChanged();
 			void handleKeyPressEvent(QKeyEvent* event);
+			void handleSplitterMoved(int pos, int index);
+			void handleAlertButtonClicked();
 
 		private:
 			void updateTitleWithUnreadCount();
 			void tabComplete();
+			void beginCorrection();
+			void cancelCorrection();
 			std::string addMessage(const std::string &message, const std::string &senderName, bool senderIsSelf, boost::shared_ptr<SecurityLabel> label, const std::string& avatarPath, const QString& style, const boost::posix_time::ptime& time);
 
 			int unreadCount_;
 			bool contactIsTyping_;
+			LastLineTracker lastLineTracker_;
 			QString contact_;
+			QString lastSentMessage_;
 			QtChatView* messageLog_;
 			QtChatTheme* theme_;
 			QtTextEdit* input_;
 			QComboBox* labelsWidget_;
 			QtTreeWidget* treeWidget_;
+			QLabel* correctingLabel_;
+			QLabel* alertLabel_;
+			QWidget* alertWidget_;
+			QPushButton* alertButton_;
 			TabComplete* completer_;
 			std::vector<SecurityLabelsCatalog::Item> availableLabels_;
+			bool isCorrection_;
 			bool previousMessageWasSelf_;
 			bool previousMessageWasSystem_;
 			bool previousMessageWasPresence_;
@@ -95,7 +121,8 @@ namespace Swift {
 			UIEventStream* eventStream_;
 			bool inputEnabled_;
 			IDGenerator id_;
+			QSplitter *logRosterSplitter_;
+			Tristate correctionEnabled_;
+			QString alertStyleSheet_;
 	};
 }
-
-#endif