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

Merge 9178bc53ef into 6f33dcc8e7

Browse source
This commit is contained in:
PhenomRetroShare 2025-12-06 15:40:23 +01:00 • committed by GitHub
commit 91605ba89b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 115 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
retroshare-gui/src/gui/MainWindow.cpp
View file

@ -1599,6 +1599,9 @@ void MainWindow::setStatus(QObject *pObject, RsStatusValue nStatus)
setStatusObject(*it, nStatus); setStatusObject(*it, nStatus);
} }
} }
rsConfig->setIsIdle(isIdle);
rsConfig->setOperatingMode(rsConfig->getOperatingMode());
} }
/* new status from context menu */ /* new status from context menu */

8
retroshare-gui/src/gui/QuickStartWizard.cpp
View file

@ -160,7 +160,7 @@ void QuickStartWizard::on_pushButtonConnectionNext_clicked()
rsPeers->setVisState(rsPeers->getOwnId(), vs_disc, vs_dht); rsPeers->setVisState(rsPeers->getOwnId(), vs_disc, vs_dht);
} }
rsConfig->SetMaxDataRates( ui.doubleSpinBoxDownloadSpeed->value(), ui.doubleSpinBoxUploadSpeed->value() ); rsConfig->setMaxDataRates( ui.doubleSpinBoxDownloadSpeed->value(), ui.doubleSpinBoxUploadSpeed->value(), ui.doubleSpinBoxDownloadSpeed->value(), ui.doubleSpinBoxUploadSpeed->value() );
ui.pagesWizard->setCurrentIndex(2); ui.pagesWizard->setCurrentIndex(2);
} }
@ -489,7 +489,9 @@ void QuickStartWizard::loadNetwork()
int dlrate = 0; int dlrate = 0;
int ulrate = 0; int ulrate = 0;
rsConfig->GetMaxDataRates(dlrate, ulrate); int dlratewi = 0;
int ulratewi = 0;
rsConfig->getMaxDataRates(dlrate, ulrate, dlratewi, ulratewi);
ui.doubleSpinBoxDownloadSpeed->setValue(dlrate); ui.doubleSpinBoxDownloadSpeed->setValue(dlrate);
ui.doubleSpinBoxUploadSpeed->setValue(ulrate); ui.doubleSpinBoxUploadSpeed->setValue(ulrate);
@ -575,7 +577,7 @@ void QuickStartWizard::saveChanges()
rsPeers->setExtAddress(rsPeers->getOwnId(), ui.extAddress->text().toStdString(), ui.extPort->value()); rsPeers->setExtAddress(rsPeers->getOwnId(), ui.extAddress->text().toStdString(), ui.extPort->value());
}*/ }*/
rsConfig->SetMaxDataRates( ui.doubleSpinBoxDownloadSpeed->value(), ui.doubleSpinBoxUploadSpeed->value() ); rsConfig->setMaxDataRates( ui.doubleSpinBoxDownloadSpeed->value(), ui.doubleSpinBoxUploadSpeed->value(), ui.doubleSpinBoxDownloadSpeed->value(), ui.doubleSpinBoxUploadSpeed->value() );
loadNetwork(); loadNetwork();
} }

24
retroshare-gui/src/gui/settings/ServerPage.cpp
View file

@ -228,6 +228,8 @@ ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags)
connect(ui.totalDownloadRate,SIGNAL(valueChanged(int)),this,SLOT(saveRates())); connect(ui.totalDownloadRate,SIGNAL(valueChanged(int)),this,SLOT(saveRates()));
connect(ui.totalUploadRate, SIGNAL(valueChanged(int)),this,SLOT(saveRates())); connect(ui.totalUploadRate, SIGNAL(valueChanged(int)),this,SLOT(saveRates()));
connect(ui.totalDownloadRateWhenIdle,SIGNAL(valueChanged(int)),this,SLOT(saveRates()));
connect(ui.totalUploadRateWhenIdle, SIGNAL(valueChanged(int)),this,SLOT(saveRates()));
//Relay Tab //Relay Tab
QObject::connect(ui.noFriendSpinBox,SIGNAL(valueChanged(int)),this,SLOT(updateRelayOptions())); QObject::connect(ui.noFriendSpinBox,SIGNAL(valueChanged(int)),this,SLOT(updateRelayOptions()));
@ -457,9 +459,13 @@ void ServerPage::load()
int dlrate = 0; int dlrate = 0;
int ulrate = 0; int ulrate = 0;
rsConfig->GetMaxDataRates(dlrate, ulrate); int dlratewi = 0;
int ulratewi = 0;
rsConfig->getMaxDataRates(dlrate, ulrate, dlratewi, ulratewi);
whileBlocking(ui.totalDownloadRate)->setValue(dlrate); whileBlocking(ui.totalDownloadRate)->setValue(dlrate);
whileBlocking(ui.totalUploadRate)->setValue(ulrate); whileBlocking(ui.totalUploadRate)->setValue(ulrate);
whileBlocking(ui.totalDownloadRateWhenIdle)->setValue(dlratewi);
whileBlocking(ui.totalUploadRateWhenIdle)->setValue(ulratewi);
toggleUPnP(); toggleUPnP();
@ -1085,7 +1091,10 @@ void ServerPage::saveAddresses()
void ServerPage::saveRates() void ServerPage::saveRates()
{ {
rsConfig->SetMaxDataRates( ui.totalDownloadRate->value(), ui.totalUploadRate->value() ); rsConfig->setMaxDataRates( ui.totalDownloadRate->value()
, ui.totalUploadRate->value()
, ui.totalDownloadRateWhenIdle->value()
, ui.totalUploadRateWhenIdle->value());
} }
void ServerPage::tabChanged(int page) void ServerPage::tabChanged(int page)
@ -1171,9 +1180,13 @@ void ServerPage::loadHiddenNode()
// Download Rates - Stay the same as before. // Download Rates - Stay the same as before.
int dlrate = 0; int dlrate = 0;
int ulrate = 0; int ulrate = 0;
rsConfig->GetMaxDataRates(dlrate, ulrate); int dlratewi = 0;
int ulratewi = 0;
rsConfig->getMaxDataRates(dlrate, ulrate, dlratewi, ulratewi);
whileBlocking(ui.totalDownloadRate)->setValue(dlrate); whileBlocking(ui.totalDownloadRate)->setValue(dlrate);
whileBlocking(ui.totalUploadRate)->setValue(ulrate); whileBlocking(ui.totalUploadRate)->setValue(ulrate);
whileBlocking(ui.totalDownloadRateWhenIdle)->setValue(dlratewi);
whileBlocking(ui.totalUploadRateWhenIdle)->setValue(ulratewi);
// Addresses. // Addresses.
ui.localAddress->setEnabled(false); ui.localAddress->setEnabled(false);
@ -1365,7 +1378,10 @@ void ServerPage::saveAddressesHiddenNode()
rsPeers->setHiddenNode(ownId, hiddenAddr, hiddenPort); rsPeers->setHiddenNode(ownId, hiddenAddr, hiddenPort);
} }
rsConfig->SetMaxDataRates( ui.totalDownloadRate->value(), ui.totalUploadRate->value() ); rsConfig->setMaxDataRates( ui.totalDownloadRate->value()
, ui.totalUploadRate->value()
, ui.totalDownloadRateWhenIdle->value()
, ui.totalUploadRateWhenIdle->value() );
load(); load();
} }

85
retroshare-gui/src/gui/settings/ServerPage.ui
View file

@ -90,7 +90,7 @@
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>Download limit (KB/s) </string> <string>Download limit when active (KB/s) </string>
</property> </property>
</widget> </widget>
</item> </item>
@ -103,7 +103,33 @@
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>Upload limit (KB/s) </string> <string>Upload limit when active (KB/s) </string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_totalDownloadRateWhenIdle">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>Download limit when idle (KB/s) </string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_totalUploadRateWhenIdle">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>Upload limit when idle (KB/s) </string>
</property> </property>
</widget> </widget>
</item> </item>
@ -139,6 +165,31 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0">
<widget class="QSpinBox" name="totalDownloadRateWhenIdle">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This download limit covers the whole application. However, in some situations, such as when transfering many small files at once, the estimated bandwidth becomes unreliable and the total value reported by Retroshare might exceed that limit. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="suffix">
<string>kB/s</string>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>100000</number>
</property>
<property name="value">
<number>1</number>
</property>
</widget>
</item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLineEdit" name="localAddress"/> <widget class="QLineEdit" name="localAddress"/>
</item> </item>
@ -361,6 +412,34 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="0">
<widget class="QSpinBox" name="totalUploadRateWhenIdle">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="suffix">
<string>kB/s</string>
</property>
<property name="prefix">
<string/>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>100000</number>
</property>
<property name="value">
<number>1</number>
</property>
</widget>
</item>
<item row="1" column="3"> <item row="1" column="3">
<layout class="QGridLayout" name="gLayout_upnp"> <layout class="QGridLayout" name="gLayout_upnp">
<property name="leftMargin"> <property name="leftMargin">
@ -451,7 +530,7 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="5" column="1" rowspan="2" colspan="3"> <item row="5" column="1" rowspan="4" colspan="3">
<widget class="QLabel" name="info_warningBandwidth"> <widget class="QLabel" name="info_warningBandwidth">
<property name="palette"> <property name="palette">
<palette> <palette>