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

Enabled to display the Notes text on the Post Item

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7011 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2014-01-12 14:53:57 +00:00
parent c869fd863d
commit ff8e30db55
3 changed files with 55 additions and 8 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

@ -103,12 +103,12 @@ void PostedItem::setContent(const RsPostedPost &post)
scoreLabel->setText(score); scoreLabel->setText(score);
// FIX THIS UP LATER. // FIX THIS UP LATER.
//notes->setPlainText(QString::fromUtf8(post.mNotes.c_str())); notes->setText(QString::fromUtf8(post.mNotes.c_str()));
// differences between Feed or Top of Comment. // differences between Feed or Top of Comment.
if (mParent) if (mParent)
{ {
// feed. // feed.
//frame_notes->hide(); frame_notes->hide();
//frame_comment->show(); //frame_comment->show();
commentButton->show(); commentButton->show();
@ -127,7 +127,14 @@ void PostedItem::setContent(const RsPostedPost &post)
else else
{ {
// no feed. // no feed.
//frame_notes->show(); if(notes->text().isEmpty())
{
frame_notes->hide();
}
else
{
frame_notes->show();
}
//frame_comment->hide(); //frame_comment->hide();
commentButton->hide(); commentButton->hide();
} }

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

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>667</width> <width>667</width>
<height>119</height> <height>156</height>
</rect> </rect>
</property> </property>
<property name="font"> <property name="font">
@ -34,10 +34,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QFrame#frame{border: 2px solid #CCCCCC; <string notr="true"/>
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #EEEEEE, stop: 1 #CCCCCC);
border-radius: 10px}</string>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
@ -48,6 +45,9 @@ border-radius: 10px}</string>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" rowspan="2"> <item row="0" column="0" rowspan="2">
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
</property>
<item> <item>
<widget class="QToolButton" name="voteUpButton"> <widget class="QToolButton" name="voteUpButton">
<property name="minimumSize"> <property name="minimumSize">
@ -280,6 +280,34 @@ border-radius: 10px}</string>
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<widget class="QFrame" name="frame_notes">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<property name="margin">
<number>1</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="notes">
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string/>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>

12
retroshare-gui/src/gui/qss/stylesheet/Standard.qss
View File

@ -540,6 +540,7 @@ MessageWidget QFrame#decryptFrame {
background: #CCFFCC; background: #CCFFCC;
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #CCFFCC, stop:1 #AAFFAA); background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #CCFFCC, stop:1 #AAFFAA);
} }
/* Posted Links */ /* Posted Links */
PostedCreatePostDialog QLabel#info_label { PostedCreatePostDialog QLabel#info_label {
@ -548,3 +549,14 @@ PostedCreatePostDialog QLabel#info_label {
background: #FFFFD7; background: #FFFFD7;
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2); background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2);
} }
PostedItem QFrame#frame {
border: 2px solid #CCCCCC;
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #EEEEEE, stop: 1 #CCCCCC);
border-radius: 10px
}
PostedItem QLabel#notes {
border: 2px solid #CCCCCC;
border-radius: 10px
}