Updating MixedMenu to v1.1, removing debug alert, changing Linux category to a single one.
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Adsooi 2021-07-23 00:46:14 +02:00
parent 5be33e8aa9
commit c74e5d69ea
Signed by: Ad5001
GPG key ID: EF45F9C6AFE20160
5 changed files with 15 additions and 20 deletions

View file

@ -39,11 +39,6 @@ Rectangle {
font.pixelSize: 18 font.pixelSize: 18
} }
Component.onCompleted: {
show("Test")
console.log("Width", width, "height", height)
}
ParallelAnimation { ParallelAnimation {
id: fadingAnimation id: fadingAnimation

View file

@ -30,20 +30,20 @@ MenuBar {
text: qsTr("&Load...") text: qsTr("&Load...")
shortcut: StandardKey.Open shortcut: StandardKey.Open
onTriggered: settings.load() onTriggered: settings.load()
iconName: 'document-open' icon.name: 'document-open'
} }
Action { Action {
text: qsTr("&Save") text: qsTr("&Save")
shortcut: StandardKey.Save shortcut: StandardKey.Save
onTriggered: settings.save() onTriggered: settings.save()
iconName: 'document-save' icon.name: 'document-save'
} }
Action { Action {
text: qsTr("Save &As...") text: qsTr("Save &As...")
shortcut: StandardKey.SaveAs shortcut: StandardKey.SaveAs
onTriggered: settings.saveAs() onTriggered: settings.saveAs()
iconName: 'document-save-as' icon.name: 'document-save-as'
} }
MenuSeparator { } MenuSeparator { }
@ -51,7 +51,7 @@ MenuBar {
text: qsTr("&Quit") text: qsTr("&Quit")
shortcut: StandardKey.Quit shortcut: StandardKey.Quit
onTriggered: Qt.quit() onTriggered: Qt.quit()
iconName: 'application-exit' icon.name: 'application-exit'
} }
} }
Menu { Menu {
@ -60,16 +60,16 @@ MenuBar {
text: qsTr("&Undo") text: qsTr("&Undo")
shortcut: StandardKey.Undo shortcut: StandardKey.Undo
onTriggered: history.undo() onTriggered: history.undo()
iconName: 'edit-undo' icon.name: 'edit-undo'
iconColor: enabled ? sysPalette.windowText : sysPaletteIn.windowText icon.color: enabled ? sysPalette.windowText : sysPaletteIn.windowText
enabled: history.undoCount > 0 enabled: history.undoCount > 0
} }
Action { Action {
text: qsTr("&Redo") text: qsTr("&Redo")
shortcut: StandardKey.Redo shortcut: StandardKey.Redo
onTriggered: history.redo() onTriggered: history.redo()
iconName: 'edit-redo' icon.name: 'edit-redo'
iconColor: enabled ? sysPalette.windowText : sysPaletteIn.windowText icon.color: enabled ? sysPalette.windowText : sysPaletteIn.windowText
enabled: history.redoCount > 0 enabled: history.redoCount > 0
} }
MenuSeparator { } MenuSeparator { }
@ -77,7 +77,7 @@ MenuBar {
text: qsTr("&Copy diagram") text: qsTr("&Copy diagram")
shortcut: StandardKey.Copy shortcut: StandardKey.Copy
onTriggered: root.copyDiagramToClipboard() onTriggered: root.copyDiagramToClipboard()
iconName: 'edit-copy' icon.name: 'edit-copy'
} }
} }
Menu { Menu {
@ -90,8 +90,8 @@ MenuBar {
text: modelData text: modelData
visible: Objects.types[modelData].createable() visible: Objects.types[modelData].createable()
height: visible ? implicitHeight : 0 height: visible ? implicitHeight : 0
iconName: modelData icon.name: modelData
iconColor: sysPalette.windowText icon.color: sysPalette.windowText
onTriggered: { onTriggered: {
var newObj = Objects.createNewRegisteredObject(modelData) var newObj = Objects.createNewRegisteredObject(modelData)
history.addToHistory(new HistoryLib.CreateNewObject(newObj.name, modelData, newObj.export())) history.addToHistory(new HistoryLib.CreateNewObject(newObj.name, modelData, newObj.export()))
@ -105,7 +105,7 @@ MenuBar {
Action { Action {
text: qsTr("&About") text: qsTr("&About")
shortcut: StandardKey.HelpContents shortcut: StandardKey.HelpContents
iconName: 'about' icon.name: 'about'
onTriggered: about.open() onTriggered: about.open()
} }
} }

@ -1 +1 @@
Subproject commit 66e3761b50fcc2f14eec97eaaf20fa5ef3a48300 Subproject commit f0d6a9617454089cf8d03ec7c775ee1aedb768ce

View file

@ -8,4 +8,4 @@ Icon=logplotter
MimeType=application/x-logarithm-plotter; MimeType=application/x-logarithm-plotter;
Terminal=false Terminal=false
StartupNotify=false StartupNotify=false
Categories=Graphics;Science;Math; Categories=Math

View file

@ -8,4 +8,4 @@ Icon=ROOTFOLDER/logplotter.svg
MimeType=application/x-logarithm-plotter; MimeType=application/x-logarithm-plotter;
Terminal=false Terminal=false
StartupNotify=false StartupNotify=false
Categories=Graphics;Science;Math; Categories=Math