mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-12-20 02:53:24 -05:00
Completely reworked the toasters. Now there is only one place that moves the toaster and the toasters are stacked.
Removed the chat and call toaster. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3900 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
9bb5f304b7
commit
2a69abe570
21 changed files with 357 additions and 2329 deletions
|
|
@ -22,16 +22,12 @@
|
|||
|
||||
#include <rshare.h>
|
||||
#include "NotifyPage.h"
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
|
||||
#include <retroshare/rsnotify.h>
|
||||
#include "rsharesettings.h"
|
||||
|
||||
#include "gui/MainWindow.h"
|
||||
|
||||
#include <QTimer>
|
||||
|
||||
|
||||
/** Constructor */
|
||||
NotifyPage::NotifyPage(QWidget * parent, Qt::WFlags flags)
|
||||
|
|
@ -76,12 +72,6 @@ NotifyPage::save(QString &errmsg)
|
|||
if (ui.popup_DownloadFinished->isChecked())
|
||||
notifyflags |= RS_POPUP_DOWNLOAD;
|
||||
|
||||
//if (ui.popup_NewChat->isChecked())
|
||||
notifyflags |= RS_POPUP_CHAT;
|
||||
|
||||
//if (ui.popup_Call->isChecked())
|
||||
// notifyflags |= RS_POPUP_CALL;
|
||||
|
||||
if (ui.notify_Peers->isChecked())
|
||||
newsflags |= RS_FEED_TYPE_PEER;
|
||||
if (ui.notify_Channels->isChecked())
|
||||
|
|
@ -145,8 +135,6 @@ void NotifyPage::load()
|
|||
ui.popup_Connect->setChecked(notifyflags & RS_POPUP_CONNECT);
|
||||
ui.popup_NewMsg->setChecked(notifyflags & RS_POPUP_MSG);
|
||||
ui.popup_DownloadFinished->setChecked(notifyflags & RS_POPUP_DOWNLOAD);
|
||||
//ui.popup_NewChat->setChecked(notifyflags & RS_POPUP_CHAT);
|
||||
//ui.popup_Call->setChecked(notifyflags & RS_POPUP_CALL);
|
||||
|
||||
ui.notify_Peers->setChecked(newsflags & RS_FEED_TYPE_PEER);
|
||||
ui.notify_Channels->setChecked(newsflags & RS_FEED_TYPE_CHAN);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue