Skip to content

GitLab

Commit ec7525be authored by Friedemann Kleint's avatar Friedemann Kleint Committed by Daniel Molkentin
Browse files

Remove last traces of the WelcomeModeTreewidget. 

Change-Id: I22ab22c5ed053a3f24ac3f08ca83fa600be98370
Reviewed-on: http://codereview.qt.nokia.com/1579

Reviewed-by: default avatarDaniel Molkentin <daniel.molkentin@nokia.com>
parent 0074b502
Hide whitespace changes
Inline Side-by-side
src/libs/utils/welcomemodetreewidget.cpp deleted 100644 → 0
View file @ 0074b502
/**************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (info@qt.nokia.com)
**
**
** GNU Lesser General Public License Usage
**
** This file may be used under the terms of the GNU Lesser General Public
** License version 2.1 as published by the Free Software Foundation and
** appearing in the file LICENSE.LGPL included in the packaging of this file.
** Please review the following information to ensure the GNU Lesser General
** Public License version 2.1 requirements will be met:
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** Other Usage
**
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
**
** If you have questions regarding the use of this file, please contact
** Nokia at info@qt.nokia.com.
**
**************************************************************************/
#include "welcomemodetreewidget.h"
#include <QtGui/QLabel>
#include <QtGui/QPixmap>
#include <QtGui/QAction>
#include <QtGui/QVBoxLayout>
#include <QtGui/QMouseEvent>
#include <QtGui/QResizeEvent>
#include <QtGui/QImage>
enum { leftContentsMargin = 2,
topContentsMargin = 2,
bottomContentsMargin = 1,
pixmapWidth = 24 };
/*!
\class Utils::WelcomeModeLabel
\brief Label usable for headers of a Welcome page.
*/
namespace Utils {
WelcomeModeLabel::WelcomeModeLabel(QWidget *parent) :
QLabel(parent), m_unused(0)
{
// Bold/enlarged font slightly gray. Force color on by stylesheet as it is used
// as a child of widgets that have stylesheets.
QFont f = font();
#ifndef Q_OS_WIN
f.setWeight(QFont::DemiBold);
#endif
f.setPointSizeF(f.pointSizeF() * 1.2);
setFont(f);
setStyleSheet(QLatin1String("color : rgb(85, 85, 85);"));
setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop);
}
WelcomeModeLabel::~WelcomeModeLabel()
{
}
// NewsLabel for the WelcomeModeTreeWidget:
// Shows a news article as "Bold Title!\nElided Start of article...."
// Adapts the eliding when resizing.
class NewsLabel : public QLabel {
public:
explicit NewsLabel(const QString &htmlTitle,
const QString &htmlText,
QWidget *parent = 0);
virtual void resizeEvent(QResizeEvent *);
private:
const QString m_title;
const QString m_text;
const int m_minWidth;
int m_lastWidth;
int m_contentsMargin;
};
NewsLabel::NewsLabel(const QString &htmlTitle,
const QString &htmlText,
QWidget *parent) :
QLabel(parent),
m_title(htmlTitle),
m_text(htmlText),
m_minWidth(100),
m_lastWidth(-1)
{
int dummy, left, right;
getContentsMargins(&left, &dummy, &right, &dummy);
m_contentsMargin = left + right;
}
void NewsLabel::resizeEvent(QResizeEvent *e)
{
enum { epsilon = 10 };
QLabel::resizeEvent(e);
// Resized: Adapt to new size (if it is > m_minWidth)
const int newWidth = qMax(e->size().width() - m_contentsMargin, m_minWidth) - epsilon;
if (newWidth == m_lastWidth)
return;
m_lastWidth = newWidth;
QFont f = font();
const QString elidedText = QFontMetrics(f).elidedText(m_text, Qt::ElideRight, newWidth);
f.setBold(true);
const QString elidedTitle = QFontMetrics(f).elidedText(m_title, Qt::ElideRight, newWidth);
QString labelText = QLatin1String("<b>");
labelText += elidedTitle;
labelText += QLatin1String("</b><br /><font color='gray'>");
labelText += elidedText;
labelText += QLatin1String("</font>");
setText(labelText);
}
// Item label of WelcomeModeTreeWidget: Horizontal widget consisting
// of arrow and clickable label.
class WelcomeModeItemWidget : public QWidget {
Q_OBJECT
public:
// Normal items
explicit WelcomeModeItemWidget(const QPixmap &pix,
const QString &text,
const QString &tooltip,
const QString &data,
QWidget *parent = 0);
// News items with title and start of article (see NewsLabel)
explicit WelcomeModeItemWidget(const QPixmap &pix,
QString htmlTitle,
QString htmlText,
const QString &tooltip,
const QString &data,
QWidget *parent = 0);
signals:
void clicked(const QString &);
protected:
virtual void mousePressEvent(QMouseEvent *);
private:
static inline void initLabel(QLabel *);
void init(const QPixmap &pix, QLabel *itemLabel, const QString &tooltip);
const QString m_data;
};
WelcomeModeItemWidget::WelcomeModeItemWidget(const QPixmap &pix,
const QString &text,
const QString &tooltipText,
const QString &data,
QWidget *parent) :
QWidget(parent),
m_data(data)
{
QLabel *label = new QLabel(text);
WelcomeModeItemWidget::initLabel(label);
init(pix, label, tooltipText);
}
static inline void fixHtml(QString &s)
{
s.replace(QLatin1String("&#8217;"), QString(QLatin1Char('\''))); // Quote
s.replace(QLatin1Char('\n'), QLatin1Char(' '));
}
WelcomeModeItemWidget::WelcomeModeItemWidget(const QPixmap &pix,
QString title,
QString text,
const QString &tooltipText,
const QString &data,
QWidget *parent) :
QWidget(parent),
m_data(data)
{
fixHtml(text);
fixHtml(title);
QLabel *newsLabel = new NewsLabel(title, text);
WelcomeModeItemWidget::initLabel(newsLabel);
init(pix, newsLabel, tooltipText);
}
void WelcomeModeItemWidget::initLabel(QLabel *label)
{
label->setTextInteractionFlags(Qt::NoTextInteraction);
label->setCursor(QCursor(Qt::PointingHandCursor));
}
void WelcomeModeItemWidget::init(const QPixmap &pix, QLabel *itemLabel,
const QString &tooltipText)
{
QHBoxLayout *hBoxLayout = new QHBoxLayout;
hBoxLayout->setContentsMargins(topContentsMargin, leftContentsMargin,
0, bottomContentsMargin);
QLabel *pxLabel = new QLabel;
QPixmap pixmap = pix;
if (layoutDirection() == Qt::RightToLeft){
QImage image = pixmap.toImage();
pixmap = QPixmap::fromImage(image.mirrored(1, 0));
}
pxLabel->setPixmap(pixmap);
pxLabel->setFixedWidth(pixmapWidth);
hBoxLayout->addWidget(pxLabel);
hBoxLayout->addWidget(itemLabel);
if (!tooltipText.isEmpty()) {
setToolTip(tooltipText);
pxLabel->setToolTip(tooltipText);
itemLabel->setToolTip(tooltipText);
}
setLayout(hBoxLayout);
}
void WelcomeModeItemWidget::mousePressEvent(QMouseEvent *e)
{
e->accept();
emit clicked(m_data);
}
// ----------------- WelcomeModeTreeWidget
struct WelcomeModeTreeWidgetPrivate
{
WelcomeModeTreeWidgetPrivate();
const QPixmap bullet;
QVBoxLayout *layout;
QVBoxLayout *itemLayout;
};
WelcomeModeTreeWidgetPrivate::WelcomeModeTreeWidgetPrivate() :
bullet(QLatin1String(":/welcome/images/list_bullet_arrow.png")),
layout(new QVBoxLayout),
itemLayout(new QVBoxLayout)
{
layout->setMargin(0);
}
/*!
\class Utils::WelcomeModeTreeWidget
\brief Show an itemized list with arrows and emits a signal on click.
*/
WelcomeModeTreeWidget::WelcomeModeTreeWidget(QWidget *parent) :
QWidget(parent), m_d(new WelcomeModeTreeWidgetPrivate)
{
setLayout(m_d->layout);
m_d->layout->addLayout(m_d->itemLayout);
m_d->layout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::MinimumExpanding));
}
WelcomeModeTreeWidget::~WelcomeModeTreeWidget()
{
delete m_d;
}
void WelcomeModeTreeWidget::addItem(const QString &label, const QString &data, const QString &toolTip)
{
addItemWidget(new WelcomeModeItemWidget(m_d->bullet, label, toolTip, data));
}
void WelcomeModeTreeWidget::addNewsItem(const QString &title,
const QString &description,
const QString &link)
{
addItemWidget(new WelcomeModeItemWidget(m_d->bullet, title, description, link, link));
}
void WelcomeModeTreeWidget::addItemWidget(WelcomeModeItemWidget *w)
{
connect(w, SIGNAL(clicked(QString)), this, SIGNAL(activated(QString)));
m_d->itemLayout->addWidget(w);
}
void WelcomeModeTreeWidget::clear()
{
for (int i = m_d->itemLayout->count() - 1; i >= 0; i--) {
QLayoutItem *item = m_d->itemLayout->takeAt(i);
delete item->widget();
delete item;
}
}
} // namespace Utils
#include "welcomemodetreewidget.moc"
src/libs/utils/welcomemodetreewidget.h deleted 100644 → 0
View file @ 0074b502
/**************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (info@qt.nokia.com)
**
**
** GNU Lesser General Public License Usage
**
** This file may be used under the terms of the GNU Lesser General Public
** License version 2.1 as published by the Free Software Foundation and
** appearing in the file LICENSE.LGPL included in the packaging of this file.
** Please review the following information to ensure the GNU Lesser General
** Public License version 2.1 requirements will be met:
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** Other Usage
**
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
**
** If you have questions regarding the use of this file, please contact
** Nokia at info@qt.nokia.com.
**
**************************************************************************/
#ifndef WELCOMEMODETREEWIDGET_H
#define WELCOMEMODETREEWIDGET_H
#include "utils_global.h"
#include <QtGui/QTreeWidget>
#include <QtGui/QLabel>
namespace Utils {
struct WelcomeModeTreeWidgetPrivate;
class WelcomeModeItemWidget;
class QTCREATOR_UTILS_EXPORT WelcomeModeLabel : public QLabel
{
Q_OBJECT
public:
explicit WelcomeModeLabel(QWidget *parent = 0);
virtual ~WelcomeModeLabel();
private:
void *m_unused;
};
class QTCREATOR_UTILS_EXPORT WelcomeModeTreeWidget : public QWidget
{
Q_OBJECT
public:
explicit WelcomeModeTreeWidget(QWidget *parent = 0);
virtual ~WelcomeModeTreeWidget();
public slots:
void addItem(const QString &label, const QString &data,const QString &toolTip = QString());
// Add a 'News' item as two lines of "<bold>Breaking news!</bold>\nElided Start of article...."
void addNewsItem(const QString &title, const QString &description, const QString &link);
void clear();
signals:
void activated(const QString &data);
private:
void addItemWidget(WelcomeModeItemWidget *w);
WelcomeModeTreeWidgetPrivate *m_d;
};
} // namespace Utils
#endif // WELCOMEMODETREEWIDGET_H
src/plugins/welcome/welcomeplugin.cpp
View file @ ec7525be
......@@ -45,7 +45,6 @@
#include <projectexplorer/projectexplorer.h>
#include <utils/styledbar.h>
#include <utils/welcomemodetreewidget.h>
#include <utils/iwelcomepage.h>
#include <QtGui/QScrollArea>
......
src/tools/qtcreatorwidgets/customwidgets.cpp
View file @ ec7525be
......@@ -240,38 +240,6 @@ Wizard_CW::Wizard_CW(QObject *parent) :
{
}
WelcomePageWidget_CW::WelcomePageWidget_CW(QObject *parent) :
QObject(parent),
CustomWidget<Utils::WelcomeModeTreeWidget>
(QLatin1String("<utils/welcomemodetreewidget.h>"),
false,
QLatin1String(groupC),
QIcon(),
QLatin1String("Welcome page widget"))
{
}
QWidget *WelcomePageWidget_CW::createWidget(QWidget *parent)
{
Utils::WelcomeModeTreeWidget *rc = new Utils::WelcomeModeTreeWidget(parent);
rc->addNewsItem(QLatin1String("Breaking news"),
QLatin1String("Bla bla bla"), QLatin1String("qt.nokia.com"));
rc->addNewsItem(QLatin1String("Yesterday's breaking news"),
QLatin1String("Blub blub blub"), QLatin1String("qt.nokia.com"));
return rc;
}
WelcomeModeLabel_CW::WelcomeModeLabel_CW(QObject *parent) :
QObject(parent),
CustomWidget<Utils::WelcomeModeLabel>
(QLatin1String("<utils/welcomemodetreewidget.h>"),
false,
QLatin1String(groupC),
QIcon(),
QLatin1String("Welcome page header label"))
{
}
CrumblePath_CW::CrumblePath_CW(QObject *parent) :
QObject(parent),
CustomWidget<Utils::CrumblePath>
......@@ -281,8 +249,7 @@ CrumblePath_CW::CrumblePath_CW(QObject *parent) :
QIcon(),
QLatin1String("Crumble Path"))
{
};
}
DetailsWidget_CW::DetailsWidget_CW(QObject *parent) :
QObject(parent),
......@@ -410,8 +377,6 @@ WidgetCollection::WidgetCollection(QObject *parent) :
m_plugins.push_back(new StyledBar_CW(this));
m_plugins.push_back(new StyledSeparator_CW(this));
m_plugins.push_back(new Wizard_CW(this));
m_plugins.push_back(new WelcomePageWidget_CW(this));
m_plugins.push_back(new WelcomeModeLabel_CW(this));
m_plugins.push_back(new CrumblePath_CW(this));
}
......
src/tools/qtcreatorwidgets/customwidgets.h
View file @ ec7525be
......@@ -50,7 +50,6 @@
#include <utils/detailswidget.h>
#include <utils/styledbar.h>
#include <utils/wizard.h>
#include <utils/welcomemodetreewidget.h>
#include <utils/crumblepath.h>
#include <QtDesigner/QDesignerCustomWidgetCollectionInterface>
......@@ -238,27 +237,6 @@ public:
explicit Wizard_CW(QObject *parent = 0);
};
class WelcomePageWidget_CW :
public QObject,
public CustomWidget<Utils::WelcomeModeTreeWidget>
{
Q_OBJECT
Q_INTERFACES(QDesignerCustomWidgetInterface)
public:
explicit WelcomePageWidget_CW(QObject *parent = 0);
virtual QWidget *createWidget(QWidget *parent);
};
class WelcomeModeLabel_CW :
public QObject,
public CustomWidget<Utils::WelcomeModeLabel>
{
Q_OBJECT
Q_INTERFACES(QDesignerCustomWidgetInterface)
public:
explicit WelcomeModeLabel_CW(QObject *parent = 0);
};
class CrumblePath_CW :
public QObject,
public CustomWidget<Utils::CrumblePath>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment