Removing scripts in win/, moving QML Module to it's own folder, adding submodule for mixedmenu

.drone/.drone.yml

@@ -6,6 +6,11 @@ platform:
   arch: amd64
 
 steps:
+- name: submodules
+  image: alpine/git
+  commands:
+  - git submodule update --init --recursive
+
 - name: Linux test
   image: ad5001/ubuntu-pyside2-xvfb:hirsute-5.15.2
   commands:

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "LogarithmPlotter/qml/eu/ad5001/MixedMenu"]
+	path = LogarithmPlotter/qml/eu/ad5001/MixedMenu
+	url = https://git.ad5001.eu/Ad5001/MixedMenu

LogarithmPlotter/__init__.py

@@ -112,7 +112,7 @@ def run():
     engine.rootContext().setContextProperty("TestBuild", "--test-build" in argv)
 
     engine.addImportPath(os.path.realpath(os.path.join(os.getcwd(), "qml")))
-    engine.load(os.path.realpath(os.path.join(os.getcwd(), "qml", "LogarithmPlotter.qml")))
+    engine.load(os.path.realpath(os.path.join(os.getcwd(), "qml", "eu", "ad5001", "LogarithmPlotter", "LogarithmPlotter.qml")))
 
     os.chdir(pwd)
     if len(argv) > 0 and os.path.exists(argv[-1]) and argv[-1].split('.')[-1] in ['json', 'lgg', 'lpf']:

LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/About.qml

@@ -29,7 +29,7 @@ D.Dialog {
     
     Image {
         id: logo
-        source: "../../logplotter.svg"
+        source: "../../../../../logplotter.svg"
         sourceSize.width: 64
         sourceSize.height: 64
         width: 64

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

@@ -17,7 +17,8 @@
  */
 
 import QtQuick 2.12
-import QtQuick.Controls 2.12
+//import QtQuick.Controls 2.12
+import eu.ad5001.MixedMenu 1.0
 import "js/objects.js" as Objects
 import "js/historylib.js" as HistoryLib
 
@@ -28,20 +29,20 @@ MenuBar {
             text: qsTr("&Load...")
             shortcut: StandardKey.Open
             onTriggered: settings.load()
-            icon.name: 'document-open'
+            iconName: 'document-open'
             
         }
         Action {
             text: qsTr("&Save")
             shortcut: StandardKey.Save
             onTriggered: settings.save()
-            icon.name: 'document-save'
+            iconName: 'document-save'
         }
         Action {
             text: qsTr("Save &As...")
             shortcut: StandardKey.SaveAs
             onTriggered: settings.saveAs()
-            icon.name: 'document-save-as'
+            iconName: 'document-save-as'
             
         }
         MenuSeparator { }
@@ -49,7 +50,7 @@ MenuBar {
             text: qsTr("&Quit")
             shortcut: StandardKey.Quit
             onTriggered: Qt.quit()
-            icon.name: 'application-exit'
+            iconName: 'application-exit'
         }
     }
     Menu {
@@ -58,16 +59,16 @@ MenuBar {
             text: qsTr("&Undo")
             shortcut: StandardKey.Undo
             onTriggered: history.undo()
-            icon.name: 'edit-undo'
-            icon.color: enabled ? sysPalette.windowText : sysPaletteIn.windowText
+            iconName: 'edit-undo'
+            iconColor: enabled ? sysPalette.windowText : sysPaletteIn.windowText
             enabled: history.undoCount > 0
         }
         Action { 
             text: qsTr("&Redo")
             shortcut: StandardKey.Redo
             onTriggered: history.redo()
-            icon.name: 'edit-redo'
-            icon.color: enabled ? sysPalette.windowText : sysPaletteIn.windowText
+            iconName: 'edit-redo'
+            iconColor: enabled ? sysPalette.windowText : sysPaletteIn.windowText
             enabled: history.redoCount > 0
         }
         MenuSeparator { }
@@ -75,7 +76,7 @@ MenuBar {
             text: qsTr("&Copy diagram")
             shortcut: StandardKey.Copy
             onTriggered: root.copyDiagramToClipboard()
-            icon.name: 'edit-copy'
+            iconName: 'edit-copy'
         }
     }
     Menu {
@@ -88,9 +89,9 @@ MenuBar {
                 text: modelData
                 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
+                iconSource: './icons/'+modelData+'.svg' // Default to dark version
+                iconName: modelData
+                iconColor: sysPalette.windowText
                 onTriggered: {
                     var newObj = Objects.createNewRegisteredObject(modelData)
                     history.addToHistory(new HistoryLib.CreateNewObject(newObj.name, modelData, newObj.export()))
@@ -103,7 +104,7 @@ MenuBar {
         title: qsTr("&Help")
         Action {
             text: qsTr("&About")
-            icon.name: 'about'
+            iconName: 'about'
             onTriggered: about.open()
         }
     }

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

@@ -35,7 +35,9 @@ ApplicationWindow {
     SystemPalette { id: sysPaletteIn; colorGroup: SystemPalette.Disabled }
     History { id: history }
     
-    menuBar: AppMenuBar {}
+    menuBar: appMenu.trueItem
+    
+    AppMenuBar {id: appMenu}
     
     About {id: about}
     

LogarithmPlotter/qml/eu/ad5001/MixedMenu

@@ -0,0 +1 @@
+Subproject commit bcae0ab4563f20bfaf9e6e1e19421d724ec7ba50

MANIFEST.in

@@ -1,2 +1,2 @@
 
-recursive-include LogarithmPlotter/qml *.qml *.js *.qdoc qmldir *.svg
+recursive-include LogarithmPlotter/qml *.qml *.js *.qdoc qmldir *.svg *.md LICENSE

win/build-windows.bat

@@ -1,5 +0,0 @@
-cd ..
-cp run.py logarithmplotter.py
-python -m pip install -U pyinstaller
-pyinstaller --add-data "qml;qml" --noconsole logarithmplotter.py --icon=win/logplotter.ico
-rm logarithmplotter.py

win/build-wine.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-# Giving pyinstaller another run
-cd ..
-rm $(find . -name "*.qmlc")
-rm $(find . -name "*.pyc")
-cp run.py logarithmplotter.py
-wine python -m pip install -U pyinstaller
-wine pyinstaller --add-data "qml;qml" --noconsole logarithmplotter.py --icon=win/logplotter.ico
-rm logarithmplotter.py

win/package-windows.bat

@@ -1,5 +0,0 @@
-cd ..
-cp * ../README.md ../LICENSE.md ../dist/logarithmplotter/
-# Creating installer
-cd ../dist/logarithmplotter/
-"C:\Program Files (x86)\NSIS\makensis" installer.nsi

win/package-wine.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-# Moving files
-cp * ../README.md ../LICENSE.md ../dist/logarithmplotter/
-# Creating installer
-cd ../dist/logarithmplotter/
-makensis installer.nsi