From c74e5d69ea905229da038c97889edb44ea5648e7 Mon Sep 17 00:00:00 2001
From: Ad5001 <mail@ad5001.eu>
Date: Fri, 23 Jul 2021 00:46:14 +0200
Subject: [PATCH] Updating MixedMenu to v1.1, removing debug alert, changing
 Linux category to a single one.

---
 .../qml/eu/ad5001/LogarithmPlotter/Alert.qml  |  5 ----
 .../eu/ad5001/LogarithmPlotter/AppMenuBar.qml | 24 +++++++++----------
 LogarithmPlotter/qml/eu/ad5001/MixedMenu      |  2 +-
 linux/logarithmplotter.desktop                |  2 +-
 linux/logplotter.desktop                      |  2 +-
 5 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Alert.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Alert.qml
index d2768c5..03dd491 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Alert.qml
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Alert.qml
@@ -39,11 +39,6 @@ Rectangle {
         font.pixelSize: 18
     }
     
-    Component.onCompleted: {
-        show("Test")
-        console.log("Width", width, "height", height)
-    }
-    
     
     ParallelAnimation {
         id: fadingAnimation
diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml
index a8943c3..87434a0 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml
@@ -30,20 +30,20 @@ MenuBar {
             text: qsTr("&Load...")
             shortcut: StandardKey.Open
             onTriggered: settings.load()
-            iconName: 'document-open'
+            icon.name: 'document-open'
             
         }
         Action {
             text: qsTr("&Save")
             shortcut: StandardKey.Save
             onTriggered: settings.save()
-            iconName: 'document-save'
+            icon.name: 'document-save'
         }
         Action {
             text: qsTr("Save &As...")
             shortcut: StandardKey.SaveAs
             onTriggered: settings.saveAs()
-            iconName: 'document-save-as'
+            icon.name: 'document-save-as'
             
         }
         MenuSeparator { }
@@ -51,7 +51,7 @@ MenuBar {
             text: qsTr("&Quit")
             shortcut: StandardKey.Quit
             onTriggered: Qt.quit()
-            iconName: 'application-exit'
+            icon.name: 'application-exit'
         }
     }
     Menu {
@@ -60,16 +60,16 @@ MenuBar {
             text: qsTr("&Undo")
             shortcut: StandardKey.Undo
             onTriggered: history.undo()
-            iconName: 'edit-undo'
-            iconColor: enabled ? sysPalette.windowText : sysPaletteIn.windowText
+            icon.name: 'edit-undo'
+            icon.color: enabled ? sysPalette.windowText : sysPaletteIn.windowText
             enabled: history.undoCount > 0
         }
         Action { 
             text: qsTr("&Redo")
             shortcut: StandardKey.Redo
             onTriggered: history.redo()
-            iconName: 'edit-redo'
-            iconColor: enabled ? sysPalette.windowText : sysPaletteIn.windowText
+            icon.name: 'edit-redo'
+            icon.color: enabled ? sysPalette.windowText : sysPaletteIn.windowText
             enabled: history.redoCount > 0
         }
         MenuSeparator { }
@@ -77,7 +77,7 @@ MenuBar {
             text: qsTr("&Copy diagram")
             shortcut: StandardKey.Copy
             onTriggered: root.copyDiagramToClipboard()
-            iconName: 'edit-copy'
+            icon.name: 'edit-copy'
         }
     }
     Menu {
@@ -90,8 +90,8 @@ MenuBar {
                 text: modelData
                 visible: Objects.types[modelData].createable()
                 height: visible ? implicitHeight : 0
-                iconName: modelData
-                iconColor: sysPalette.windowText
+                icon.name: modelData
+                icon.color: sysPalette.windowText
                 onTriggered: {
                     var newObj = Objects.createNewRegisteredObject(modelData)
                     history.addToHistory(new HistoryLib.CreateNewObject(newObj.name, modelData, newObj.export()))
@@ -105,7 +105,7 @@ MenuBar {
         Action {
             text: qsTr("&About")
             shortcut: StandardKey.HelpContents
-            iconName: 'about'
+            icon.name: 'about'
             onTriggered: about.open()
         }
     }
diff --git a/LogarithmPlotter/qml/eu/ad5001/MixedMenu b/LogarithmPlotter/qml/eu/ad5001/MixedMenu
index 66e3761..f0d6a96 160000
--- a/LogarithmPlotter/qml/eu/ad5001/MixedMenu
+++ b/LogarithmPlotter/qml/eu/ad5001/MixedMenu
@@ -1 +1 @@
-Subproject commit 66e3761b50fcc2f14eec97eaaf20fa5ef3a48300
+Subproject commit f0d6a9617454089cf8d03ec7c775ee1aedb768ce
diff --git a/linux/logarithmplotter.desktop b/linux/logarithmplotter.desktop
index 18875d1..80afe81 100644
--- a/linux/logarithmplotter.desktop
+++ b/linux/logarithmplotter.desktop
@@ -8,4 +8,4 @@ Icon=logplotter
 MimeType=application/x-logarithm-plotter;
 Terminal=false
 StartupNotify=false
-Categories=Graphics;Science;Math;
+Categories=Math
diff --git a/linux/logplotter.desktop b/linux/logplotter.desktop
index 790a057..6661f99 100644
--- a/linux/logplotter.desktop
+++ b/linux/logplotter.desktop
@@ -8,4 +8,4 @@ Icon=ROOTFOLDER/logplotter.svg
 MimeType=application/x-logarithm-plotter;
 Terminal=false
 StartupNotify=false
-Categories=Graphics;Science;Math;
+Categories=Math