Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-30 01:38:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replaced scroll area in NewsFeed with RSFeedWidget.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7680 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-11-15 17:24:49 +00:00
parent dcabaf780d
commit dee39a8840
20 changed files with 477 additions and 290 deletions
Download patch file Download diff file Expand all files Collapse all files

101
retroshare-gui/src/gui/feeds/ChatMsgItem.ui
View file

@ -11,8 +11,17 @@
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_1">
<property name="margin">
<number>0</number>
<property name="leftMargin">
<number>1</number>
</property>
<property name="topMargin">
<number>1</number>
</property>
<property name="rightMargin">
<number>1</number>
</property>
<property name="bottomMargin">
<number>1</number>
</property>
<item row="0" column="0">
<widget class="QFrame" name="frame">
@ -204,32 +213,22 @@
</property>
</widget>
</item>
<item row="2" column="0" colspan="5">
<widget class="QFrame" name="frame_2">
<layout class="QGridLayout" name="gridLayout_4">
<property name="margin">
<item row="3" column="0" colspan="5">
<widget class="QFrame" name="buttonFrame">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<item row="0" column="0" colspan="6">
<widget class="QFrame" name="messageFrame">
<layout class="QGridLayout" name="gridLayout_3">
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0" colspan="2">
<widget class="QTextEdit" name="quickmsgText">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>115</height>
</size>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QToolButton" name="quickmsgButton">
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
@ -252,7 +251,7 @@
</property>
</widget>
</item>
<item row="1" column="1">
<item>
<widget class="QToolButton" name="msgButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@ -281,7 +280,7 @@
</property>
</widget>
</item>
<item row="1" column="2">
<item>
<widget class="QToolButton" name="chatButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@ -313,7 +312,7 @@
</property>
</widget>
</item>
<item row="1" column="3">
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@ -326,7 +325,17 @@
</property>
</spacer>
</item>
<item row="1" column="5">
<item>
<widget class="QPushButton" name="cancelButton">
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>Cancel</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="sendButton">
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
@ -339,13 +348,31 @@
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QPushButton" name="cancelButton">
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>Cancel</string>
</layout>
</widget>
</item>
<item row="2" column="0" colspan="5">
<widget class="QFrame" name="messageFrame">
<layout class="QGridLayout" name="gridLayout_3">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0" colspan="2">
<widget class="QTextEdit" name="quickmsgText">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>115</height>
</size>
</property>
</widget>
</item>