diff options
Diffstat (limited to 'Swift/Controllers')
| -rw-r--r-- | Swift/Controllers/Chat/ChatsManager.cpp | 26 | ||||
| -rw-r--r-- | Swift/Controllers/Chat/ChatsManager.h | 9 | ||||
| -rw-r--r-- | Swift/Controllers/MainController.cpp | 19 | ||||
| -rw-r--r-- | Swift/Controllers/MainController.h | 4 | ||||
| -rw-r--r-- | Swift/Controllers/UIInterfaces/ChatListWindow.h | 13 | ||||
| -rw-r--r-- | Swift/Controllers/UIInterfaces/ChatListWindowFactory.h | 11 | 
6 files changed, 61 insertions, 21 deletions
| diff --git a/Swift/Controllers/Chat/ChatsManager.cpp b/Swift/Controllers/Chat/ChatsManager.cpp index 104df22..d83c42e 100644 --- a/Swift/Controllers/Chat/ChatsManager.cpp +++ b/Swift/Controllers/Chat/ChatsManager.cpp @@ -8,6 +8,7 @@  #include "Swift/Controllers/EventController.h"  #include "Swift/Controllers/Chat/MUCController.h"  #include "Swift/Controllers/UIEvents/RequestChatUIEvent.h" +#include "Swift/Controllers/UIInterfaces/ChatListWindowFactory.h"  #include "Swiften/Presence/PresenceSender.h"  #include "Swiften/Elements/ChatState.h"  #include "Swiften/MUC/MUCBookmarkManager.h" @@ -17,7 +18,7 @@ namespace Swift {  typedef std::pair<JID, ChatController*> JIDChatControllerPair;  typedef std::pair<JID, MUCController*> JIDMUCControllerPair; -ChatsManager::ChatsManager(JID jid, StanzaChannel* stanzaChannel, IQRouter* iqRouter, EventController* eventController, ChatWindowFactory* chatWindowFactory, TreeWidgetFactory* treeWidgetFactory, NickResolver* nickResolver, PresenceOracle* presenceOracle, boost::shared_ptr<DiscoInfo> serverDiscoInfo, PresenceSender* presenceSender, UIEventStream* uiEventStream) : jid_(jid) { +ChatsManager::ChatsManager(JID jid, StanzaChannel* stanzaChannel, IQRouter* iqRouter, EventController* eventController, ChatWindowFactory* chatWindowFactory, TreeWidgetFactory* treeWidgetFactory, NickResolver* nickResolver, PresenceOracle* presenceOracle, boost::shared_ptr<DiscoInfo> serverDiscoInfo, PresenceSender* presenceSender, UIEventStream* uiEventStream, ChatListWindowFactory* chatListWindowFactory) : jid_(jid) {  	eventController_ = eventController;  	stanzaChannel_ = stanzaChannel;  	iqRouter_ = iqRouter; @@ -30,9 +31,11 @@ ChatsManager::ChatsManager(JID jid, StanzaChannel* stanzaChannel, IQRouter* iqRo  	presenceSender_ = presenceSender;  	uiEventStream_ = uiEventStream;  	mucBookmarkManager_ = new MUCBookmarkManager(iqRouter); -	mucBookmarkManager_->onBookmarksChanged.connect(boost::bind(&ChatsManager::handleMUCBookmarksChanged, this)); +	mucBookmarkManager_->onBookmarkAdded.connect(boost::bind(&ChatsManager::handleMUCBookmarkAdded, this, _1)); +	mucBookmarkManager_->onBookmarkRemoved.connect(boost::bind(&ChatsManager::handleMUCBookmarkRemoved, this, _1));  	presenceOracle_->onPresenceChange.connect(boost::bind(&ChatsManager::handlePresenceChange, this, _1, _2));  	uiEventStream_->onUIEvent.connect(boost::bind(&ChatsManager::handleUIEvent, this, _1)); +	chatListWindow_ = chatListWindowFactory->createWindow(uiEventStream_);  }  ChatsManager::~ChatsManager() { @@ -45,15 +48,18 @@ ChatsManager::~ChatsManager() {  	delete mucBookmarkManager_;  } -void ChatsManager::handleMUCBookmarksChanged() { -	foreach (boost::shared_ptr<MUCBookmark> bookmark, mucBookmarkManager_->getBookmarks()) { -		std::map<JID, MUCController*>::iterator it = mucControllers_.find(bookmark->getRoom()); -		if (it == mucControllers_.end()) { -			//FIXME: need vcard stuff here to get a nick -			String nick = bookmark->getNick() ? bookmark->getNick().get() : "Swift user"; -			handleJoinMUCRequest(bookmark->getRoom(), nick); -		} +void ChatsManager::handleMUCBookmarkAdded(boost::shared_ptr<MUCBookmark> bookmark) { +	std::map<JID, MUCController*>::iterator it = mucControllers_.find(bookmark->getRoom()); +	if (it == mucControllers_.end()) { +		//FIXME: need vcard stuff here to get a nick +		String nick = bookmark->getNick() ? bookmark->getNick().get() : "Swift user"; +		handleJoinMUCRequest(bookmark->getRoom(), nick);  	} +	chatListWindow_->addMUCBookmark(bookmark); +} + +void ChatsManager::handleMUCBookmarkRemoved(boost::shared_ptr<MUCBookmark> bookmark) { +	chatListWindow_->removeMUCBookmark(bookmark);  }  void ChatsManager::handleUserLeftMUC(MUCController* mucController) { diff --git a/Swift/Controllers/Chat/ChatsManager.h b/Swift/Controllers/Chat/ChatsManager.h index a1614f8..575be5f 100644 --- a/Swift/Controllers/Chat/ChatsManager.h +++ b/Swift/Controllers/Chat/ChatsManager.h @@ -11,6 +11,7 @@  #include "Swiften/JID/JID.h"  #include "Swiften/MUC/MUCRegistry.h"  #include "Swift/Controllers/UIEvents/UIEventStream.h" +#include "Swiften/MUC/MUCBookmark.h"  namespace Swift {  	class EventController; @@ -25,10 +26,12 @@ namespace Swift {  	class IQRouter;  	class PresenceSender;  	class MUCBookmarkManager; +	class ChatListWindow; +	class ChatListWindowFactory;  	class ChatsManager : public MUCRegistry {  		public: -			ChatsManager(JID jid, StanzaChannel* stanzaChannel, IQRouter* iqRouter, EventController* eventController, ChatWindowFactory* chatWindowFactory, TreeWidgetFactory* treeWidgetFactory, NickResolver* nickResolver, PresenceOracle* presenceOracle, boost::shared_ptr<DiscoInfo> serverDiscoInfo, PresenceSender* presenceSender, UIEventStream* uiEventStream); +			ChatsManager(JID jid, StanzaChannel* stanzaChannel, IQRouter* iqRouter, EventController* eventController, ChatWindowFactory* chatWindowFactory, TreeWidgetFactory* treeWidgetFactory, NickResolver* nickResolver, PresenceOracle* presenceOracle, boost::shared_ptr<DiscoInfo> serverDiscoInfo, PresenceSender* presenceSender, UIEventStream* uiEventStream, ChatListWindowFactory* chatListWindowFactory);  			~ChatsManager();  			void setAvatarManager(AvatarManager* avatarManager);  			void setEnabled(bool enabled); @@ -40,7 +43,8 @@ namespace Swift {  			void rebindControllerJID(const JID& from, const JID& to);  			void handlePresenceChange(boost::shared_ptr<Presence> newPresence, boost::shared_ptr<Presence> lastPresence);  			void handleUIEvent(boost::shared_ptr<UIEvent> event); -			void handleMUCBookmarksChanged(); +			void handleMUCBookmarkAdded(boost::shared_ptr<MUCBookmark> bookmark); +			void handleMUCBookmarkRemoved(boost::shared_ptr<MUCBookmark> bookmark);  			void handleUserLeftMUC(MUCController* mucController);  			ChatController* getChatController(const JID &contact);  			virtual bool isMUC(const JID& muc) const; @@ -60,5 +64,6 @@ namespace Swift {  			UIEventStream* uiEventStream_;  			MUCBookmarkManager* mucBookmarkManager_;  			boost::shared_ptr<DiscoInfo> serverDiscoInfo_; +			ChatListWindow* chatListWindow_;  	};  } diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp index 310d28f..ee11b70 100644 --- a/Swift/Controllers/MainController.cpp +++ b/Swift/Controllers/MainController.cpp @@ -55,7 +55,7 @@ static const String CLIENT_VERSION = "0.3";  static const String CLIENT_NODE = "http://swift.im"; -MainController::MainController(ChatWindowFactory* chatWindowFactory, MainWindowFactory *mainWindowFactory, LoginWindowFactory *loginWindowFactory, TreeWidgetFactory *treeWidgetFactory, EventWindowFactory* eventWindowFactory, SettingsProvider *settings, Application* application, SystemTray* systemTray, SoundPlayer* soundPlayer, XMLConsoleWidgetFactory* xmlConsoleWidgetFactory) +MainController::MainController(ChatWindowFactory* chatWindowFactory, MainWindowFactory *mainWindowFactory, LoginWindowFactory *loginWindowFactory, TreeWidgetFactory *treeWidgetFactory, EventWindowFactory* eventWindowFactory, SettingsProvider *settings, Application* application, SystemTray* systemTray, SoundPlayer* soundPlayer, XMLConsoleWidgetFactory* xmlConsoleWidgetFactory, ChatListWindowFactory* chatListWindowFactory)  		: timerFactory_(&boostIOServiceThread_.getIOService()), idleDetector_(&idleQuerier_, &timerFactory_, 100), client_(NULL), presenceSender_(NULL), chatWindowFactory_(chatWindowFactory), mainWindowFactory_(mainWindowFactory), loginWindowFactory_(loginWindowFactory), treeWidgetFactory_(treeWidgetFactory), settings_(settings), xmppRosterController_(NULL), rosterController_(NULL), loginWindow_(NULL), clientVersionResponder_(NULL), nickResolver_(NULL), discoResponder_(NULL) {  	application_ = application;  	presenceOracle_ = NULL; @@ -63,6 +63,7 @@ MainController::MainController(ChatWindowFactory* chatWindowFactory, MainWindowF  	chatsManager_ = NULL;  	eventController_ = NULL;  	eventWindowFactory_ = eventWindowFactory; +	chatListWindowFactory_ = chatListWindowFactory;  	uiEventStream_ = new UIEventStream();  	avatarStorage_ = new AvatarFileStorage(application_->getAvatarDir()); @@ -135,20 +136,22 @@ void MainController::handleConnected() {  		nickResolver_ = new NickResolver(xmppRoster_);		  		lastSentPresence_ = boost::shared_ptr<Presence>(); -		chatsManager_ = new ChatsManager(jid_, client_, client_, eventController_, chatWindowFactory_, treeWidgetFactory_, nickResolver_, presenceOracle_, serverDiscoInfo_, presenceSender_, uiEventStream_); -		client_->onMessageReceived.connect(boost::bind(&ChatsManager::handleIncomingMessage, chatsManager_, _1)); - -		avatarManager_ = new AvatarManager(client_, client_, avatarStorage_, chatsManager_); - -		chatsManager_->setAvatarManager(avatarManager_); +		 +		avatarManager_ = new AvatarManager(client_, client_, avatarStorage_);  		rosterController_ = new RosterController(jid_, xmppRoster_, avatarManager_, mainWindowFactory_, treeWidgetFactory_, nickResolver_, presenceOracle_, eventController_, uiEventStream_);  		rosterController_->onChangeStatusRequest.connect(boost::bind(&MainController::handleChangeStatusRequest, this, _1, _2));  		rosterController_->onSignOutRequest.connect(boost::bind(&MainController::signOut, this)); -				rosterController_->onStartChatRequest.connect(boost::bind(&ChatsManager::handleChatRequest, chatsManager_, _1)); + +		chatsManager_ = new ChatsManager(jid_, client_, client_, eventController_, chatWindowFactory_, treeWidgetFactory_, nickResolver_, presenceOracle_, serverDiscoInfo_, presenceSender_, uiEventStream_, chatListWindowFactory_); +		client_->onMessageReceived.connect(boost::bind(&ChatsManager::handleIncomingMessage, chatsManager_, _1)); +		chatsManager_->setAvatarManager(avatarManager_); +		rosterController_->onStartChatRequest.connect(boost::bind(&ChatsManager::handleChatRequest, chatsManager_, _1));  		rosterController_->onJoinMUCRequest.connect(boost::bind(&ChatsManager::handleJoinMUCRequest, chatsManager_, _1, _2)); +		avatarManager_->setMUCRegistry(chatsManager_); +  		xmppRosterController_ = new XMPPRosterController(client_, xmppRoster_);  		xmppRosterController_->requestRoster(); diff --git a/Swift/Controllers/MainController.h b/Swift/Controllers/MainController.h index 387fcb6..75a8e5a 100644 --- a/Swift/Controllers/MainController.h +++ b/Swift/Controllers/MainController.h @@ -26,6 +26,7 @@ namespace Swift {  	class ChatWindowFactory;  	class ChatController;  	class ChatsManager; +	class ChatListWindowFactory;  	class EventController;  	class MainWindowFactory;  	class MainWindow; @@ -54,7 +55,7 @@ namespace Swift {  	class MainController {  		public: -			MainController(ChatWindowFactory* chatWindowFactory, MainWindowFactory *mainWindowFactory, LoginWindowFactory *loginWindowFactory, TreeWidgetFactory* treeWidgetFactory, EventWindowFactory* eventWindowFactory, SettingsProvider *settings, Application* application, SystemTray* systemTray, SoundPlayer* soundPlayer, XMLConsoleWidgetFactory* xmlConsoleWidgetFactory); +			MainController(ChatWindowFactory* chatWindowFactory, MainWindowFactory *mainWindowFactory, LoginWindowFactory *loginWindowFactory, TreeWidgetFactory* treeWidgetFactory, EventWindowFactory* eventWindowFactory, SettingsProvider *settings, Application* application, SystemTray* systemTray, SoundPlayer* soundPlayer, XMLConsoleWidgetFactory* xmlConsoleWidgetFactory, ChatListWindowFactory* chatListWindowFactory_);  			~MainController(); @@ -117,5 +118,6 @@ namespace Swift {  			boost::shared_ptr<Presence> queuedPresence_;  			String password_;  			String certificateFile_; +			ChatListWindowFactory* chatListWindowFactory_;  	};  } diff --git a/Swift/Controllers/UIInterfaces/ChatListWindow.h b/Swift/Controllers/UIInterfaces/ChatListWindow.h new file mode 100644 index 0000000..2883d5c --- /dev/null +++ b/Swift/Controllers/UIInterfaces/ChatListWindow.h @@ -0,0 +1,13 @@ +#pragma once + +#include <boost/shared_ptr.hpp> + +#include "Swiften/MUC/MUCBookmark.h" + +namespace Swift { +	class ChatListWindow { +		public: +			virtual void addMUCBookmark(boost::shared_ptr<MUCBookmark> bookmark) = 0; +			virtual void removeMUCBookmark(boost::shared_ptr<MUCBookmark> bookmark) = 0; +	}; +} diff --git a/Swift/Controllers/UIInterfaces/ChatListWindowFactory.h b/Swift/Controllers/UIInterfaces/ChatListWindowFactory.h new file mode 100644 index 0000000..05e5a55 --- /dev/null +++ b/Swift/Controllers/UIInterfaces/ChatListWindowFactory.h @@ -0,0 +1,11 @@ +#pragma once + +#include "Swift/Controllers/UIInterfaces/ChatListWindow.h" + +namespace Swift { +	class UIEventStream; +	class ChatListWindowFactory { +		public: +			virtual ChatListWindow* createWindow(UIEventStream* uiEventStream) = 0;	 +	}; +} | 
 Swift
 Swift