From eddcb5a54563eaf88ced3d356e11e47553855bfe Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Sun, 14 Mar 2021 19:03:58 +0100 Subject: [PATCH] Miinor changes --- linux/x-logarithm-plotter.xml | 4 +- qml/ComboBoxSetting.qml | 3 +- qml/ListSetting.qml | 3 +- qml/LogGraph.qml | 9 +--- qml/ObjectLists.qml | 84 +++++++++++++++-------------------- qml/TextSetting.qml | 4 +- qml/icons/Function.svg | 24 +++++----- qml/icons/X Cursor.svg | 29 ++++++------ 8 files changed, 68 insertions(+), 92 deletions(-) diff --git a/linux/x-logarithm-plotter.xml b/linux/x-logarithm-plotter.xml index d28e7a7..fc32e06 100644 --- a/linux/x-logarithm-plotter.xml +++ b/linux/x-logarithm-plotter.xml @@ -1,8 +1,8 @@ - Logarithm Plot/Graph - Graphe Logarithmique + Logarithm Plot File + Fichier Graphe Logarithmique diff --git a/qml/ComboBoxSetting.qml b/qml/ComboBoxSetting.qml index 7fa5037..33c452c 100644 --- a/qml/ComboBoxSetting.qml +++ b/qml/ComboBoxSetting.qml @@ -35,12 +35,11 @@ Item { return combox.find(elementName) } - Text { + Label { id: labelItem height: 30 anchors.top: parent.top verticalAlignment: TextInput.AlignVCenter - color: sysPalette.windowText text: control.label +": " } diff --git a/qml/ListSetting.qml b/qml/ListSetting.qml index 3265636..3a9dd35 100644 --- a/qml/ListSetting.qml +++ b/qml/ListSetting.qml @@ -20,11 +20,10 @@ Column { property alias model: repeater.model - Text { + Label { id: labelItem height: 30 verticalAlignment: TextInput.AlignVCenter - color: sysPalette.windowText text: control.label +": " } diff --git a/qml/LogGraph.qml b/qml/LogGraph.qml index 74db77d..d2b3cc2 100644 --- a/qml/LogGraph.qml +++ b/qml/LogGraph.qml @@ -48,17 +48,10 @@ ApplicationWindow { visible: !inPortrait - Rectangle { - id: topSeparator - color: sysPaletteIn.dark - width: parent.width - height: 0 - } - TabBar { id: sidebarSelector width: parent.width - anchors.top: topSeparator.bottom + anchors.top: parent.top TabButton { text: qsTr("Objects") } diff --git a/qml/ObjectLists.qml b/qml/ObjectLists.qml index 54a6246..4edc0ab 100644 --- a/qml/ObjectLists.qml +++ b/qml/ObjectLists.qml @@ -64,10 +64,9 @@ ListView { ToolTip.text: checked ? `Hide all ${Objects.types[objType].typeMultiple()}` : `Show all ${Objects.types[objType].typeMultiple()}` } - Text { + Label { id: typeHeaderText verticalAlignment: TextInput.AlignVCenter - color: sysPalette.windowText text: Objects.types[objType].typeMultiple() + ":" font.pixelSize: 20 } @@ -98,15 +97,14 @@ ListView { ToolTip.text: checked ? `Hide ${objType} ${obj.name}` : `Show ${objType} ${obj.name}` } - Text { + Label { id: objDescription anchors.left: objVisibilityCheckBox.right - anchors.right: settingsButton.left + anchors.right: deleteButton.left height: parent.height verticalAlignment: TextInput.AlignVCenter text: obj.getReadableString() font.pixelSize: 14 - color: sysPalette.windowText MouseArea { 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 { id: deleteButton width: parent.height - 10 @@ -198,7 +177,7 @@ ListView { width: 300 height: 400 - Text { + Label { id: dlgTitle anchors.left: parent.left anchors.top: parent.top @@ -261,13 +240,13 @@ ListView { width: dlgProperties.width property string label: Utils.camelCase2readable(modelData[0]) - Text { + Label { id: customPropComment width: parent.width height: visible ? implicitHeight : 0 visible: modelData[0].startsWith('comment') text: visible ? modelData[1].replace(/\{name\}/g, objEditor.obj.name) : '' - color: sysPalette.windowText + //color: sysPalette.windowText wrapMode: Text.WordWrap } @@ -387,35 +366,42 @@ ListView { id: createRow width: parent.width - Text { + Label { id: createTitle verticalAlignment: TextInput.AlignVCenter text: '+ Create new:' font.pixelSize: 20 - color: sysPalette.windowText + //color: sysPalette.windowText } - Repeater { - model: Object.keys(Objects.types) - - Button { - id: createBtn - text: modelData - width: createRow.width - visible: Objects.types[modelData].createable() - height: visible ? implicitHeight : 0 - icon.source: './icons/'+modelData+'.svg' // Default to dark version - icon.name: modelData - icon.color: sysPalette.windowText + Grid { + width: parent.width + columns: 3 + Repeater { + model: Object.keys(Objects.types) - onClicked: { - Objects.createNewRegisteredObject(modelData) - objectListList.update() - objEditor.obj = Objects.currentObjects[modelData][Objects.currentObjects[modelData].length - 1] - objEditor.objType = modelData - objEditor.objIndex = Objects.currentObjects[modelData].length - 1 - objEditor.editingRow = objectListList.listViews[modelData].editingRows[objEditor.objIndex] - objEditor.show() + Button { + id: createBtn + text: modelData + width: parent.width/3 + visible: Objects.types[modelData].createable() + height: visible ? implicitHeight : 0 + display: AbstractButton.TextUnderIcon + icon.source: './icons/'+modelData+'.svg' // Default to dark version + icon.name: modelData + icon.width: 24 + icon.height: 24 + icon.color: sysPalette.windowText + + onClicked: { + Objects.createNewRegisteredObject(modelData) + objectListList.update() + objEditor.obj = Objects.currentObjects[modelData][Objects.currentObjects[modelData].length - 1] + objEditor.objType = modelData + objEditor.objIndex = Objects.currentObjects[modelData].length - 1 + objEditor.editingRow = objectListList.listViews[modelData].editingRows[objEditor.objIndex] + objEditor.show() + } } } } diff --git a/qml/TextSetting.qml b/qml/TextSetting.qml index 6439f03..299e53d 100644 --- a/qml/TextSetting.qml +++ b/qml/TextSetting.qml @@ -31,12 +31,12 @@ Item { property string label property string defValue - Text { + Label { id: labelItem height: 30 anchors.top: parent.top verticalAlignment: TextInput.AlignVCenter - color: sysPalette.windowText + //color: sysPalette.windowText text: control.label +": " } diff --git a/qml/icons/Function.svg b/qml/icons/Function.svg index 502cc2c..458e1bb 100644 --- a/qml/icons/Function.svg +++ b/qml/icons/Function.svg @@ -23,16 +23,16 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="15.839192" - inkscape:cx="25.331188" - inkscape:cy="8.0958853" + inkscape:zoom="31.678384" + inkscape:cx="15.0192" + inkscape:cy="8.9307793" inkscape:document-units="px" inkscape:current-layer="layer1" inkscape:document-rotation="0" showgrid="true" inkscape:window-width="1920" inkscape:window-height="1011" - inkscape:window-x="1920" + inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1"> image/svg+xml - + @@ -57,15 +57,15 @@ id="layer1"> f(x) + x="0.3459909" + y="17.966721" + style="font-size:16px;stroke-width:0.98816">f(x) diff --git a/qml/icons/X Cursor.svg b/qml/icons/X Cursor.svg index d49203b..e6fe6d7 100644 --- a/qml/icons/X Cursor.svg +++ b/qml/icons/X Cursor.svg @@ -12,7 +12,7 @@ viewBox="0 0 24.0 24.0" version="1.1" 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)"> @@ -23,9 +23,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="22.4" - inkscape:cx="23.448337" - inkscape:cy="12.896609" + inkscape:zoom="15.839192" + inkscape:cx="21.452629" + inkscape:cy="4.4190861" inkscape:document-units="px" inkscape:current-layer="layer1" inkscape:document-rotation="0" @@ -58,18 +58,17 @@ inkscape:label="Calque 1" inkscape:groupmode="layer" id="layer1"> - 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"> + +