Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ModelWindow: Populate publisher URL if available.

Browse Source 
- Also rework things a bit to fix passing the same reference into the
  installed package list repeatedly, thus causing only the first package
  to be marked as actually being installed.
This commit is contained in:
Rene Gollent 2013-09-18 17:27:29 +02:00
parent 519bb60aef
commit e12c26ec2d
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/apps/haiku-depot/MainWindow.cpp
View File

@ -274,15 +274,23 @@ MainWindow::_InitModel()
PackageInfoMap::iterator it = foundPackages.find(
repoPackageInfo.Name());
if (it != foundPackages.end())
modelInfo = it->second;
modelInfo.SetTo(it->second);
else {
BString publisherURL;
if (repoPackageInfo.URLList().CountStrings() > 0)
publisherURL = repoPackageInfo.URLList().StringAt(0);
modelInfo.SetTo(new(std::nothrow) PackageInfo(NULL,
repoPackageInfo.Name(), repoPackageInfo.Version().ToString(),
PublisherInfo(BitmapRef(), repoPackageInfo.Vendor(), "", ""),
repoPackageInfo.Summary(), repoPackageInfo.Description(), ""),
true);
repoPackageInfo.Name(),
repoPackageInfo.Version().ToString(),
PublisherInfo(BitmapRef(), repoPackageInfo.Vendor(),
"", publisherURL), repoPackageInfo.Summary(),
repoPackageInfo.Description(), ""),
true);
if (modelInfo.Get() == NULL)
return;
foundPackages[repoPackageInfo.Name()] = modelInfo;
}
BSolverRepository* repository = package->Repository();
@ -302,16 +310,20 @@ MainWindow::_InitModel()
installationLocation = "home";
}
if (installationLocation != NULL)
packageLocations[installationLocation].AddItem(modelInfo.Get());
if (installationLocation != NULL) {
packageLocations[installationLocation].AddItem(
modelInfo.Get());
}
}
}
for (DepotInfoMap::iterator it = depots.begin(); it != depots.end(); ++it)
for (DepotInfoMap::iterator it = depots.begin(); it != depots.end();
++it) {
fModel.AddDepot(it->second);
}
for (PackageLocationMap::iterator it = packageLocations.begin();
it != packageLocations.end(); ++it) {
it != packageLocations.end(); ++it) {
for (int32 i = 0; i < it->second.CountItems(); i++) {
fModel.SetPackageState(it->second.ItemAt(i), ACTIVATED);
// TODO: indicate the specific installation location
@ -319,5 +331,4 @@ MainWindow::_InitModel()
// by querying the package roster
}
}
}