Fixing bugs

This commit is contained in:
Adsooi 2021-03-09 20:37:12 +01:00
parent b90fa5a99b
commit f63e86b78a
5 changed files with 227 additions and 215 deletions

View file

@ -1,8 +1,11 @@
#!/bin/bash #!/bin/bash
APPROOT="$(cd -P "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" APPROOT="$(cd -P "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
echo "Adding desktop file..."
mkdir -p ~/.local/share/applications mkdir -p ~/.local/share/applications
sed "s+/home/ad5001/Apps/LogarithmPlotter/+$APPROOT+g" "$APPROOT/linux/logplotter.desktop" > ~/.local/share/applications/logplotter.desktop sed "s+/home/ad5001/Apps/LogarithmPlotter/+$APPROOT/+g" "$APPROOT/linux/logplotter.desktop" > ~/.local/share/applications/logplotter.desktop
sed "s+/home/ad5001/Apps/LogarithmPlotter/+$APPROOT+g" "$APPROOT/linux/x-logarithm-plotter.xml" > ~/.local/share/mime/x-logarithm-plotter.xml echo "Installing mime-type..."
mkdir -p ~/.local/share/applications
sed "s+/home/ad5001/Apps/LogarithmPlotter/+$APPROOT/+g" "$APPROOT/linux/x-logarithm-plotter.xml" > ~/.local/share/mime/packages/x-logarithm-plotter.xml
mkdir -p ~/.local/share/icons/hicolor/scalable/mimetypes mkdir -p ~/.local/share/icons/hicolor/scalable/mimetypes
cp "$APPROOT/linux/logplotterfile.svg" ~/.local/share/icons/hicolor/scalable/mimetypes/application-x-logarithm-plotter.svg cp "$APPROOT/linux/logplotterfile.svg" ~/.local/share/icons/hicolor/scalable/mimetypes/application-x-logarithm-plotter.svg
update-mime-database ~/.local/share/mime/ update-mime-database ~/.local/share/mime/

View file

@ -14,18 +14,18 @@
version="1.1" version="1.1"
id="SVGRoot" id="SVGRoot"
sodipodi:docname="logplotterfile.svg" sodipodi:docname="logplotterfile.svg"
inkscape:version="1.0.2 (e86c870879, 2021-01-15)"> inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
<defs <defs
id="defs10"> id="defs10">
<linearGradient <linearGradient
inkscape:collect="always" inkscape:collect="always"
id="linearGradient51"> id="linearGradient51">
<stop <stop
style="stop-color:#ededef;stop-opacity:1" style="stop-color:#e0e0e0;stop-opacity:1"
offset="0" offset="0"
id="stop47" /> id="stop47" />
<stop <stop
style="stop-color:#ffffff;stop-opacity:0;" style="stop-color:#ffffff;stop-opacity:1"
offset="1" offset="1"
id="stop49" /> id="stop49" />
</linearGradient> </linearGradient>
@ -73,7 +73,12 @@
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-height="1011"
inkscape:window-x="1920"
inkscape:window-y="0"
inkscape:window-maximized="1">
<inkscape:grid <inkscape:grid
type="xygrid" type="xygrid"
id="grid19" /> id="grid19" />

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

View file

@ -1,10 +1,11 @@
<?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-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">
<!--Created automatically by update-mime-database. DO NOT EDIT!-->
<comment>Logarithm Plot/Graph</comment> <comment>Logarithm Plot/Graph</comment>
<icon name="/home/ad5001/Apps/LogarithmPlotter/logplotterfile.svg"/> <icon name="/home/ad5001/Apps/LogarithmPlotter/linux/logplotterfile.svg"/>
<glob-deleteall/> <glob-deleteall/>
<glob pattern="*.json"/> <glob pattern="*.json"/>
<glob pattern="*.lgg"/> <glob pattern="*.lgg"/>
<glob pattern="*.lgp"/> <glob pattern="*.lgp"/>
</mime-type> </mime-type>
</mime-info>

View file

@ -68,12 +68,13 @@ ApplicationWindow {
} }
StackLayout { StackLayout {
id: sidebarContents
anchors.top: sidebarSelector.bottom anchors.top: sidebarSelector.bottom
anchors.left: parent.left anchors.left: parent.left
anchors.topMargin: 5 anchors.topMargin: 5
anchors.leftMargin: 5 anchors.leftMargin: 5
width: parent.width - 10 width: parent.width - 10
height: parent.height - sidebarSelector.height height: parent.height - sidebarContents.x;
currentIndex: sidebarSelector.currentIndex currentIndex: sidebarSelector.currentIndex
z: -1 z: -1
clip: true clip: true

View file

@ -20,11 +20,8 @@ import QtQuick.Controls 2.12
import QtQuick 2.12 import QtQuick 2.12
import "js/utils.js" as Utils import "js/utils.js" as Utils
Column { ScrollView {
id: settings id: settings
height: 30*9 //30*Math.max(1, Math.ceil(7 / columns))
//columns: Math.floor(width / settingWidth)
spacing: 10
signal changed() signal changed()
@ -43,6 +40,10 @@ Column {
property bool showxgrad: true property bool showxgrad: true
property bool showygrad: true property bool showygrad: true
Column {
height: 30*9 //30*Math.max(1, Math.ceil(7 / columns))
//columns: Math.floor(width / settingWidth)
spacing: 10
FileDialog { FileDialog {
id: fdiag id: fdiag
onAccepted: { onAccepted: {
@ -256,6 +257,7 @@ Column {
icon.name: 'fileopen' icon.name: 'fileopen'
onClicked: load() onClicked: load()
} }
}
function save() { function save() {
if(settings.saveFilename == "") { if(settings.saveFilename == "") {