ProjectExplorer: Use Utils::ElidingLabel in EnvironmentKitAspectWidget

Utils: :ElidingLabel re-elides on resize.
Change-Id: I62709da60e7ab0156a33f373b236f71d1795d48f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Alessandro Portale
2019-11-21 15:35:24 +01:00
parent b6ed781c28
commit e53e0a808b

View File

@@ -39,6 +39,7 @@
#include <coreplugin/variablechooser.h> #include <coreplugin/variablechooser.h>
#include <ssh/sshconnection.h> #include <ssh/sshconnection.h>
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/elidinglabel.h>
#include <utils/environment.h> #include <utils/environment.h>
#include <utils/environmentdialog.h> #include <utils/environmentdialog.h>
#include <utils/macroexpander.h> #include <utils/macroexpander.h>
@@ -1129,7 +1130,7 @@ class EnvironmentKitAspectWidget : public KitAspectWidget
public: public:
EnvironmentKitAspectWidget(Kit *workingCopy, const KitAspect *ki) EnvironmentKitAspectWidget(Kit *workingCopy, const KitAspect *ki)
: KitAspectWidget(workingCopy, ki), : KitAspectWidget(workingCopy, ki),
m_summaryLabel(new QLabel), m_summaryLabel(new Utils::ElidingLabel),
m_manageButton(new QPushButton), m_manageButton(new QPushButton),
m_mainWidget(new QWidget) m_mainWidget(new QWidget)
{ {
@@ -1153,9 +1154,7 @@ private:
void refresh() override void refresh() override
{ {
const Utils::EnvironmentItems changes = currentEnvironment(); const Utils::EnvironmentItems changes = currentEnvironment();
QString shortSummary = Utils::EnvironmentItem::toStringList(changes).join(QLatin1String("; ")); const QString shortSummary = Utils::EnvironmentItem::toStringList(changes).join("; ");
QFontMetrics fm(m_summaryLabel->font());
shortSummary = fm.elidedText(shortSummary, Qt::ElideRight, m_summaryLabel->width());
m_summaryLabel->setText(shortSummary.isEmpty() ? tr("No changes to apply.") : shortSummary); m_summaryLabel->setText(shortSummary.isEmpty() ? tr("No changes to apply.") : shortSummary);
} }
@@ -1216,7 +1215,7 @@ private:
}); });
} }
QLabel *m_summaryLabel; Utils::ElidingLabel *m_summaryLabel;
QPushButton *m_manageButton; QPushButton *m_manageButton;
QCheckBox *m_vslangCheckbox; QCheckBox *m_vslangCheckbox;
QWidget *m_mainWidget; QWidget *m_mainWidget;