mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-07-21 13:49:04 -04:00
new notify capability of chat lobbies: message counting, nickname occurrence counting and specific text counting. Also sorts out notify tab in Settings (Patch from Phenom, slightly modified: gui layout/text + added a flag to enable/disable user defined text grep)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8082 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
9d2b6faf9c
commit
e40460bdcc
18 changed files with 1045 additions and 392 deletions
|
@ -4,6 +4,7 @@
|
|||
#include <retroshare/rsmsgs.h>
|
||||
#include "ui_ChatLobbyWidget.h"
|
||||
#include "RsAutoUpdatePage.h"
|
||||
#include "chat/ChatLobbyUserNotify.h"
|
||||
|
||||
#define IMAGE_CHATLOBBY ":/images/chat_32.png"
|
||||
|
||||
|
@ -20,7 +21,6 @@ struct ChatLobbyInfoStruct
|
|||
QIcon default_icon ;
|
||||
ChatLobbyDialog *dialog ;
|
||||
time_t last_typing_event ;
|
||||
uint unread_count;
|
||||
};
|
||||
|
||||
class ChatLobbyWidget : public RsAutoUpdatePage
|
||||
|
@ -38,12 +38,13 @@ public:
|
|||
virtual QString pageName() const { return tr("Chat Lobbies") ; } //MainPage
|
||||
virtual QString helpText() const { return ""; } //MainPage
|
||||
|
||||
virtual UserNotify *getUserNotify(QObject *parent);
|
||||
virtual UserNotify *getUserNotify(QObject *parent); //MainPage
|
||||
|
||||
virtual void updateDisplay();
|
||||
|
||||
void setCurrentChatPage(ChatLobbyDialog *) ; // used by ChatLobbyDialog to raise.
|
||||
void addChatPage(ChatLobbyDialog *) ;
|
||||
void showLobbyAnchor(ChatLobbyId id, QString anchor) ;
|
||||
|
||||
uint unreadCount();
|
||||
|
||||
|
@ -66,7 +67,7 @@ protected slots:
|
|||
void subscribeChatLobbyAs() ;
|
||||
void updateTypingStatus(ChatLobbyId id) ;
|
||||
void resetLobbyTreeIcons() ;
|
||||
void updateMessageChanged(ChatLobbyId);
|
||||
void updateMessageChanged(bool incoming, ChatLobbyId, QDateTime time, QString senderName, QString msg);
|
||||
void updatePeerEntering(ChatLobbyId);
|
||||
void updatePeerLeaving(ChatLobbyId);
|
||||
void autoSubscribeItem();
|
||||
|
@ -75,11 +76,12 @@ private slots:
|
|||
void filterColumnChanged(int);
|
||||
void filterItems(const QString &text);
|
||||
|
||||
|
||||
void setShowUserCountColumn(bool show);
|
||||
void setShowTopicColumn(bool show);
|
||||
void setShowSubscribeColumn(bool show);
|
||||
|
||||
void updateNotify(ChatLobbyId id, unsigned int count) ;
|
||||
|
||||
private:
|
||||
void autoSubscribeLobby(QTreeWidgetItem *item);
|
||||
void subscribeChatLobby(ChatLobbyId id) ;
|
||||
|
@ -109,6 +111,8 @@ private:
|
|||
QAction* showSubscribeAct;
|
||||
int getNumColVisible();
|
||||
|
||||
ChatLobbyUserNotify* myChatLobbyUserNotify;
|
||||
|
||||
/* UI - from Designer */
|
||||
Ui::ChatLobbyWidget ui;
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue