Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed GPG password freeze

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3311 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2010-07-23 11:55:21 +00:00
parent 8bfc74485a
commit ba47eedfe3
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
retroshare-gui/src/gui/ChannelFeed.cpp
View File

@ -45,7 +45,7 @@
/** Constructor */ /** Constructor */
ChannelFeed::ChannelFeed(QWidget *parent) ChannelFeed::ChannelFeed(QWidget *parent)
: MainPage (parent) : RsAutoUpdatePage(1000,parent)
{ {
/* Invoke the Qt Designer generated object setup routine */ /* Invoke the Qt Designer generated object setup routine */
setupUi(this); setupUi(this);
@ -123,9 +123,7 @@ ChannelFeed::ChannelFeed(QWidget *parent)
channelpushButton->setMenu(channelmenu); channelpushButton->setMenu(channelmenu);
QTimer *timer = new QTimer(this);
timer->connect(timer, SIGNAL(timeout()), this, SLOT(checkUpdate()));
timer->start(1000);
} }
void ChannelFeed::channelListCustomPopupMenu( QPoint point ) void ChannelFeed::channelListCustomPopupMenu( QPoint point )
@ -285,7 +283,7 @@ void ChannelFeed::selectChannel(const QModelIndex &index)
updateChannelMsgs(); updateChannelMsgs();
} }
void ChannelFeed::checkUpdate() void ChannelFeed::updateDisplay()
{ {
std::list<std::string> chanIds; std::list<std::string> chanIds;
std::list<std::string>::iterator it; std::list<std::string>::iterator it;

13
retroshare-gui/src/gui/ChannelFeed.h
View File

@ -23,6 +23,8 @@
#define _CHANNEL_FEED_DIALOG_H #define _CHANNEL_FEED_DIALOG_H
#include "mainpage.h" #include "mainpage.h"
#include "RsAutoUpdatePage.h"
#include "ui_ChannelFeed.h" #include "ui_ChannelFeed.h"
#include <QStandardItemModel> #include <QStandardItemModel>
@ -36,7 +38,7 @@
class ChanMsgItem; class ChanMsgItem;
class ChannelFeed : public MainPage, public FeedHolder, private Ui::ChannelFeed class ChannelFeed : public RsAutoUpdatePage, public FeedHolder, private Ui::ChannelFeed
{ {
Q_OBJECT Q_OBJECT
@ -46,8 +48,11 @@ public:
/** Default Destructor */ /** Default Destructor */
virtual void deleteFeedItem(QWidget *item, uint32_t type); virtual void deleteFeedItem(QWidget *item, uint32_t type);
virtual void openChat(std::string peerId); virtual void openChat(std::string peerId);
/* overloaded from RsAuthUpdatePage */
virtual void updateDisplay();
public slots: public slots:
@ -59,8 +64,6 @@ private slots:
void channelListCustomPopupMenu( QPoint point ); void channelListCustomPopupMenu( QPoint point );
void checkUpdate();
void createChannel(); void createChannel();
void channelSelection(); void channelSelection();