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