forked from qt-creator/qt-creator
DetailsWidget: Add a "checked" variant with a icon
To be used on the new targetsetuppage
This commit is contained in:
@@ -39,6 +39,7 @@
|
|||||||
|
|
||||||
#include <QtGui/QGridLayout>
|
#include <QtGui/QGridLayout>
|
||||||
#include <QtGui/QLabel>
|
#include <QtGui/QLabel>
|
||||||
|
#include <QtGui/QCheckBox>
|
||||||
#include <QtGui/QPainter>
|
#include <QtGui/QPainter>
|
||||||
#include <QtGui/QScrollArea>
|
#include <QtGui/QScrollArea>
|
||||||
#include <QtGui/QApplication>
|
#include <QtGui/QApplication>
|
||||||
@@ -57,11 +58,12 @@ namespace Utils {
|
|||||||
// +------------+-------------------------+---------------+
|
// +------------+-------------------------+---------------+
|
||||||
|
|
||||||
struct DetailsWidgetPrivate {
|
struct DetailsWidgetPrivate {
|
||||||
DetailsWidgetPrivate();
|
DetailsWidgetPrivate(QWidget *parent);
|
||||||
|
|
||||||
DetailsButton *m_detailsButton;
|
DetailsButton *m_detailsButton;
|
||||||
QGridLayout *m_grid;
|
QGridLayout *m_grid;
|
||||||
QLabel *m_summaryLabel;
|
QLabel *m_summaryLabel;
|
||||||
|
QCheckBox *m_summaryCheckBox;
|
||||||
Utils::FadingPanel *m_toolWidget;
|
Utils::FadingPanel *m_toolWidget;
|
||||||
QWidget *m_widget;
|
QWidget *m_widget;
|
||||||
|
|
||||||
@@ -70,27 +72,34 @@ namespace Utils {
|
|||||||
|
|
||||||
DetailsWidget::State m_state;
|
DetailsWidget::State m_state;
|
||||||
bool m_hovered;
|
bool m_hovered;
|
||||||
|
bool m_useCheckBox;
|
||||||
};
|
};
|
||||||
|
|
||||||
DetailsWidgetPrivate::DetailsWidgetPrivate() :
|
DetailsWidgetPrivate::DetailsWidgetPrivate(QWidget * parent) :
|
||||||
m_detailsButton(new DetailsButton),
|
m_detailsButton(new DetailsButton),
|
||||||
m_grid(new QGridLayout),
|
m_grid(new QGridLayout),
|
||||||
m_summaryLabel(new QLabel),
|
m_summaryLabel(new QLabel(parent)),
|
||||||
|
m_summaryCheckBox(new QCheckBox(parent)),
|
||||||
m_toolWidget(0),
|
m_toolWidget(0),
|
||||||
m_widget(0),
|
m_widget(0),
|
||||||
m_state(DetailsWidget::Collapsed),
|
m_state(DetailsWidget::Collapsed),
|
||||||
m_hovered(false)
|
m_hovered(false),
|
||||||
|
m_useCheckBox(false)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
DetailsWidget::DetailsWidget(QWidget *parent) :
|
DetailsWidget::DetailsWidget(QWidget *parent) :
|
||||||
QWidget(parent),
|
QWidget(parent),
|
||||||
d(new DetailsWidgetPrivate)
|
d(new DetailsWidgetPrivate(this))
|
||||||
{
|
{
|
||||||
d->m_summaryLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
|
d->m_summaryLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
|
||||||
d->m_summaryLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
|
d->m_summaryLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
|
||||||
d->m_summaryLabel->setContentsMargins(MARGIN, MARGIN, MARGIN, MARGIN);
|
d->m_summaryLabel->setContentsMargins(MARGIN, MARGIN, MARGIN, MARGIN);
|
||||||
|
|
||||||
|
d->m_summaryCheckBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
|
||||||
|
d->m_summaryCheckBox->setContentsMargins(MARGIN, MARGIN, MARGIN, MARGIN);
|
||||||
|
d->m_summaryCheckBox->setVisible(false);
|
||||||
|
|
||||||
d->m_grid->setContentsMargins(0, 0, 0, 0);
|
d->m_grid->setContentsMargins(0, 0, 0, 0);
|
||||||
d->m_grid->setSpacing(0);
|
d->m_grid->setSpacing(0);
|
||||||
d->m_grid->addWidget(d->m_summaryLabel, 0, 0);
|
d->m_grid->addWidget(d->m_summaryLabel, 0, 0);
|
||||||
@@ -99,6 +108,8 @@ namespace Utils {
|
|||||||
|
|
||||||
connect(d->m_detailsButton, SIGNAL(toggled(bool)),
|
connect(d->m_detailsButton, SIGNAL(toggled(bool)),
|
||||||
this, SLOT(setExpanded(bool)));
|
this, SLOT(setExpanded(bool)));
|
||||||
|
connect(d->m_summaryCheckBox, SIGNAL(toggled(bool)),
|
||||||
|
this, SIGNAL(checked(bool)));
|
||||||
updateControls();
|
updateControls();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -107,13 +118,51 @@ namespace Utils {
|
|||||||
delete d;
|
delete d;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool DetailsWidget::useCheckBox()
|
||||||
|
{
|
||||||
|
return d->m_useCheckBox;
|
||||||
|
}
|
||||||
|
|
||||||
|
void DetailsWidget::setUseCheckBox(bool b)
|
||||||
|
{
|
||||||
|
d->m_useCheckBox = b;
|
||||||
|
QWidget *widget = b ? static_cast<QWidget *>(d->m_summaryCheckBox) : static_cast<QWidget *>(d->m_summaryLabel);
|
||||||
|
d->m_grid->addWidget(widget, 0, 0);
|
||||||
|
d->m_summaryLabel->setVisible(b);
|
||||||
|
d->m_summaryCheckBox->setVisible(!b);
|
||||||
|
}
|
||||||
|
|
||||||
|
void DetailsWidget::setChecked(bool b)
|
||||||
|
{
|
||||||
|
d->m_summaryCheckBox->setChecked(b);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool DetailsWidget::isChecked() const
|
||||||
|
{
|
||||||
|
return d->m_useCheckBox && d->m_summaryCheckBox->isChecked();
|
||||||
|
}
|
||||||
|
|
||||||
|
void DetailsWidget::setSummaryFontBold(bool b)
|
||||||
|
{
|
||||||
|
QFont f;
|
||||||
|
f.setBold(b);
|
||||||
|
d->m_summaryCheckBox->setFont(f);
|
||||||
|
d->m_summaryLabel->setFont(f);
|
||||||
|
}
|
||||||
|
|
||||||
|
void DetailsWidget::setIcon(const QIcon &icon)
|
||||||
|
{
|
||||||
|
d->m_summaryCheckBox->setIcon(icon);
|
||||||
|
}
|
||||||
|
|
||||||
void DetailsWidget::paintEvent(QPaintEvent *paintEvent)
|
void DetailsWidget::paintEvent(QPaintEvent *paintEvent)
|
||||||
{
|
{
|
||||||
QWidget::paintEvent(paintEvent);
|
QWidget::paintEvent(paintEvent);
|
||||||
|
|
||||||
QPainter p(this);
|
QPainter p(this);
|
||||||
|
|
||||||
QPoint topLeft(d->m_summaryLabel->geometry().left(), contentsRect().top());
|
QWidget *topLeftWidget = d->m_useCheckBox ? static_cast<QWidget *>(d->m_summaryCheckBox) : static_cast<QWidget *>(d->m_summaryLabel);
|
||||||
|
QPoint topLeft(topLeftWidget->geometry().left(), contentsRect().top());
|
||||||
const QRect paintArea(topLeft, contentsRect().bottomRight());
|
const QRect paintArea(topLeft, contentsRect().bottomRight());
|
||||||
|
|
||||||
if (d->m_state != Expanded) {
|
if (d->m_state != Expanded) {
|
||||||
@@ -144,6 +193,7 @@ namespace Utils {
|
|||||||
void DetailsWidget::setSummaryText(const QString &text)
|
void DetailsWidget::setSummaryText(const QString &text)
|
||||||
{
|
{
|
||||||
d->m_summaryLabel->setText(text);
|
d->m_summaryLabel->setText(text);
|
||||||
|
d->m_summaryCheckBox->setText(text);
|
||||||
}
|
}
|
||||||
|
|
||||||
QString DetailsWidget::summaryText() const
|
QString DetailsWidget::summaryText() const
|
||||||
@@ -176,7 +226,8 @@ namespace Utils {
|
|||||||
d->m_detailsButton->setChecked(d->m_state == Expanded && d->m_widget);
|
d->m_detailsButton->setChecked(d->m_state == Expanded && d->m_widget);
|
||||||
//d->m_summaryLabel->setEnabled(d->m_state == Collapsed && d->m_widget);
|
//d->m_summaryLabel->setEnabled(d->m_state == Collapsed && d->m_widget);
|
||||||
d->m_detailsButton->setVisible(d->m_state != NoSummary);
|
d->m_detailsButton->setVisible(d->m_state != NoSummary);
|
||||||
d->m_summaryLabel->setVisible(d->m_state != NoSummary);
|
d->m_summaryLabel->setVisible(d->m_state != NoSummary && !d->m_useCheckBox);
|
||||||
|
d->m_summaryCheckBox->setVisible(d->m_state != NoSummary && d->m_useCheckBox);
|
||||||
{
|
{
|
||||||
QWidget *w = this;
|
QWidget *w = this;
|
||||||
while (w) {
|
while (w) {
|
||||||
@@ -245,7 +296,7 @@ namespace Utils {
|
|||||||
pixmap.fill(Qt::transparent);
|
pixmap.fill(Qt::transparent);
|
||||||
QPainter p(&pixmap);
|
QPainter p(&pixmap);
|
||||||
|
|
||||||
QRect topRect(0, 0, size.width(), d->m_summaryLabel->height());
|
QRect topRect(0, 0, size.width(), d->m_useCheckBox ? d->m_summaryCheckBox->height() : d->m_summaryLabel->height());
|
||||||
QRect fullRect(0, 0, size.width(), size.height());
|
QRect fullRect(0, 0, size.width(), size.height());
|
||||||
p.fillRect(fullRect, QColor(255, 255, 255, 40));
|
p.fillRect(fullRect, QColor(255, 255, 255, 40));
|
||||||
|
|
||||||
|
|||||||
@@ -51,6 +51,8 @@ class QTCREATOR_UTILS_EXPORT DetailsWidget : public QWidget
|
|||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
Q_PROPERTY(QString summaryText READ summaryText WRITE setSummaryText DESIGNABLE true)
|
Q_PROPERTY(QString summaryText READ summaryText WRITE setSummaryText DESIGNABLE true)
|
||||||
|
Q_PROPERTY(bool useCheckBox READ useCheckBox WRITE setUseCheckBox DESIGNABLE true)
|
||||||
|
Q_PROPERTY(bool checked READ isChecked WRITE setChecked DESIGNABLE true)
|
||||||
Q_PROPERTY(State state READ state WRITE setState)
|
Q_PROPERTY(State state READ state WRITE setState)
|
||||||
Q_ENUMS(State)
|
Q_ENUMS(State)
|
||||||
|
|
||||||
@@ -76,6 +78,17 @@ public:
|
|||||||
void setToolWidget(Utils::FadingPanel *widget);
|
void setToolWidget(Utils::FadingPanel *widget);
|
||||||
QWidget *toolWidget() const;
|
QWidget *toolWidget() const;
|
||||||
|
|
||||||
|
void setSummaryFontBold(bool b);
|
||||||
|
|
||||||
|
bool isChecked() const;
|
||||||
|
void setChecked(bool b);
|
||||||
|
|
||||||
|
bool useCheckBox();
|
||||||
|
void setUseCheckBox(bool b);
|
||||||
|
/// Sets an icon, only supported if useCheckBox is true
|
||||||
|
void setIcon(const QIcon &icon);
|
||||||
|
signals:
|
||||||
|
void checked(bool);
|
||||||
private slots:
|
private slots:
|
||||||
void setExpanded(bool);
|
void setExpanded(bool);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user