Skip to content

Commit

Permalink
STYLE: Re-factor qSlicerExtensionsDescriptionLabel introducing MoreLi…
Browse files Browse the repository at this point in the history
…nkTarget
  • Loading branch information
jcfr committed May 26, 2021
1 parent d421cac commit bfe7ea2
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions Base/QTGUI/qSlicerExtensionsManageWidget.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -262,13 +262,13 @@ class qSlicerExtensionsDescriptionLabel : public QLabel

// --------------------------------------------------------------------------
qSlicerExtensionsDescriptionLabel(const QString& extensionSlicerVersion, const QString& slicerRevision,
const QString& extensionId, const QString& extensionName,
const QString& moreLinkTarget, const QString& extensionName,
const QString& extensionDescription, bool extensionEnabled,
bool extensionCompatible)
: QLabel(), ExtensionSlicerVersion(extensionSlicerVersion), SlicerRevision(slicerRevision),
ExtensionIncompatible(!extensionCompatible), WarningColor("#bd8530"),
ExtensionUpdateAvailable(false), InfoColor("#2c70c8"),
ExtensionDisabled(!extensionEnabled), ExtensionId(extensionId),
ExtensionDisabled(!extensionEnabled), MoreLinkTarget(moreLinkTarget),
ExtensionName(extensionName), ExtensionDescription(extensionDescription),
LastWidth(0), LastElidedDescription(extensionDescription)
{
Expand All @@ -279,7 +279,7 @@ class qSlicerExtensionsDescriptionLabel : public QLabel
this->prepareText(extensionDescription); // Ensure reasonable initial height for size hint
this->setToolTip(extensionDescription);

this->setMouseTracking(!extensionId.isEmpty());
this->setMouseTracking(!moreLinkTarget.isEmpty());
}

// --------------------------------------------------------------------------
Expand Down Expand Up @@ -341,9 +341,9 @@ class qSlicerExtensionsDescriptionLabel : public QLabel
{
warningText += this->extensionUpdateAvailableText();
}
if (!this->ExtensionId.isEmpty())
if (!this->MoreLinkTarget.isEmpty())
{
linkText = QString(" <a href=\"slicer:%1\">More</a>").arg(this->ExtensionId);
linkText = QString(" <a href=\"%1\">More</a>").arg(this->MoreLinkTarget);
}
return format.arg(warningText, this->ExtensionName, enabledText, elidedDescription, linkText);
}
Expand Down Expand Up @@ -373,7 +373,7 @@ class qSlicerExtensionsDescriptionLabel : public QLabel
if (this->LastWidth != cr.width())
{
int margin = this->margin() * 2;
if (!this->ExtensionId.isEmpty())
if (!this->MoreLinkTarget.isEmpty())
{
margin += this->fontMetrics().width(" More");
}
Expand Down Expand Up @@ -465,7 +465,7 @@ class qSlicerExtensionsDescriptionLabel : public QLabel

bool ExtensionDisabled;

QString ExtensionId;
QString MoreLinkTarget;
QString ExtensionName;
QString ExtensionDescription;

Expand Down Expand Up @@ -539,9 +539,10 @@ void qSlicerExtensionsManageWidgetPrivate::addExtensionItem(const ExtensionMetad
bool isExtensionCompatible =
q->extensionsManagerModel()->isExtensionCompatible(extensionName).isEmpty();

QString moreLinkTarget = QString("slicer:%1").arg(extensionId);
qSlicerExtensionsDescriptionLabel * label = new qSlicerExtensionsDescriptionLabel(
extensionSlicerRevision, q->extensionsManagerModel()->slicerRevision(),
extensionId, extensionName, description, enabled, isExtensionCompatible);
moreLinkTarget, extensionName, description, enabled, isExtensionCompatible);
label->setMargin(6);
QObject::connect(label, SIGNAL(linkActivated(QString)), q, SLOT(onLinkActivated(QString)));

Expand Down

0 comments on commit bfe7ea2

Please sign in to comment.