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

Merge pull request #1070 from RetroPooh/posted-descr

Browse Source 
fix descriptions display in Posted
This commit is contained in:
csoler 2017-10-23 21:07:23 +02:00 committed by GitHub
commit 1d7d53a95a
2 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
retroshare-gui/src/gui/Posted/PostedItem.cpp
View File

@ -104,8 +104,6 @@ void PostedItem::setup()
ui->clearButton->hide();
ui->readAndClearButton->hide();
ui->frame_notes->hide();
}
bool PostedItem::setGroup(const RsPostedGroup &group, bool doFill)
@ -278,11 +276,12 @@ void PostedItem::fill()
// FIX THIS UP LATER.
ui->notes->setText(QString::fromUtf8(mPost.mNotes.c_str()));
if(ui->notes->text().isEmpty())
ui->frame_notes->hide();
// differences between Feed or Top of Comment.
if (mFeedHolder)
{
// feed.
ui->frame_notes->hide();
//frame_comment->show();
ui->commentButton->show();
@ -303,14 +302,6 @@ void PostedItem::fill()
else
{
// no feed.
if(ui->notes->text().isEmpty())
{
ui->frame_notes->hide();
}
else
{
ui->frame_notes->show();
}
//frame_comment->hide();
ui->commentButton->hide();

37
retroshare-gui/src/gui/Posted/PostedItem.ui
View File

@ -60,7 +60,7 @@
</property>
</widget>
</item>
<item>
<item>
<layout class="QHBoxLayout" name="newCommHLayout">
<property name="topMargin">
<number>0</number>
@ -327,30 +327,29 @@
<item>
<widget class="QFrame" name="frame_notes">
<property name="frameShape">
<enum>QFrame::Box</enum>
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<widget class="QLabel" name="notes">
<property name="geometry">
<rect>
<x>2</x>
<y>2</y>
<width>16</width>
<height>17</height>
</rect>
<layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>1</number>
</property>
<property name="styleSheet">
<string notr="true"/>
<property name="spacing">
<number>1</number>
</property>
<property name="text">
<string/>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
<item row="0" column="0">
<widget class="QLabel" name="notes">
<property name="text">
<string/>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>