Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix/component-version-resolusion
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
commit
575cdb043b
97 changed files with 3260 additions and 804 deletions
|
@ -101,6 +101,13 @@ QVariant VersionList::data(const QModelIndex& index, int role) const
|
|||
return QVariant::fromValue(version);
|
||||
case RecommendedRole:
|
||||
return version->isRecommended() || m_externalRecommendsVersions.contains(version->version());
|
||||
case JavaMajorRole: {
|
||||
auto major = version->version();
|
||||
if (major.startsWith("java")) {
|
||||
major = "Java " + major.mid(4);
|
||||
}
|
||||
return major;
|
||||
}
|
||||
// FIXME: this should be determined in whatever view/proxy is used...
|
||||
// case LatestRole: return version == getLatestStable();
|
||||
default:
|
||||
|
@ -110,10 +117,14 @@ QVariant VersionList::data(const QModelIndex& index, int role) const
|
|||
|
||||
BaseVersionList::RoleList VersionList::providesRoles() const
|
||||
{
|
||||
return { VersionPointerRole, VersionRole, VersionIdRole, ParentVersionRole, TypeRole, UidRole,
|
||||
TimeRole, RequiresRole, SortRole, RecommendedRole, LatestRole, VersionPtrRole };
|
||||
return m_provided_roles;
|
||||
}
|
||||
|
||||
void VersionList::setProvidedRoles(RoleList roles)
|
||||
{
|
||||
m_provided_roles = roles;
|
||||
};
|
||||
|
||||
QHash<int, QByteArray> VersionList::roleNames() const
|
||||
{
|
||||
QHash<int, QByteArray> roles = BaseVersionList::roleNames();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue