369 |
{ |
{ |
370 |
// Try to restore old form window positioning. |
// Try to restore old form window positioning. |
371 |
if (pWidget) { |
if (pWidget) { |
372 |
|
if (bVisible) pWidget->show(); // Force initial exposure! |
373 |
m_settings.beginGroup("/Geometry/" + pWidget->objectName()); |
m_settings.beginGroup("/Geometry/" + pWidget->objectName()); |
374 |
|
#if QT_VERSION >= 0x050000 |
375 |
const QByteArray& geometry |
const QByteArray& geometry |
376 |
= m_settings.value("/geometry").toByteArray(); |
= m_settings.value("/geometry").toByteArray(); |
377 |
if (!geometry.isEmpty()) { |
if (!geometry.isEmpty()) |
378 |
pWidget->restoreGeometry(geometry); |
pWidget->restoreGeometry(geometry); |
379 |
} else { |
else |
380 |
#if 1//--LOAD_OLD_GEOMETRY |
#else//--LOAD_OLD_GEOMETRY |
381 |
QPoint wpos; |
QPoint wpos; |
382 |
QSize wsize; |
QSize wsize; |
383 |
wpos.setX(m_settings.value("/x", -1).toInt()); |
wpos.setX(m_settings.value("/x", -1).toInt()); |
384 |
wpos.setY(m_settings.value("/y", -1).toInt()); |
wpos.setY(m_settings.value("/y", -1).toInt()); |
385 |
wsize.setWidth(m_settings.value("/width", -1).toInt()); |
wsize.setWidth(m_settings.value("/width", -1).toInt()); |
386 |
wsize.setHeight(m_settings.value("/height", -1).toInt()); |
wsize.setHeight(m_settings.value("/height", -1).toInt()); |
387 |
if (wpos.x() > 0 && wpos.y() > 0) |
if (wpos.x() > 0 && wpos.y() > 0) |
388 |
pWidget->move(wpos); |
pWidget->move(wpos); |
389 |
if (wsize.width() > 0 && wsize.height() > 0) |
if (wsize.width() > 0 && wsize.height() > 0) |
390 |
pWidget->resize(wsize); |
pWidget->resize(wsize); |
391 |
else |
else |
392 |
#endif |
#endif |
393 |
pWidget->adjustSize(); |
pWidget->adjustSize(); |
|
} |
|
394 |
if (!bVisible) |
if (!bVisible) |
395 |
bVisible = m_settings.value("/visible", false).toBool(); |
bVisible = m_settings.value("/visible", false).toBool(); |
396 |
if (bVisible) |
if (bVisible) |
409 |
// only save the form geometry while its up and visible) |
// only save the form geometry while its up and visible) |
410 |
if (pWidget) { |
if (pWidget) { |
411 |
m_settings.beginGroup("/Geometry/" + pWidget->objectName()); |
m_settings.beginGroup("/Geometry/" + pWidget->objectName()); |
412 |
#if 0//--SAVE_OLD_GEOMETRY |
#if QT_VERSION >= 0x050000 |
413 |
|
m_settings.setValue("/geometry", pWidget->saveGeometry()); |
414 |
|
#else//--SAVE_OLD_GEOMETRY |
415 |
const QPoint& wpos = pWidget->pos(); |
const QPoint& wpos = pWidget->pos(); |
416 |
const QSize& wsize = pWidget->size(); |
const QSize& wsize = pWidget->size(); |
417 |
m_settings.setValue("/x", wpos.x()); |
m_settings.setValue("/x", wpos.x()); |
419 |
m_settings.setValue("/width", wsize.width()); |
m_settings.setValue("/width", wsize.width()); |
420 |
m_settings.setValue("/height", wsize.height()); |
m_settings.setValue("/height", wsize.height()); |
421 |
#endif |
#endif |
|
m_settings.setValue("/geometry", pWidget->saveGeometry()); |
|
422 |
if (!bVisible) bVisible = pWidget->isVisible(); |
if (!bVisible) bVisible = pWidget->isVisible(); |
423 |
m_settings.setValue("/visible", bVisible); |
m_settings.setValue("/visible", bVisible); |
424 |
m_settings.endGroup(); |
m_settings.endGroup(); |