mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-25 09:11:06 -04:00
Changed the chat service from a timer tick from the gui to a service tick.
Created a new notifier for new chat available - NOTIFY_LIST_CHAT. Removed the QTimer in PeersDialog and connect the signal. Created news feed for public chat (prework of defnax, need still some gui changes) git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3413 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
c7c6f6d36a
commit
b6b5fa5cd6
18 changed files with 832 additions and 175 deletions
|
@ -96,6 +96,8 @@ NotifyPage::save(QString &errmsg)
|
|||
newsflags |= RS_FEED_TYPE_CHAT;
|
||||
if (ui.notify_Messages->isChecked())
|
||||
newsflags |= RS_FEED_TYPE_MSG;
|
||||
if (ui.notify_Chat->isChecked())
|
||||
newsflags |= RS_FEED_TYPE_CHAT;
|
||||
|
||||
if (ui.chat_NewWindow->isChecked())
|
||||
chatflags |= RS_CHAT_OPEN_NEW;
|
||||
|
@ -136,6 +138,7 @@ void NotifyPage::load()
|
|||
ui.notify_Blogs->setChecked(newsflags & RS_FEED_TYPE_BLOG);
|
||||
ui.notify_Chat->setChecked(newsflags & RS_FEED_TYPE_CHAT);
|
||||
ui.notify_Messages->setChecked(newsflags & RS_FEED_TYPE_MSG);
|
||||
ui.notify_Chat->setChecked(newsflags & RS_FEED_TYPE_CHAT);
|
||||
|
||||
ui.chat_NewWindow->setChecked(chatflags & RS_CHAT_OPEN_NEW);
|
||||
ui.chat_Reopen->setChecked(chatflags & RS_CHAT_REOPEN);
|
||||
|
@ -144,8 +147,7 @@ void NotifyPage::load()
|
|||
ui.systray_GroupChat->setChecked(Settings->getDisplayTrayGroupChat());
|
||||
|
||||
/* disable ones that don't work yet */
|
||||
ui.notify_Chat->setEnabled(false);
|
||||
//ui.popup_NewChat->setEnabled(false);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue