merge PR, send request from Contacttab

This commit is contained in:
DenioD
2020-05-21 16:00:25 +02:00
parent 5ad5d07c1c
commit c1954633de
5 changed files with 182 additions and 41 deletions

View File

@@ -14,21 +14,21 @@
<string>Send a contact request</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="2">
<item row="0" column="3">
<widget class="QLabel" name="label_6">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;right&quot;&gt;Choose a avatar for your contact :&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="1" column="0">
<item row="1" column="0" colspan="2">
<widget class="QLabel" name="label_3">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please insert a Nickname for your contact :&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="1" column="2">
<item row="1" column="3">
<widget class="QComboBox" name="comboBoxAvatar">
<item>
<property name="text">
@@ -162,44 +162,54 @@
</item>
</widget>
</item>
<item row="2" column="0">
<item row="2" column="0" colspan="2">
<widget class="QLineEdit" name="labelRequest"/>
</item>
<item row="3" column="0">
<item row="3" column="0" colspan="2">
<widget class="QLabel" name="label">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please insert the Address of your contact :&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="4" column="0">
<item row="4" column="0" colspan="2">
<widget class="QLineEdit" name="zaddr"/>
</item>
<item row="5" column="0">
<item row="4" column="2" colspan="2">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Insert a memo for the request</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="2">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Your HushChat Address</string>
</property>
</widget>
</item>
<item row="6" column="0">
<item row="5" column="2" rowspan="4" colspan="2">
<widget class="QTextEdit" name="memorequest"/>
</item>
<item row="6" column="0" colspan="2">
<widget class="QLineEdit" name="myzaddr"/>
</item>
<item row="7" column="0">
<item row="7" column="0" colspan="2">
<widget class="QLabel" name="label_5">
<property name="text">
<string>The Conversation ID </string>
</property>
</widget>
</item>
<item row="8" column="0">
<item row="8" column="0" colspan="2">
<widget class="QLabel" name="cid">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="9" column="1">
<item row="9" column="0">
<widget class="QPushButton" name="cancel">
<property name="baseSize">
<size>
@@ -215,7 +225,36 @@
</property>
</widget>
</item>
<item row="9" column="1">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>278</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="9" column="2">
<widget class="QPushButton" name="onlyAdd">
<property name="baseSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Only add this contact</string>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
</item>
<item row="9" column="3">
<widget class="QPushButton" name="sendRequestButton">
<property name="baseSize">
<size>
@@ -224,7 +263,7 @@
</size>
</property>
<property name="text">
<string>Add Contact</string>
<string>Add Contact &amp; send request</string>
</property>
<property name="flat">
<bool>false</bool>