Ad5001/LogarithmPlotter
Ad5001/LogarithmPlotter
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Wiki Activity

Miinor changes

Browse source
This commit is contained in:
Adsooi 2021-03-14 19:03:58 +01:00
parent 620bdfc28c
commit eddcb5a545
8 changed files with 68 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
linux/x-logarithm-plotter.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
<mime-type xmlns="http://www.freedesktop.org/standards/shared-mime-info" type="application/x-logarithm-plotter"> <mime-type xmlns="http://www.freedesktop.org/standards/shared-mime-info" type="application/x-logarithm-plotter">
<comment>Logarithm Plot/Graph</comment> <comment>Logarithm Plot File</comment>
<comment xml:lang="fr">Graphe Logarithmique</comment> <comment xml:lang="fr">Fichier Graphe Logarithmique</comment>
<icon name="/home/ad5001/Apps/LogarithmPlotter/linux/logplotterfile.svg"/> <icon name="/home/ad5001/Apps/LogarithmPlotter/linux/logplotterfile.svg"/>
<glob-deleteall/> <glob-deleteall/>
<glob pattern="*.json"/> <glob pattern="*.json"/>

3
qml/ComboBoxSetting.qml
View file

@ -35,12 +35,11 @@ Item {
return combox.find(elementName) return combox.find(elementName)
} }
Text { Label {
id: labelItem id: labelItem
height: 30 height: 30
anchors.top: parent.top anchors.top: parent.top
verticalAlignment: TextInput.AlignVCenter verticalAlignment: TextInput.AlignVCenter
color: sysPalette.windowText
text: control.label +": " text: control.label +": "
} }

3
qml/ListSetting.qml
View file

@ -20,11 +20,10 @@ Column {
property alias model: repeater.model property alias model: repeater.model
Text { Label {
id: labelItem id: labelItem
height: 30 height: 30
verticalAlignment: TextInput.AlignVCenter verticalAlignment: TextInput.AlignVCenter
color: sysPalette.windowText
text: control.label +": " text: control.label +": "
} }

9
qml/LogGraph.qml
View file

@ -48,17 +48,10 @@ ApplicationWindow {
visible: !inPortrait visible: !inPortrait
Rectangle {
id: topSeparator
color: sysPaletteIn.dark
width: parent.width
height: 0
}
TabBar { TabBar {
id: sidebarSelector id: sidebarSelector
width: parent.width width: parent.width
anchors.top: topSeparator.bottom anchors.top: parent.top
TabButton { TabButton {
text: qsTr("Objects") text: qsTr("Objects")
} }

82
qml/ObjectLists.qml
View file

@ -64,10 +64,9 @@ ListView {
ToolTip.text: checked ? `Hide all ${Objects.types[objType].typeMultiple()}` : `Show all ${Objects.types[objType].typeMultiple()}` ToolTip.text: checked ? `Hide all ${Objects.types[objType].typeMultiple()}` : `Show all ${Objects.types[objType].typeMultiple()}`
} }
Text { Label {
id: typeHeaderText id: typeHeaderText
verticalAlignment: TextInput.AlignVCenter verticalAlignment: TextInput.AlignVCenter
color: sysPalette.windowText
text: Objects.types[objType].typeMultiple() + ":" text: Objects.types[objType].typeMultiple() + ":"
font.pixelSize: 20 font.pixelSize: 20
} }
@ -98,15 +97,14 @@ ListView {
ToolTip.text: checked ? `Hide ${objType} ${obj.name}` : `Show ${objType} ${obj.name}` ToolTip.text: checked ? `Hide ${objType} ${obj.name}` : `Show ${objType} ${obj.name}`
} }
Text { Label {
id: objDescription id: objDescription
anchors.left: objVisibilityCheckBox.right anchors.left: objVisibilityCheckBox.right
anchors.right: settingsButton.left anchors.right: deleteButton.left
height: parent.height height: parent.height
verticalAlignment: TextInput.AlignVCenter verticalAlignment: TextInput.AlignVCenter
text: obj.getReadableString() text: obj.getReadableString()
font.pixelSize: 14 font.pixelSize: 14
color: sysPalette.windowText
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
@ -120,25 +118,6 @@ ListView {
} }
} }
Button {
id: settingsButton
width: parent.height - 10
height: width
anchors.right: deleteButton.left
anchors.rightMargin: 5
anchors.topMargin: 5
icon.source: './icons/settings.svg'
icon.name: 'configure'
onClicked: {
objEditor.obj = Objects.currentObjects[objType][index]
objEditor.objType = objType
objEditor.objIndex = index
objEditor.editingRow = controlRow
objEditor.show()
}
}
Button { Button {
id: deleteButton id: deleteButton
width: parent.height - 10 width: parent.height - 10
@ -198,7 +177,7 @@ ListView {
width: 300 width: 300
height: 400 height: 400
Text { Label {
id: dlgTitle id: dlgTitle
anchors.left: parent.left anchors.left: parent.left
anchors.top: parent.top anchors.top: parent.top
@ -261,13 +240,13 @@ ListView {
width: dlgProperties.width width: dlgProperties.width
property string label: Utils.camelCase2readable(modelData[0]) property string label: Utils.camelCase2readable(modelData[0])
Text { Label {
id: customPropComment id: customPropComment
width: parent.width width: parent.width
height: visible ? implicitHeight : 0 height: visible ? implicitHeight : 0
visible: modelData[0].startsWith('comment') visible: modelData[0].startsWith('comment')
text: visible ? modelData[1].replace(/\{name\}/g, objEditor.obj.name) : '' text: visible ? modelData[1].replace(/\{name\}/g, objEditor.obj.name) : ''
color: sysPalette.windowText //color: sysPalette.windowText
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
} }
@ -387,35 +366,42 @@ ListView {
id: createRow id: createRow
width: parent.width width: parent.width
Text { Label {
id: createTitle id: createTitle
verticalAlignment: TextInput.AlignVCenter verticalAlignment: TextInput.AlignVCenter
text: '+ Create new:' text: '+ Create new:'
font.pixelSize: 20 font.pixelSize: 20
color: sysPalette.windowText //color: sysPalette.windowText
} }
Repeater { Grid {
model: Object.keys(Objects.types) width: parent.width
columns: 3
Repeater {
model: Object.keys(Objects.types)
Button { Button {
id: createBtn id: createBtn
text: modelData text: modelData
width: createRow.width width: parent.width/3
visible: Objects.types[modelData].createable() visible: Objects.types[modelData].createable()
height: visible ? implicitHeight : 0 height: visible ? implicitHeight : 0
icon.source: './icons/'+modelData+'.svg' // Default to dark version display: AbstractButton.TextUnderIcon
icon.name: modelData icon.source: './icons/'+modelData+'.svg' // Default to dark version
icon.color: sysPalette.windowText icon.name: modelData
icon.width: 24
icon.height: 24
icon.color: sysPalette.windowText
onClicked: { onClicked: {
Objects.createNewRegisteredObject(modelData) Objects.createNewRegisteredObject(modelData)
objectListList.update() objectListList.update()
objEditor.obj = Objects.currentObjects[modelData][Objects.currentObjects[modelData].length - 1] objEditor.obj = Objects.currentObjects[modelData][Objects.currentObjects[modelData].length - 1]
objEditor.objType = modelData objEditor.objType = modelData
objEditor.objIndex = Objects.currentObjects[modelData].length - 1 objEditor.objIndex = Objects.currentObjects[modelData].length - 1
objEditor.editingRow = objectListList.listViews[modelData].editingRows[objEditor.objIndex] objEditor.editingRow = objectListList.listViews[modelData].editingRows[objEditor.objIndex]
objEditor.show() objEditor.show()
}
} }
} }
} }

4
qml/TextSetting.qml
View file

@ -31,12 +31,12 @@ Item {
property string label property string label
property string defValue property string defValue
Text { Label {
id: labelItem id: labelItem
height: 30 height: 30
anchors.top: parent.top anchors.top: parent.top
verticalAlignment: TextInput.AlignVCenter verticalAlignment: TextInput.AlignVCenter
color: sysPalette.windowText //color: sysPalette.windowText
text: control.label +": " text: control.label +": "
} }

24
qml/icons/Function.svg
View file

@ -23,16 +23,16 @@
borderopacity="1.0" borderopacity="1.0"
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="15.839192" inkscape:zoom="31.678384"
inkscape:cx="25.331188" inkscape:cx="15.0192"
inkscape:cy="8.0958853" inkscape:cy="8.9307793"
inkscape:document-units="px" inkscape:document-units="px"
inkscape:current-layer="layer1" inkscape:current-layer="layer1"
inkscape:document-rotation="0" inkscape:document-rotation="0"
showgrid="true" showgrid="true"
inkscape:window-width="1920" inkscape:window-width="1920"
inkscape:window-height="1011" inkscape:window-height="1011"
inkscape:window-x="1920" inkscape:window-x="0"
inkscape:window-y="0" inkscape:window-y="0"
inkscape:window-maximized="1"> inkscape:window-maximized="1">
<inkscape:grid <inkscape:grid
@ -47,7 +47,7 @@
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
<dc:type <dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title> <dc:title />
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
@ -57,15 +57,15 @@
id="layer1"> id="layer1">
<text <text
xml:space="preserve" xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:17.1281px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.98816" style="font-style:normal;font-weight:normal;font-size:16px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.98816"
x="-0.045739319" x="0.3459909"
y="18.130817" y="17.966721"
id="text3942" id="text3942"
transform="scale(0.98816009,1.0119818)"><tspan transform="scale(0.98816007,1.0119818)"><tspan
sodipodi:role="line" sodipodi:role="line"
id="tspan3940" id="tspan3940"
x="-0.045739319" x="0.3459909"
y="18.130817" y="17.966721"
style="font-size:17.1281px;stroke-width:0.98816">f(x)</tspan></text> style="font-size:16px;stroke-width:0.98816">f(x)</tspan></text>
</g> </g>
</svg> </svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

29
qml/icons/X Cursor.svg
View file

@ -12,7 +12,7 @@
viewBox="0 0 24.0 24.0" viewBox="0 0 24.0 24.0"
version="1.1" version="1.1"
id="SVGRoot" id="SVGRoot"
sodipodi:docname="X Cursor.svg.2020_12_24_14_32_23.0.svg" sodipodi:docname="X Cursor.svg"
inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"> inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
<defs <defs
id="defs1469" /> id="defs1469" />
@ -23,9 +23,9 @@
borderopacity="1.0" borderopacity="1.0"
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="22.4" inkscape:zoom="15.839192"
inkscape:cx="23.448337" inkscape:cx="21.452629"
inkscape:cy="12.896609" inkscape:cy="4.4190861"
inkscape:document-units="px" inkscape:document-units="px"
inkscape:current-layer="layer1" inkscape:current-layer="layer1"
inkscape:document-rotation="0" inkscape:document-rotation="0"
@ -58,18 +58,17 @@
inkscape:label="Calque 1" inkscape:label="Calque 1"
inkscape:groupmode="layer" inkscape:groupmode="layer"
id="layer1"> id="layer1">
<text <g
xml:space="preserve" aria-label="X"
style="font-style:normal;font-weight:normal;font-size:17.3373px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.00023" transform="scale(0.99446808,1.0055627)"
x="3.0166881"
y="13.425312"
id="text14" id="text14"
transform="scale(0.99446808,1.0055627)"><tspan style="font-style:normal;font-weight:normal;font-size:17.3373px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.00023">
sodipodi:role="line" <path
id="tspan12" d="M 8.5472829,6.9612765 12.066752,1.4917021 H 10.055627 L 7.5417202,5.9668084 5.0278135,1.4917021 H 3.0166881 L 6.5361575,6.9612765 3.0166881,13.425312 H 5.0278135 L 7.5417202,7.9557446 10.055627,13.425312 h 2.011125 z"
x="3.0166881" style="font-size:17.3373px;stroke-width:1.00023"
y="13.425312" id="path835"
style="font-size:17.3373px;stroke-width:1.00023">X</tspan></text> sodipodi:nodetypes="ccccccccccccc" />
</g>
<rect <rect
style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.774803;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.774803;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect12" id="rect12"

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB