diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml
index 945c200..cb68524 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml
@@ -21,14 +21,13 @@ import QtQuick.Dialogs 1.3 as D
import QtQuick.Controls 2.12
import eu.ad5001.LogarithmPlotter.Setting 1.0 as Setting
import "../js/objects.js" as Objects
-import "../js/historylib.js" as HistoryLib
/*!
\qmltype ObjectLists
\inqmlmodule eu.ad5001.LogarithmPlotter
\brief Tab of the drawer that allows the user to manage the objects.
- This item allows the user to syntheticly see all objects, while giving the user the ability
+ This item allows the user to synthetically see all objects, while giving the user the ability
to show, hide, delete, change the location and color, as well as opening the editor dialog
for each object.
@@ -89,146 +88,18 @@ ScrollView {
}
}
- delegate: Item {
+ delegate: ObjectRow {
id: controlRow
- property var obj: Objects.currentObjects[objType][index]
- property alias objVisible: objVisibilityCheckBox.checked
- height: 40
width: objTypeList.width
+ obj: Objects.currentObjects[objType][index]
+ posPicker: positionPicker
+
+ onChanged: {
+ //obj = Objects.currentObjects[objType][index]
+ objectListList.update()
+ }
Component.onCompleted: objTypeList.editingRows.push(controlRow)
-
- CheckBox {
- id: objVisibilityCheckBox
- checked: Objects.currentObjects[objType][index].visible
- anchors.verticalCenter: parent.verticalCenter
- anchors.left: parent.left
- anchors.leftMargin: 5
- onClicked: {
- history.addToHistory(new HistoryLib.EditedVisibility(
- Objects.currentObjects[objType][index].name, objType, this.checked
- ))
- Objects.currentObjects[objType][index].visible = this.checked
- objectListList.changed()
- controlRow.obj = Objects.currentObjects[objType][index]
- }
-
- ToolTip.visible: hovered
- ToolTip.text: checked ?
- qsTr("Hide %1 %2").arg(Objects.types[objType].displayType()).arg(obj.name) :
- qsTr("Show %1 %2").arg(Objects.types[objType].displayType()).arg(obj.name)
- }
-
- Label {
- id: objDescription
- anchors.left: objVisibilityCheckBox.right
- anchors.right: deleteButton.left
- height: parent.height
- verticalAlignment: TextInput.AlignVCenter
- text: obj.getReadableString()
- font.pixelSize: 14
-
- MouseArea {
- anchors.fill: parent
- onClicked: {
- objEditor.obj = Objects.currentObjects[objType][index]
- objEditor.objType = objType
- objEditor.objIndex = index
- //objEditor.editingRow = controlRow
- objEditor.show()
- }
- }
- }
-
- Button {
- id: pointerButton
- width: parent.height - 10
- height: width
- anchors.right: deleteButton.left
- anchors.rightMargin: 5
- anchors.topMargin: 5
-
- Setting.Icon {
- id: icon
- width: 18
- height: 18
- anchors.centerIn: parent
-
- color: sysPalette.windowText
- source: '../icons/common/position.svg'
- }
-
- property bool hasXProp: Objects.types[objType].properties().hasOwnProperty('x')
- property bool hasYProp: Objects.types[objType].properties().hasOwnProperty('y')
- visible: hasXProp || hasYProp
- ToolTip.visible: hovered
- ToolTip.text: qsTr("Set %1 %2 position").arg(Objects.types[objType].displayType()).arg(obj.name)
-
- onClicked: {
- positionPicker.objType = objType
- positionPicker.objName = obj.name
- positionPicker.pickX = hasXProp
- positionPicker.pickY = hasYProp
- positionPicker.propertyX = 'x'
- positionPicker.propertyY = 'y'
- positionPicker.visible = true
-
- }
- }
-
- Button {
- id: deleteButton
- width: parent.height - 10
- height: width
- anchors.right: colorPickRect.left
- anchors.rightMargin: 5
- anchors.topMargin: 5
- icon.name: 'delete'
- icon.source: '../icons/common/delete.svg'
- icon.color: sysPalette.buttonText
- ToolTip.visible: hovered
- ToolTip.text: qsTr("Delete %1 %2").arg(Objects.types[objType].displayType()).arg(obj.name)
-
- onClicked: {
- history.addToHistory(new HistoryLib.DeleteObject(
- obj.name, objType, obj.export()
- ))
- Objects.deleteObject(obj.name)
- objectListList.update()
- }
- }
-
- Rectangle {
- id: colorPickRect
- anchors.right: parent.right
- anchors.rightMargin: 5
- anchors.topMargin: 5
- color: obj.color
- width: parent.height - 10
- height: width
- radius: Math.min(width, height)
- border.width: 2
- border.color: sysPalette.windowText
-
- MouseArea {
- anchors.fill: parent
- onClicked: pickColor.open()
- }
- }
-
- D.ColorDialog {
- id: pickColor
- color: obj.color
- title: qsTr("Pick new color for %1 %2").arg(Objects.types[objType].displayType()).arg(obj.name)
- onAccepted: {
- history.addToHistory(new HistoryLib.ColorChanged(
- obj.name, objType, obj.color, color.toString()
- ))
- obj.color = color.toString()
- controlRow.obj = Objects.currentObjects[objType][index]
- objectListList.update()
- }
- }
}
}
diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectRow.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectRow.qml
new file mode 100644
index 0000000..cf91ffc
--- /dev/null
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectRow.qml
@@ -0,0 +1,180 @@
+/**
+ * LogarithmPlotter - 2D plotter software to make BODE plots, sequences and distribution functions.
+ * Copyright (C) 2022 Ad5001
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+import QtQuick 2.12
+import QtQuick.Dialogs 1.3 as D
+import QtQuick.Controls 2.12
+import eu.ad5001.LogarithmPlotter.Setting 1.0 as Setting
+import "../js/objects.js" as Objects
+import "../js/historylib.js" as HistoryLib
+
+/*!
+ \qmltype ObjectRow
+ \inqmlmodule eu.ad5001.LogarithmPlotter
+ \brief Row describing an object.
+
+ This item allows the user to see, control, and modify a graph object.
+ It includes the visibility checkbox, the description label (optionally latex if enabled),
+ the reposition and delete buttons, and the color picker.
+
+
+ \sa LogarithmPlotter, ObjectCreationGrid, ObjectLists
+*/
+Item {
+ id: objectRow
+
+ signal changed()
+
+ property var obj
+ property var posPicker
+
+ property alias objVisible: objVisibilityCheckBox.checked
+
+ height: 40
+ width: obj.typeList.width
+
+ CheckBox {
+ id: objVisibilityCheckBox
+ checked: obj.visible
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.left: parent.left
+ anchors.leftMargin: 5
+ onClicked: {
+ history.addToHistory(new HistoryLib.EditedVisibility(
+ obj.name, obj.type, this.checked
+ ))
+ obj.visible = this.checked
+ changed()
+ }
+
+ ToolTip.visible: hovered
+ ToolTip.text: checked ?
+ qsTr("Hide %1 %2").arg(obj.constructor.displayType()).arg(obj.name) :
+ qsTr("Show %1 %2").arg(obj.constructor.displayType()).arg(obj.name)
+ }
+
+ Label {
+ id: objDescription
+ anchors.left: objVisibilityCheckBox.right
+ anchors.right: deleteButton.left
+ height: parent.height
+ verticalAlignment: TextInput.AlignVCenter
+ text: obj.getReadableString()
+ font.pixelSize: 14
+
+ MouseArea {
+ anchors.fill: parent
+ onClicked: {
+ objEditor.obj = Objects.currentObjects[obj.type][index]
+ objEditor.obj.type = obj.type
+ objEditor.objIndex = index
+ //objEditor.editingRow = objectRow
+ objEditor.show()
+ }
+ }
+ }
+
+ Button {
+ id: pointerButton
+ width: parent.height - 10
+ height: width
+ anchors.right: deleteButton.left
+ anchors.rightMargin: 5
+ anchors.topMargin: 5
+
+ Setting.Icon {
+ id: icon
+ width: 18
+ height: 18
+ anchors.centerIn: parent
+
+ color: sysPalette.windowText
+ source: '../icons/common/position.svg'
+ }
+
+ property bool hasXProp: obj.constructor.properties().hasOwnProperty('x')
+ property bool hasYProp: obj.constructor.properties().hasOwnProperty('y')
+ visible: hasXProp || hasYProp
+ ToolTip.visible: hovered
+ ToolTip.text: qsTr("Set %1 %2 position").arg(obj.constructor.displayType()).arg(obj.name)
+
+ onClicked: {
+ posPicker.objType = obj.type
+ posPicker.objName = obj.name
+ posPicker.pickX = hasXProp
+ posPicker.pickY = hasYProp
+ posPicker.propertyX = 'x'
+ posPicker.propertyY = 'y'
+ posPicker.visible = true
+
+ }
+ }
+
+ Button {
+ id: deleteButton
+ width: parent.height - 10
+ height: width
+ anchors.right: colorPickRect.left
+ anchors.rightMargin: 5
+ anchors.topMargin: 5
+ icon.name: 'delete'
+ icon.source: '../icons/common/delete.svg'
+ icon.color: sysPalette.buttonText
+ ToolTip.visible: hovered
+ ToolTip.text: qsTr("Delete %1 %2").arg(obj.constructor.displayType()).arg(obj.name)
+
+ onClicked: {
+ history.addToHistory(new HistoryLib.DeleteObject(
+ obj.name, obj.type, obj.export()
+ ))
+ Objects.deleteObject(obj.name)
+ changed()
+ }
+ }
+
+ Rectangle {
+ id: colorPickRect
+ anchors.right: parent.right
+ anchors.rightMargin: 5
+ anchors.topMargin: 5
+ color: obj.color
+ width: parent.height - 10
+ height: width
+ radius: Math.min(width, height)
+ border.width: 2
+ border.color: sysPalette.windowText
+
+ MouseArea {
+ anchors.fill: parent
+ onClicked: pickColor.open()
+ }
+ }
+
+ D.ColorDialog {
+ id: pickColor
+ color: obj.color
+ title: qsTr("Pick new color for %1 %2").arg(obj.constructor.displayType()).arg(obj.name)
+ onAccepted: {
+ history.addToHistory(new HistoryLib.ColorChanged(
+ obj.name, obj.type, obj.color, color.toString()
+ ))
+ obj.color = color.toString()
+ changed()
+ }
+ }
+}
diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/qmldir b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/qmldir
index 7cbf3ea..1478c34 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/qmldir
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/qmldir
@@ -2,5 +2,5 @@ module eu.ad5001.LogarithmPlotter.ObjectLists
ObjectLists 1.0 ObjectLists.qml
ObjectCreationGrid 1.0 ObjectCreationGrid.qml
+ObjectRow 1.0 ObjectRow.qml
EditorDialog 1.0 EditorDialog.qml
-
diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/editproperty.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/editproperty.js
index 87be759..9641967 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/editproperty.js
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/editproperty.js
@@ -116,7 +116,7 @@ class EditedProperty extends C.Action {
.arg(this.targetPropertyReadable)
.arg(' ' + this.targetName + ' ')
.arg(' '+this.prev+' ')
- .arg(' '+this.next+'')
+ .arg(' '+this.next+' ')
// .arg('' + Objects.types[this.targetType].displayType())
}