diff --git a/src/libs/utils/filewizarddialog.cpp b/src/libs/utils/filewizarddialog.cpp index 6c3ee378b5cfdae52b6b3d69981453974adb2c0a..e855884e13f541d0f0ab26d6f8e1b4e9cbe7d3d4 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 222d0d9d66e86020f644a9708f1f76e70f93d19f..becb9eecaad69b1bf3c86448787dce87e70a052d 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 80b0f5cae9173f83a4638adb2ef9e65906153a4d..b7ba36c07d751df841f7329b0aafeb5300598a12 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 96569ce23aecb92b157bcc181f896be5a62f4e9b..806ece30e80bfd15253aa90d050c2cab8e3a7da5 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -32,7 +32,6 @@ <file>images/pushbutton.png</file> <file>images/pushbutton_hover.png</file> <file>images/pushbutton_pressed.png</file> - <file>images/qtwatermark.png</file> <file>images/redo.png</file> <file>images/replace.png</file> <file>images/reset.png</file> diff --git a/src/plugins/coreplugin/dialogs/newdialog.cpp b/src/plugins/coreplugin/dialogs/newdialog.cpp index ed1290d6887b70e0e057d5b2eadf2930711ee36d..cc030c37ee2dfd2a25c5ef3872706842928da516 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 a21b06a8ca9b397332551cabaf713811fd6e8795..275a0a3c945db9f63feaf18a8a95c6ad6eb5ca66 100644 --- a/src/plugins/coreplugin/dialogs/newdialog.ui +++ b/src/plugins/coreplugin/dialogs/newdialog.ui @@ -13,48 +13,24 @@ <property name="windowTitle"> <string>New Project</string> </property> - <layout class="QVBoxLayout"> - <property name="spacing"> - <number>6</number> - </property> - <property name="margin"> - <number>9</number> - </property> + <layout class="QVBoxLayout" name="verticalLayout"> <item> - <layout class="QGridLayout"> - <property name="margin"> - <number>0</number> + <widget class="QTreeWidget" name="templatesTree"> + <property name="minimumSize"> + <size> + <width>400</width> + <height>301</height> + </size> </property> - <property name="spacing"> - <number>6</number> - </property> - <item row="0" column="1"> - <widget class="QTreeWidget" name="templatesTree"> - <property name="minimumSize"> - <size> - <width>400</width> - <height>301</height> - </size> - </property> - <column> - <property name="text"> - <string>1</string> - </property> - </column> - </widget> - </item> - <item row="1" column="1"> - <widget class="QLabel" name="descLabel"> - </widget> - </item> - <item row="0" column="0"> - <widget class="QLabel" name="watermark"> - <property name="alignment"> - <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> - </property> - </widget> - </item> - </layout> + <column> + <property name="text"> + <string>1</string> + </property> + </column> + </widget> + </item> + <item> + <widget class="QLabel" name="descLabel"/> </item> <item> <widget class="Line" name="line"> diff --git a/src/plugins/coreplugin/images/qtwatermark.png b/src/plugins/coreplugin/images/qtwatermark.png deleted file mode 100644 index d5eec355dc26e20d33cc102a9e16f1cc45e5e85f..0000000000000000000000000000000000000000 Binary files a/src/plugins/coreplugin/images/qtwatermark.png and /dev/null differ