kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-10-17 11:24:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix restoreState() for QETElementEditor and QETTitleBlockTemplateEditor on Qt6

Browse Source 
Apply the same split readSettings()/readSettingsState() pattern from
QETDiagramEditor to the other two main windows:
- QETElementEditor: split in constructor, call readSettingsState() after show()
- QETTitleBlockTemplateEditor: split readSettings(), callers call
  readSettingsState() after show() (newTemplate + 2x openTitleBlockTemplate)
- Remove destructive settings.remove() guards that would delete saved
  state on every Qt6 launch when restoreState() fails before show()

Co-authored-by: ispyisail
This commit is contained in:
Kellermorph
2026-08-23 10:37:52 +02:00
parent f6afd87522
commit 61a160fa62
5 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/editor/ui/qetelementeditor.cpp
+17 -8
View File
@@ -77,8 +77,9 @@ QETElementEditor::QETElementEditor(QWidget *parent) :
//ui->m_display_menu->insertMenu(ui->m_zoom_in_action, menu);
setWindowState(Qt::WindowMaximized);
readSettings();
readSettings(); // restoreGeometry before show()
show();
readSettingsState(); // restoreState() must be called after show() in Qt6
}
/**
@@ -950,20 +951,28 @@ void QETElementEditor::readSettings()
restoreGeometry(geometry.toByteArray());
}
auto data = m_elmt_scene->elementData();
data.m_drawing_information = settings.value("elementeditor/default-informations", "").toString();
m_elmt_scene->setElementData(data);
}
/**
* @brief QETElementEditor::readSettingsState
* Restore the window state (docks, toolbars).
* Must be called AFTER show() in Qt6 for restoreState() to work correctly.
*/
void QETElementEditor::readSettingsState()
{
QSettings settings;
QVariant state = settings.value("elementeditor/state");
if (state.isValid()) {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
if (!restoreState(state.toByteArray())) {
settings.remove("elementeditor/state");
}
restoreState(state.toByteArray());
#else
restoreState(state.toByteArray());
#endif
}
auto data = m_elmt_scene->elementData();
data.m_drawing_information = settings.value("elementeditor/default-informations", "").toString();
m_elmt_scene->setElementData(data);
}
/**