Hi solitone,
sorry for the late reply. First let me thank you for investigating on
that problem. Looks like you solved it.
Concerning the password: Imho it's a better practice to ask for the
login once each session and to keep the provided information in RAM.
Thus you will be asked for login only once every QLGT startup. I
wouldn't store that stuff in a registry or any other config file. Can
you change that? It's removing the setup from the config dialog and to
use QInputDialog::getText() if there is no login and password yet defined.
And please use the command "svn diff > patch.txt" and send the resulting
patch.txt That's much easier to handle for me and you :)
Oliver
> solitone ha scritto:
>> The only thing missing is setting up proxy authentication data from the
>> GUI--and not by manually editing the registry. I'm not a C++ / GT
>> programmer, so it'll presumably take me some time.
>
> I've done also this last thing, adding a couple of LineEdits in the
> proxy configuration widget for user and password fields.
>
>> I would share the changes I made to the code. I know there's a diff tool
>> that would be helpful, but I have to refresh my memory on how to take
>> advantage of it.
>
> Here's the diff output. Please consider I'm not sure whether my changes
> have an impact on locale translations..
>
>
> diff --git "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CCreateMapWMS.cpp"
> b/./CCreateMapWMS.cpp
> index eaa284b..94bc2c5 100644
> --- "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CCreateMapWMS.cpp"
> +++ b/./CCreateMapWMS.cpp
> @@ -24,7 +24,7 @@
> #include "CMainWindow.h"
>
> #include <QtGui>
> -#include <QtNetwork/QHttp>
> +#include <QtNetwork>
> #include <QtXml/QDomDocument>
> #include <projects.h>
>
> @@ -70,6 +70,8 @@ void CCreateMapWMS::slotSetupLink()
> if(enableProxy)
> {
> server->setProxy(url,port);
> + connect(server, SIGNAL(proxyAuthenticationRequired(const
> QNetworkProxy&, QAuthenticator*)),
> + this,
> SLOT(slotProxyAuthenticationRequired(const QNetworkProxy&,
> QAuthenticator*)));
> }
>
>
> connect(server,SIGNAL(requestStarted(int)),this,SLOT(slotRequestStarted(int)));
> @@ -248,6 +250,18 @@ void CCreateMapWMS::slotRequestFinished(int , bool
> error)
> }
>
>
> +void CCreateMapWMS::slotProxyAuthenticationRequired(const QNetworkProxy
> &prox, QAuthenticator *auth)
> +{
> + QString user;
> + QString pwd;
> +
> + CResources::self().getHttpProxyAuth(user,pwd);
> +
> + auth->setUser(user);
> + auth->setPassword(pwd);
> +}
> +
> +
> void CCreateMapWMS::slotSave()
> {
> QDomDocument dom;
> diff --git "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CCreateMapWMS.h"
> b/./CCreateMapWMS.h
> index 21cc9e5..5574573 100644
> --- "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CCreateMapWMS.h"
> +++ b/./CCreateMapWMS.h
> @@ -21,6 +21,7 @@
> #define CCREATEMAPWMS_H
>
> #include <QWidget>
> +#include <QtNetwortk>
> #include "ui_ICreateMapWMS.h"
>
> class QHttp;
> @@ -37,6 +38,7 @@ class CCreateMapWMS : public QWidget, private
> Ui::ICreateMapWMS
> void slotSetupLink();
> void slotRequestStarted(int );
> void slotRequestFinished(int , bool error);
> + void slotProxyAuthenticationRequired(const QNetworkProxy&,
> QAuthenticator*);
> void slotSave();
> void slotSelectFile();
>
> diff --git "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CDlgConfig.cpp"
> b/./CDlgConfig.cpp
> index 5b86c61..34e0bfc 100644
> --- "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CDlgConfig.cpp"
> +++ b/./CDlgConfig.cpp
> @@ -67,6 +67,8 @@ void CDlgConfig::exec()
> checkProxy->setChecked(resources.m_useHttpProxy);
> lineProxyURL->setText(resources.m_httpProxy);
> lineProxyPort->setText(QString("%1").arg(resources.m_httpProxyPort));
> + lineProxyUser->setText(resources.m_httpProxyUser);
> + lineProxyPwd->setText(resources.m_httpProxyPwd);
>
> labelFont->setFont(resources.m_mapfont);
> if(resources.unit->type == "metric")
> @@ -160,6 +162,8 @@ void CDlgConfig::accept()
> resources.m_useHttpProxy = checkProxy->isChecked();
> resources.m_httpProxy = lineProxyURL->text();
> resources.m_httpProxyPort = lineProxyPort->text().toUInt();
> + resources.m_httpProxyUser = lineProxyUser->text();
> + resources.m_httpProxyPwd = lineProxyPwd->text();
>
> if(resources.m_useHttpProxy)
>
> QNetworkProxy::setApplicationProxy(QNetworkProxy(QNetworkProxy::HttpProxy,resources.m_httpProxy,resources.m_httpProxyPort));
> diff --git "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CDlgMapWmsConfig.cpp"
> b/./CDlgMapWmsConfig.cpp
> index 5bf41d3..7e21aa9 100644
> --- "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CDlgMapWmsConfig.cpp"
> +++ b/./CDlgMapWmsConfig.cpp
> @@ -20,6 +20,7 @@
> #include "CDlgMapWmsConfig.h"
> #include "CMapWms.h"
> #include "CMapDB.h"
> +#include "CResources.h"
>
> #include <QtGui>
> #include <QtXml>
> @@ -145,7 +146,10 @@ CDlgMapWmsConfig::CDlgMapWmsConfig(CMapWms &map)
>
> accessManager = new QNetworkAccessManager(this);
> accessManager->setProxy(QNetworkProxy(QNetworkProxy::DefaultProxy));
> +
>
> connect(accessManager,SIGNAL(finished(QNetworkReply*)),this,SLOT(slotRequestFinished(QNetworkReply*)));
> + connect(accessManager, SIGNAL(proxyAuthenticationRequired(const
> QNetworkProxy&, QAuthenticator*)),
> + this, SLOT(slotProxyAuthenticationRequired(const
> QNetworkProxy&,
> QAuthenticator*)));
>
> QNetworkRequest request;
> QUrl url(map.urlstr);
> @@ -293,3 +297,15 @@ void
> CDlgMapWmsConfig::slotRequestFinished(QNetworkReply* reply)
> textCapabilities->setPlainText(dom.toString());
> }
> }
> +
> +
> +void CDlgMapWmsConfig::slotProxyAuthenticationRequired(const
> QNetworkProxy &prox, QAuthenticator *auth)
> +{
> + QString user;
> + QString pwd;
> +
> + CResources::self().getHttpProxyAuth(user,pwd);
> +
> + auth->setUser(user);
> + auth->setPassword(pwd);
> +}
> diff --git "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CDlgMapWmsConfig.h"
> b/./CDlgMapWmsConfig.h
> index 3af6843..c1c7016 100644
> --- "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CDlgMapWmsConfig.h"
> +++ b/./CDlgMapWmsConfig.h
> @@ -21,7 +21,7 @@
> #define CDLGMAPWMSCONFIG_H
>
> #include <QDialog>
> -
> +#include <QtNetwork>
> #include "ui_IDlgMapWmsConfig.h"
>
> class CMapWms;
> @@ -41,6 +41,7 @@ class CDlgMapWmsConfig : public QDialog, private
> Ui::IDlgMapWmsConfig
>
> private slots:
> void slotRequestFinished(QNetworkReply* reply);
> + void slotProxyAuthenticationRequired(const QNetworkProxy&,
> QAuthenticator*);
>
> private:
> void updateEntry(QDomDocument& dom, QTreeWidgetItem* item,
> QDomElement& elem, const QString& tag);
> diff --git "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CMapTms.cpp"
> b/./CMapTms.cpp
> index e8584bc..9925fe8 100644
> --- "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CMapTms.cpp"
> +++ b/./CMapTms.cpp
> @@ -85,7 +85,10 @@ CMapTms::CMapTms(const QString& key, CCanvas *parent)
>
> accessManager = new QNetworkAccessManager(this);
> accessManager->setProxy(QNetworkProxy(QNetworkProxy::DefaultProxy));
> +
>
> connect(accessManager,SIGNAL(finished(QNetworkReply*)),this,SLOT(slotRequestFinished(QNetworkReply*)));
> + connect(accessManager, SIGNAL(proxyAuthenticationRequired(const
> QNetworkProxy&, QAuthenticator*)),
> + this, SLOT(slotProxyAuthenticationRequired(const
> QNetworkProxy&,
> QAuthenticator*)));
>
> if ( layers[0].strUrl.startsWith("file") )
> {
> @@ -659,6 +662,18 @@ void CMapTms::slotRequestFinished(QNetworkReply* reply)
> }
>
>
> +void CMapTms::slotProxyAuthenticationRequired(const QNetworkProxy
> &prox, QAuthenticator *auth)
> +{
> + QString user;
> + QString pwd;
> +
> + CResources::self().getHttpProxyAuth(user,pwd);
> +
> + auth->setUser(user);
> + auth->setPassword(pwd);
> +}
> +
> +
> void CMapTms::config()
> {
> CDlgMapTmsConfig dlg(*this);
> diff --git "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CMapTms.h" b/./CMapTms.h
> index f2f88b4..a35a9a8 100644
> --- "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CMapTms.h"
> +++ b/./CMapTms.h
> @@ -27,6 +27,7 @@
> #include <QSet>
> #include <QtCore>
> #include <IDiskCache.h>
> +#include <QtNetwork>
>
> class QNetworkAccessManager;
> class QNetworkReply;
> @@ -63,6 +64,7 @@ class CMapTms : public IMap
>
> private slots:
> void slotRequestFinished(QNetworkReply* reply);
> + void slotProxyAuthenticationRequired(const QNetworkProxy&,
> QAuthenticator*);
>
>
> private:
> diff --git "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CMapWms.cpp"
> b/./CMapWms.cpp
> index c2658f1..66ab8d5 100644
> --- "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CMapWms.cpp"
> +++ b/./CMapWms.cpp
> @@ -156,7 +156,10 @@ CMapWms::CMapWms(const QString &key, const QString
> &filename, CCanvas *parent)
>
> accessManager = new QNetworkAccessManager(this);
> accessManager->setProxy(QNetworkProxy(QNetworkProxy::DefaultProxy));
> +
>
> connect(accessManager,SIGNAL(finished(QNetworkReply*)),this,SLOT(slotRequestFinished(QNetworkReply*)));
> + connect(accessManager, SIGNAL(proxyAuthenticationRequired(const
> QNetworkProxy&, QAuthenticator*)),
> + this, SLOT(slotProxyAuthenticationRequired(const
> QNetworkProxy&,
> QAuthenticator*)));
>
> diskCache = new CDiskCache(false, this);
>
> @@ -680,6 +683,19 @@ void CMapWms::slotRequestFinished(QNetworkReply* reply)
> emit sigChanged();
> }
>
> +
> +void CMapWms::slotProxyAuthenticationRequired(const QNetworkProxy
> &prox, QAuthenticator *auth)
> +{
> + QString user;
> + QString pwd;
> +
> + CResources::self().getHttpProxyAuth(user,pwd);
> +
> + auth->setUser(user);
> + auth->setPassword(pwd);
> +}
> +
> +
> void CMapWms::config()
> {
> CDlgMapWmsConfig dlg(*this);
> diff --git "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CMapWms.h" b/./CMapWms.h
> index d2ece60..048703c 100644
> --- "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CMapWms.h"
> +++ b/./CMapWms.h
> @@ -25,6 +25,7 @@
> #include <QHash>
> #include <QQueue>
> #include <QSet>
> +#include <QtNetwork>
>
> class QCheckBox;
> class QNetworkAccessManager;
> @@ -59,6 +60,7 @@ class CMapWms : public IMap
>
> private slots:
> void slotRequestFinished(QNetworkReply* reply);
> + void slotProxyAuthenticationRequired(const QNetworkProxy&,
> QAuthenticator*);
>
> private:
> void convertPixel2M(double& u, double& v);
> diff --git "a/..\\..\\qlandkartegt-1.5.1.orig\\src/COsmTilesHash.cpp"
> b/./COsmTilesHash.cpp
> index ccc69ce..b31dc58 100644
> --- "a/..\\..\\qlandkartegt-1.5.1.orig\\src/COsmTilesHash.cpp"
> +++ b/./COsmTilesHash.cpp
> @@ -52,6 +52,8 @@ COsmTilesHash::COsmTilesHash(QString tileUrl, QObject
> *parent)
>
> m_networkAccessManager->setProxy(QNetworkProxy(QNetworkProxy::DefaultProxy));
>
>
> connect(m_networkAccessManager,SIGNAL(finished(QNetworkReply*)),this,SLOT(slotRequestFinished(QNetworkReply*)));
> + connect(m_networkAccessManager,
> SIGNAL(proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)),
> + this, SLOT(slotProxyAuthenticationRequired(const
> QNetworkProxy&,
> QAuthenticator*)));
> }
>
>
> @@ -186,3 +188,16 @@ int COsmTilesHash::lat2tile(double lat, int z)
> {
> return (int)(qRound(256*(1.0 - log( tan(lat * M_PI/180.0) + 1.0 /
> cos(lat * M_PI/180.0)) / M_PI) / 2.0 * pow(2.0, z)));
> }
> +
> +
> +void COsmTilesHash::slotProxyAuthenticationRequired(const QNetworkProxy
> &prox, QAuthenticator *auth)
> +{
> + QString user;
> + QString pwd;
> +
> + CResources::self().getHttpProxyAuth(user,pwd);
> +
> + auth->setUser(user);
> + auth->setPassword(pwd);
> +}
> +
> diff --git "a/..\\..\\qlandkartegt-1.5.1.orig\\src/COsmTilesHash.h"
> b/./COsmTilesHash.h
> index 5512f7e..9ab241e 100644
> --- "a/..\\..\\qlandkartegt-1.5.1.orig\\src/COsmTilesHash.h"
> +++ b/./COsmTilesHash.h
> @@ -41,6 +41,7 @@ class COsmTilesHash: public QObject
>
> signals:
> void newImageReady(const QPixmap& image, bool lastTileLoaded);
> +
> private:
> QUrl m_tileUrl;
> QString m_tilePath;
> @@ -58,7 +59,9 @@ class COsmTilesHash: public QObject
> QNetworkAccessManager *m_networkAccessManager;
>
> void dequeue();
> +
> private slots:
> void slotRequestFinished(QNetworkReply*);
> + void slotProxyAuthenticationRequired(const QNetworkProxy&,
> QAuthenticator*);
> };
> #endif /* COSMTILESHASH_H_ */
> diff --git "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CResources.cpp"
> b/./CResources.cpp
> index 5776c2b..7134759 100644
> --- "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CResources.cpp"
> +++ b/./CResources.cpp
> @@ -106,8 +106,13 @@ CResources::CResources(QObject * parent)
> m_httpProxy =
> cfg.value("network/proxy/url",m_httpProxy).toString();
> m_httpProxyPort =
> cfg.value("network/proxy/port",m_httpProxyPort).toUInt();
>
> + // Proxy authentication support
> + m_httpProxyUser =
> cfg.value("network/proxy/usr",m_httpProxyUser).toString();
> + m_httpProxyPwd =
> cfg.value("network/proxy/pwd",m_httpProxyPwd).toString();
> +
> if(m_useHttpProxy)
>
> QNetworkProxy::setApplicationProxy(QNetworkProxy(QNetworkProxy::HttpProxy,m_httpProxy,m_httpProxyPort));
> +
> else
>
> QNetworkProxy::setApplicationProxy(QNetworkProxy(QNetworkProxy::NoProxy));
>
> @@ -222,6 +227,9 @@ CResources::~CResources()
> cfg.setValue("network/useProxy",m_useHttpProxy);
> cfg.setValue("network/proxy/url",m_httpProxy);
> cfg.setValue("network/proxy/port",m_httpProxyPort);
> + // Proxy authentication support
> + cfg.setValue("network/proxy/usr",m_httpProxyUser);
> + cfg.setValue("network/proxy/pwd",m_httpProxyPwd);
>
>
> cfg.setValue("device/key",m_devKey);
> @@ -279,9 +287,16 @@ bool CResources::getHttpProxy(QString& url,
> quint16& port)
>
> url = m_httpProxy;
> port = m_httpProxyPort;
> +
> return m_useHttpProxy;
> }
>
> +void CResources::getHttpProxyAuth(QString& user, QString& pwd)
> +{
> + // Proxy authentication support
> + user = m_httpProxyUser;
> + pwd = m_httpProxyPwd;
> +}
>
> IDevice * CResources::device()
> {
> @@ -352,5 +367,3 @@ QString CResources::charset()
> else
> return m_devCharset;
> }
> \ No newline at end of file
> -
> -
> diff --git "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CResources.h"
> b/./CResources.h
> index 47da89f..4709637 100644
> --- "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CResources.h"
> +++ b/./CResources.h
> @@ -45,6 +45,7 @@ class CResources : public QObject
> @return The method will return true if the proxy is enabled.
> */
> bool getHttpProxy(QString& url, quint16& port);
> + void getHttpProxyAuth(QString& user, QString& pwd);
>
> /// get pointer to current device handler
> IDevice * device();
> @@ -102,6 +103,10 @@ class CResources : public QObject
> /// the proxy port
> quint16 m_httpProxyPort;
>
> + /// the proxy logon data
> + QString m_httpProxyUser;
> + QString m_httpProxyPwd;
> +
> /// font used by the map
> QFont m_mapfont;
>
> diff --git "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CRouteToolWidget.cpp"
> b/./CRouteToolWidget.cpp
> index 4197c37..07899c9 100644
> --- "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CRouteToolWidget.cpp"
> +++ b/./CRouteToolWidget.cpp
> @@ -63,6 +63,7 @@ CRouteToolWidget::CRouteToolWidget(QTabWidget * parent)
> {
>
> m_networkAccessManager->setProxy(QNetworkProxy(QNetworkProxy::DefaultProxy,url,port));
>
> }
> +
>
> connect(m_networkAccessManager,SIGNAL(finished(QNetworkReply*)),this,SLOT(slotRequestFinished(QNetworkReply*)));
>
> connect(&CRouteDB::self(), SIGNAL(sigChanged()), this,
> SLOT(slotDBChanged()));
> @@ -169,6 +170,9 @@ CRouteToolWidget::CRouteToolWidget(QTabWidget * parent)
>
>
> m_networkAccessManager->setProxy(QNetworkProxy(QNetworkProxy::DefaultProxy));
>
> + connect(m_networkAccessManager,
> SIGNAL(proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)),
> + this, SLOT(slotProxyAuthenticationRequired(const
> QNetworkProxy&,
> QAuthenticator*)));
> +
> timer = new QTimer(this);
> timer->setSingleShot(true);
>
> @@ -556,6 +560,18 @@ void CRouteToolWidget::addOpenLSPos(QDomDocument&
> xml, QDomElement& Parent, CRou
> }
>
>
> +void CRouteToolWidget::slotProxyAuthenticationRequired(const
> QNetworkProxy &prox, QAuthenticator *auth)
> +{
> + QString user;
> + QString pwd;
> +
> + CResources::self().getHttpProxyAuth(user,pwd);
> +
> + auth->setUser(user);
> + auth->setPassword(pwd);
> +}
> +
> +
> void CRouteToolWidget::slotRequestFinished(QNetworkReply* reply)
> {
> QString key;
> @@ -930,3 +946,6 @@ void
> CRouteToolWidget::addMapQuestLocations(QDomDocument& xml, QDomElement& loca
> locations.appendChild(location);
> }
> }
> +
> +
> +
> diff --git "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CRouteToolWidget.h"
> b/./CRouteToolWidget.h
> index 269c60b..9a2adac 100644
> --- "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CRouteToolWidget.h"
> +++ b/./CRouteToolWidget.h
> @@ -21,9 +21,11 @@
>
> #include <QWidget>
> #include <QSet>
> +#include <QtNetwork>
> #include "CRoute.h"
> #include "ui_IRouteToolWidget.h"
>
> +
> class CRoute;
> class QDomDocument;
> class QDomElement;
> @@ -69,6 +71,8 @@ class CRouteToolWidget : public QWidget, private
> Ui::IRouteToolWidget
> void slotTimeout();
> void slotServiceChanged(int);
>
> + void slotProxyAuthenticationRequired(const QNetworkProxy&,
> QAuthenticator*);
> +
>
> private:
> void startOpenRouteService(CRoute& rte);
> diff --git "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CSearchDB.cpp"
> b/./CSearchDB.cpp
> index 8af0836..579fed4 100644
> --- "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CSearchDB.cpp"
> +++ b/./CSearchDB.cpp
> @@ -42,7 +42,10 @@ CSearchDB::CSearchDB(QTabWidget * tb, QObject * parent)
> toolview = new CSearchToolWidget(tb);
>
>
> networkAccessManager.setProxy(QNetworkProxy(QNetworkProxy::DefaultProxy));
> +
>
> connect(&networkAccessManager,SIGNAL(finished(QNetworkReply*)),this,SLOT(slotRequestFinished(QNetworkReply*)));
>
> + connect(&networkAccessManager,
> SIGNAL(proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)),
> + this, SLOT(slotProxyAuthenticationRequired(const
> QNetworkProxy&,
> QAuthenticator*)));
> }
>
>
> @@ -364,6 +367,18 @@ void
> CSearchDB::slotRequestFinishedMapQuest(QByteArray& data)
> }
>
>
> +void CSearchDB::slotProxyAuthenticationRequired(const QNetworkProxy
> &prox, QAuthenticator *auth)
> +{
> + QString user;
> + QString pwd;
> +
> + CResources::self().getHttpProxyAuth(user,pwd);
> +
> + auth->setUser(user);
> + auth->setPassword(pwd);
> +}
> +
> +
> CSearch * CSearchDB::getResultByKey(const QString& key)
> {
> if(!results.contains(key)) return 0;
> @@ -431,4 +446,3 @@ void CSearchDB::selSearchByKey(const QString& key)
> }
>
>
> -
> diff --git "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CSearchDB.h"
> b/./CSearchDB.h
> index 3c16c9b..64c2b4d 100644
> --- "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CSearchDB.h"
> +++ b/./CSearchDB.h
> @@ -91,6 +91,7 @@ class CSearchDB : public IDB
> void slotRequestFinishedGoogle(QByteArray& data);
> void slotRequestFinishedOpenRouteService(QByteArray& data);
> void slotRequestFinishedMapQuest(QByteArray& data);
> + void slotProxyAuthenticationRequired(const QNetworkProxy&,
> QAuthenticator*);
>
> private:
> friend class CMainWindow;
> diff --git "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CTrack.cpp"
> b/./CTrack.cpp
> index fef74f7..3a1ded0 100644
> --- "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CTrack.cpp"
> +++ b/./CTrack.cpp
> @@ -631,7 +631,8 @@ CTrack::CTrack(QObject * parent)
> geonames->setHost("ws.geonames.org");
>
> connect(geonames,SIGNAL(requestStarted(int)),this,SLOT(slotRequestStarted(int)));
>
> connect(geonames,SIGNAL(requestFinished(int,bool)),this,SLOT(slotRequestFinished(int,bool)));
>
> -
> + connect(geonames, SIGNAL(proxyAuthenticationRequired(const
> QNetworkProxy&, QAuthenticator*)),
> + this, SLOT(slotProxyAuthenticationRequired(const
> QNetworkProxy&,
> QAuthenticator*)));
> connect(&CWptDB::self(), SIGNAL(sigChanged()), this,
> SLOT(slotScaleWpt2Track()));
> }
>
> @@ -703,6 +704,19 @@ void CTrack::replaceElevationByRemote(bool
> replaceOrignalData)
> }
> }
>
> +
> +void CTrack::slotProxyAuthenticationRequired(const QNetworkProxy &prox,
> QAuthenticator *auth)
> +{
> + QString user;
> + QString pwd;
> +
> + CResources::self().getHttpProxyAuth(user,pwd);
> +
> + auth->setUser(user);
> + auth->setPassword(pwd);
> +}
> +
> +
> void CTrack::slotRequestStarted(int id)
> {
> // qDebug() << "void CTrack::slotRequestStarted(int id)" << id;
> @@ -1577,4 +1591,3 @@ QDataStream& operator <<(QDataStream& s, CFlags& flag)
> return s;
> }
>
> -
> diff --git "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CTrack.h" b/./CTrack.h
> index d35ea10..ccd05fa 100644
> --- "a/..\\..\\qlandkartegt-1.5.1.orig\\src/CTrack.h"
> +++ b/./CTrack.h
> @@ -27,6 +27,7 @@
> #include <QDateTime>
> #include <QMap>
> #include <QList>
> +#include <QtNetwork>
> #include <QPointer>
> #include "CWpt.h"
> #include "IItem.h"
> @@ -38,6 +39,7 @@
> #define MAX_TRACK_SIZE 10000
> #define WPT_TO_TRACK_DIST 2500
>
> +
> class QHttp;
> class QProgressDialog;
>
> @@ -280,8 +282,7 @@ class CTrack : public IItem
> private slots:
> void slotRequestStarted(int );
> void slotRequestFinished(int , bool error);
> -
> -
> + void slotProxyAuthenticationRequired(const QNetworkProxy&,
> QAuthenticator*);
>
> private:
> friend class CTrackDB;
> diff --git "a/..\\..\\qlandkartegt-1.5.1.orig\\src/IDlgConfig.ui"
> b/./IDlgConfig.ui
> index 227d822..86d4173 100644
> --- "a/..\\..\\qlandkartegt-1.5.1.orig\\src/IDlgConfig.ui"
> +++ b/./IDlgConfig.ui
> @@ -271,6 +271,34 @@
> </item>
> </layout>
> </item>
> + <item>
> + <layout class="QHBoxLayout">
> + <item>
> + <widget class="QLabel" name="labelProxyUser">
> + <property name="text">
> + <string>User</string>
> + </property>
> + </widget>
> + </item>
> + <item>
> + <widget class="QLineEdit" name="lineProxyUser"/>
> + </item>
> + <item>
> + <widget class="QLabel" name="labelProxyPwd">
> + <property name="text">
> + <string>Password</string>
> + </property>
> + </widget>
> + </item>
> + <item>
> + <widget class="QLineEdit" name="lineProxyPwd">
> + <property name="echoMode">
> + <enum>QLineEdit::Password</enum>
> + </property>
>
> + </widget>
> + </item>
> + </layout>
> + </item>
> </layout>
> </widget>
> </item>
>
> ------------------------------------------------------------------------------
> Live Security Virtual Conference
> Exclusive live event will cover all the ways today's security and
> threat landscape has changed and how IT managers can respond. Discussions
> will include endpoint security, mobile security and the latest in malware
> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
> _______________________________________________
> Qlandkartegt-users mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/qlandkartegt-users
>
------------------------------------------------------------------------------
How fast is your code?
3 out of 4 devs don\\\'t know how their code performs in production.
Find out how slow your code is with AppDynamics Lite.
http://ad.doubleclick.net/clk;262219672;13503038;z?
http://info.appdynamics.com/FreeJavaPerformanceDownload.html
_______________________________________________
Qlandkartegt-users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/qlandkartegt-users
