MessengerWindow

- cleaned include files
- changed menu for set the tree is decorated
- new check for sort rows by state
- saved the state of sort order, hide offline, sort by state and decorated state

PopupChatWindow:
- when setting "Grab Focus when chat arrives" not checked, the new chat window is opened minimized and flashed in taskbar

reworked start private chat and message to friend from PeersDialog and MessengerWindow:
- moved method for starting a private chat from PeersDialog and MessengerWindow to PopupChatDialog
- moved method for sending a message to a friend from PeersDialog to MessageComposer
- removed signal startChat

fixed bug in MessengerWindow:
- when peer is not online and private chat is not available, the message was send to the wrong peer (the current peer in PeersDialog)


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3154 b45a01b8-16f6-495d-af2f-9b41ad6348cc

retroshare-gui/src/gui/PeersDialog.h

@@ -33,6 +33,17 @@
 
 #include "im_history/IMHistoryKeeper.h"
 
+// states for sorting (equal values are possible)
+// used in BuildSortString - state + name
+#define PEER_STATE_ONLINE       1
+#define PEER_STATE_AWAY         2
+#define PEER_STATE_BUSY         3
+#define PEER_STATE_AVAILABLE    4
+#define PEER_STATE_INACTIVE     5
+#define PEER_STATE_OFFLINE      6
+
+#define BuildStateSortString(bEnabled,sName,nState) bEnabled ? (QString ("%1").arg(nState) + " " + sName) : sName
+
 class QFont;
 class QAction;
 class QTextEdit;
@@ -49,9 +60,6 @@ public:
 		/** Default Destructor */
 		~PeersDialog ();
 
-		PopupChatDialog *getPrivateChat(std::string id, std::string name, uint chatflags);
-		void clearOldChats();
-
 		void loadEmoticonsgroupchat();
 		//  void setChatDialog(ChatDialog *cd);
 
@@ -146,7 +154,6 @@ private slots:
 signals:
 		void friendsUpdated() ;
 		void notifyGroupChat(const QString&,const QString&) ;
-		void startChat(QTreeWidgetItem* );
 
 private:
 		void processSettings(bool bLoad);
@@ -192,8 +199,6 @@ private:
 		QHash<QString, QString> smileys;
 		QWidget *smWidget;
 
-		std::map<std::string, PopupChatDialog *> chatDialogs;
-
 		QFont mCurrentFont; /* how the text will come out */
 
 		/** Qt Designer generated object */