Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-05 09:35:39 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1416 from pedro-nonfree/patch-1

Browse Source 
remove unnecessary warning
This commit is contained in:
G10h4ck 2018-11-27 18:55:40 +01:00 committed by GitHub
commit 032f1307ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 0 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,11 +143,6 @@ ConnectFriendWizard::ConnectFriendWizard(QWidget *parent) :
ui->trustEdit->hide(); ui->trustEdit->hide();
} }
unsigned int onlineCount = 0, friendCount = 0;
rsPeers->getPeerCount (&friendCount, &onlineCount, false);
if(friendCount<30)
ui->makefriend_infolabel->hide();
//Add warning to direct source checkbox depends general setting. //Add warning to direct source checkbox depends general setting.
switch (rsFiles->filePermDirectDL()) switch (rsFiles->filePermDirectDL())
{ {

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

@ -1031,87 +1031,6 @@
<string notr="true">ConnectFriendWizard::Page_Conclusion</string> <string notr="true">ConnectFriendWizard::Page_Conclusion</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="ConclusionPageVLayout"> <layout class="QVBoxLayout" name="ConclusionPageVLayout">
<item>
<widget class="StyledLabel" name="makefriend_infolabel">
<property name="palette">
<palette>
<active>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>178</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>178</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>178</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>178</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
</property>
<property name="text">
<string>Please note that RetroShare will require excessive amounts of bandwidth, memory and CPU if you add too many friends. You can add as many friends as you like, but more than 40 will probably require too much
resources.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item> <item>
<widget class="StyledLabel" name="cp_Label"> <widget class="StyledLabel" name="cp_Label">
<property name="palette"> <property name="palette">

8
retroshare-gui/src/gui/qss/stylesheet/Standard.qss
View File

@ -313,14 +313,6 @@ ConnectFriendWizard QWizardPage#ConclusionPage > QGroupBox#peerDetailsFrame {
padding: 12 12px; padding: 12 12px;
} }
ConnectFriendWizard QWizardPage#ConclusionPage > QLabel#makefriend_infolabel
{
border: 1px solid #DCDC41;
border-radius: 6px;
background: #FFFFD7;
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2);
}
ConnectFriendWizard QLabel#fr_label, QLabel#requestinfolabel ConnectFriendWizard QLabel#fr_label, QLabel#requestinfolabel
{ {
border: 1px solid #DCDC41; border: 1px solid #DCDC41;

5
retroshare-gui/src/gui/qss/stylesheet/qss.default
View File

@ -109,11 +109,6 @@ ConnectFrientWizard QLabel#requestinfolabel
qproperty-fontSizeFactor: 125; qproperty-fontSizeFactor: 125;
} }
ConnectFriendWizard QLabel#makefriend_infolabel
{
qproperty-fontSizeFactor: 125;
}
ShareManager QLabel#labelInstructions ShareManager QLabel#labelInstructions
{ {
qproperty-fontSizeFactor: 125; qproperty-fontSizeFactor: 125;