From a03308f02885cc0ee8ae0cde0c0e2269a4d08378 Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Sun, 11 Jul 2021 19:35:12 +0200 Subject: [PATCH] Removing scripts in win/, moving QML Module to it's own folder, adding submodule for mixedmenu --- .drone/.drone.yml | 5 ++++ .gitmodules | 3 ++ LogarithmPlotter/__init__.py | 2 +- .../ad5001/LogarithmPlotter}/About.qml | 2 +- .../ad5001/LogarithmPlotter}/AppMenuBar.qml | 29 ++++++++++--------- .../LogarithmPlotter}/ComboBoxSetting.qml | 0 .../ad5001/LogarithmPlotter}/FileDialog.qml | 0 .../ad5001/LogarithmPlotter}/History.qml | 0 .../LogarithmPlotter}/HistoryBrowser.qml | 0 .../{ => eu/ad5001/LogarithmPlotter}/Icon.qml | 0 .../ad5001/LogarithmPlotter}/ListSetting.qml | 0 .../LogarithmPlotter}/LogGraphCanvas.qml | 0 .../LogarithmPlotter}/LogarithmPlotter.qml | 4 ++- .../ad5001/LogarithmPlotter}/ObjectLists.qml | 0 .../ad5001/LogarithmPlotter}/Settings.qml | 0 .../ad5001/LogarithmPlotter}/TextSetting.qml | 0 .../LogarithmPlotter}/icons/Function.svg | 0 .../LogarithmPlotter}/icons/Gain Bode.svg | 0 .../LogarithmPlotter}/icons/Phase Bode.svg | 0 .../ad5001/LogarithmPlotter}/icons/Point.svg | 0 .../LogarithmPlotter}/icons/Repartition.svg | 0 .../LogarithmPlotter}/icons/Sequence.svg | 0 .../icons/Somme gains Bode.svg | 0 .../icons/Somme gains Bode2.svg | 0 .../icons/Somme phases Bode.svg | 0 .../ad5001/LogarithmPlotter}/icons/Text.svg | 0 .../LogarithmPlotter}/icons/X Cursor.svg | 0 .../ad5001/LogarithmPlotter}/icons/delete.svg | 0 .../settings/custom/Definition Domain.svg | 0 .../settings/custom/Destination Domain.svg | 0 .../icons/settings/custom/Display Mode.svg | 0 .../icons/settings/custom/Display Style.svg | 0 .../icons/settings/custom/Expression.svg | 0 .../icons/settings/custom/Gain.svg | 0 .../icons/settings/custom/Label Position.svg | 0 .../icons/settings/custom/Label X.svg | 0 .../icons/settings/custom/Pass.svg | 0 .../icons/settings/custom/Phase.svg | 0 .../icons/settings/custom/Point Style.svg | 0 .../icons/settings/custom/Rounding.svg | 0 .../icons/settings/custom/Target Element.svg | 0 .../settings/custom/Target Value Position.svg | 0 .../icons/settings/custom/Text.svg | 0 .../icons/settings/custom/Unit.svg | 0 .../icons/settings/custom/X.svg | 0 .../icons/settings/custom/Y.svg | 0 .../icons/settings/custom/angle.svg | 0 .../icons/settings/custom/appearance.svg | 0 .../icons/settings/custom/arrow.svg | 0 .../icons/settings/custom/label.svg | 0 .../icons/settings/custom/position.svg | 0 .../icons/settings/custom/target.svg | 0 .../icons/settings/custom/ω₀.svg | 0 .../icons/settings/linewidth.svg | 0 .../icons/settings/textsize.svg | 0 .../icons/settings/xaxisstep.svg | 0 .../icons/settings/xlabel.svg | 0 .../LogarithmPlotter}/icons/settings/xmin.svg | 0 .../icons/settings/xzoom.svg | 0 .../icons/settings/yaxisstep.svg | 0 .../icons/settings/ylabel.svg | 0 .../LogarithmPlotter}/icons/settings/ymax.svg | 0 .../icons/settings/yzoom.svg | 0 .../ad5001/LogarithmPlotter}/js/expr-eval.js | 0 .../ad5001/LogarithmPlotter}/js/historylib.js | 0 .../ad5001/LogarithmPlotter}/js/mathlib.js | 0 .../ad5001/LogarithmPlotter}/js/objects.js | 0 .../ad5001/LogarithmPlotter}/js/parameters.js | 0 .../ad5001/LogarithmPlotter}/js/utils.js | 0 LogarithmPlotter/qml/eu/ad5001/MixedMenu | 1 + MANIFEST.in | 2 +- win/build-windows.bat | 5 ---- win/build-wine.sh | 9 ------ win/package-windows.bat | 5 ---- win/package-wine.sh | 6 ---- 75 files changed, 30 insertions(+), 43 deletions(-) create mode 100644 .gitmodules rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/About.qml (98%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/AppMenuBar.qml (80%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/ComboBoxSetting.qml (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/FileDialog.qml (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/History.qml (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/HistoryBrowser.qml (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/Icon.qml (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/ListSetting.qml (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/LogGraphCanvas.qml (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/LogarithmPlotter.qml (99%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/ObjectLists.qml (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/Settings.qml (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/TextSetting.qml (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/Function.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/Gain Bode.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/Phase Bode.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/Point.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/Repartition.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/Sequence.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/Somme gains Bode.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/Somme gains Bode2.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/Somme phases Bode.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/Text.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/X Cursor.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/delete.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/custom/Definition Domain.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/custom/Destination Domain.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/custom/Display Mode.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/custom/Display Style.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/custom/Expression.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/custom/Gain.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/custom/Label Position.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/custom/Label X.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/custom/Pass.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/custom/Phase.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/custom/Point Style.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/custom/Rounding.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/custom/Target Element.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/custom/Target Value Position.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/custom/Text.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/custom/Unit.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/custom/X.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/custom/Y.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/custom/angle.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/custom/appearance.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/custom/arrow.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/custom/label.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/custom/position.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/custom/target.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/custom/ω₀.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/linewidth.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/textsize.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/xaxisstep.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/xlabel.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/xmin.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/xzoom.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/yaxisstep.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/ylabel.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/ymax.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/icons/settings/yzoom.svg (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/js/expr-eval.js (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/js/historylib.js (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/js/mathlib.js (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/js/objects.js (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/js/parameters.js (100%) rename LogarithmPlotter/qml/{ => eu/ad5001/LogarithmPlotter}/js/utils.js (100%) create mode 160000 LogarithmPlotter/qml/eu/ad5001/MixedMenu delete mode 100644 win/build-windows.bat delete mode 100644 win/build-wine.sh delete mode 100644 win/package-windows.bat delete mode 100644 win/package-wine.sh diff --git a/.drone/.drone.yml b/.drone/.drone.yml index 199952c..1c8fbf0 100644 --- a/.drone/.drone.yml +++ b/.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: diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..df81e42 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "LogarithmPlotter/qml/eu/ad5001/MixedMenu"] + path = LogarithmPlotter/qml/eu/ad5001/MixedMenu + url = https://git.ad5001.eu/Ad5001/MixedMenu diff --git a/LogarithmPlotter/__init__.py b/LogarithmPlotter/__init__.py index 76e418d..86e9579 100644 --- a/LogarithmPlotter/__init__.py +++ b/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']: diff --git a/LogarithmPlotter/qml/About.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/About.qml similarity index 98% rename from LogarithmPlotter/qml/About.qml rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/About.qml index c8bf377..12ada65 100644 --- a/LogarithmPlotter/qml/About.qml +++ b/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 diff --git a/LogarithmPlotter/qml/AppMenuBar.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml similarity index 80% rename from LogarithmPlotter/qml/AppMenuBar.qml rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml index 0fa34d8..14e26ac 100644 --- a/LogarithmPlotter/qml/AppMenuBar.qml +++ b/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() } } diff --git a/LogarithmPlotter/qml/ComboBoxSetting.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ComboBoxSetting.qml similarity index 100% rename from LogarithmPlotter/qml/ComboBoxSetting.qml rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ComboBoxSetting.qml diff --git a/LogarithmPlotter/qml/FileDialog.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/FileDialog.qml similarity index 100% rename from LogarithmPlotter/qml/FileDialog.qml rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/FileDialog.qml diff --git a/LogarithmPlotter/qml/History.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/History.qml similarity index 100% rename from LogarithmPlotter/qml/History.qml rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/History.qml diff --git a/LogarithmPlotter/qml/HistoryBrowser.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/HistoryBrowser.qml similarity index 100% rename from LogarithmPlotter/qml/HistoryBrowser.qml rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/HistoryBrowser.qml diff --git a/LogarithmPlotter/qml/Icon.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Icon.qml similarity index 100% rename from LogarithmPlotter/qml/Icon.qml rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Icon.qml diff --git a/LogarithmPlotter/qml/ListSetting.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ListSetting.qml similarity index 100% rename from LogarithmPlotter/qml/ListSetting.qml rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ListSetting.qml diff --git a/LogarithmPlotter/qml/LogGraphCanvas.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/LogGraphCanvas.qml similarity index 100% rename from LogarithmPlotter/qml/LogGraphCanvas.qml rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/LogGraphCanvas.qml diff --git a/LogarithmPlotter/qml/LogarithmPlotter.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/LogarithmPlotter.qml similarity index 99% rename from LogarithmPlotter/qml/LogarithmPlotter.qml rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/LogarithmPlotter.qml index 5d1bd96..7474674 100644 --- a/LogarithmPlotter/qml/LogarithmPlotter.qml +++ b/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} diff --git a/LogarithmPlotter/qml/ObjectLists.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists.qml similarity index 100% rename from LogarithmPlotter/qml/ObjectLists.qml rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists.qml diff --git a/LogarithmPlotter/qml/Settings.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Settings.qml similarity index 100% rename from LogarithmPlotter/qml/Settings.qml rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Settings.qml diff --git a/LogarithmPlotter/qml/TextSetting.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/TextSetting.qml similarity index 100% rename from LogarithmPlotter/qml/TextSetting.qml rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/TextSetting.qml diff --git a/LogarithmPlotter/qml/icons/Function.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/Function.svg similarity index 100% rename from LogarithmPlotter/qml/icons/Function.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/Function.svg diff --git a/LogarithmPlotter/qml/icons/Gain Bode.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/Gain Bode.svg similarity index 100% rename from LogarithmPlotter/qml/icons/Gain Bode.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/Gain Bode.svg diff --git a/LogarithmPlotter/qml/icons/Phase Bode.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/Phase Bode.svg similarity index 100% rename from LogarithmPlotter/qml/icons/Phase Bode.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/Phase Bode.svg diff --git a/LogarithmPlotter/qml/icons/Point.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/Point.svg similarity index 100% rename from LogarithmPlotter/qml/icons/Point.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/Point.svg diff --git a/LogarithmPlotter/qml/icons/Repartition.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/Repartition.svg similarity index 100% rename from LogarithmPlotter/qml/icons/Repartition.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/Repartition.svg diff --git a/LogarithmPlotter/qml/icons/Sequence.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/Sequence.svg similarity index 100% rename from LogarithmPlotter/qml/icons/Sequence.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/Sequence.svg diff --git a/LogarithmPlotter/qml/icons/Somme gains Bode.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/Somme gains Bode.svg similarity index 100% rename from LogarithmPlotter/qml/icons/Somme gains Bode.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/Somme gains Bode.svg diff --git a/LogarithmPlotter/qml/icons/Somme gains Bode2.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/Somme gains Bode2.svg similarity index 100% rename from LogarithmPlotter/qml/icons/Somme gains Bode2.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/Somme gains Bode2.svg diff --git a/LogarithmPlotter/qml/icons/Somme phases Bode.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/Somme phases Bode.svg similarity index 100% rename from LogarithmPlotter/qml/icons/Somme phases Bode.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/Somme phases Bode.svg diff --git a/LogarithmPlotter/qml/icons/Text.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/Text.svg similarity index 100% rename from LogarithmPlotter/qml/icons/Text.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/Text.svg diff --git a/LogarithmPlotter/qml/icons/X Cursor.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/X Cursor.svg similarity index 100% rename from LogarithmPlotter/qml/icons/X Cursor.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/X Cursor.svg diff --git a/LogarithmPlotter/qml/icons/delete.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/delete.svg similarity index 100% rename from LogarithmPlotter/qml/icons/delete.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/delete.svg diff --git a/LogarithmPlotter/qml/icons/settings/custom/Definition Domain.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Definition Domain.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/custom/Definition Domain.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Definition Domain.svg diff --git a/LogarithmPlotter/qml/icons/settings/custom/Destination Domain.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Destination Domain.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/custom/Destination Domain.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Destination Domain.svg diff --git a/LogarithmPlotter/qml/icons/settings/custom/Display Mode.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Display Mode.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/custom/Display Mode.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Display Mode.svg diff --git a/LogarithmPlotter/qml/icons/settings/custom/Display Style.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Display Style.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/custom/Display Style.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Display Style.svg diff --git a/LogarithmPlotter/qml/icons/settings/custom/Expression.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Expression.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/custom/Expression.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Expression.svg diff --git a/LogarithmPlotter/qml/icons/settings/custom/Gain.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Gain.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/custom/Gain.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Gain.svg diff --git a/LogarithmPlotter/qml/icons/settings/custom/Label Position.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Label Position.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/custom/Label Position.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Label Position.svg diff --git a/LogarithmPlotter/qml/icons/settings/custom/Label X.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Label X.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/custom/Label X.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Label X.svg diff --git a/LogarithmPlotter/qml/icons/settings/custom/Pass.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Pass.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/custom/Pass.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Pass.svg diff --git a/LogarithmPlotter/qml/icons/settings/custom/Phase.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Phase.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/custom/Phase.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Phase.svg diff --git a/LogarithmPlotter/qml/icons/settings/custom/Point Style.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Point Style.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/custom/Point Style.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Point Style.svg diff --git a/LogarithmPlotter/qml/icons/settings/custom/Rounding.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Rounding.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/custom/Rounding.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Rounding.svg diff --git a/LogarithmPlotter/qml/icons/settings/custom/Target Element.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Target Element.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/custom/Target Element.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Target Element.svg diff --git a/LogarithmPlotter/qml/icons/settings/custom/Target Value Position.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Target Value Position.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/custom/Target Value Position.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Target Value Position.svg diff --git a/LogarithmPlotter/qml/icons/settings/custom/Text.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Text.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/custom/Text.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Text.svg diff --git a/LogarithmPlotter/qml/icons/settings/custom/Unit.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Unit.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/custom/Unit.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Unit.svg diff --git a/LogarithmPlotter/qml/icons/settings/custom/X.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/X.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/custom/X.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/X.svg diff --git a/LogarithmPlotter/qml/icons/settings/custom/Y.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Y.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/custom/Y.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/Y.svg diff --git a/LogarithmPlotter/qml/icons/settings/custom/angle.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/angle.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/custom/angle.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/angle.svg diff --git a/LogarithmPlotter/qml/icons/settings/custom/appearance.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/appearance.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/custom/appearance.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/appearance.svg diff --git a/LogarithmPlotter/qml/icons/settings/custom/arrow.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/arrow.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/custom/arrow.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/arrow.svg diff --git a/LogarithmPlotter/qml/icons/settings/custom/label.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/label.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/custom/label.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/label.svg diff --git a/LogarithmPlotter/qml/icons/settings/custom/position.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/position.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/custom/position.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/position.svg diff --git a/LogarithmPlotter/qml/icons/settings/custom/target.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/target.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/custom/target.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/target.svg diff --git a/LogarithmPlotter/qml/icons/settings/custom/ω₀.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/ω₀.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/custom/ω₀.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/custom/ω₀.svg diff --git a/LogarithmPlotter/qml/icons/settings/linewidth.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/linewidth.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/linewidth.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/linewidth.svg diff --git a/LogarithmPlotter/qml/icons/settings/textsize.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/textsize.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/textsize.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/textsize.svg diff --git a/LogarithmPlotter/qml/icons/settings/xaxisstep.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/xaxisstep.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/xaxisstep.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/xaxisstep.svg diff --git a/LogarithmPlotter/qml/icons/settings/xlabel.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/xlabel.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/xlabel.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/xlabel.svg diff --git a/LogarithmPlotter/qml/icons/settings/xmin.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/xmin.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/xmin.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/xmin.svg diff --git a/LogarithmPlotter/qml/icons/settings/xzoom.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/xzoom.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/xzoom.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/xzoom.svg diff --git a/LogarithmPlotter/qml/icons/settings/yaxisstep.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/yaxisstep.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/yaxisstep.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/yaxisstep.svg diff --git a/LogarithmPlotter/qml/icons/settings/ylabel.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/ylabel.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/ylabel.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/ylabel.svg diff --git a/LogarithmPlotter/qml/icons/settings/ymax.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/ymax.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/ymax.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/ymax.svg diff --git a/LogarithmPlotter/qml/icons/settings/yzoom.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/yzoom.svg similarity index 100% rename from LogarithmPlotter/qml/icons/settings/yzoom.svg rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/settings/yzoom.svg diff --git a/LogarithmPlotter/qml/js/expr-eval.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/expr-eval.js similarity index 100% rename from LogarithmPlotter/qml/js/expr-eval.js rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/expr-eval.js diff --git a/LogarithmPlotter/qml/js/historylib.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/historylib.js similarity index 100% rename from LogarithmPlotter/qml/js/historylib.js rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/historylib.js diff --git a/LogarithmPlotter/qml/js/mathlib.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/mathlib.js similarity index 100% rename from LogarithmPlotter/qml/js/mathlib.js rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/mathlib.js diff --git a/LogarithmPlotter/qml/js/objects.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objects.js similarity index 100% rename from LogarithmPlotter/qml/js/objects.js rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objects.js diff --git a/LogarithmPlotter/qml/js/parameters.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parameters.js similarity index 100% rename from LogarithmPlotter/qml/js/parameters.js rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parameters.js diff --git a/LogarithmPlotter/qml/js/utils.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/utils.js similarity index 100% rename from LogarithmPlotter/qml/js/utils.js rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/utils.js diff --git a/LogarithmPlotter/qml/eu/ad5001/MixedMenu b/LogarithmPlotter/qml/eu/ad5001/MixedMenu new file mode 160000 index 0000000..bcae0ab --- /dev/null +++ b/LogarithmPlotter/qml/eu/ad5001/MixedMenu @@ -0,0 +1 @@ +Subproject commit bcae0ab4563f20bfaf9e6e1e19421d724ec7ba50 diff --git a/MANIFEST.in b/MANIFEST.in index e68c444..6cac856 100644 --- a/MANIFEST.in +++ b/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 diff --git a/win/build-windows.bat b/win/build-windows.bat deleted file mode 100644 index 0582764..0000000 --- a/win/build-windows.bat +++ /dev/null @@ -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 diff --git a/win/build-wine.sh b/win/build-wine.sh deleted file mode 100644 index 4710793..0000000 --- a/win/build-wine.sh +++ /dev/null @@ -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 diff --git a/win/package-windows.bat b/win/package-windows.bat deleted file mode 100644 index cc7d33b..0000000 --- a/win/package-windows.bat +++ /dev/null @@ -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 diff --git a/win/package-wine.sh b/win/package-wine.sh deleted file mode 100644 index 4c73b72..0000000 --- a/win/package-wine.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -# Moving files -cp * ../README.md ../LICENSE.md ../dist/logarithmplotter/ -# Creating installer -cd ../dist/logarithmplotter/ -makensis installer.nsi