Merge branch 'master' of https://git.ad5001.eu/Ad5001/LogarithmPlotter

+ Fixing broken links on Linux

LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Popup/Preferences.qml

@@ -163,8 +163,7 @@ Popup {
                     text: qsTranslate('settingCategory', modelData)
                     
                     onClicked: {
-                        settingView.model = Modules.Preferences.categories[modelData]
-                        settingView.name = text
+                        settingView.modelName = modelData
                     }
                 }
             }
@@ -203,13 +202,13 @@ Popup {
             clip: true
             width: 500
             spacing: 10
-            model: Modules.Preferences.categories.general
+            model: Modules.Preferences.categories[modelName]
             anchors {
                 top: parent.top
                 bottom: parent.bottom
             }
             ScrollBar.vertical: ScrollBar { }
-            property string name: qsTranslate('settingCategory', 'general')
+            property string modelName: 'general'
 
             
             header: Text {
@@ -217,7 +216,7 @@ Popup {
                 font.pixelSize: 32
                 height: 48
                 color: sysPalette.windowText
-                text: settingView.name
+                text: qsTranslate('settingCategory', settingView.modelName)
                 
                 Rectangle {
                     id: bottomSeparator
@@ -233,20 +232,20 @@ Popup {
             delegate: Component {
                 Loader {
                     width: settingView.width * 2 / 3
-                    property var setting: modelData
+                    property var setting: Modules.Preferences.categories[settingView.modelName][index]
                     sourceComponent: {
-                        if(setting instanceof S.BoolSetting)
+                        if(setting.type === "bool")
                             return boolSettingComponent
-                        else if(setting instanceof S.EnumIntSetting)
+                        else if(setting.type === "enum")
                             return enumIntSettingComponent
-                        else if(setting instanceof S.NumberSetting)
+                        else if(setting.type === "number")
                             return numberSettingComponent
-                        else if(setting instanceof S.ExpressionSetting)
+                        else if(setting.type === "expression")
                             return expressionSettingComponent
-                        else if(setting instanceof S.StringSetting)
+                        else if(setting.type === "string")
                             return stringSettingComponent
                         else
-                            console.log('Unknown setting type!', modelData.constructor)
+                            console.log('Unknown setting type!', setting.constructor.name, setting.constructor)
                     }
                 }
             }

linux/eu.ad5001.LogarithmPlotter.metainfo.xml

@@ -149,13 +149,13 @@
             </description>
             <artifacts>
                 <artifact type="binary" platform="x86_64-windows-any">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.5.0/logarithmplotter-v0.5.0-setup.exe</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.5.0/logarithmplotter-v0.5.0-setup.exe</location>
                 </artifact>
                 <artifact type="binary" platform="x86_64-macos-any">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.5.0/LogarithmPlotter-v0.5.0-setup.dmg</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.5.0/LogarithmPlotter-v0.5.0-setup.dmg</location>
                 </artifact>
                 <artifact type="source">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.5.0/logarithmplotter-0.5.0.tar.gz</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.5.0/logarithmplotter-0.5.0.tar.gz</location>
                 </artifact>
             </artifacts>
         </release>
@@ -198,13 +198,13 @@
             </description>
             <artifacts>
                 <artifact type="binary" platform="x86_64-windows-any">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.4.0/logarithmplotter-v0.4.0-setup.exe</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.4.0/logarithmplotter-v0.4.0-setup.exe</location>
                 </artifact>
                 <artifact type="binary" platform="x86_64-macos-any">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.4.0/LogarithmPlotter-v0.4.0-setup.dmg</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.4.0/LogarithmPlotter-v0.4.0-setup.dmg</location>
                 </artifact>
                 <artifact type="source">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.4.0/logarithmplotter-0.4.0.tar.gz</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.4.0/logarithmplotter-0.4.0.tar.gz</location>
                 </artifact>
             </artifacts>
         </release>
@@ -264,13 +264,13 @@
             </description>
             <artifacts>
                 <artifact type="binary" platform="x86_64-windows-any">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.3.0/logarithmplotter-v0.3.0-setup.exe</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.3.0/logarithmplotter-v0.3.0-setup.exe</location>
                 </artifact>
                 <artifact type="binary" platform="x86_64-macos-any">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.3.0/LogarithmPlotter-v0.3.0-setup.dmg</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.3.0/LogarithmPlotter-v0.3.0-setup.dmg</location>
                 </artifact>
                 <artifact type="source">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.3.0/logarithmplotter-0.3.0.tar.gz</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.3.0/logarithmplotter-0.3.0.tar.gz</location>
                 </artifact>
             </artifacts>
         </release>
@@ -317,13 +317,13 @@
             </description>
             <artifacts>
                 <artifact type="binary" platform="x86_64-windows-any">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.2.0/logarithmplotter-v0.2.0-setup.exe</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.2.0/logarithmplotter-v0.2.0-setup.exe</location>
                 </artifact>
                 <artifact type="binary" platform="x86_64-macos-any">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.2.0/LogarithmPlotter-v0.2.0-setup.dmg</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.2.0/LogarithmPlotter-v0.2.0-setup.dmg</location>
                 </artifact>
                 <artifact type="source">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.2.0/logarithmplotter-0.2.0.tar.gz</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.2.0/logarithmplotter-0.2.0.tar.gz</location>
                 </artifact>
             </artifacts>
         </release>
@@ -362,13 +362,13 @@
             </description>
             <artifacts>
                 <artifact type="binary" platform="x86_64-windows-any">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.8/logarithmplotter-v0.1.8-setup.exe</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.8/logarithmplotter-v0.1.8-setup.exe</location>
                 </artifact>
                 <artifact type="binary" platform="x86_64-macos-any">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.8/LogarithmPlotter-v0.1.8-setup.dmg</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.8/LogarithmPlotter-v0.1.8-setup.dmg</location>
                 </artifact>
                 <artifact type="source">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.8/logarithmplotter-0.1.8.tar.gz</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.8/logarithmplotter-0.1.8.tar.gz</location>
                 </artifact>
             </artifacts>
         </release>
@@ -418,13 +418,13 @@
             </description>
             <artifacts>
                 <artifact type="binary" platform="x86_64-windows-any">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.7/logarithmplotter-v0.1.7-setup.exe</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.7/logarithmplotter-v0.1.7-setup.exe</location>
                 </artifact>
                 <artifact type="binary" platform="x86_64-macos-any">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.7/LogarithmPlotter-v0.1.7-setup.dmg</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.7/LogarithmPlotter-v0.1.7-setup.dmg</location>
                 </artifact>
                 <artifact type="source">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.7/logarithmplotter-0.1.7.tar.gz</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.7/logarithmplotter-0.1.7.tar.gz</location>
                 </artifact>
             </artifacts>
         </release>
@@ -459,13 +459,13 @@
             </description>
             <artifacts>
                 <artifact type="binary" platform="x86_64-windows-any">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.6/logarithmplotter-v0.1.6-setup.exe</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.6/logarithmplotter-v0.1.6-setup.exe</location>
                 </artifact>
                 <artifact type="binary" platform="x86_64-macos-any">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.6/LogarithmPlotter-v0.1.6-setup.dmg</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.6/LogarithmPlotter-v0.1.6-setup.dmg</location>
                 </artifact>
                 <artifact type="source">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.6/LogarithmPlotter-v0.1.6.tar.gz</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.6/LogarithmPlotter-v0.1.6.tar.gz</location>
                 </artifact>
             </artifacts>
         </release>
@@ -489,13 +489,13 @@
             </description>
             <artifacts>
                 <artifact type="binary" platform="x86_64-windows-any">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.5/logarithmplotter-v0.1.5-setup.exe</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.5/logarithmplotter-v0.1.5-setup.exe</location>
                 </artifact>
                 <artifact type="binary" platform="x86_64-macos-any">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.5/LogarithmPlotter-v0.1.5-setup.dmg</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.5/LogarithmPlotter-v0.1.5-setup.dmg</location>
                 </artifact>
                 <artifact type="source">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.5/LogarithmPlotter-v0.1.5.tar.gz</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.5/LogarithmPlotter-v0.1.5.tar.gz</location>
                 </artifact>
             </artifacts>
         </release>
@@ -520,13 +520,13 @@
             </description>
             <artifacts>
                 <artifact type="binary" platform="x86_64-windows-any">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.4/logarithmplotter-v0.1.4-setup.exe</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.4/logarithmplotter-v0.1.4-setup.exe</location>
                 </artifact>
                 <artifact type="binary" platform="x86_64-macos-any">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.4/LogarithmPlotter-v0.1.4-setup.dmg</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.4/LogarithmPlotter-v0.1.4-setup.dmg</location>
                 </artifact>
                 <artifact type="source">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.4/LogarithmPlotter-v0.1.4.tar.gz</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.4/LogarithmPlotter-v0.1.4.tar.gz</location>
                 </artifact>
             </artifacts>
         </release>
@@ -541,13 +541,13 @@
             </description>
             <artifacts>
                 <artifact type="binary" platform="x86_64-windows-any">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.3/logarithmplotter-v0.1.3-setup.exe</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.3/logarithmplotter-v0.1.3-setup.exe</location>
                 </artifact>
                 <artifact type="binary" platform="x86_64-macos-any">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.3/LogarithmPlotter-v0.1.3-setup.dmg</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.3/LogarithmPlotter-v0.1.3-setup.dmg</location>
                 </artifact>
                 <artifact type="source">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.3/LogarithmPlotter-v0.1.3.tar.gz</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.3/LogarithmPlotter-v0.1.3.tar.gz</location>
                 </artifact>
             </artifacts>
         </release>
@@ -565,13 +565,13 @@
             </description>
             <artifacts>
                 <artifact type="binary" platform="x86_64-windows-any">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.2/logarithmplotter-v0.1.2-setup.exe</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.2/logarithmplotter-v0.1.2-setup.exe</location>
                 </artifact>
                 <artifact type="binary" platform="x86_64-macos-any">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.2/LogarithmPlotter-v0.1.2-setup.dmg</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.2/LogarithmPlotter-v0.1.2-setup.dmg</location>
                 </artifact>
                 <artifact type="source">
-                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.2/LogarithmPlotter-v0.1.2.tar.gz</location>
+                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v0.1.2/LogarithmPlotter-v0.1.2.tar.gz</location>
                 </artifact>
             </artifacts>
         </release>

linux/generate-appstream-changelog.sh

@@ -11,13 +11,13 @@ BEGIN {
         print "            </description>"
         print "            <artifacts>"
         print "                <artifact type=\"binary\" platform=\"x86_64-windows-any\">"
-        print "                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v"version"/logarithmplotter-v"version"-setup.exe</location>"
+        print "                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v"version"/logarithmplotter-v"version"-setup.exe</location>"
         print "                </artifact>"
         print "                <artifact type=\"binary\" platform=\"x86_64-macos-any\">"
-        print "                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v"version"/LogarithmPlotter-v"version"-setup.dmg</location>"
+        print "                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v"version"/LogarithmPlotter-v"version"-setup.dmg</location>"
         print "                </artifact>"
         print "                <artifact type=\"source\">"
-        print "                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v"version"/logarithmplotter-"version".tar.gz</location>"
+        print "                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v"version"/logarithmplotter-"version".tar.gz</location>"
         print "                </artifact>"
         print "            </artifacts>"
         print "        </release>"
@@ -58,13 +58,13 @@ BEGIN {
     print "            </description>"
     print "            <artifacts>"
     print "                <artifact type=\"binary\" platform=\"x86_64-windows-any\">"
-    print "                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v"version"/logarithmplotter-v"version"-setup.exe</location>"
+    print "                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v"version"/logarithmplotter-v"version"-setup.exe</location>"
     print "                </artifact>"
     print "                <artifact type=\"binary\" platform=\"x86_64-macos-any\">"
-    print "                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v"version"/LogarithmPlotter-v"version"-setup.dmg</location>"
+    print "                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v"version"/LogarithmPlotter-v"version"-setup.dmg</location>"
     print "                </artifact>"
     print "                <artifact type=\"source\">"
-    print "                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v"version"/logarithmplotter-"version".tar.gz</location>"
+    print "                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v"version"/logarithmplotter-"version".tar.gz</location>"
     print "                </artifact>"
     print "            </artifacts>"
     print "        </release>"
@@ -74,13 +74,13 @@ END {
     print "            </description>"
     print "            <artifacts>"
     print "                <artifact type=\"binary\" platform=\"x86_64-windows-any\">"
-    print "                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v"version"/logarithmplotter-v"version"-setup.exe</location>"
+    print "                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v"version"/logarithmplotter-v"version"-setup.exe</location>"
     print "                </artifact>"
     print "                <artifact type=\"binary\" platform=\"x86_64-macos-any\">"
-    print "                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v"version"/LogarithmPlotter-v"version"-setup.dmg</location>"
+    print "                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v"version"/LogarithmPlotter-v"version"-setup.dmg</location>"
     print "                </artifact>"
     print "                <artifact type=\"source\">"
-    print "                    <location>https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/logarithmplotter/v"version"/logarithmplotter-"version".tar.gz</location>"
+    print "                    <location>https://artifacts.ad5001.eu/repository/apps.ad5001.eu-apps/logarithmplotter/v"version"/logarithmplotter-"version".tar.gz</location>"
     print "                </artifact>"
     print "            </artifacts>"
     print "        </release>"