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

Fixed layout problem (vertical scrollbar) in ChannelFeed.

Browse Source 
Indent text of the channel message and set it to selectable.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4406 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2011-07-07 22:01:30 +00:00
parent d64b714982
commit 5e0e244b8a
3 changed files with 70 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
retroshare-gui/src/gui/ChannelFeed.ui
View File

@ -524,24 +524,6 @@ border-image: url(:/images/btn_26_pressed.png) 4;
</widget>
</item>
<item row="1" column="0">
<widget class="QFrame" name="msgFrame">
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_8">
<property name="margin">
<number>0</number>
</property>
<property name="spacing">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable">
<bool>true</bool>
@ -554,8 +536,8 @@ border-image: url(:/images/btn_26_pressed.png) 4;
<rect>
<x>0</x>
<y>0</y>
<width>484</width>
<height>331</height>
<width>486</width>
<height>333</height>
</rect>
</property>
<property name="styleSheet">
@ -576,10 +558,13 @@ border-image: url(:/images/btn_26_pressed.png) 4;
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>391</width>
<height>266</height>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
@ -590,9 +575,6 @@ border-image: url(:/images/btn_26_pressed.png) 4;
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
</layout>

2
retroshare-gui/src/gui/feeds/ChanMsgItem.cpp
View File

@ -163,7 +163,7 @@ void ChanMsgItem::updateItemStatic()
}
msgLabel->setText(QString::fromStdWString(cmi.msg));
msgLabel->setVisible(!cmi.msg.empty());
msgWidget->setVisible(!cmi.msg.empty());
QDateTime qtime;
qtime.setTime_t(cmi.ts);

39
retroshare-gui/src/gui/feeds/ChanMsgItem.ui
View File

@ -97,22 +97,6 @@ border-radius: 10px;}</string>
</property>
</widget>
</item>
<item row="1" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>138</width>
<height>1</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="0" column="1">
@ -456,6 +440,16 @@ border-radius: 10px;}</string>
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout">
<item>
<widget class="QWidget" name="msgWidget" native="true">
<property name="styleSheet">
<string notr="true">QWidget#msgWidget{border: 2px solid #238;
border-radius: 10px;}</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">
<number>5</number>
</property>
<item>
<widget class="QLabel" name="msgLabel">
<property name="sizePolicy">
@ -469,16 +463,15 @@ border-radius: 10px;}</string>
<stylestrategy>PreferAntialias</stylestrategy>
</font>
</property>
<property name="styleSheet">
<string notr="true">QLabel#msgLabel{border: 2px solid #238;
border-radius: 10px;}</string>
</property>
<property name="text">
<string notr="true"/>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>