Commit 6a77873b authored by Joris Guisson's avatar Joris Guisson
Browse files

Merged rev 785875 from trunk (speed settings sync bug, 159039)


svn path=/branches/ktorrent/3.0/; revision=785876
parent f8cba825
......@@ -17,6 +17,8 @@ this makes sure that it is sized properly when you open the dialog
- Fix keep seeding (159040)
- Make sure settings of logviewer plugin are applied at startup
- Make sure that views stay sorted (158975)
- Make sure speed settings are kept in sync between all the places where you
can change them (159039)
Changes in 3.O :
- Fix sorting of upload and download rate (157939)
......
......@@ -352,7 +352,7 @@ namespace kt
if (!pref_dlg)
pref_dlg = new PrefDialog(this,core);
pref_dlg->show();
pref_dlg->updateWidgetsAndShow();
}
void GUI::showStatusBar()
......
......@@ -22,9 +22,12 @@
#include <QNetworkInterface>
#include <solid/device.h>
#include <solid/networkinterface.h>
#include <util/log.h>
#include "networkpref.h"
#include "settings.h"
using namespace bt;
namespace kt
{
......@@ -41,6 +44,9 @@ namespace kt
void NetworkPref::loadSettings()
{
kcfg_maxDownloadRate->setValue(Settings::maxDownloadRate());
kcfg_maxUploadRate->setValue(Settings::maxUploadRate());
kcfg_httpTrackerProxy->setEnabled(Settings::doNotUseKDEProxy());
kcfg_networkInterface->addItem(KIcon("network-wired"),i18n("All interfaces"));
......
......@@ -154,6 +154,12 @@ namespace kt
pages.remove(page);
}
}
void PrefDialog::updateWidgetsAndShow()
{
updateWidgets();
show();
}
void PrefDialog::updateWidgets()
{
......
......@@ -53,6 +53,11 @@ namespace kt
* @param page The page
* */
void removePrefPage(PrefPageInterface* page);
/**
* Update the widgets and show
*/
void updateWidgetsAndShow();
protected:
virtual void updateWidgets();
......
......@@ -298,7 +298,9 @@ namespace kt
type=t;
makeMenu();
connect(this,SIGNAL(triggered(QAction*)),this,SLOT(onTriggered(QAction* )));
connect(this,SIGNAL(aboutToShow()),this,SLOT(update()));
}
SetMaxRate::~SetMaxRate()
{}
......
......@@ -131,7 +131,9 @@ namespace kt
SetMaxRate(Core* tc, Type t, QWidget *parent);
virtual ~SetMaxRate();
public slots:
void update();
private:
void makeMenu();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment