diff --git a/src/libs/utils/filewizarddialog.cpp b/src/libs/utils/filewizarddialog.cpp index 6c3ee378b5c..e855884e13f 100644 --- a/src/libs/utils/filewizarddialog.cpp +++ b/src/libs/utils/filewizarddialog.cpp @@ -41,7 +41,6 @@ FileWizardDialog::FileWizardDialog(QWidget *parent) : setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setOption(QWizard::NoCancelButton, false); setOption(QWizard::NoDefaultButton, false); - setPixmap(QWizard::WatermarkPixmap, QPixmap(QLatin1String(":/core/images/qtwatermark.png"))); addPage(m_filePage); connect(m_filePage, SIGNAL(activated()), button(QWizard::FinishButton), SLOT(animateClick())); } diff --git a/src/plugins/coreplugin/basefilewizard.cpp b/src/plugins/coreplugin/basefilewizard.cpp index 222d0d9d66e..becb9eecaad 100644 --- a/src/plugins/coreplugin/basefilewizard.cpp +++ b/src/plugins/coreplugin/basefilewizard.cpp @@ -534,14 +534,8 @@ QStringList BaseFileWizard::runWizard(const QString &path, QWidget *parent) return result; } -QPixmap BaseFileWizard::watermark() -{ - return QPixmap(QLatin1String(":/core/images/qtwatermark.png")); -} - void BaseFileWizard::setupWizard(QWizard *w) { - w->setPixmap(QWizard::WatermarkPixmap, watermark()); w->setOption(QWizard::NoCancelButton, false); w->setOption(QWizard::NoDefaultButton, false); w->setOption(QWizard::NoBackButtonOnStartPage, true); diff --git a/src/plugins/coreplugin/basefilewizard.h b/src/plugins/coreplugin/basefilewizard.h index 80b0f5cae91..b7ba36c07d7 100644 --- a/src/plugins/coreplugin/basefilewizard.h +++ b/src/plugins/coreplugin/basefilewizard.h @@ -165,9 +165,7 @@ public: // Build a file name, adding the extension unless baseName already has one static QString buildFileName(const QString &path, const QString &baseName, const QString &extension); - // Return standard pixmap to be used as watermark - static QPixmap watermark(); - // Set the standard watermark on a QWizard + // Sets some standard options on a QWizard static void setupWizard(QWizard *); protected: diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index 96569ce23ae..806ece30e80 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -32,7 +32,6 @@ images/pushbutton.png images/pushbutton_hover.png images/pushbutton_pressed.png - images/qtwatermark.png images/redo.png images/replace.png images/reset.png diff --git a/src/plugins/coreplugin/dialogs/newdialog.cpp b/src/plugins/coreplugin/dialogs/newdialog.cpp index ed1290d6887..cc030c37ee2 100644 --- a/src/plugins/coreplugin/dialogs/newdialog.cpp +++ b/src/plugins/coreplugin/dialogs/newdialog.cpp @@ -61,8 +61,6 @@ NewDialog::NewDialog(QWidget *parent) : m_okButton = m_ui->buttonBox->button(QDialogButtonBox::Ok); m_okButton->setDefault(true); - m_ui->watermark->setPixmap(BaseFileWizard::watermark()); - m_ui->templatesTree->header()->hide(); connect(m_ui->templatesTree, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)), this, SLOT(currentItemChanged(QTreeWidgetItem*))); diff --git a/src/plugins/coreplugin/dialogs/newdialog.ui b/src/plugins/coreplugin/dialogs/newdialog.ui index a21b06a8ca9..275a0a3c945 100644 --- a/src/plugins/coreplugin/dialogs/newdialog.ui +++ b/src/plugins/coreplugin/dialogs/newdialog.ui @@ -13,48 +13,24 @@ New Project - - - 6 - - - 9 - + - - - 0 + + + + 400 + 301 + - - 6 - - - - - - 400 - 301 - - - - - 1 - - - - - - - - - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - + + + 1 + + + + + + diff --git a/src/plugins/coreplugin/images/qtwatermark.png b/src/plugins/coreplugin/images/qtwatermark.png deleted file mode 100644 index d5eec355dc2..00000000000 Binary files a/src/plugins/coreplugin/images/qtwatermark.png and /dev/null differ