Compare commits
No commits in common. "93308f2bfa0b77def17772ebf08089ec6c8f9742" and "424eef6e17c43a1b74ae620f55bfa7f646074baf" have entirely different histories.
93308f2bfa
...
424eef6e17
3 changed files with 24 additions and 92 deletions
|
@ -18,7 +18,6 @@
|
|||
|
||||
import QtQuick
|
||||
import QtQuick.Controls
|
||||
import eu.ad5001.LogarithmPlotter.Setting 1.0 as Setting
|
||||
import "js/objects.js" as Objects
|
||||
import "js/mathlib.js" as MathLib
|
||||
import "js/historylib.js" as HistoryLib
|
||||
|
@ -37,7 +36,6 @@ import "js/historylib.js" as HistoryLib
|
|||
Item {
|
||||
id: pickerRoot
|
||||
visible: false
|
||||
clip: true
|
||||
|
||||
/*!
|
||||
\qmlproperty var PickLocationOverlay::canvas
|
||||
|
@ -122,97 +120,32 @@ Item {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Rectangle {
|
||||
id: pickerSettings
|
||||
radius: 15
|
||||
color: sysPalette.window
|
||||
width: pickerSettingsColumn.width + 30;
|
||||
height: pickerSettingsColumn.height + 20
|
||||
property bool folded: false;
|
||||
x: -15 - ((width-55) * folded);
|
||||
y: 10
|
||||
z: 2
|
||||
Row {
|
||||
height: precisionSlider.height
|
||||
Text {
|
||||
text: " "+ qsTr("Pointer precision:") + " "
|
||||
color: 'black'
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
}
|
||||
|
||||
Row {
|
||||
id: pickerSettingsColumn
|
||||
anchors {
|
||||
left: parent.left
|
||||
top: parent.top
|
||||
leftMargin: 20
|
||||
topMargin: 10
|
||||
}
|
||||
spacing: 15
|
||||
property int cellHeight: 15
|
||||
|
||||
Column {
|
||||
spacing: 5
|
||||
width: 100
|
||||
|
||||
Text {
|
||||
text: qsTr("Pointer precision:")
|
||||
color: sysPalette.windowText
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
height: pickerSettingsColumn.cellHeight
|
||||
}
|
||||
|
||||
Text {
|
||||
text: qsTr("Snap to grid") + ":"
|
||||
color: sysPalette.windowText
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
height: pickerSettingsColumn.cellHeight
|
||||
}
|
||||
}
|
||||
|
||||
Column {
|
||||
spacing: 5
|
||||
|
||||
Slider {
|
||||
id: precisionSlider
|
||||
from: 0
|
||||
value: 2
|
||||
to: 10
|
||||
stepSize: 1
|
||||
height: pickerSettingsColumn.cellHeight
|
||||
|
||||
ToolTip {
|
||||
parent: precisionSlider.handle
|
||||
visible: precisionSlider.pressed
|
||||
text: precisionSlider.value.toFixed(0)
|
||||
}
|
||||
}
|
||||
|
||||
CheckBox {
|
||||
id: snapToGridCheckbox
|
||||
height: pickerSettingsColumn.cellHeight
|
||||
// text: qsTr("Snap to grid")
|
||||
checked: false
|
||||
}
|
||||
}
|
||||
|
||||
Button {
|
||||
width: 24
|
||||
anchors.top: parent.top
|
||||
anchors.bottom: parent.bottom
|
||||
flat: true
|
||||
|
||||
onClicked: pickerSettings.folded = !pickerSettings.folded
|
||||
|
||||
ToolTip.visible: hovered
|
||||
ToolTip.delay: 200
|
||||
ToolTip.text: pickerSettings.folded ? qsTr("Open picker settings") : qsTr("Hide picker settings")
|
||||
|
||||
Setting.Icon {
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
width: 18
|
||||
height: 18
|
||||
color: sysPalette.windowText
|
||||
source: `../icons/common/settings.svg`
|
||||
}
|
||||
Slider {
|
||||
id: precisionSlider
|
||||
from: 0
|
||||
value: 2
|
||||
to: 10
|
||||
stepSize: 1
|
||||
ToolTip {
|
||||
parent: precisionSlider.handle
|
||||
visible: precisionSlider.pressed
|
||||
text: precisionSlider.value.toFixed(0)
|
||||
}
|
||||
}
|
||||
|
||||
CheckBox {
|
||||
id: snapToGridCheckbox
|
||||
text: qsTr("Snap to grid")
|
||||
checked: false
|
||||
}
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
|
|
|
@ -47,11 +47,11 @@ Item {
|
|||
id: img
|
||||
height: parent.height
|
||||
width: parent.width
|
||||
//smooth: true
|
||||
visible: false
|
||||
sourceSize.width: width*Screen.devicePixelRatio
|
||||
sourceSize.height: width*Screen.devicePixelRatio
|
||||
}
|
||||
|
||||
ColorOverlay {
|
||||
anchors.fill: img
|
||||
source: img
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M24 13.616v-3.232l-2.869-1.02c-.198-.687-.472-1.342-.811-1.955l1.308-2.751-2.285-2.285-2.751 1.307c-.613-.339-1.269-.613-1.955-.811l-1.021-2.869h-3.232l-1.021 2.869c-.686.198-1.342.471-1.955.811l-2.751-1.308-2.285 2.285 1.308 2.752c-.339.613-.614 1.268-.811 1.955l-2.869 1.02v3.232l2.869 1.02c.197.687.472 1.342.811 1.955l-1.308 2.751 2.285 2.286 2.751-1.308c.613.339 1.269.613 1.955.811l1.021 2.869h3.232l1.021-2.869c.687-.198 1.342-.472 1.955-.811l2.751 1.308 2.285-2.286-1.308-2.751c.339-.613.613-1.268.811-1.955l2.869-1.02zm-12 2.384c-2.209 0-4-1.791-4-4s1.791-4 4-4 4 1.791 4 4-1.791 4-4 4z"/></svg>
|
Before Width: | Height: | Size: 696 B |
Loading…
Reference in a new issue