fixed unread chat cound in FriendsDialog, fix display of status in distant chat (Patch from electron)

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

retroshare-gui/src/gui/FriendsDialog.cpp

@@ -239,16 +239,6 @@ void FriendsDialog::processSettings(bool bLoad)
 
 void FriendsDialog::showEvent(QShowEvent *event)
 {
-    static bool first = true;
-    if (first) {
-        // Workaround: now the scroll position is correct calculated
-        first = false;
-        /* remove
-        QScrollBar *scrollbar = ui.msgText->verticalScrollBar();
-        scrollbar->setValue(scrollbar->maximum());
-        */
-    }
-
     RsAutoUpdatePage::showEvent(event);
 }
 
@@ -262,6 +252,13 @@ void FriendsDialog::chatMessageReceived(const ChatMessage &msg)
         QString name = QString::fromUtf8(rsPeers->getPeerName(msg.broadcast_peer_id).c_str());
 
         ui.chatWidget->addChatMsg(msg.incoming, name, sendTime, recvTime, message, ChatWidget::MSGTYPE_NORMAL);
+
+        if(ui.chatWidget->isActive())
+        {
+            // clear the chat notify when control returns to the Qt event loop
+            // we have to do this later, because we don't know if we or the notify receives the chat message first
+            QMetaObject::invokeMethod(this, "clearChatNotify", Qt::QueuedConnection);
+        }
     }
 }
 
@@ -319,6 +316,11 @@ void FriendsDialog::loadmypersonalstatus()
 	}
 }
 
+void FriendsDialog::clearChatNotify()
+{
+    ChatUserNotify::clearWaitingChat(ChatId::makeBroadcastId());
+}
+
 void FriendsDialog::statusmessage()
 {
     StatusMessage statusmsgdialog (this);

retroshare-gui/src/gui/FriendsDialog.h

@@ -92,6 +92,8 @@ private slots:
 
     void loadmypersonalstatus();
 
+    void clearChatNotify();
+
     //void newsFeedChanged(int count);
 
 signals:

retroshare-gui/src/gui/chat/ChatUserNotify.cpp

@@ -28,10 +28,39 @@
 #include <retroshare/rsnotify.h>
 #include <retroshare/rsmsgs.h>
 
+static std::map<ChatId, int> waitingChats;
+static ChatUserNotify* instance = 0;
+
+/*static*/ void ChatUserNotify::getPeersWithWaitingChat(std::vector<RsPeerId> &peers)
+{
+    for(std::map<ChatId, int>::iterator mit = waitingChats.begin(); mit != waitingChats.end(); ++mit)
+    {
+        if(mit->first.isPeerId() && std::find(peers.begin(), peers.end(), mit->first.toPeerId()) == peers.end())
+            peers.push_back(mit->first.toPeerId());
+    }
+}
+
+/*static*/ void ChatUserNotify::clearWaitingChat(ChatId id)
+{
+    std::map<ChatId, int>::iterator mit = waitingChats.find(id);
+    if(mit != waitingChats.end())
+    {
+        waitingChats.erase(mit);
+        if(instance)
+            instance->updateIcon();
+    }
+}
+
 ChatUserNotify::ChatUserNotify(QObject *parent) :
     UserNotify(parent)
 {
     connect(NotifyQt::getInstance(), SIGNAL(chatMessageReceived(ChatMessage)), this, SLOT(chatMessageReceived(ChatMessage)));
+    instance = this;
+}
+
+ChatUserNotify::~ChatUserNotify()
+{
+    instance = 0;
 }
 
 bool ChatUserNotify::hasSetting(QString *name, QString *group)
@@ -55,7 +84,7 @@ QIcon ChatUserNotify::getMainIcon(bool hasNew)
 unsigned int ChatUserNotify::getNewCount()
 {
     int sum = 0;
-    for(std::map<ChatId, int>::iterator mit = mWaitingChats.begin(); mit != mWaitingChats.end(); ++mit)
+    for(std::map<ChatId, int>::iterator mit = waitingChats.begin(); mit != waitingChats.end(); ++mit)
     {
         sum += mit->second;
     }
@@ -65,10 +94,8 @@ unsigned int ChatUserNotify::getNewCount()
 void ChatUserNotify::iconClicked()
 {
 	ChatDialog *chatDialog = NULL;
-    if (mWaitingChats.empty() == false) {
+    // ChatWidget removes the waiting chat from the list with clearWaitingChat()
-        chatDialog = ChatDialog::getChat(mWaitingChats.begin()->first, RS_CHAT_OPEN | RS_CHAT_FOCUS);
+    chatDialog = ChatDialog::getChat(waitingChats.begin()->first, RS_CHAT_OPEN | RS_CHAT_FOCUS);
-        mWaitingChats.erase(mWaitingChats.begin());
-	}
 
 	if (chatDialog == NULL) {
 		MainWindow::showWindow(MainWindow::Friends);
@@ -78,13 +105,18 @@ void ChatUserNotify::iconClicked()
 
 void ChatUserNotify::chatMessageReceived(ChatMessage msg)
 {
-    if(ChatDialog::getExistingChat(msg.chat_id) || (Settings->getChatFlags() & RS_CHAT_OPEN) || msg.chat_id.isGxsId())
+    if(!msg.chat_id.isBroadcast()
+            &&( ChatDialog::getExistingChat(msg.chat_id)
+                || (Settings->getChatFlags() & RS_CHAT_OPEN)
+                || msg.chat_id.isGxsId()))
+    {
         ChatDialog::chatMessageReceived(msg);
+    }
     else
     {
         // this implicitly counts broadcast messages, because broadcast messages are not handled by chat dialog
         bool found = false;
-        for(std::map<ChatId, int>::iterator mit = mWaitingChats.begin(); mit != mWaitingChats.end(); ++mit)
+        for(std::map<ChatId, int>::iterator mit = waitingChats.begin(); mit != waitingChats.end(); ++mit)
         {
             if(msg.chat_id.isSameEndpoint(mit->first))
             {
@@ -93,7 +125,7 @@ void ChatUserNotify::chatMessageReceived(ChatMessage msg)
             }
         }
         if(!found)
-            mWaitingChats[msg.chat_id] = 1;
+            waitingChats[msg.chat_id] = 1;
         updateIcon();
     }
 }

retroshare-gui/src/gui/chat/ChatUserNotify.h

@@ -25,12 +25,19 @@
 #include <retroshare/rsmsgs.h>
 #include "gui/common/UserNotify.h"
 
+// this class uses lots of global state
+// so only one instance is allowed
+// (it does not make sense to have multiple instances of this class anyway)
 class ChatUserNotify : public UserNotify
 {
 	Q_OBJECT
 
 public:
+    static void getPeersWithWaitingChat(std::vector<RsPeerId>& peers);
+    static void clearWaitingChat(ChatId id);
+
 	ChatUserNotify(QObject *parent = 0);
+    ~ChatUserNotify();
 
 	virtual bool hasSetting(QString *name, QString *group);
 
@@ -42,8 +49,6 @@ private:
 	virtual QIcon getMainIcon(bool hasNew);
 	virtual unsigned int getNewCount();
 	virtual void iconClicked();
-
-    std::map<ChatId, int> mWaitingChats;
 };
 
 #endif // CHATUSERNOTIFY_H

retroshare-gui/src/gui/chat/ChatWidget.cpp

@@ -46,6 +46,7 @@
 #include "gui/common/Emoticons.h"
 #include "util/misc.h"
 #include "util/HandleRichText.h"
+#include "gui/chat/ChatUserNotify.h"
 
 #include <retroshare/rsstatus.h>
 #include <retroshare/rsidentity.h>
@@ -61,7 +62,7 @@
  *****/
 
 ChatWidget::ChatWidget(QWidget *parent) :
-	QWidget(parent), ui(new Ui::ChatWidget)
+    QWidget(parent), ui(new Ui::ChatWidget), sendingBlocked(false)
 {
 	ui->setupUi(this);
 
@@ -330,6 +331,19 @@ ChatWidget::ChatType ChatWidget::chatType()
     return CHATTYPE_UNKNOWN;
 }
 
+void ChatWidget::blockSending(QString msg)
+{
+    sendingBlocked = true;
+    ui->sendButton->setEnabled(false);
+    ui->sendButton->setToolTip(msg);
+}
+
+void ChatWidget::unblockSending()
+{
+    sendingBlocked = false;
+    updateLenOfChatTextEdit();
+}
+
 void ChatWidget::processSettings(bool load)
 {
 	Settings->beginGroup(QString("ChatWidget"));
@@ -486,6 +500,7 @@ bool ChatWidget::eventFilter(QObject *obj, QEvent *event)
 				newMessages = false;
 				emit infoChanged(this);
 				focusDialog();
+                ChatUserNotify::clearWaitingChat(chatId);
 			}
 		}
 	}
@@ -653,6 +668,7 @@ void ChatWidget::showEvent(QShowEvent */*event*/)
 	newMessages = false;
 	emit infoChanged(this);
 	focusDialog();
+    ChatUserNotify::clearWaitingChat(chatId);
 
 	if (firstShow) {
 		// Workaround: now the scroll position is correct calculated
@@ -863,6 +879,9 @@ void ChatWidget::updateStatusTyping()
 
 void ChatWidget::updateLenOfChatTextEdit()
 {
+    if(sendingBlocked)
+        return;
+
 	QTextEdit *chatWidget = ui->chatTextEdit;
 	QString text;
 	RsHtml::optimizeHtml(chatWidget, text);
@@ -1448,7 +1467,7 @@ void ChatWidget::updatePeersCustomStateString(const QString& peer_id, const QStr
     */
 }
 
-void ChatWidget::updateStatusString(const QString &statusMask, const QString &statusString)
+void ChatWidget::updateStatusString(const QString &statusMask, const QString &statusString, bool permanent)
 {
 	ui->typingLabel->setText(QString(statusMask).arg(tr(statusString.toLatin1()))); // displays info for 5 secs.
 	ui->typingpixmapLabel->setPixmap(QPixmap(":images/typing.png") );
@@ -1459,7 +1478,8 @@ void ChatWidget::updateStatusString(const QString &statusMask, const QString &st
 		emit infoChanged(this);
 	}
 
-	QTimer::singleShot(5000, this, SLOT(resetStatusBar())) ;
+    if(!permanent)
+        QTimer::singleShot(5000, this, SLOT(resetStatusBar())) ;
 }
 
 void ChatWidget::setName(const QString &name)

retroshare-gui/src/gui/chat/ChatWidget.h

@@ -75,6 +75,10 @@ public:
     ChatId getChatId();
     ChatType chatType();
 
+    // allow/disallow sendng of messages
+    void blockSending(QString msg);
+    void unblockSending();
+
 	bool hasNewMessages() { return newMessages; }
 	bool isTyping() { return typing; }
 
@@ -84,7 +88,7 @@ public:
 
 	void setWelcomeMessage(QString &text);
 	void addChatMsg(bool incoming, const QString &name, const QDateTime &sendTime, const QDateTime &recvTime, const QString &message, MsgType chatType);
-	void updateStatusString(const QString &statusMask, const QString &statusString);
+    void updateStatusString(const QString &statusMask, const QString &statusString, bool permanent = false);
 
 	void addToolsAction(QAction *action);
 
@@ -200,6 +204,8 @@ private:
 	bool typing;
 	int peerStatus;
 
+    bool sendingBlocked;
+
 	time_t lastStatusSendTime;
 
 	ChatStyle chatStyle;

retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp

@@ -82,36 +82,49 @@ void PopupDistantChatDialog::updateDisplay()
 	uint32_t status= RS_DISTANT_CHAT_STATUS_UNKNOWN;
     rsMsgs->getDistantChatStatus(_pid,status) ;
 
+    QString msg;
 	switch(status)
 	{
-		case RS_DISTANT_CHAT_STATUS_UNKNOWN: //std::cerr << "Unknown hash. Error!" << std::endl;
+        case RS_DISTANT_CHAT_STATUS_UNKNOWN: //std::cerr << "Unknown hash. Error!" << std::endl;
-														 _status_label->setPixmap(QPixmap(IMAGE_GRY_LED)) ;
+            _status_label->setPixmap(QPixmap(IMAGE_GRY_LED)) ;
-														  _status_label->setToolTip(QObject::tr("Hash error")) ;
+            msg = tr("Hash Error. No tunnel.");
-														  setPeerStatus(RS_STATUS_OFFLINE) ;
+            _status_label->setToolTip(msg) ;
-														 break ;
+            getChatWidget()->updateStatusString("%1", msg, true);
-		case RS_DISTANT_CHAT_STATUS_REMOTELY_CLOSED: std::cerr << "Chat remotely closed. " << std::endl;
+            getChatWidget()->blockSending(tr("Can't send message, because there is no tunnel."));
-														 _status_label->setPixmap(QPixmap(IMAGE_RED_LED)) ;
+            setPeerStatus(RS_STATUS_OFFLINE) ;
-														  _status_label->setToolTip(QObject::tr("Distant peer has closed the chat")) ;
+            break ;
+        case RS_DISTANT_CHAT_STATUS_REMOTELY_CLOSED: std::cerr << "Chat remotely closed. " << std::endl;
+            _status_label->setPixmap(QPixmap(IMAGE_RED_LED)) ;
+            _status_label->setToolTip(QObject::tr("Distant peer has closed the chat")) ;
 
-														  QMessageBox::warning(NULL,tr("Distant chat terminated"),tr("The person you're talking to has deleted the secured chat tunnel. You may remove the chat window now.")) ;
+            getChatWidget()->updateStatusString("%1", tr("The person you're talking to has deleted the secured chat tunnel. You may remove the chat window now."), true);
-														  setPeerStatus(RS_STATUS_OFFLINE) ;
+            getChatWidget()->blockSending(tr("Can't send message, because the chat partner deleted the secure tunnel."));
+            setPeerStatus(RS_STATUS_OFFLINE) ;
 
-														 break ;
+            break ;
 		case RS_DISTANT_CHAT_STATUS_TUNNEL_DN: //std::cerr << "Tunnel asked. Waiting for reponse. " << std::endl;
-														 _status_label->setPixmap(QPixmap(IMAGE_RED_LED)) ;
+            _status_label->setPixmap(QPixmap(IMAGE_RED_LED)) ;
-														  _status_label->setToolTip(QObject::tr("Tunnel is pending...")) ;
+            msg = QObject::tr("Tunnel is pending...");
-														  setPeerStatus(RS_STATUS_OFFLINE) ;
+            _status_label->setToolTip(msg) ;
-														 break ;
+            getChatWidget()->updateStatusString("%1", msg, true);
+            getChatWidget()->blockSending(msg);
+            setPeerStatus(RS_STATUS_OFFLINE) ;
+            break ;
 		case RS_DISTANT_CHAT_STATUS_TUNNEL_OK: //std::cerr << "Tunnel is ok. " << std::endl;
-														 _status_label->setPixmap(QPixmap(IMAGE_YEL_LED)) ;
+            _status_label->setPixmap(QPixmap(IMAGE_YEL_LED)) ;
-														  _status_label->setToolTip(QObject::tr("Secured tunnel established. Waiting for ACK...")) ;
+            msg = QObject::tr("Secured tunnel established. Waiting for ACK...");
-														  setPeerStatus(RS_STATUS_ONLINE) ;
+            _status_label->setToolTip(msg) ;
-														 break ;
+            getChatWidget()->updateStatusString("%1", msg, true);
+            getChatWidget()->blockSending(msg);
+            setPeerStatus(RS_STATUS_ONLINE) ;
+            break ;
 		case RS_DISTANT_CHAT_STATUS_CAN_TALK: //std::cerr << "Tunnel is ok and data is transmitted." << std::endl;
-														 _status_label->setPixmap(QPixmap(IMAGE_GRN_LED)) ;
+            _status_label->setPixmap(QPixmap(IMAGE_GRN_LED)) ;
-														  _status_label->setToolTip(QObject::tr("Secured tunnel is working. You can talk!")) ;
+            msg = QObject::tr("Secured tunnel is working. You can talk!");
-														  setPeerStatus(RS_STATUS_ONLINE) ;
+            _status_label->setToolTip(msg) ;
-														 break ;
+            getChatWidget()->unblockSending();
+            setPeerStatus(RS_STATUS_ONLINE) ;
+            break ;
 	}
 }
 

retroshare-gui/src/gui/common/FriendList.cpp

@@ -49,7 +49,7 @@
 #include "util/misc.h"
 #include "vmessagebox.h"
 #include "util/QtVersion.h"
-
+#include "gui/chat/ChatUserNotify.h"
 #include "gui/connect/ConnectProgressDialog.h"
 
 #include "FriendList.h"
@@ -598,10 +598,9 @@ void  FriendList::insertPeers()
         return;
     }
 
-    // get ids of existing private chat messages
+    // get peers with waiting incoming chats
-    std::list<RsPeerId> privateChatIds;
+    std::vector<RsPeerId> privateChatIds;
-    // TODO
+    ChatUserNotify::getPeersWithWaitingChat(privateChatIds);
-    //rsMsgs->getPrivateChatQueueIds(true, privateChatIds);
 
     // get existing groups
     std::list<RsGroupInfo> groupInfoList;