Switched parent from MainPage to RsAutoUpdatePage ... in an attempt to fix GPG password freeze.

don't think it worked!



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3259 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2010-07-05 19:41:46 +00:00
parent 0c4bf7be54
commit 126a1d4012
2 changed files with 7 additions and 9 deletions

View File

@ -102,7 +102,7 @@ static int FilterColumnToComboBox(int nIndex)
/** Constructor */ /** Constructor */
ForumsDialog::ForumsDialog(QWidget *parent) ForumsDialog::ForumsDialog(QWidget *parent)
: MainPage(parent) : RsAutoUpdatePage(1000,parent)
{ {
/* Invoke the Qt Designer generated object setup routine */ /* Invoke the Qt Designer generated object setup routine */
ui.setupUi(this); ui.setupUi(this);
@ -130,10 +130,6 @@ ForumsDialog::ForumsDialog(QWidget *parent)
connect(ui.filterPatternLineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(filterRegExpChanged())); connect(ui.filterPatternLineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(filterRegExpChanged()));
connect(ui.filterColumnComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(filterColumnChanged())); connect(ui.filterColumnComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(filterColumnChanged()));
QTimer *timer = new QTimer(this);
timer->connect(timer, SIGNAL(timeout()), this, SLOT(checkUpdate()));
timer->start(1000);
/* Set header resize modes and initial section sizes */ /* Set header resize modes and initial section sizes */
QHeaderView * ftheader = ui.forumTreeWidget->header () ; QHeaderView * ftheader = ui.forumTreeWidget->header () ;
ftheader->setResizeMode (0, QHeaderView::Interactive); ftheader->setResizeMode (0, QHeaderView::Interactive);
@ -377,7 +373,7 @@ void ForumsDialog::togglethreadview_internal()
} }
} }
void ForumsDialog::checkUpdate() void ForumsDialog::updateDisplay()
{ {
std::list<std::string> forumIds; std::list<std::string> forumIds;
std::list<std::string>::iterator it; std::list<std::string>::iterator it;

View File

@ -23,9 +23,10 @@
#define _FORUMSDIALOG_H #define _FORUMSDIALOG_H
#include "mainpage.h" #include "mainpage.h"
#include "RsAutoUpdatePage.h"
#include "ui_ForumsDialog.h" #include "ui_ForumsDialog.h"
class ForumsDialog : public MainPage class ForumsDialog : public RsAutoUpdatePage
{ {
Q_OBJECT Q_OBJECT
@ -38,6 +39,8 @@ public:
void loadForumEmoticons(); void loadForumEmoticons();
/* overloaded from RsAuthUpdatePage */
virtual void updateDisplay();
private slots: private slots:
@ -49,7 +52,6 @@ private slots:
void newforum(); void newforum();
void checkUpdate();
void changedForum( QTreeWidgetItem *curr, QTreeWidgetItem *prev ); void changedForum( QTreeWidgetItem *curr, QTreeWidgetItem *prev );
void changedThread(); void changedThread();