SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

SessionManager auto-slots now also on top-level widgets

Browse Source 
PIVariantEditors::FileBase crash on Dir and fullEditMode fix
This commit is contained in:
Пелипенко Иван
2023-08-30 15:53:59 +03:00
parent c20a5788ca
commit cf99bc1624
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/piqt_utils/pivariant_edit_widgets.cpp
View File

@@ -605,8 +605,9 @@ void PIVariantEditors::FileBase::applyAttributes(const PIVariantMap & a) {
void PIVariantEditors::FileBase::setFullEditMode(bool on) { void PIVariantEditors::FileBase::setFullEditMode(bool on) {
act_save->setVisible(on); edit_widget->setVisible(on);
act_filter->setVisible(on); if (act_save) act_save->setVisible(on);
if (act_filter) act_filter->setVisible(on);
} }

2
libs/widgets/session_manager.cpp
View File

@@ -114,6 +114,7 @@ void SessionManager::save() {
QSet<QObject *> all_list; QSet<QObject *> all_list;
foreach(QObject * c, tsc) { foreach(QObject * c, tsc) {
all_list |= QList2QSet(c->findChildren<QObject *>()); all_list |= QList2QSet(c->findChildren<QObject *>());
all_list |= c;
} }
QMap<const QMetaObject *, QByteArray> funcs = metaFunctions(all_list, "sessionSave"); QMap<const QMetaObject *, QByteArray> funcs = metaFunctions(all_list, "sessionSave");
// qDebug() << "check for save" << all_list.size(); // qDebug() << "check for save" << all_list.size();
@@ -237,6 +238,7 @@ void SessionManager::load(bool onlyMainwindow) {
QSet<QObject *> all_list; QSet<QObject *> all_list;
foreach(QObject * c, tsc) { foreach(QObject * c, tsc) {
all_list |= QList2QSet(c->findChildren<QObject *>()); all_list |= QList2QSet(c->findChildren<QObject *>());
all_list |= c;
} }
QMap<const QMetaObject *, QByteArray> funcs = metaFunctions(all_list, "sessionLoad"); QMap<const QMetaObject *, QByteArray> funcs = metaFunctions(all_list, "sessionLoad");
// qDebug() << "check for load" << all_list.size(); // qDebug() << "check for load" << all_list.size();