mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-01-19 20:01:48 -05:00
* Change on the Timers of Network Menu that weren't wroking properlly
* Fixed the context menu position of the Netwok Log git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1351 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
6ba3dc355b
commit
070939704c
@ -21,6 +21,7 @@
|
|||||||
|
|
||||||
#include <QFile>
|
#include <QFile>
|
||||||
#include <QFileInfo>
|
#include <QFileInfo>
|
||||||
|
#include <QCursor>
|
||||||
|
|
||||||
#include "rshare.h"
|
#include "rshare.h"
|
||||||
#include "common/vmessagebox.h"
|
#include "common/vmessagebox.h"
|
||||||
@ -149,11 +150,11 @@ NetworkDialog::NetworkDialog(QWidget *parent)
|
|||||||
ui.viewButton->setMenu(menu);
|
ui.viewButton->setMenu(menu);
|
||||||
|
|
||||||
QTimer *timer = new QTimer(this);
|
QTimer *timer = new QTimer(this);
|
||||||
timer->connect(timer, SIGNAL(timeout()), this, SLOT(getNetworkStatus()));
|
connect(timer, SIGNAL(timeout()), this, SLOT(getNetworkStatus()));
|
||||||
timer->start(100000);
|
timer->start(100000);
|
||||||
|
|
||||||
QTimer *timer2 = new QTimer(this);
|
QTimer *timer2 = new QTimer(this);
|
||||||
timer2->connect(timer, SIGNAL(timeout()), this, SLOT(updateNetworkStatus()));
|
connect(timer2, SIGNAL(timeout()), this, SLOT(updateNetworkStatus()));
|
||||||
timer2->start(1000);
|
timer2->start(1000);
|
||||||
|
|
||||||
getNetworkStatus();
|
getNetworkStatus();
|
||||||
@ -628,7 +629,9 @@ void NetworkDialog::displayInfoLogMenu(const QPoint& pos) {
|
|||||||
QMenu myLogMenu(this);
|
QMenu myLogMenu(this);
|
||||||
myLogMenu.addAction(ui.actionClearLog);
|
myLogMenu.addAction(ui.actionClearLog);
|
||||||
// XXX: Why mapToGlobal() is not enough?
|
// XXX: Why mapToGlobal() is not enough?
|
||||||
myLogMenu.exec(mapToGlobal(pos)+QPoint(0,320));
|
// myLogMenu.exec(mapToGlobal(pos)+QPoint(0,320));
|
||||||
|
// No. Simple use QCursor::pos() to retrieve the position of the cursor.
|
||||||
|
myLogMenu.exec(QCursor::pos());
|
||||||
}
|
}
|
||||||
|
|
||||||
void NetworkDialog::getNetworkStatus()
|
void NetworkDialog::getNetworkStatus()
|
||||||
|
Loading…
Reference in New Issue
Block a user