--- a/controlpanelplugins/themeplugin/src/cpthemepreview.cpp Thu May 27 12:52:25 2010 +0300
+++ b/controlpanelplugins/themeplugin/src/cpthemepreview.cpp Fri Jun 11 13:39:17 2010 +0300
@@ -18,7 +18,7 @@
#include <QString>
#include <QGraphicsPixmapItem>
#include <QGraphicsLinearLayout>
-#include <QDebug>
+
#include <hbaction.h>
#include <hbtoolbar.h>
#include <hbicon.h>
@@ -52,12 +52,10 @@
//setup the heading.
//TODO: translation of string hbTrId("txt_cp_title_preview_1")
-
QString themeHeading = tr("Preview: ") + mTheme.name;
HbLabel* label = new HbLabel(themeHeading, this);
label->setFontSpec(HbFontSpec(HbFontSpec::Primary));
- label->setPreferredHeight(5.0);
layout->addItem(label);
layout->setAlignment(layout->itemAt(0), Qt::AlignTop);
@@ -90,8 +88,7 @@
mPreviewIcon = new HbIconItem(mTheme.portraitPreviewIcon, this);
}
layout->addItem(mPreviewIcon);
- layout->setAlignment(layout->itemAt(0), Qt::AlignTop);
-
+
setToolBar(mToolBar);
setLayout(layout);
@@ -101,7 +98,7 @@
QObject::connect(mSoftKeyBackAction, SIGNAL(triggered()),
this, SIGNAL(aboutToClose()) );
- this->setNavigationAction(mSoftKeyBackAction);
+ setNavigationAction(mSoftKeyBackAction);
}
/*!
@@ -152,16 +149,14 @@
QGraphicsLinearLayout* previewLayout = dynamic_cast<QGraphicsLinearLayout*>(layout());
- if(mPreviewIcon == dynamic_cast<HbIconItem*>(previewLayout->itemAt(1)) ) {
+ if(mPreviewIcon && mPreviewIcon == dynamic_cast<HbIconItem*>(previewLayout->itemAt(1)) ) {
previewLayout->removeAt(1);
- delete mPreviewIcon;
- mPreviewIcon = 0;
if(orientation == Qt::Horizontal) {
- mPreviewIcon = new HbIconItem(mTheme.landscapePreviewIcon, this);
+ mPreviewIcon->setIcon(mTheme.landscapePreviewIcon);
}
else {
- mPreviewIcon = new HbIconItem(mTheme.portraitPreviewIcon, this);
+ mPreviewIcon->setIcon(mTheme.portraitPreviewIcon);
}
previewLayout->addItem(mPreviewIcon);