StelDialogLogBook.cpp   StelDialogLogBook.cpp 
skipping to change at line 56 skipping to change at line 56
widget()->setWindowOpacity(0.4); widget()->setWindowOpacity(0.4);
} }
if (event->type()==QEvent::WindowActivate) if (event->type()==QEvent::WindowActivate)
{ {
widget()->setWindowOpacity(0.9); widget()->setWindowOpacity(0.9);
} }
return QGraphicsProxyWidget::event(event); return QGraphicsProxyWidget::event(event);
} }
}; };
StelDialogLogBook::StelDialogLogBook() : dialog(NULL) StelDialogLogBook::StelDialogLogBook() : dialog(Q_NULLPTR)
{ {
} }
StelDialogLogBook::~StelDialogLogBook() StelDialogLogBook::~StelDialogLogBook()
{ {
} }
void StelDialogLogBook::close() void StelDialogLogBook::close()
{ {
setVisible(false); setVisible(false);
skipping to change at line 95 skipping to change at line 95
if (newPos.x()>=screenSize.width()) if (newPos.x()>=screenSize.width())
newPos.setX(screenSize.width() - dialog->siz e().width()); newPos.setX(screenSize.width() - dialog->siz e().width());
if (newPos.y()>=screenSize.height()) if (newPos.y()>=screenSize.height())
newPos.setY(screenSize.height() - dialog->si ze().height()); newPos.setY(screenSize.height() - dialog->si ze().height());
if (newPos != dialog->pos()) if (newPos != dialog->pos())
proxy->setPos(newPos); proxy->setPos(newPos);
proxy->setFocus(); proxy->setFocus();
return; return;
} }
dialog = new QDialog(NULL); dialog = new QDialog(Q_NULLPTR);
connect(dialog, SIGNAL(rejected()), this, SLOT(close())); connect(dialog, SIGNAL(rejected()), this, SLOT(close()));
createDialogContent(); createDialogContent();
proxy = new CustomProxy(NULL, Qt::Tool); proxy = new CustomProxy(Q_NULLPTR, Qt::Tool);
proxy->setWidget(dialog); proxy->setWidget(dialog);
QRectF bound = proxy->boundingRect(); QRectF bound = proxy->boundingRect();
// centre with dialog according to current window size. // centre with dialog according to current window size.
proxy->setPos((int)((screenSize.width()-bound.width())/2), ( int)((screenSize.height()-bound.height())/2)); proxy->setPos((int)((screenSize.width()-bound.width())/2), ( int)((screenSize.height()-bound.height())/2));
StelMainView::getInstance().scene()->addItem(proxy); StelMainView::getInstance().scene()->addItem(proxy);
proxy->setWindowFrameMargins(2,0,2,2); proxy->setWindowFrameMargins(2,0,2,2);
// The caching is buggy on all plateforms with Qt 4.5.2 // The caching is buggy on all plateforms with Qt 4.5.2
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/