Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-01 10:46:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

tried to improve layout of items

Browse source
This commit is contained in:
csoler 2020-09-22 22:43:24 +02:00
parent 1f253f6bfa
commit 010fc1dc44
2 changed files with 450 additions and 390 deletions
Download patch file Download diff file Expand all files Collapse all files

45
retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp
View file

@ -61,16 +61,20 @@ BoardPostDisplayWidget::BoardPostDisplayWidget(const RsPostedPost& post, Display
ui->arrowsLayout->addStretch(); ui->arrowsLayout->addStretch();
ui->arrowsLayout->setAlignment(Qt::AlignTop); ui->arrowsLayout->setAlignment(Qt::AlignTop);
ui->verticalLayout_2->addStretch(); ui->verticalLayout_2->addStretch();
// ui->verticalLayout_3->addStretch();
// ui->verticalLayout_3->setAlignment(Qt::AlignTop);
if(display_flags & SHOW_COMMENTS) adjustSize();
{
ui->commentsWidget->setTokenService(rsPosted->getTokenService(),rsPosted);
std::set<RsGxsMessageId> post_versions ; // if(display_flags & SHOW_COMMENTS)
post_versions.insert(post.mMeta.mMsgId) ; // {
// ui->commentsWidget->setTokenService(rsPosted->getTokenService(),rsPosted);
ui->commentsWidget->commentLoad(post.mMeta.mGroupId, post_versions,mPost.mMeta.mMsgId,true); //
} // std::set<RsGxsMessageId> post_versions ;
// post_versions.insert(post.mMeta.mMsgId) ;
//
// ui->commentsWidget->commentLoad(post.mMeta.mGroupId, post_versions,mPost.mMeta.mMsgId,true);
// }
} }
void BoardPostDisplayWidget::setCommentsSize(int comNb) void BoardPostDisplayWidget::setCommentsSize(int comNb)
@ -172,8 +176,8 @@ void BoardPostDisplayWidget::setup()
case DISPLAY_MODE_COMPACT: case DISPLAY_MODE_COMPACT:
{ {
ui->pictureLabel_compact->show(); ui->pictureLabel_compact->show();
ui->expandButton->hide(); //ui->expandButton->hide();
//ui->expandButton->show(); // always hide, since we have the photoview already ui->expandButton->show(); // always hide, since we have the photoview already
ui->pictureLabel->hide(); ui->pictureLabel->hide();
ui->notes->hide(); ui->notes->hide();
@ -207,7 +211,7 @@ void BoardPostDisplayWidget::setup()
if(!(mDisplayFlags & SHOW_COMMENTS)) if(!(mDisplayFlags & SHOW_COMMENTS))
{ {
ui->commentsWidget->hide(); //ui->commentsWidget->hide();
ui->commentButton->setChecked(false); ui->commentButton->setChecked(false);
} }
else else
@ -269,7 +273,7 @@ void BoardPostDisplayWidget::setup()
QDateTime qtime; QDateTime qtime;
qtime.setTime_t(mPost.mMeta.mPublishTs); qtime.setTime_t(mPost.mMeta.mPublishTs);
QString timestamp = qtime.toString("hh:mm dd-MMM-yyyy"); QString timestamp = qtime.toString("hh:mm dd-MMM-yyyy");
QString timestamp2 = misc::timeRelativeToNow(mPost.mMeta.mPublishTs); QString timestamp2 = misc::timeRelativeToNow(mPost.mMeta.mPublishTs) + " " + tr("ago");
ui->dateLabel->setText(timestamp2); ui->dateLabel->setText(timestamp2);
ui->dateLabel->setToolTip(timestamp); ui->dateLabel->setToolTip(timestamp);
@ -377,7 +381,10 @@ void BoardPostDisplayWidget::setup()
doc.setHtml(ui->notes->text()); doc.setHtml(ui->notes->text());
if(doc.toPlainText().trimmed().isEmpty()) if(doc.toPlainText().trimmed().isEmpty())
{
ui->notes->hide(); ui->notes->hide();
ui->expandButton->hide();
}
// feed. // feed.
//frame_comment->show(); //frame_comment->show();
@ -385,9 +392,7 @@ void BoardPostDisplayWidget::setup()
if (mPost.mComments) if (mPost.mComments)
{ {
QString commentText = QString::number(mPost.mComments); QString commentText = tr("Comments (%1)").arg(QString::number(mPost.mComments));
commentText += " ";
commentText += tr("Comments");
ui->commentButton->setText(commentText); ui->commentButton->setText(commentText);
} }
else else
@ -435,6 +440,16 @@ void BoardPostDisplayWidget::setup()
void BoardPostDisplayWidget::doExpand(bool e) void BoardPostDisplayWidget::doExpand(bool e)
{ {
std::cerr << "Expanding" << std::endl; std::cerr << "Expanding" << std::endl;
if(e)
{
//ui->notes->show();
ui->pictureLabel_2->show();
}
else
{
//ui->notes->hide();
ui->pictureLabel_2->hide();
}
emit expand(mPost.mMeta.mMsgId,e); emit expand(mPost.mMeta.mMsgId,e);
} }

233
retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.ui
View file

@ -6,12 +6,12 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>758</width> <width>558</width>
<height>211</height> <height>202</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding"> <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -22,26 +22,29 @@
<property name="styleSheet"> <property name="styleSheet">
<string notr="true"/> <string notr="true"/>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<property name="sizeConstraint">
<enum>QLayout::SetMaximumSize</enum>
</property>
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>2</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>2</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>0</number> <number>2</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>2</number>
</property> </property>
<item> <item>
<widget class="QFrame" name="frame"> <widget class="QFrame" name="frame">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum"> <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -52,11 +55,39 @@
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <property name="spacing">
<layout class="QVBoxLayout" name="verticalLayout"> <number>2</number>
</property>
<property name="sizeConstraint">
<enum>QLayout::SetMaximumSize</enum>
</property>
<property name="leftMargin">
<number>1</number>
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>1</number>
</property>
<property name="bottomMargin">
<number>2</number>
</property>
<item> <item>
<layout class="QHBoxLayout" name="topLayout"> <layout class="QHBoxLayout" name="topLayout">
<property name="leftMargin">
<number>2</number>
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<number>2</number>
</property>
<item> <item>
<layout class="QVBoxLayout" name="arrowsLayout"> <layout class="QVBoxLayout" name="arrowsLayout">
<item> <item>
@ -148,10 +179,40 @@
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="sizeConstraint"> <item>
<enum>QLayout::SetMinimumSize</enum> <widget class="StyledLabel" name="titleLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="font">
<font>
<family>Arial</family>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string notr="true">This is a very very very very loooooooooooooooonnnnnnnnnnnnnnnnng title don't you think? Yes it is and should wrap around I hope</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing"> <property name="spacing">
@ -214,6 +275,26 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>70</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QToolButton" name="readButton"> <widget class="QToolButton" name="readButton">
<property name="maximumSize"> <property name="maximumSize">
@ -250,42 +331,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>70</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QToolButton" name="commentButton">
<property name="text">
<string>Comments</string>
</property>
<property name="icon">
<iconset resource="Posted_images.qrc">
<normaloff>:/images/comments.png</normaloff>:/images/comments.png</iconset>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item> <item>
<widget class="QPushButton" name="shareButton"> <widget class="QPushButton" name="shareButton">
<property name="text"> <property name="text">
@ -320,41 +365,41 @@
</property> </property>
</widget> </widget>
</item> </item>
</layout>
</item>
<item> <item>
<widget class="StyledLabel" name="titleLabel"> <widget class="QToolButton" name="commentButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<family>Arial</family>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text"> <property name="text">
<string notr="true">This is a very very very very loooooooooooooooonnnnnnnnnnnnnnnnng title don't you think? Yes it is and should wrap around I hope</string> <string>Comments</string>
</property> </property>
<property name="alignment"> <property name="icon">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <iconset resource="Posted_images.qrc">
<normaloff>:/images/comments.png</normaloff>:/images/comments.png</iconset>
</property> </property>
<property name="wordWrap"> <property name="checkable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="openExternalLinks"> <property name="toolButtonStyle">
<bool>true</bool> <enum>Qt::ToolButtonTextBesideIcon</enum>
</property> </property>
<property name="textInteractionFlags"> <property name="autoRaise">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item> <item>
<widget class="QLabel" name="notes"> <widget class="QLabel" name="notes">
<property name="text"> <property name="text">
@ -424,6 +469,24 @@
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="spacing">
<number>2</number>
</property>
<property name="sizeConstraint">
<enum>QLayout::SetMaximumSize</enum>
</property>
<property name="leftMargin">
<number>1</number>
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>1</number>
</property>
<property name="bottomMargin">
<number>2</number>
</property>
<item> <item>
<widget class="QLabel" name="pictureLabel_2"> <widget class="QLabel" name="pictureLabel_2">
<property name="sizePolicy"> <property name="sizePolicy">
@ -449,18 +512,6 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<widget class="GxsCommentDialog" name="commentsWidget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>1</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -482,12 +533,6 @@
<extends>QLabel</extends> <extends>QLabel</extends>
<header>util/ClickableLabel.h</header> <header>util/ClickableLabel.h</header>
</customwidget> </customwidget>
<customwidget>
<class>GxsCommentDialog</class>
<extends>QWidget</extends>
<header>gui/gxs/GxsCommentDialog.h</header>
<container>1</container>
</customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="Posted_images.qrc"/> <include location="Posted_images.qrc"/>