LogarithmPlotter/logarithmplotter.py

@@ -85,7 +85,6 @@ def run():
     app = QApplication(argv)
     app.setApplicationName("LogarithmPlotter")
     app.setOrganizationName("Ad5001")
-    app.styleHints().setShowShortcutsInContextMenus(True)
     app.setWindowIcon(QIcon(path.realpath(path.join(getcwd(), "logarithmplotter.svg"))))
     
     # Installing translators

LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml

@@ -18,7 +18,6 @@
 
 import QtQuick 2.12
 import QtQuick.Dialogs 1.3
-//import QtQuick.Controls 2.12
 import eu.ad5001.MixedMenu 1.1
 import "js/objects.js" as Objects
 import "js/historylib.js" as HistoryLib

LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml

@@ -35,8 +35,6 @@ import "../js/utils.js" as Utils
 ScrollView {
     id: historyBrowser
     
-    ScrollBar.horizontal.visible: false
-    
     /*!
        \qmlproperty int HistoryBrowser::actionWidth
        Width of the actions.

LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectCreationGrid.qml

@@ -20,8 +20,6 @@ import QtQuick 2.12
 import QtQuick.Controls 2.12
 import "../js/objects.js" as Objects
 import "../js/historylib.js" as HistoryLib
-import eu.ad5001.LogarithmPlotter.Setting 1.0 as Setting
-
 
 /*!
     \qmltype ObjectCreationGrid
@@ -50,42 +48,19 @@ Column {
             
             Button {
                 id: createBtn
+                text: Objects.types[modelData].displayType()
                 width: parent.width/3
                 visible: Objects.types[modelData].createable()
-                height: visible ? width*0.6 : 0
+                height: visible ? implicitHeight : 0
-                // The KDE SDK is kinda buggy, so it respects neither specified color nor display propreties.
+                display: AbstractButton.TextUnderIcon
-                //display: AbstractButton.TextUnderIcon
+                icon.name: modelData
-    
+                icon.source: '../icons/objects/' + modelData + '.svg'
-                Setting.Icon {
+                icon.width: 24
-                    id: icon
+                icon.height: 24
-                    width: 24
+                icon.color: sysPalette.buttonText
-                    height: 24
-                    anchors.left: parent.left
-                    anchors.leftMargin: (parent.width-width)/2
-                    anchors.top: parent.top
-                    anchors.topMargin: 8
-                    
-                    color: sysPalette.windowText
-                    source: '../icons/objects/'+modelData+'.svg'
-                }
-    
-                Label {
-                    id: label
-                    anchors.bottom: parent.bottom
-                    anchors.bottomMargin: 5
-                    anchors.left: parent.left
-                    anchors.leftMargin: 4
-                    anchors.right: parent.right
-                    anchors.rightMargin: 4
-                    horizontalAlignment: Text.AlignHCenter
-                    font.pixelSize: 14
-                    text: Objects.types[modelData].displayType()
-                    clip: true
-                }
-                
                 ToolTip.visible: hovered
                 ToolTip.delay: 200
-                ToolTip.text: label.text
+                ToolTip.text: text
                 
                 onClicked: {
                     var newObj = Objects.createNewRegisteredObject(modelData)

LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml

@@ -19,7 +19,6 @@
 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
 
@@ -140,17 +139,9 @@ ListView {
                 anchors.right: deleteButton.left
                 anchors.rightMargin: 5
                 anchors.topMargin: 5
-                
+                icon.name: 'position'
-                Setting.Icon {
+                icon.source: '../icons/common/position.svg'
-                    id: icon
+                icon.color: sysPalette.buttonText
-                    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
@@ -213,7 +204,7 @@ ListView {
             D.ColorDialog {
                 id: pickColor
                 color: obj.color
-                title: qsTr("Pick new color for %1 %2").arg(Objects.types[objType].displayType()).arg(obj.name)
+                title: qsTr("Pick new color for %1 %2").arg(Objects.types[objType].displayType())
                 onAccepted: {
                     history.addToHistory(new HistoryLib.EditedProperty(
                         obj.name, objType, "color", 

LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/objects/Point.svg

@@ -1 +1,78 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path style="opacity:1;vector-effect:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" d="M9.98 18.12a3.5 3.5 0 0 1-3.064 3.855 3.5 3.5 0 0 1-3.887-3.022 3.5 3.5 0 0 1 2.982-3.919 3.5 3.5 0 0 1 3.95 2.94"/><text xml:space="preserve" style="font-style:normal;font-weight:400;font-size:17.3373px;line-height:1.25;font-family:sans-serif;letter-spacing:0;word-spacing:0;fill-opacity:1;stroke:none;stroke-width:1.00023" x="12.067" y="13.923" transform="scale(.99447 1.00556)"><tspan x="12.067" y="13.923" style="font-size:17.3373px;stroke-width:1.00023">A</tspan></text></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24.0px"
+   height="24.0px"
+   viewBox="0 0 24.0 24.0"
+   version="1.1"
+   id="SVGRoot"
+   sodipodi:docname="Point.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2021-09-07)">
+  <defs
+     id="defs1469" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="23.448337"
+     inkscape:cy="9.9487426"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="true"
+     inkscape:window-width="1829"
+     inkscape:window-height="916"
+     inkscape:window-x="48"
+     inkscape:window-y="31"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2039" />
+    <inkscape:grid
+       type="xygrid"
+       id="grid2058" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata1472">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       id="path1414"
+       style="opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0"
+       d="m 9.979376,18.120606 a 3.5,3.5 0 0 1 -3.06333,3.854578 3.5,3.5 0 0 1 -3.8866522,-3.022533 3.5,3.5 0 0 1 2.9814002,-3.918293 3.5,3.5 0 0 1 3.9495,2.939936" />
+    <text
+       xml:space="preserve"
+       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"
+       x="12.066752"
+       y="13.922545"
+       id="text14"
+       transform="scale(0.99446808,1.0055627)"><tspan
+         sodipodi:role="line"
+         id="tspan12"
+         x="12.066752"
+         y="13.922545"
+         style="font-size:17.3373px;stroke-width:1.00023">A</tspan></text>
+  </g>
+</svg>

linux/eu.ad5001.LogarithmPlotter.metainfo.flatpak.xml

@@ -77,7 +77,6 @@
     <categories>
         <category>Science</category>
         <category>Education</category>
-        <category>Qt</category>
     </categories>
     
     <url type="homepage">https://apps.ad5001.eu/logarithmplotter/</url>
@@ -185,21 +184,6 @@
     </content_rating>
     <developer_name>Ad5001</developer_name>
     <update_contact>mail@ad5001.eu</update_contact>
-    
-    <keywords>
-        <keyword>Plot</keyword>
-        <keyword>Plotter</keyword>
-        <keyword>Log</keyword>
-        <keyword>Logarithm</keyword>
-        <keyword>Logarithmic</keyword>
-        <keyword>Bode</keyword>
-        <keyword>Magnitude</keyword>
-        <keyword>Diagram</keyword>
-        <keyword>Graph</keyword>
-        <keyword>Phase</keyword>
-        <keyword>Sequence</keyword>
-        <keyword>Distribution</keyword>
-    </keywords>
 </application>
 
 

linux/eu.ad5001.LogarithmPlotter.metainfo.xml

@@ -77,7 +77,6 @@
     <categories>
         <category>Science</category>
         <category>Education</category>
-        <category>Qt</category>
     </categories>
     
     <url type="homepage">https://apps.ad5001.eu/logarithmplotter/</url>
@@ -99,8 +98,7 @@
         <screenshot xml:lang="hu">https://apps.ad5001.eu/img/hu/logarithmplotter/welcome.png</screenshot>
         <screenshot xml:lang="no" type="default">https://apps.ad5001.eu/img/no/gain.png</screenshot>
         <screenshot xml:lang="no">https://apps.ad5001.eu/img/no/logarithmplotter/phase.png</screenshot>
-        <screenshot xml:lang="no">https://apps.ad5001.eu/img/no/logarithmplotter/welcome.png</screenshot>
+        <screenshot xml:lang="no">https://apps.ad5001.eu/img/no/logarithmplotter/welcome.png</screenshot>    </screenshots>
-    </screenshots>
     
     <!-- recommend at least 600 logical pixels of space -->
     <recommends>
@@ -185,21 +183,6 @@
     </content_rating>
     <developer_name>Ad5001</developer_name>
     <update_contact>mail@ad5001.eu</update_contact>
-    
-    <keywords>
-        <keyword>Plot</keyword>
-        <keyword>Plotter</keyword>
-        <keyword>Log</keyword>
-        <keyword>Logarithm</keyword>
-        <keyword>Logarithmic</keyword>
-        <keyword>Bode</keyword>
-        <keyword>Magnitude</keyword>
-        <keyword>Diagram</keyword>
-        <keyword>Graph</keyword>
-        <keyword>Phase</keyword>
-        <keyword>Sequence</keyword>
-        <keyword>Distribution</keyword>
-    </keywords>
 </application>