From 6f1e1f8523a4a0334271ec19b4bc288e29d4a2e2 Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 11 Aug 2020 13:04:29 +0200 Subject: [PATCH] attempt to fix size problem in boards display widget --- .../src/gui/Posted/BoardPostDisplayWidget.cpp | 5 +- .../src/gui/Posted/BoardPostDisplayWidget.ui | 686 +++++++++--------- 2 files changed, 347 insertions(+), 344 deletions(-) diff --git a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp index df79d374b..6933c4a98 100644 --- a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp +++ b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp @@ -25,7 +25,6 @@ #include "rshare.h" #include "BoardPostDisplayWidget.h" -#include "gui/feeds/FeedHolder.h" #include "gui/gxs/GxsIdDetails.h" #include "util/misc.h" #include "gui/common/FilesDefs.h" @@ -125,12 +124,12 @@ void BoardPostDisplayWidget::setup() if(dmode == DISPLAY_MODE_COMPACT) { ui->pictureLabel_compact->show(); + ui->expandButton->show(); + ui->pictureLabel->hide(); ui->notes->hide(); ui->siteLabel->hide(); - ui->expandButton->show(); - if(mExpanded) { ui->frame_picture->show(); diff --git a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.ui b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.ui index 273eeebd0..a1fe4b3e8 100644 --- a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.ui +++ b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.ui @@ -6,8 +6,8 @@ 0 0 - 816 - 203 + 758 + 195 @@ -22,38 +22,209 @@ - + - - - QLayout::SetMinimumSize - + - - - QLayout::SetMinimumSize - + - + + + QLayout::SetMinimumSize + - + - + + + + + + 0 + 0 + + + + Vote up + + + + + + + :/images/up-arrow.png:/images/up-arrow.png + + + true + + + + + + + + 9 + + + + 0 + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Vote down + + + + + + \/ + + + + :/images/down-arrow.png:/images/down-arrow.png + + + true + + + + + + + + + PictureLabel_compact + + + + + + + + + Qt::Vertical + + + QSizePolicy::MinimumExpanding + + + + 20 + 40 + + + + + + + + + + QLayout::SetMinimumSize + + + + + 5 + + + 0 + + + 6 + + + - + 0 0 - - Vote up + + + 50 + false + - + Posted by + + + + + + + + 0 + 0 + + + + Signed by + + + true + + + + + + + + 0 + 0 + + + + You eyes only + + + true + + + + + + + + 24 + 16777215 + + + + Qt::NoFocus + + + Toggle Message Read Status - - :/images/up-arrow.png:/images/up-arrow.png + + :/images/message-state-unread.png:/images/message-state-unread.png + + + true + + + false true @@ -61,46 +232,70 @@ - - - - 9 - - + - 0 - - - Qt::AlignCenter + New - - - - 0 - 0 - + + + Qt::Horizontal - + + QSizePolicy::Expanding + + - 0 - 0 + 70 + 20 - - Vote down - - - - + + + + - \/ + Comments - :/images/down-arrow.png:/images/down-arrow.png + :/images/comments.png:/images/comments.png + + + Qt::ToolButtonTextBesideIcon + + + true + + + + + + + Share + + + + :/images/share.png:/images/share.png + + + true + + + + + + + Expand + + + + + + + :/images/expand.png:/images/expand.png true @@ -110,74 +305,45 @@ - - - PictureLabel_compact - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - QLayout::SetMinimumSize - - - - - 5 - - - 0 - - - 6 - - - + - + 0 0 - 50 - false + Arial + 10 + 75 + true - Posted by + This is a very very very very loooooooooooooooonnnnnnnnnnnnnnnnng title don't you think? Yes it is and should wrap around I hope + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + true + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - 0 - 0 - - + - Signed by + TextLabel + + + true true @@ -185,15 +351,15 @@ - + - + 0 0 - You eyes only + site true @@ -201,251 +367,89 @@ - - - - 24 - 16777215 - - - - Qt::NoFocus - - - Toggle Message Read Status - - - - :/images/message-state-unread.png:/images/message-state-unread.png - - - true - - - false - - - true - - - - - - - New - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 70 - 20 - - - - - - - - Comments - - - - :/images/comments.png:/images/comments.png - - - Qt::ToolButtonTextBesideIcon - - - true - - - - - - - Share - - - - :/images/share.png:/images/share.png - - - true - - - - - - - Expand - - - - - - - :/images/expand.png:/images/expand.png - - - true - - - - - - - - - - 0 - 0 - - - - - Arial - 10 - 75 - true - - - - This is a very very very very loooooooooooooooonnnnnnnnnnnnnnnnng title don't you think? Yes it is and should wrap around I hope - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - true - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - - TextLabel - - - true - - - true - - - - - - - - 0 - 0 - - - - site - - - true - - - - - - - - - PictureLabel - - - true - - - - - - - Qt::Horizontal - - - - 268 - 17 - - - + + + + + PictureLabel + + + true + + + + + + + Qt::Horizontal + + + + 268 + 17 + + + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + Qt::Horizontal + + + + 257 + 20 + + + + + + + + TextLabel + + + true + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + Qt::Horizontal + + + + 257 + 20 + + + + + + + - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - Qt::Horizontal - - - - 257 - 20 - - - - - - - - TextLabel - - - true - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - - Qt::Horizontal - - - - 257 - 20 - - - - - - -