1 files changed, 29 insertions, 8 deletions
diff --git a/Swift/QtUI/QtMainWindow.h b/Swift/QtUI/QtMainWindow.h
index bef483d..ea92c79 100644
--- a/Swift/QtUI/QtMainWindow.h
+++ b/Swift/QtUI/QtMainWindow.h
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2010-2011 Kevin Smith
+ * Copyright (c) 2010-2014 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
@@ -7,14 +7,16 @@
 #pragma once
 
+#include <vector>
+
 #include <QWidget>
 #include <QMenu>
 #include <QList>
-#include "Swift/Controllers/UIInterfaces/MainWindow.h"
-#include "Swift/QtUI/QtRosterHeader.h"
-#include "Swift/QtUI/EventViewer/QtEventWindow.h"
-#include "Swift/QtUI/ChatList/QtChatListWindow.h"
-#include "Swift/QtUI/QtLoginWindow.h"
 
-#include <vector>
+#include <Swift/Controllers/UIInterfaces/MainWindow.h>
+
+#include <Swift/QtUI/QtRosterHeader.h>
+#include <Swift/QtUI/EventViewer/QtEventWindow.h>
+#include <Swift/QtUI/ChatList/QtChatListWindow.h>
+#include <Swift/QtUI/QtLoginWindow.h>
 
 class QComboBox;
@@ -33,9 +35,10 @@ namespace Swift {
 	class SettingsProvider;
 	class QtUIPreferences;
+	class StatusCache;
 
 	class QtMainWindow : public QWidget, public MainWindow {
 		Q_OBJECT
 		public:
-			QtMainWindow(SettingsProvider*, UIEventStream* eventStream, QtLoginWindow::QtMenus loginMenus);
+			QtMainWindow(SettingsProvider*, UIEventStream* eventStream, QtLoginWindow::QtMenus loginMenus, StatusCache* statusCache, bool emoticonsExist, bool enableAdHocCommandOnJID);
 			virtual ~QtMainWindow();
 			std::vector<QMenu*> getMenus() {return menus_;}
@@ -45,18 +48,27 @@ namespace Swift {
 			void setMyStatusText(const std::string& status);
 			void setMyStatusType(StatusShow::Type type);
+			void setMyContactRosterItem(boost::shared_ptr<ContactRosterItem> contact);
 			void setConnecting();
+			void setStreamEncryptionStatus(bool tlsInPlaceAndValid);
+			void openCertificateDialog(const std::vector<Certificate::ref>& chain);
+			static void openCertificateDialog(const std::vector<Certificate::ref>& chain, QWidget* parent);
 			QtEventWindow* getEventWindow();
 			QtChatListWindow* getChatListWindow();
 			void setRosterModel(Roster* roster);
 			void setAvailableAdHocCommands(const std::vector<DiscoItems::Item>& commands);
+			void setBlockingCommandAvailable(bool isAvailable);
 		private slots:
 			void handleStatusChanged(StatusShow::Type showType, const QString &statusMessage);
 			void handleSettingChanged(const std::string& settingPath);
+			void handleCompactRosterToggled(bool);
 			void handleShowOfflineToggled(bool);
+			void handleShowEmoticonsToggled(bool);
 			void handleJoinMUCAction();
+			void handleViewLogsAction();
 			void handleSignOutAction();
 			void handleEditProfileAction();
 			void handleAddUserActionTriggered(bool checked);
 			void handleChatUserActionTriggered(bool checked);
+			void handleOtherAdHocActionTriggered();
 			void handleAdHocActionTriggered(bool checked);
 			void handleEventCountUpdated(int count);
@@ -65,4 +77,7 @@ namespace Swift {
 			void handleTabChanged(int index);
 			void handleToggleRequestDeliveryReceipts(bool enabled);
+			void handleShowCertificateInfo();
+			void handleEditBlockingList();
+			void handleSomethingSelectedChanged(bool itemSelected);
 
 		private:
@@ -75,8 +90,13 @@ namespace Swift {
 			QAction* editUserAction_;
 			QAction* chatUserAction_;
+			QAction* otherAdHocAction_;
 			QAction* showOfflineAction_;
+			QAction* compactRosterAction_;
+			QAction* showEmoticonsAction_;
+			QAction* openBlockingListEditor_;
 			QAction* toggleRequestDeliveryReceipts_;
 			QMenu* serverAdHocMenu_;
 			QtTabWidget* tabs_;
+			QComboBox* tabBarCombo_;
 			QWidget* contactsTabWidget_;
 			QWidget* eventsTabWidget_;
@@ -86,4 +106,5 @@ namespace Swift {
 			std::vector<DiscoItems::Item> serverAdHocCommands_;
 			QList<QAction*> serverAdHocCommandActions_;
+			QList<QAction*> onlineOnlyActions_;
 	};
 }