Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-21 05:39:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- fixed a few bugs in PopupDistantChatDialog (Possible deadlock, wrong window for private chat)

Browse source 
- added method to properly close distant chat conversation (Still needs some work)
- improved chat link creation window + clipboard copy



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6426 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-06-12 21:10:09 +00:00
parent 3f752b9eae
commit 42db43e590
10 changed files with 111 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

13
retroshare-gui/src/gui/chat/PopupDistantChatDialog.h
View file

@ -25,6 +25,7 @@
#include "PopupChatDialog.h"
class QTimer ;
class QCloseEvent ;
class PopupDistantChatDialog: public PopupChatDialog
{
@ -32,10 +33,7 @@ class PopupDistantChatDialog: public PopupChatDialog
friend class ChatDialog;
public slots:
void checkTunnel() ;
protected:
protected:
/** Default constructor */
PopupDistantChatDialog(QWidget *parent = 0, Qt::WFlags flags = 0);
/** Default destructor */
@ -43,8 +41,13 @@ protected:
virtual void init(const std::string& _hash, const QString &title);
virtual void updateStatus(int /*status*/) {}
virtual void closeEvent(QCloseEvent *e) ;
QTimer *_tunnel_check_timer ;
protected slots:
void updateDisplay() ; // overloads RsAutoUpdatePage
private:
QTimer *_update_timer ;
std::string _hash ;
std::string _virtual_peer_id ;
QLabel *_status_label ;