Commit a6f43a49 authored by Thorbjørn Lindeijer's avatar Thorbjørn Lindeijer
Browse files

Removed the watermark from the wizard pages

Too much Qt branding, looks cleaner without.
parent e7ba2300
......@@ -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()));
}
......
......@@ -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);
......
......@@ -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:
......
......@@ -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>
......
......@@ -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*)));
......
......@@ -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">
......
Markdown is supported
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