Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-17 17:43:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed conflicts with master

Browse source
This commit is contained in:
csoler 2019-12-14 18:27:41 +01:00
commit da6e7f9e9b
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
50 changed files with 1735 additions and 771 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>543</width>
<height>208</height>
<width>565</width>
<height>209</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_1">
@ -41,10 +41,7 @@
<enum>QFrame::Sunken</enum>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="0" rowspan="2">
<item row="0" column="0" rowspan="3">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="AvatarWidget" name="avatar">
@ -122,7 +119,7 @@
</property>
</widget>
</item>
<item row="1" column="1" colspan="4">
<item row="1" column="1" colspan="3">
<widget class="QLabel" name="chatTextlabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@ -150,7 +147,7 @@
</property>
</widget>
</item>
<item row="3" column="0" colspan="5">
<item row="2" column="1" colspan="3">
<widget class="QFrame" name="buttonFrame">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin">
@ -308,7 +305,7 @@
</layout>
</widget>
</item>
<item row="2" column="0" colspan="5">
<item row="3" column="0" colspan="4">
<widget class="QFrame" name="messageFrame">
<layout class="QGridLayout" name="gridLayout_3">
<property name="leftMargin">

4
retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui
View file

@ -347,6 +347,10 @@
<property name="text">
<string>Edit</string>
</property>
<property name="icon">
<iconset resource="../icons.qrc">
<normaloff>:/icons/png/pencil-edit-button.png</normaloff>:/icons/png/pencil-edit-button.png</iconset>
</property>
</widget>
</item>
<item>

32
retroshare-gui/src/gui/feeds/PeerItem.ui
View file

@ -150,22 +150,6 @@
</item>
<item row="1" column="1" colspan="2">
<layout class="QHBoxLayout" name="buttonHLayout">
<item>
<spacer name="buttonHSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>388</width>
<height>21</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QToolButton" name="sendmsgButton">
<property name="focusPolicy">
@ -215,6 +199,22 @@
</property>
</widget>
</item>
<item>
<spacer name="buttonHSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>388</width>
<height>21</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="expandButton">
<property name="sizePolicy">