From 6b19673c6586156f874835b21d8fecf0cb8303ed Mon Sep 17 00:00:00 2001 From: LilyCalla Date: Tue, 30 Apr 2024 22:45:58 -0700 Subject: [PATCH 1/6] prevent invisible search filter --- qmlui/qml/fixturesfunctions/LeftPanel.qml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/qmlui/qml/fixturesfunctions/LeftPanel.qml b/qmlui/qml/fixturesfunctions/LeftPanel.qml index afab32e9f5..a3ba6b44bf 100644 --- a/qmlui/qml/fixturesfunctions/LeftPanel.qml +++ b/qmlui/qml/fixturesfunctions/LeftPanel.qml @@ -98,8 +98,10 @@ SidePanel autoExclusive: false onToggled: { - if (checked == true) + if (checked == true) { loaderSource = "qrc:/FixtureGroupManager.qml" + fixtureManager.searchFilter = "" + } animatePanel(checked) } } From 689ed36e5ad5af3b80103843912206841942de26 Mon Sep 17 00:00:00 2001 From: LilyCalla Date: Tue, 30 Apr 2024 22:47:58 -0700 Subject: [PATCH 2/6] prevent accidental nullptr entries in map --- qmlui/treemodel.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qmlui/treemodel.cpp b/qmlui/treemodel.cpp index bbd8881ad3..c28d95797b 100644 --- a/qmlui/treemodel.cpp +++ b/qmlui/treemodel.cpp @@ -202,6 +202,8 @@ TreeModelItem *TreeModel::itemAtPath(QString path) return nullptr; } + if(m_itemsPathMap.contains(pathList.at(0))) + return nullptr; TreeModelItem *item = m_itemsPathMap[pathList.at(0)]; QString subPath = path.mid(path.indexOf(TreeModel::separator()) + 1); return item->children()->itemAtPath(subPath); @@ -270,6 +272,8 @@ void TreeModel::setItemRoleData(QString path, const QVariant &value, int role) } else { + if(!m_itemsPathMap.contains(pathList.at(0))) + return; TreeModelItem *item = m_itemsPathMap[pathList.at(0)]; QString subPath = path.mid(path.indexOf(TreeModel::separator()) + 1); item->children()->setItemRoleData(subPath, value, role); From 74be2d89ee86406c44405fef90a7f82295aebd23 Mon Sep 17 00:00:00 2001 From: LilyCalla Date: Tue, 30 Apr 2024 22:49:23 -0700 Subject: [PATCH 3/6] prevent ESC from clearing fixture text --- qmlui/qml/fixturesfunctions/FixtureNodeDelegate.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/qmlui/qml/fixturesfunctions/FixtureNodeDelegate.qml b/qmlui/qml/fixturesfunctions/FixtureNodeDelegate.qml index 9a44a25cd9..739e084412 100644 --- a/qmlui/qml/fixturesfunctions/FixtureNodeDelegate.qml +++ b/qmlui/qml/fixturesfunctions/FixtureNodeDelegate.qml @@ -132,6 +132,7 @@ Column id: nodeLabel Layout.fillWidth: true text: textLabel + originalText: text onTextConfirmed: { From 9afdc73cba65d88b1dfb3b9cdd2ff326cc109aa8 Mon Sep 17 00:00:00 2001 From: LilyCalla Date: Wed, 1 May 2024 08:33:14 -0700 Subject: [PATCH 4/6] correct filename in license header --- qmlui/qml/GenericMultiDragItem.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qmlui/qml/GenericMultiDragItem.qml b/qmlui/qml/GenericMultiDragItem.qml index e3ca4e4759..b354a9d6ee 100644 --- a/qmlui/qml/GenericMultiDragItem.qml +++ b/qmlui/qml/GenericMultiDragItem.qml @@ -1,6 +1,6 @@ /* Q Light Controller Plus - FunctionDragItem.qml + GenericMultiDragItem.qml Copyright (c) Massimo Callegari From 8d9ec56976d6964c772194de5c16e5bce66f248d Mon Sep 17 00:00:00 2001 From: LilyCalla Date: Wed, 1 May 2024 08:43:17 -0700 Subject: [PATCH 5/6] prevent ESC from erasing universe names --- qmlui/qml/TreeNodeDelegate.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/qmlui/qml/TreeNodeDelegate.qml b/qmlui/qml/TreeNodeDelegate.qml index f421b52760..1b9f1bea3c 100644 --- a/qmlui/qml/TreeNodeDelegate.qml +++ b/qmlui/qml/TreeNodeDelegate.qml @@ -103,6 +103,7 @@ Column id: nodeLabel width: nodeBgRect.width - x - 1 text: cRef ? cRef.name : textLabel + originalText: text onTextConfirmed: nodeContainer.pathChanged(nodePath, text) } From 6bf200f03c60652367971be5fb7fe9c63a7669af Mon Sep 17 00:00:00 2001 From: LilyCalla Date: Thu, 2 May 2024 12:51:13 -0700 Subject: [PATCH 6/6] fixed code style issues --- qmlui/qml/fixturesfunctions/LeftPanel.qml | 3 ++- qmlui/treemodel.cpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/qmlui/qml/fixturesfunctions/LeftPanel.qml b/qmlui/qml/fixturesfunctions/LeftPanel.qml index a3ba6b44bf..679f59f5e3 100644 --- a/qmlui/qml/fixturesfunctions/LeftPanel.qml +++ b/qmlui/qml/fixturesfunctions/LeftPanel.qml @@ -98,7 +98,8 @@ SidePanel autoExclusive: false onToggled: { - if (checked == true) { + if (checked == true) + { loaderSource = "qrc:/FixtureGroupManager.qml" fixtureManager.searchFilter = "" } diff --git a/qmlui/treemodel.cpp b/qmlui/treemodel.cpp index c28d95797b..7149b521bf 100644 --- a/qmlui/treemodel.cpp +++ b/qmlui/treemodel.cpp @@ -202,7 +202,7 @@ TreeModelItem *TreeModel::itemAtPath(QString path) return nullptr; } - if(m_itemsPathMap.contains(pathList.at(0))) + if (m_itemsPathMap.contains(pathList.at(0))) return nullptr; TreeModelItem *item = m_itemsPathMap[pathList.at(0)]; QString subPath = path.mid(path.indexOf(TreeModel::separator()) + 1); @@ -272,7 +272,7 @@ void TreeModel::setItemRoleData(QString path, const QVariant &value, int role) } else { - if(!m_itemsPathMap.contains(pathList.at(0))) + if (!m_itemsPathMap.contains(pathList.at(0))) return; TreeModelItem *item = m_itemsPathMap[pathList.at(0)]; QString subPath = path.mid(path.indexOf(TreeModel::separator()) + 1);