diff --git a/retroshare-gui/src/gui/NewsFeed.cpp b/retroshare-gui/src/gui/NewsFeed.cpp index fb509c6e3..fbc8f1b6c 100644 --- a/retroshare-gui/src/gui/NewsFeed.cpp +++ b/retroshare-gui/src/gui/NewsFeed.cpp @@ -18,7 +18,6 @@ * * *******************************************************************************/ -#include #include #include "NewsFeed.h" @@ -91,7 +90,7 @@ NewsFeed::NewsFeed(QWidget *parent) : MainPage(parent), ui(new Ui::NewsFeed) connect(ui->sortComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(sortChanged(int))); connect(ui->removeAllButton, SIGNAL(clicked()), ui->feedWidget, SLOT(clear())); - connect(ui->feedWidget, SIGNAL(feedCountChanged()), this, SLOT(sendNewsFeedChanged())); + connect(ui->feedWidget, SIGNAL(feedCountChanged()), this, SLOT(sendNewsFeedChanged()),Qt::QueuedConnection); connect(ui->feedOptionsButton, SIGNAL(clicked()), this, SLOT(feedoptions())); ui->feedOptionsButton->hide(); // (csoler) Hidden until we repare the system to display a specific settings page. diff --git a/retroshare-gui/src/gui/common/RSFeedWidget.cpp b/retroshare-gui/src/gui/common/RSFeedWidget.cpp index dab4ed5f8..5be4eadcd 100644 --- a/retroshare-gui/src/gui/common/RSFeedWidget.cpp +++ b/retroshare-gui/src/gui/common/RSFeedWidget.cpp @@ -392,9 +392,20 @@ void RSFeedWidget::removeFeedItem(FeedItem *feedItem) QTreeWidgetItem *treeItem = findTreeWidgetItem(feedItem); feedRemoved(feedItem); - if (treeItem) { + + if (treeItem) + { + int treeItem_index = ui->treeWidget->indexOfTopLevelItem(treeItem); + + if(treeItem_index < 0) + { + std::cerr << "(EE) Cannot remove designated item \"" << feedItem->uniqueIdentifier() << "\": not found!" << std::endl; + return ; + } + + ui->treeWidget->takeTopLevelItem(treeItem_index); delete(treeItem); - } + } if (!mCountChangedDisabled) { emit feedCountChanged(); @@ -498,6 +509,9 @@ FeedItem *RSFeedWidget::findFeedItem(const std::string& identifier) std::string id = feedItem->uniqueIdentifier(); + std::cerr << "Comparing \"" << id << "\""; + std::cerr << " to " << identifier << "\"" << " pthread_t = " << pthread_self() << std::endl; + if (id == identifier) return feedItem; } diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp index c166d115b..d7a807d59 100644 --- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp +++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp @@ -183,6 +183,7 @@ void GxsChannelPostItem::setup() connect(ui->downloadButton, SIGNAL(clicked()), this, SLOT(download())); // HACK FOR NOW. + ui->commentButton->hide();// hidden until properly enabled. connect(ui->commentButton, SIGNAL(clicked()), this, SLOT(loadComments())); connect(ui->playButton, SIGNAL(clicked()), this, SLOT(play(void))); diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui index 3747fc5db..01d113665 100644 --- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui +++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui @@ -6,7 +6,7 @@ 0 0 - 1140 + 1359 342 @@ -57,18 +57,6 @@ 0 - - - 82 - 108 - - - - - 156 - 107 - - @@ -138,12 +126,6 @@ 0 - - - 16777215 - 60 - - Short Description @@ -570,8 +552,8 @@ - + diff --git a/retroshare-gui/src/gui/feeds/NewsFeedUserNotify.cpp b/retroshare-gui/src/gui/feeds/NewsFeedUserNotify.cpp index e089aa946..e71c166f2 100644 --- a/retroshare-gui/src/gui/feeds/NewsFeedUserNotify.cpp +++ b/retroshare-gui/src/gui/feeds/NewsFeedUserNotify.cpp @@ -26,7 +26,7 @@ NewsFeedUserNotify::NewsFeedUserNotify(NewsFeed *newsFeed, QObject *parent) : { mNewFeedCount = 0; - connect(newsFeed, SIGNAL(newsFeedChanged(int)), this, SLOT(newsFeedChanged(int))); + connect(newsFeed, SIGNAL(newsFeedChanged(int)), this, SLOT(newsFeedChanged(int)),Qt::QueuedConnection); } void NewsFeedUserNotify::newsFeedChanged(int count)