Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-29 01:16:20 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2249 from PhenomRetroShare/Fix_AddFriendWizardAdvResize

Browse Source 
Fix AddFriend Wizard Resize when show Advanced options.
This commit is contained in:
defnax 2021-01-25 18:33:53 +01:00 committed by GitHub
commit cb90c70beb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 85 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
View File

@ -1179,6 +1179,7 @@ void ConnectFriendWizard::toggleAdvanced()
{ {
ui->cp_Frame->show(); ui->cp_Frame->show();
ui->toggleadvancedButton->setText("Hide advanced options"); ui->toggleadvancedButton->setText("Hide advanced options");
resize(sizeHint());
AdvancedVisible=true; AdvancedVisible=true;
} }
} }

84
retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
View File

@ -361,6 +361,12 @@
<layout class="QVBoxLayout" name="ConclusionPageVLayout"> <layout class="QVBoxLayout" name="ConclusionPageVLayout">
<item> <item>
<widget class="StyledLabel" name="cp_Label"> <widget class="StyledLabel" name="cp_Label">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="palette"> <property name="palette">
<palette> <palette>
<active> <active>
@ -444,6 +450,12 @@
</item> </item>
<item> <item>
<widget class="QLabel" name="alreadyRegisteredLabel"> <widget class="QLabel" name="alreadyRegisteredLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>This peer is already on your friend list. Adding it might just set it's ip address.</string> <string>This peer is already on your friend list. Adding it might just set it's ip address.</string>
</property> </property>
@ -466,6 +478,12 @@
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="trustLabel"> <widget class="QLabel" name="trustLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>Key validity:</string> <string>Key validity:</string>
</property> </property>
@ -473,6 +491,12 @@
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLabel" name="trustEdit"> <widget class="QLabel" name="trustEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string notr="true">Trust level</string> <string notr="true">Trust level</string>
</property> </property>
@ -480,6 +504,12 @@
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="nameLabel"> <widget class="QLabel" name="nameLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>Name:</string> <string>Name:</string>
</property> </property>
@ -487,6 +517,12 @@
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QLabel" name="nameEdit"> <widget class="QLabel" name="nameEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string notr="true">Name</string> <string notr="true">Name</string>
</property> </property>
@ -494,6 +530,12 @@
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QLabel" name="profileIdLabel"> <widget class="QLabel" name="profileIdLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>Profile ID:</string> <string>Profile ID:</string>
</property> </property>
@ -501,6 +543,12 @@
</item> </item>
<item row="3" column="1"> <item row="3" column="1">
<widget class="QLabel" name="profileIdEdit"> <widget class="QLabel" name="profileIdEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string notr="true">Email</string> <string notr="true">Email</string>
</property> </property>
@ -508,6 +556,12 @@
</item> </item>
<item row="4" column="0"> <item row="4" column="0">
<widget class="QLabel" name="nodeLabel"> <widget class="QLabel" name="nodeLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>Location:</string> <string>Location:</string>
</property> </property>
@ -515,6 +569,12 @@
</item> </item>
<item row="4" column="1"> <item row="4" column="1">
<widget class="QLabel" name="nodeEdit"> <widget class="QLabel" name="nodeEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string notr="true">Location</string> <string notr="true">Location</string>
</property> </property>
@ -522,6 +582,12 @@
</item> </item>
<item row="6" column="0"> <item row="6" column="0">
<widget class="QLabel" name="signersLabel"> <widget class="QLabel" name="signersLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>Signers</string> <string>Signers</string>
</property> </property>
@ -529,6 +595,12 @@
</item> </item>
<item row="6" column="1"> <item row="6" column="1">
<widget class="QPlainTextEdit" name="signersEdit"> <widget class="QPlainTextEdit" name="signersEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend's key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend's key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
@ -539,6 +611,12 @@
</item> </item>
<item row="5" column="0"> <item row="5" column="0">
<widget class="QLabel" name="ipLabel"> <widget class="QLabel" name="ipLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>IP-Addr:</string> <string>IP-Addr:</string>
</property> </property>
@ -546,6 +624,12 @@
</item> </item>
<item row="5" column="1"> <item row="5" column="1">
<widget class="QLabel" name="ipEdit"> <widget class="QLabel" name="ipEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>IP-Address</string> <string>IP-Address</string>
</property> </property>