Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

associated changes for the GUI. move all datarate reference to use rsConfig.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5890 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-11-25 20:26:32 +00:00
parent de80f2aa3e
commit 4561752c45
5 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/MainWindow.cpp
View File

@ -580,7 +580,7 @@ void MainWindow::updateStatus()
float downKb = 0; float downKb = 0;
float upKb = 0; float upKb = 0;
rsicontrol -> ConfigGetDataRates(downKb, upKb); rsConfig->GetCurrentDataRates(downKb, upKb);
if (ratesstatus) if (ratesstatus)
ratesstatus->getRatesStatus(downKb, upKb); ratesstatus->getRatesStatus(downKb, upKb);

16
retroshare-gui/src/gui/QuickStartWizard.cpp
View File

@ -29,7 +29,7 @@
#include <QHeaderView> #include <QHeaderView>
#include <retroshare/rsfiles.h> #include <retroshare/rsfiles.h>
#include <retroshare/rsiface.h> #include <retroshare/rsconfig.h>
#include <retroshare/rspeers.h> #include <retroshare/rspeers.h>
#include <retroshare/rstypes.h> #include <retroshare/rstypes.h>
#include "settings/rsharesettings.h" #include "settings/rsharesettings.h"
@ -149,7 +149,7 @@ void QuickStartWizard::on_pushButtonConnectionNext_clicked()
{ {
rsPeers->setVisState(rsPeers->getOwnId(), visState); rsPeers->setVisState(rsPeers->getOwnId(), visState);
} }
rsicontrol->ConfigSetDataRates( ui.doubleSpinBoxDownloadSpeed->value(), ui.doubleSpinBoxUploadSpeed->value() ); rsConfig->SetMaxDataRates( ui.doubleSpinBoxDownloadSpeed->value(), ui.doubleSpinBoxUploadSpeed->value() );
ui.pagesWizard->setCurrentIndex(2); ui.pagesWizard->setCurrentIndex(2);
} }
@ -450,12 +450,12 @@ void QuickStartWizard::loadNetwork()
ui.discoveryComboBox->setCurrentIndex(netIndex); ui.discoveryComboBox->setCurrentIndex(netIndex);
rsiface->lockData(); /* Lock Interface */ int dlrate = 0;
int ulrate = 0;
rsConfig->GetMaxDataRates(dlrate, ulrate);
ui.doubleSpinBoxDownloadSpeed->setValue(dlrate);
ui.doubleSpinBoxUploadSpeed->setValue(ulrate);
ui.doubleSpinBoxDownloadSpeed->setValue(rsiface->getConfig().maxDownloadDataRate);
ui.doubleSpinBoxUploadSpeed->setValue(rsiface->getConfig().maxUploadDataRate);
rsiface->unlockData(); /* UnLock Interface */
} }
void QuickStartWizard::saveChanges() void QuickStartWizard::saveChanges()
@ -528,7 +528,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());
}*/ }*/
rsicontrol->ConfigSetDataRates( ui.doubleSpinBoxDownloadSpeed->value(), ui.doubleSpinBoxUploadSpeed->value() ); rsConfig->SetMaxDataRates( ui.doubleSpinBoxDownloadSpeed->value(), ui.doubleSpinBoxUploadSpeed->value() );
loadNetwork(); loadNetwork();
} }

6
retroshare-gui/src/gui/bwgraph/bwgraph.cpp
View File

@ -25,7 +25,7 @@
#include <control/bandwidthevent.h> #include <control/bandwidthevent.h>
#include "bwgraph.h" #include "bwgraph.h"
#include <retroshare-gui/RsAutoUpdatePage.h> #include <retroshare-gui/RsAutoUpdatePage.h>
#include <retroshare/rsiface.h> #include <retroshare/rsconfig.h>
#include <iomanip> #include <iomanip>
#include <unistd.h> #include <unistd.h>
@ -110,7 +110,7 @@ BandwidthGraph::timerEvent( QTimerEvent * )
/* set users/friends/network */ /* set users/friends/network */
/*float downKb = 0; /*float downKb = 0;
float upKb = 0; float upKb = 0;
rsicontrol -> ConfigGetDataRates(downKb, upKb); rsConfig->GetCurrentDataRates(downKb, upKb);
updateGraph(downKb,upKb);*/ updateGraph(downKb,upKb);*/
@ -125,7 +125,7 @@ BandwidthGraph::updategraphstatus( )
/* set users/friends/network */ /* set users/friends/network */
float downKb = 0; float downKb = 0;
float upKb = 0; float upKb = 0;
rsicontrol -> ConfigGetDataRates(downKb, upKb); rsConfig->GetCurrentDataRates(downKb, upKb);
updateGraph(downKb,upKb); updateGraph(downKb,upKb);

17
retroshare-gui/src/gui/settings/ServerPage.cpp
View File

@ -27,7 +27,7 @@
#include <iostream> #include <iostream>
#include <retroshare/rsiface.h> #include <retroshare/rsconfig.h>
#include <retroshare/rspeers.h> #include <retroshare/rspeers.h>
#include <retroshare/rsturtle.h> #include <retroshare/rsturtle.h>
@ -170,13 +170,11 @@ void ServerPage::load()
ui.discComboBox->setCurrentIndex(netIndex); ui.discComboBox->setCurrentIndex(netIndex);
rsiface->lockData(); /* Lock Interface */ int dlrate = 0;
int ulrate = 0;
ui.totalDownloadRate->setValue(rsiface->getConfig().maxDownloadDataRate); rsConfig->GetMaxDataRates(dlrate, ulrate);
ui.totalUploadRate->setValue(rsiface->getConfig().maxUploadDataRate); ui.totalDownloadRate->setValue(dlrate);
ui.totalUploadRate->setValue(ulrate);
rsiface->unlockData(); /* UnLock Interface */
toggleUPnP(); toggleUPnP();
@ -317,8 +315,7 @@ void ServerPage::saveAddresses()
} }
rsPeers->setDynDNS(ownId, ui.dynDNS->text().toStdString()); rsPeers->setDynDNS(ownId, ui.dynDNS->text().toStdString());
rsConfig->SetMaxDataRates( ui.totalDownloadRate->value(), ui.totalUploadRate->value() );
rsicontrol->ConfigSetDataRates( ui.totalDownloadRate->value(), ui.totalUploadRate->value() );
load(); load();
} }

4
retroshare-gui/src/gui/unfinished/StatisticDialog.cpp
View File

@ -23,7 +23,7 @@
#include "StatisticDialog.h" #include "StatisticDialog.h"
#include <control/bandwidthevent.h> #include <control/bandwidthevent.h>
#include <retroshare/rsiface.h> #include <retroshare/rsconfig.h>
#include <QTime> #include <QTime>
#include <QHeaderView> #include <QHeaderView>
@ -121,7 +121,7 @@ void StatisticDialog::timerEvent( QTimerEvent * )
/* set users/friends/network */ /* set users/friends/network */
float downKb = 0; float downKb = 0;
float upKb = 0; float upKb = 0;
rsicontrol -> ConfigGetDataRates(downKb, upKb); rsConfig->GetCurrentDataRates(downKb, upKb);
updateGraph(downKb,upKb); updateGraph(downKb,upKb);
// //