diff --git a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui index bc61fe8b3..bb7688ffa 100644 --- a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui +++ b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui @@ -7,7 +7,7 @@ 0 0 618 - 157 + 161 @@ -178,6 +178,25 @@ + + + + + 0 + 0 + + + + Qt::NoFocus + + + Subscribe to Channel + + + Subscribe + + + @@ -205,26 +224,6 @@ - - - - - 0 - 0 - - - - Qt::NoFocus - - - Subscribe to Channel - - - - :/images/directoryadd_24x24_shadow.png:/images/directoryadd_24x24_shadow.png - - - diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp index 9b70ca191..bbf9e1823 100644 --- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp +++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp @@ -392,9 +392,21 @@ void GxsChannelPostItem::fill() if(mPost.mThumbnail.mData != NULL) { - QPixmap thumbnail; + QPixmap thumbnail; + GxsIdDetails::loadPixmapFromData(mPost.mThumbnail.mData, mPost.mThumbnail.mSize, thumbnail,GxsIdDetails::ORIGINAL); // Wiping data - as its been passed to thumbnail. + if( thumbnail.width() < 90 ){ + ui->logoLabel->setMaximumSize(82,108); + } + else if( thumbnail.width() < 109 ){ + ui->logoLabel->setMinimumSize(108,108); + ui->logoLabel->setMaximumSize(108,108); + } + else{ + ui->logoLabel->setMinimumSize(156,108); + ui->logoLabel->setMaximumSize(156,108); + } ui->logoLabel->setPixmap(thumbnail); } diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui index cd6594674..53e7f5348 100644 --- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui +++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui @@ -51,9 +51,15 @@ + + + 0 + 0 + + - 158 + 82 108 diff --git a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui index 60f306113..ccdb0a591 100644 --- a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui +++ b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui @@ -7,7 +7,7 @@ 0 0 618 - 157 + 161 @@ -178,6 +178,25 @@ + + + + + 0 + 0 + + + + Qt::NoFocus + + + Subscribe to Forum + + + Subscribe + + + @@ -205,26 +224,6 @@ - - - - - 0 - 0 - - - - Qt::NoFocus - - - Subscribe to Forum - - - - :/images/directoryadd_24x24_shadow.png:/images/directoryadd_24x24_shadow.png - - - diff --git a/retroshare-gui/src/gui/feeds/PostedGroupItem.ui b/retroshare-gui/src/gui/feeds/PostedGroupItem.ui index dd2b199bd..e792fadca 100644 --- a/retroshare-gui/src/gui/feeds/PostedGroupItem.ui +++ b/retroshare-gui/src/gui/feeds/PostedGroupItem.ui @@ -7,7 +7,7 @@ 0 0 618 - 157 + 161 @@ -178,6 +178,25 @@ + + + + + 0 + 0 + + + + Qt::NoFocus + + + Subscribe to Posted + + + Subscribe + + + @@ -205,26 +224,6 @@ - - - - - 0 - 0 - - - - Qt::NoFocus - - - Subscribe to Posted - - - - :/images/directoryadd_24x24_shadow.png:/images/directoryadd_24x24_shadow.png - - - @@ -330,6 +329,7 @@ +