Merge remote-tracking branch 'origin/1.3' into merge

Change-Id: I2ef155784d34a250c0adc878208b86da0ab2e5d2

7 files changed, 41 insertions, 10 deletions

diff --git a/src/libs/installer/getrepositorymetainfojob.cpp b/src/libs/installer/getrepositorymetainfojob.cpp
index df7d02744..14299fbb4 100644
--- a/src/libs/installer/getrepositorymetainfojob.cpp
+++ b/src/libs/installer/getrepositorymetainfojob.cpp
@@ -137,7 +137,7 @@ Repository GetRepositoryMetaInfoJob::repository() const
 void GetRepositoryMetaInfoJob::setRepository(const Repository &r)
 {
     m_repository = r;
-    qDebug() << "Setting repository with URL:" << r.url().toString();
+    qDebug() << "Setting repository with URL:" << r.displayname();
 }
 
 int GetRepositoryMetaInfoJob::silentRetries() const
@@ -298,6 +298,7 @@ void GetRepositoryMetaInfoJob::updatesXmlDownloadFinished()
                     Repository repository(el.attribute(QLatin1String("url")), true);
                     repository.setUsername(el.attribute(QLatin1String("username")));
                     repository.setPassword(el.attribute(QLatin1String("password")));
+                    repository.setDisplayName(el.attribute(QLatin1String("displayname")));
                     repositoryUpdates.insertMulti(action, qMakePair(repository, Repository()));
 
                     qDebug() << "Repository to add:" << repository.url().toString();
@@ -313,6 +314,7 @@ void GetRepositoryMetaInfoJob::updatesXmlDownloadFinished()
                     Repository newRepository(el.attribute(QLatin1String("newUrl")), true);
                     newRepository.setUsername(el.attribute(QLatin1String("username")));
                     newRepository.setPassword(el.attribute(QLatin1String("password")));
+                    newRepository.setDisplayName(el.attribute(QLatin1String("displayname")));
 
                     // store the new repository and the one old it replaces
                     repositoryUpdates.insertMulti(action, qMakePair(newRepository, oldRepository));
@@ -515,7 +517,7 @@ void GetRepositoryMetaInfoJob::unzipFinished(bool ok, const QString &error)
 }
 
 bool GetRepositoryMetaInfoJob::updateRepositories(QSet<Repository> *repositories, const QString &username,
-    const QString &password)
+    const QString &password, const QString &displayname)
 {
     if (!repositories->contains(m_repository))
         return false;
@@ -523,6 +525,7 @@ bool GetRepositoryMetaInfoJob::updateRepositories(QSet<Repository> *repositories
     repositories->remove(m_repository);
     m_repository.setUsername(username);
     m_repository.setPassword(password);
+    m_repository.setDisplayName(displayname);
     repositories->insert(m_repository);
     return true;
 }
diff --git a/src/libs/installer/getrepositorymetainfojob.h b/src/libs/installer/getrepositorymetainfojob.h
index 4ebbeb94c..8601742a2 100644
--- a/src/libs/installer/getrepositorymetainfojob.h
+++ b/src/libs/installer/getrepositorymetainfojob.h
@@ -87,7 +87,7 @@ private:
     /* reimp */ void doCancel();
     void finished(int error, const QString &errorString = QString());
     bool updateRepositories(QSet<Repository> *repositories, const QString &username,
-        const QString &password);
+                            const QString &password, const QString &displayname = QString());
 
 private Q_SLOTS:
     void startUpdatesXmlDownload();
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index d643fd34d..d703bbd97 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -764,6 +764,8 @@ static QSet<Repository> readRepositories(QXmlStreamReader &reader, bool isDefaul
                     repo.setUsername(reader.readElementText());
                 else if (reader.name() == QLatin1String("Password"))
                     repo.setPassword(reader.readElementText());
+                else if (reader.name() == QLatin1String("DisplayName"))
+                    repo.setDisplayName(reader.readElementText());
                 else if (reader.name() == QLatin1String("Enabled"))
                     repo.setEnabled(bool(reader.readElementText().toInt()));
                 else
diff --git a/src/libs/installer/repository.cpp b/src/libs/installer/repository.cpp
index 2f0510760..786cb2a49 100644
--- a/src/libs/installer/repository.cpp
+++ b/src/libs/installer/repository.cpp
@@ -65,12 +65,13 @@ Repository::Repository(const Repository &other)
     , m_enabled(other.m_enabled)
     , m_username(other.m_username)
     , m_password(other.m_password)
+    , m_displayname(other.m_displayname)
 {
     registerMetaType();
 }
 
 /*!
-    Constructs a new repository by setting it's address to \a url and it's default state.
+    Constructs a new repository by setting its address to \a url and its default state.
 */
 Repository::Repository(const QUrl &url, bool isDefault)
     : m_url(url)
@@ -81,7 +82,7 @@ Repository::Repository(const QUrl &url, bool isDefault)
 }
 
 /*!
-    Constructs a new repository by setting it's address to \a repositoryUrl as string and it's
+    Constructs a new repository by setting its address to \a repositoryUrl as string and its
     default state.
 
     Note: user and password can be inside the \a repositoryUrl string: http://user:password@repository.url
@@ -192,13 +193,29 @@ void Repository::setPassword(const QString &password)
 }
 
 /*!
+    Returns the Name for the repository to be displayed instead of the URL
+*/
+QString Repository::displayname() const
+{
+    return m_displayname.isEmpty() ? m_url.toString() : m_displayname;
+}
+
+/*!
+    Sets the DisplayName of the repository to \a displayname.
+*/
+void Repository::setDisplayName(const QString &displayname)
+{
+    m_displayname = displayname;
+}
+
+/*!
     Compares the values of this repository to \a other and returns true if they are equal (same server,
     default state, enabled state as well as username and password). \sa operator!=()
 */
 bool Repository::operator==(const Repository &other) const
 {
     return m_url == other.m_url && m_default == other.m_default && m_enabled == other.m_enabled
-        && m_username == other.m_username && m_password == other.m_password;
+        && m_username == other.m_username && m_password == other.m_password && m_displayname == other.m_displayname;
 }
 
 /*!
@@ -223,6 +240,7 @@ const Repository &Repository::operator=(const Repository &other)
     m_enabled = other.m_enabled;
     m_username = other.m_username;
     m_password = other.m_password;
+    m_displayname = other.m_displayname;
 
     return *this;
 }
@@ -235,18 +253,20 @@ void Repository::registerMetaType()
 
 QDataStream &operator>>(QDataStream &istream, Repository &repository)
 {
-    QByteArray url, username, password;
-    istream >> url >> repository.m_default >> repository.m_enabled >> username >> password;
+    QByteArray url, username, password, displayname;
+    istream >> url >> repository.m_default >> repository.m_enabled >> username >> password >> displayname;
     repository.setUrl(QUrl::fromEncoded(QByteArray::fromBase64(url)));
     repository.setUsername(QString::fromUtf8(QByteArray::fromBase64(username)));
     repository.setPassword(QString::fromUtf8(QByteArray::fromBase64(password)));
+    repository.setDisplayName(QString::fromUtf8(QByteArray::fromBase64(displayname)));
     return istream;
 }
 
 QDataStream &operator<<(QDataStream &ostream, const Repository &repository)
 {
     return ostream << repository.m_url.toEncoded().toBase64() << repository.m_default << repository.m_enabled
-        << repository.m_username.toUtf8().toBase64() << repository.m_password.toUtf8().toBase64();
+        << repository.m_username.toUtf8().toBase64() << repository.m_password.toUtf8().toBase64()
+        << repository.m_displayname.toUtf8().toBase64();
 }
 
 }
diff --git a/src/libs/installer/repository.h b/src/libs/installer/repository.h
index 967cae75d..1f9e22777 100644
--- a/src/libs/installer/repository.h
+++ b/src/libs/installer/repository.h
@@ -73,6 +73,9 @@ public:
     QString password() const;
     void setPassword(const QString &password);
 
+    QString displayname() const;
+    void setDisplayName(const QString &displayname);
+
     bool operator==(const Repository &other) const;
     bool operator!=(const Repository &other) const;
 
@@ -91,6 +94,7 @@ private:
     bool m_enabled;
     QString m_username;
     QString m_password;
+    QString m_displayname;
 };
 
 inline uint qHash(const Repository &repository)
diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp
index 2635dc10c..8ef248db8 100644
--- a/src/libs/installer/settings.cpp
+++ b/src/libs/installer/settings.cpp
@@ -110,6 +110,8 @@ static QSet<Repository> readRepositories(QXmlStreamReader &reader, bool isDefaul
                     repo.setUsername(reader.readElementText());
                 } else if (reader.name() == QLatin1String("Password")) {
                     repo.setPassword(reader.readElementText());
+                } else if (reader.name() == QLatin1String("DisplayName")) {
+                    repo.setDisplayName(reader.readElementText());
                 } else if (reader.name() == QLatin1String("Enabled")) {
                     repo.setEnabled(bool(reader.readElementText().toInt()));
                 } else {
diff --git a/src/sdk/settingsdialog.cpp b/src/sdk/settingsdialog.cpp
index b9bfba617..1c243e456 100644
--- a/src/sdk/settingsdialog.cpp
+++ b/src/sdk/settingsdialog.cpp
@@ -249,7 +249,7 @@ QVariant RepositoryItem::data(int column, int role) const
                 case 3:
                     return m_repo.password();
                 case 4:
-                    return m_repo.url().toString();
+                    return m_repo.displayname();
                 default:
                     break;
             };