From ef926c63431059fc2402af2926ad3e89030447b4 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 15 Apr 2010 16:01:18 +0200 Subject: [PATCH] WelcomeModeLabel: Make usable in Designer as a normal 'styled' label. Remove HTML-formatting and replace by properties set in constructor. Use in forms. --- src/libs/utils/welcomemodetreewidget.cpp | 24 ++++--- src/libs/utils/welcomemodetreewidget.h | 6 +- .../projectwelcomepagewidget.cpp | 2 - .../projectwelcomepagewidget.ui | 46 ++++--------- .../gettingstartedwelcomepagewidget.cpp | 3 - .../gettingstartedwelcomepagewidget.ui | 65 +++++++++++-------- .../welcome/communitywelcomepagewidget.cpp | 3 - .../welcome/communitywelcomepagewidget.ui | 43 ++++-------- src/tools/qtcreatorwidgets/customwidgets.cpp | 12 ++++ src/tools/qtcreatorwidgets/customwidgets.h | 11 ++++ 10 files changed, 97 insertions(+), 118 deletions(-) diff --git a/src/libs/utils/welcomemodetreewidget.cpp b/src/libs/utils/welcomemodetreewidget.cpp index 38d457819ca..a750aa0b1f1 100644 --- a/src/libs/utils/welcomemodetreewidget.cpp +++ b/src/libs/utils/welcomemodetreewidget.cpp @@ -45,26 +45,24 @@ enum { leftContentsMargin = 2, namespace Utils { WelcomeModeLabel::WelcomeModeLabel(QWidget *parent) : - QLabel(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() { } -void WelcomeModeLabel::setStyledText(const QString &text) -{ - QString rc = QLatin1String( - "" - "" - "

" - ""); - rc += text; - rc += QLatin1String("

"); - setText(rc); -} - // NewsLabel for the WelcomeModeTreeWidget: // Shows a news article as "Bold Title!\nElided Start of article...." // Adapts the eliding when resizing. diff --git a/src/libs/utils/welcomemodetreewidget.h b/src/libs/utils/welcomemodetreewidget.h index 863bc08f6be..eae57ade97a 100644 --- a/src/libs/utils/welcomemodetreewidget.h +++ b/src/libs/utils/welcomemodetreewidget.h @@ -38,9 +38,9 @@ namespace Utils { struct WelcomeModeTreeWidgetPrivate; -struct WelcomeModeLabelPrivate; class WelcomeModeItemWidget; +// Label usable for headers of a Welcome page. class QTCREATOR_UTILS_EXPORT WelcomeModeLabel : public QLabel { Q_OBJECT @@ -48,10 +48,8 @@ public: explicit WelcomeModeLabel(QWidget *parent = 0); virtual ~WelcomeModeLabel(); - void setStyledText(const QString &text); - private: - WelcomeModeLabelPrivate *m_d; + void *m_unused; }; // WelcomeModeTreeWidget: Show an itemized list with arrows and emits a signal on click. diff --git a/src/plugins/projectexplorer/projectwelcomepagewidget.cpp b/src/plugins/projectexplorer/projectwelcomepagewidget.cpp index 7429887294a..255c9fe2e3a 100644 --- a/src/plugins/projectexplorer/projectwelcomepagewidget.cpp +++ b/src/plugins/projectexplorer/projectwelcomepagewidget.cpp @@ -78,8 +78,6 @@ ProjectWelcomePageWidget::ProjectWelcomePageWidget(QWidget *parent) : ui(new Ui::ProjectWelcomePageWidget) { ui->setupUi(this); - ui->projTitleLabel->setStyledText(tr("Recent Projects")); - ui->recentSessionsTitleLabel->setStyledText(tr("Resume Session")); updateWelcomePage(WelcomePageData()); connect(ui->sessTreeWidget, SIGNAL(activated(QString)), SLOT(slotSessionClicked(QString))); diff --git a/src/plugins/projectexplorer/projectwelcomepagewidget.ui b/src/plugins/projectexplorer/projectwelcomepagewidget.ui index 80a3b6c0dd0..98ec7783646 100644 --- a/src/plugins/projectexplorer/projectwelcomepagewidget.ui +++ b/src/plugins/projectexplorer/projectwelcomepagewidget.ui @@ -2,14 +2,6 @@ ProjectExplorer::Internal::ProjectWelcomePageWidget - - - 0 - 0 - 639 - 322 - - Form @@ -28,9 +20,6 @@ - - - QFrame::StyledPanel @@ -42,33 +31,23 @@ - - - + + 9 + 0 3 - - 9 - - - + - - - 0 - 0 - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + Recent Projects @@ -89,9 +68,6 @@ 130 - - - 0 @@ -107,14 +83,16 @@ 0 + + Resume Session + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - + @@ -189,12 +167,12 @@ Utils::WelcomeModeTreeWidget QWidget -
utils/welcomemodetreewidget.h
+
utils/welcomemodetreewidget.h
 Utils::WelcomeModeLabel QLabel -
utils/welcomemodetreewidget.h
+
utils/welcomemodetreewidget.h
 diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp index 68d910248f0..d9561a285e7 100644 --- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp +++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp @@ -64,10 +64,7 @@ GettingStartedWelcomePageWidget::GettingStartedWelcomePageWidget(QWidget *parent ui(new Ui::GettingStartedWelcomePageWidget) { ui->setupUi(this); - ui->tutorialsTitleLabel->setStyledText(tr("Tutorials")); - ui->demoTitleLabel->setStyledText(tr("Explore Qt Examples")); ui->didYouKnowTextBrowser->viewport()->setAutoFillBackground(false); - ui->didYouKnowTitleLabel->setStyledText(tr("Did You Know?")); connect(ui->tutorialTreeWidget, SIGNAL(activated(QString)), SLOT(slotOpenHelpPage(const QString&))); diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui index 803a7928e4c..c62a653e6fe 100644 --- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui +++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui @@ -57,20 +57,13 @@ - - - 0 - 0 - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + Tutorials - - + @@ -101,8 +94,8 @@ - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + Explore Qt Examples @@ -155,19 +148,6 @@ 12 - - - - - 0 - 0 - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - @@ -273,6 +253,37 @@ + + + + + + Qt::Vertical + + + + 0 + 0 + + + + + + + + Did You Know? + + + + + + + Qt::Vertical + + + + + @@ -330,12 +341,12 @@ Utils::WelcomeModeTreeWidget QWidget -
utils/welcomemodetreewidget.h
+
utils/welcomemodetreewidget.h
 Utils::WelcomeModeLabel QLabel -
utils/welcomemodetreewidget.h
+
utils/welcomemodetreewidget.h
 diff --git a/src/plugins/welcome/communitywelcomepagewidget.cpp b/src/plugins/welcome/communitywelcomepagewidget.cpp index c2becf0ce52..d9043daf83d 100644 --- a/src/plugins/welcome/communitywelcomepagewidget.cpp +++ b/src/plugins/welcome/communitywelcomepagewidget.cpp @@ -84,9 +84,6 @@ CommunityWelcomePageWidget::CommunityWelcomePageWidget(QWidget *parent) : ui(new Ui::CommunityWelcomePageWidget) { ui->setupUi(this); - ui->labsTitleLabel->setStyledText(tr("News From the Qt Labs")); - ui->supportSitesTitleLabel->setStyledText(tr("Qt Support Sites")); - ui->miscSitesTitleLabel->setStyledText(tr("Qt Links")); connect(ui->newsTreeWidget, SIGNAL(activated(QString)), SLOT(slotUrlClicked(QString))); connect(ui->miscSitesTreeWidget, SIGNAL(activated(QString)), SLOT(slotUrlClicked(QString))); diff --git a/src/plugins/welcome/communitywelcomepagewidget.ui b/src/plugins/welcome/communitywelcomepagewidget.ui index 9e3a3c9260a..488119ca4ab 100644 --- a/src/plugins/welcome/communitywelcomepagewidget.ui +++ b/src/plugins/welcome/communitywelcomepagewidget.ui @@ -54,20 +54,13 @@ - - - 0 - 0 - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + News From the Qt Labs - - + @@ -83,37 +76,23 @@ - - - 0 - 0 - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + Qt Support Sites - - + - - - 0 - 0 - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + Qt Links - - + @@ -127,12 +106,12 @@ Utils::WelcomeModeTreeWidget QWidget -
utils/welcomemodetreewidget.h
+
utils/welcomemodetreewidget.h
 Utils::WelcomeModeLabel QLabel -
utils/welcomemodetreewidget.h
+
utils/welcomemodetreewidget.h
 diff --git a/src/tools/qtcreatorwidgets/customwidgets.cpp b/src/tools/qtcreatorwidgets/customwidgets.cpp index e3486915e84..cc0a98e76f5 100644 --- a/src/tools/qtcreatorwidgets/customwidgets.cpp +++ b/src/tools/qtcreatorwidgets/customwidgets.cpp @@ -244,6 +244,17 @@ QWidget *WelcomePageWidget_CW::createWidget(QWidget *parent) return rc; } +WelcomeModeLabel_CW::WelcomeModeLabel_CW(QObject *parent) : + QObject(parent), + CustomWidget + (QLatin1String(""), + false, + QLatin1String(groupC), + QIcon(), + QLatin1String("Welcome page header label")) +{ +} + DetailsWidget_CW::DetailsWidget_CW(QObject *parent) : QObject(parent), CustomWidget @@ -370,6 +381,7 @@ WidgetCollection::WidgetCollection(QObject *parent) : 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)); } QList WidgetCollection::customWidgets() const diff --git a/src/tools/qtcreatorwidgets/customwidgets.h b/src/tools/qtcreatorwidgets/customwidgets.h index 77db44c2010..73b5a50b420 100644 --- a/src/tools/qtcreatorwidgets/customwidgets.h +++ b/src/tools/qtcreatorwidgets/customwidgets.h @@ -235,6 +235,17 @@ public: virtual QWidget *createWidget(QWidget *parent); }; +class WelcomeModeLabel_CW : + public QObject, + public CustomWidget +{ + Q_OBJECT + Q_INTERFACES(QDesignerCustomWidgetInterface) +public: + explicit WelcomeModeLabel_CW(QObject *parent = 0); +}; + + // Details Widget: plugin + simple, hacky container extension that // accepts only one page.