mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-06 08:05:18 -04: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
|
@ -4,9 +4,11 @@
|
|||
#include <retroshare/rsiface.h>
|
||||
#include <retroshare/rsturtle.h>
|
||||
#include <QObject>
|
||||
//#include <QMutex>
|
||||
|
||||
#include <string>
|
||||
|
||||
class QTimer;
|
||||
class NetworkDialog;
|
||||
class PeersDialog;
|
||||
class SharedFilesDialog;
|
||||
|
@ -15,6 +17,7 @@ class ChatDialog;
|
|||
class MessagesDialog;
|
||||
class ChannelsDialog;
|
||||
class MessengerWindow;
|
||||
class Toaster;
|
||||
struct TurtleFileInfo;
|
||||
|
||||
//class NotifyQt: public NotifyBase, public QObject
|
||||
|
@ -95,11 +98,23 @@ class NotifyQt: public QObject, public NotifyBase
|
|||
|
||||
void UpdateGUI(); /* called by timer */
|
||||
|
||||
private slots:
|
||||
void runningTick();
|
||||
|
||||
private:
|
||||
NotifyQt() : cDialog(NULL) { return; }
|
||||
NotifyQt();
|
||||
|
||||
static NotifyQt *_instance;
|
||||
|
||||
void startWaitingToasters();
|
||||
|
||||
// QMutex waitingToasterMutex; // for lock of the waiting toaster list
|
||||
QList<Toaster*> waitingToasterList;
|
||||
|
||||
QTimer *runningToasterTimer;
|
||||
// QMutex runningToasterMutex; // for lock of the running toaster list
|
||||
QList<Toaster*> runningToasterList;
|
||||
|
||||
// void displayNeighbours();
|
||||
// void displayFriends();
|
||||
// void displayDirectories();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue