diff -r 36d60d12b4af -r 819e59dfc032 perfapps/perfmon/ui/hb/datapopup/src/perfmondatapopupdialog.cpp --- a/perfapps/perfmon/ui/hb/datapopup/src/perfmondatapopupdialog.cpp Fri Sep 17 14:22:55 2010 +0300 +++ b/perfapps/perfmon/ui/hb/datapopup/src/perfmondatapopupdialog.cpp Mon Oct 04 10:09:02 2010 +0300 @@ -29,7 +29,7 @@ PerfMonDataPopupDialog::PerfMonDataPopupDialog(const QVariantMap ¶meters) : mLastError(NoError), mShowEventReceived(false), - mLocation(LocationTopRight), + mLocation(LocationUndefined), mWidget(new PerfMonDataPopupWidget(this)) { setTimeout(0); @@ -108,10 +108,6 @@ // Widget is about to hide. Closing effect has ended. void PerfMonDataPopupDialog::hideEvent(QHideEvent *event) { - if (mainWindow()) { - disconnect(mainWindow(), SIGNAL(orientationChanged(Qt::Orientation)), - this, SLOT(reposition())); - } HbPopup::hideEvent(event); emit deviceDialogClosed(); } @@ -119,11 +115,6 @@ // Widget is about to show void PerfMonDataPopupDialog::showEvent(QShowEvent *event) { - if (mainWindow()) { - connect(mainWindow(), SIGNAL(orientationChanged(Qt::Orientation)), - this, SLOT(reposition())); - } - reposition(); HbPopup::showEvent(event); mShowEventReceived = true; } @@ -148,7 +139,13 @@ { if (location != mLocation) { mLocation = location; - reposition(); + QSize screenSize = HbDeviceProfile::profile(mainWindow()).logicalSize(); + if(mLocation == LocationTopRight) { + setPreferredPos(QPointF(screenSize.width(), 0), HbPopup::TopRightCorner); + } + else{ + setPreferredPos(QPointF(screenSize.width() / 2, screenSize.height()), HbPopup::BottomEdgeCenter); + } } } @@ -160,24 +157,4 @@ void PerfMonDataPopupDialog::setLines(const QStringList &lines) { mWidget->setLines(lines); - setPreferredSize(mWidget->preferredWidth()+30,mWidget->preferredHeight()+30); } - -void PerfMonDataPopupDialog::reposition() -{ - if (mainWindow()) { - QSize screenSize = HbDeviceProfile::profile(mainWindow()).logicalSize(); - switch (mLocation) { - case LocationTopRight: - setPreferredPos(QPointF(screenSize.width(), 0), - HbPopup::TopRightCorner); - break; - - case LocationBottomMiddle: - setPreferredPos(QPointF(screenSize.width() / 2, screenSize.height()), - HbPopup::BottomEdgeCenter); - break; - } - } - resize(0,0); -}