diff options
author | prbiswal <pradeep.biswal@nokia.com> | 2012-08-23 20:32:22 +0530 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@nokia.com> | 2012-08-24 14:22:41 +0200 |
commit | f9814b28ce934541f16d12d54534bea543143c01 (patch) | |
tree | 3134c0853162738d53dcb1284cb137c466e33d80 /src/libs/installer/packagemanagercore.cpp | |
parent | e7754dc0c578d66b7bf1deda730831efdc6d2dc9 (diff) |
Code changes for new SDK Manager UI.
- These changes are specific to S40 SDK installer. Changes are done (libs)to create a new coulmn on component selection page to get the status for component.
- New SDK Manager UI replaces default component selection page (s40/componentviewpage.cpp/.h)
- A macro has been added to .pro file to have s40 specific changes in libs.
Change-Id: Ic8cf61d7085b3c7d62edd208949ec71d81e43140
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Diffstat (limited to 'src/libs/installer/packagemanagercore.cpp')
-rw-r--r-- | src/libs/installer/packagemanagercore.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp index 2dda4205f..c0879f7eb 100644 --- a/src/libs/installer/packagemanagercore.cpp +++ b/src/libs/installer/packagemanagercore.cpp @@ -1917,8 +1917,11 @@ void PackageManagerCore::updateDisplayVersions(const QString &displayKey) const QString displayVersionRemote = findDisplayVersion(key, components, scRemoteVersion, visited); if (displayVersionRemote.isEmpty()) components.value(key)->setValue(displayKey, tr("invalid")); - else - components.value(key)->setValue(displayKey, displayVersionRemote); + else { + components.value(key)->setValue(displayKey, displayVersionRemote); + if (displayVersionRemote > findDisplayVersion(key, components, scVersion, visited ) ) + components.value(key)->setValue(scPackageStatus, tr("Updates available")); + } } } @@ -1942,8 +1945,7 @@ QString PackageManagerCore::findDisplayVersion(const QString &componentName, ComponentModel *PackageManagerCore::componentModel(PackageManagerCore *core, const QString &objectName) const { - ComponentModel *model = new ComponentModel(4, core); - + ComponentModel *model = new ComponentModel(5, core); model->setObjectName(objectName); model->setHeaderData(ComponentModelHelper::NameColumn, Qt::Horizontal, ComponentModel::tr("Component Name")); @@ -1953,6 +1955,8 @@ ComponentModel *PackageManagerCore::componentModel(PackageManagerCore *core, con ComponentModel::tr("New Version")); model->setHeaderData(ComponentModelHelper::UncompressedSizeColumn, Qt::Horizontal, ComponentModel::tr("Size")); + model->setHeaderData(ComponentModelHelper::ComponentStatus, Qt::Horizontal, + ComponentModel::tr("Status")); connect(this, SIGNAL(setRootComponents(QList<QInstaller::Component*>)), model, SLOT(setRootComponents(QList<QInstaller::Component*>))); connect(model, SIGNAL(defaultCheckStateChanged(bool)), this, SLOT(componentsToInstallNeedsRecalculation())); |