Wrong position of back button and missing window icon.

Task-number: QTIFW-44
Task-number: QTIFW-158

Removed some leftover code that breaks the wizard layout.

Change-Id: I9cdaa6a970c87236d5ee33ec93afe73e3201e869
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>

7 files changed, 11 insertions, 9 deletions

diff --git a/src/libs/installer/installer.pro b/src/libs/installer/installer.pro
index 1b68cb132..4081b5bf5 100644
--- a/src/libs/installer/installer.pro
+++ b/src/libs/installer/installer.pro
@@ -162,7 +162,8 @@ SOURCES += packagemanagercore.cpp \
     link.cpp \
     createlinkoperation.cpp
 
-RESOURCES += resources/patch_file_lists.qrc
+RESOURCES += resources/patch_file_lists.qrc \
+             resources/installer.qrc
 
 macx {
     HEADERS += macrelocateqt.h \
diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp
index 5bbea1606..353df3df4 100644
--- a/src/libs/installer/packagemanagergui.cpp
+++ b/src/libs/installer/packagemanagergui.cpp
@@ -245,7 +245,6 @@ PackageManagerGui::PackageManagerGui(PackageManagerCore *core, QWidget *parent)
 #endif
     setOption(QWizard::NoBackButtonOnStartPage);
     setOption(QWizard::NoBackButtonOnLastPage);
-    setLayout(new QVBoxLayout(this));
 
     connect(this, SIGNAL(rejected()), m_core, SLOT(setCanceled()));
     connect(this, SIGNAL(interrupted()), m_core, SLOT(interrupt()));
@@ -284,12 +283,6 @@ PackageManagerGui::PackageManagerGui(PackageManagerCore *core, QWidget *parent)
 
     for (int i = QWizard::BackButton; i < QWizard::CustomButton1; ++i)
         d->m_defaultButtonText.insert(i, buttonText(QWizard::WizardButton(i)));
-
-#ifdef Q_OS_MAC
-    resize(sizeHint() * 1.25);
-#else
-    resize(sizeHint());
-#endif
 }
 
 PackageManagerGui::~PackageManagerGui()
@@ -682,7 +675,6 @@ void PackageManagerGui::dependsOnLocalInstallerBinary()
 }
 
 
-
 // -- PackageManagerPage
 
 PackageManagerPage::PackageManagerPage(PackageManagerCore *core)
diff --git a/src/libs/installer/resources/installer.icns b/src/libs/installer/resources/installer.icns
new file mode 100644
index 000000000..8d870d649
--- /dev/null
+++ b/src/libs/installer/resources/installer.icns
diff --git a/src/libs/installer/resources/installer.ico b/src/libs/installer/resources/installer.ico
new file mode 100644
index 000000000..79bd163de
--- /dev/null
+++ b/src/libs/installer/resources/installer.ico
diff --git a/src/libs/installer/resources/installer.png b/src/libs/installer/resources/installer.png
new file mode 100644
index 000000000..423b3585d
--- /dev/null
+++ b/src/libs/installer/resources/installer.png
diff --git a/src/libs/installer/resources/installer.qrc b/src/libs/installer/resources/installer.qrc
new file mode 100644
index 000000000..77bf00f65
--- /dev/null
+++ b/src/libs/installer/resources/installer.qrc
@@ -0,0 +1,7 @@
+<RCC>
+    <qresource prefix="/">
+        <file>installer.png</file>
+        <file>installer.ico</file>
+        <file>installer.icns</file>
+    </qresource>
+</RCC>
diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp
index 181152646..e4d51491e 100644
--- a/src/libs/installer/settings.cpp
+++ b/src/libs/installer/settings.cpp
@@ -223,6 +223,8 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix)
     }
 
     // Add some possible missing values
+    if (!s.d->m_data.contains(scIcon))
+        s.d->m_data.insert(scIcon, QLatin1String(":/installer"));
     if (!s.d->m_data.contains(scRemoveTargetDir))
         s.d->m_data.insert(scRemoveTargetDir, scTrue);
     if (!s.d->m_data.contains(scUninstallerName))