Compare commits
4 commits
Author | SHA1 | Date | |
---|---|---|---|
5c6e05b1e4 | |||
ab80a422ed | |||
4c9f0571d2 | |||
f0d6a96174 |
6 changed files with 10 additions and 19 deletions
|
@ -42,9 +42,7 @@ Item {
|
||||||
property alias enabled: controlsAction.enabled
|
property alias enabled: controlsAction.enabled
|
||||||
property alias shortcut: controlsAction.shortcut
|
property alias shortcut: controlsAction.shortcut
|
||||||
property alias text: controlsAction.text
|
property alias text: controlsAction.text
|
||||||
property alias iconName: controlsAction.icon.name
|
property alias icon: controlsAction.icon
|
||||||
property alias iconSource: controlsAction.icon.source
|
|
||||||
property alias iconColor: controlsAction.icon.color
|
|
||||||
|
|
||||||
Native.MenuItem {
|
Native.MenuItem {
|
||||||
id: nativeAction
|
id: nativeAction
|
||||||
|
@ -64,8 +62,7 @@ Item {
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
// Forwarding to MenuBar. Little hack to make Action shortcuts work properly, because otherwise, they would not trigger
|
// Forwarding to MenuBar. Little hack to make Action shortcuts work properly, because otherwise, they would not trigger
|
||||||
if(shortcut != 0) {
|
if(shortcut != 0 && shortcut != undefined) {
|
||||||
console.log("Adding shortcut for", text, "with shortcut", shortcut)
|
|
||||||
parent.parent.addShortcut(shortcut, root.triggered)
|
parent.parent.addShortcut(shortcut, root.triggered)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -95,6 +95,5 @@ Item {
|
||||||
}`, root, "shortcut" + sequence);
|
}`, root, "shortcut" + sequence);
|
||||||
newShortcut.sequence = sequence
|
newShortcut.sequence = sequence
|
||||||
newShortcut.activated.connect(trigger)
|
newShortcut.activated.connect(trigger)
|
||||||
console.log("Added shortcut " + sequence)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,9 +42,7 @@ Item {
|
||||||
property bool enabled: true
|
property bool enabled: true
|
||||||
property font font: trueItem.font
|
property font font: trueItem.font
|
||||||
property string text: ""
|
property string text: ""
|
||||||
property alias iconName: controlsMenuItem.icon.name
|
property alias icon: controlsMenuItem.icon
|
||||||
property alias iconSource: controlsMenuItem.icon.source
|
|
||||||
property alias iconColor: controlsMenuItem.icon.color
|
|
||||||
|
|
||||||
Native.MenuItem {
|
Native.MenuItem {
|
||||||
id: nativeMenuItem
|
id: nativeMenuItem
|
||||||
|
|
|
@ -23,10 +23,7 @@ When switching from QtQuick.Controls 2 to MixedMenu, the following changes need
|
||||||
|
|
||||||
|QtQuick.Controls2/Qt.labs | > |eu.ad5001.MixedMenu |
|
|QtQuick.Controls2/Qt.labs | > |eu.ad5001.MixedMenu |
|
||||||
|-------------------------------------|---|--------------------------------------------------------|
|
|-------------------------------------|---|--------------------------------------------------------|
|
||||||
|`import import QtQuick.Controls 2.12`| > |`import eu.ad5001.MixedMenu 1.0` |
|
|`import import QtQuick.Controls 2.12`| > |`import eu.ad5001.MixedMenu 1.1` |
|
||||||
|`icon.name: ...` | > |`iconName: ...` |
|
|
||||||
|`icon.source: ...` | > |`iconSource: ...` |
|
|
||||||
|`icon.color: ...` | > |`iconColor: ...` |
|
|
||||||
|`menuBar: MenuBar {}` | > |`MenuBar { id: appMenu }`<br>`menuBar: appMenu.trueItem`|
|
|`menuBar: MenuBar {}` | > |`MenuBar { id: appMenu }`<br>`menuBar: appMenu.trueItem`|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\qmlmodule eu.ad5001.MixedMenu 1.0
|
\qmlmodule eu.ad5001.MixedMenu 1.1
|
||||||
\title MixedMenu QML Module
|
\title MixedMenu QML Module
|
||||||
\brief Provides a near drop-in replacements for QtQuick.Controls menus allowing to use the platform native ones on supported platforms.
|
\brief Provides a near drop-in replacements for QtQuick.Controls menus allowing to use the platform native ones on supported platforms.
|
||||||
|
|
||||||
|
|
10
qmldir
10
qmldir
|
@ -1,6 +1,6 @@
|
||||||
module eu.ad5001.MixedMenu
|
module eu.ad5001.MixedMenu
|
||||||
MenuBar 1.0 MenuBar.qml
|
MenuBar 1.1 MenuBar.qml
|
||||||
MenuItem 1.0 MenuItem.qml
|
MenuItem 1.1 MenuItem.qml
|
||||||
Action 1.0 Action.qml
|
Action 1.1 Action.qml
|
||||||
Menu 1.0 Menu.qml
|
Menu 1.1 Menu.qml
|
||||||
MenuSeparator 1.0 MenuSeparator.qml
|
MenuSeparator 1.1 MenuSeparator.qml
|
||||||
|
|
Loading…
Reference in a new issue