Compare commits
No commits in common. "main" and "v1.0" have entirely different histories.
7 changed files with 17 additions and 39 deletions
12
Action.qml
12
Action.qml
|
@ -42,7 +42,9 @@ Item {
|
|||
property alias enabled: controlsAction.enabled
|
||||
property alias shortcut: controlsAction.shortcut
|
||||
property alias text: controlsAction.text
|
||||
property alias icon: controlsAction.icon
|
||||
property alias iconName: controlsAction.icon.name
|
||||
property alias iconSource: controlsAction.icon.source
|
||||
property alias iconColor: controlsAction.icon.color
|
||||
|
||||
Native.MenuItem {
|
||||
id: nativeAction
|
||||
|
@ -60,13 +62,6 @@ Item {
|
|||
onToggled: root.toggled()
|
||||
}
|
||||
|
||||
Component.onCompleted: {
|
||||
// Forwarding to MenuBar. Little hack to make Action shortcuts work properly, because otherwise, they would not trigger
|
||||
if(shortcut != 0 && shortcut != undefined) {
|
||||
parent.parent.addShortcut(shortcut, root.triggered)
|
||||
}
|
||||
}
|
||||
|
||||
/*!
|
||||
\qmlmethod void Action::toggle()
|
||||
Toggles the \c checked state to its opposite state.
|
||||
|
@ -74,4 +69,5 @@ Item {
|
|||
function toggle(){
|
||||
root.trueItem.toggle()
|
||||
}
|
||||
|
||||
}
|
||||
|
|
9
Menu.qml
9
Menu.qml
|
@ -192,13 +192,4 @@ Item {
|
|||
controlsMenu.popup()
|
||||
}
|
||||
}
|
||||
|
||||
/*!
|
||||
\qmlmethod void Menu::addShortcut(keysequence sequence, var trigger)
|
||||
Forwarding to MenuBar. Little hack to make Action shortcuts work properly, because otherwise, they would not trigger
|
||||
\sa MenuBar::addShortcut
|
||||
*/
|
||||
function addShortcut(sequence, trigger) {
|
||||
parent.parent.addShortcut(sequence, trigger)
|
||||
}
|
||||
}
|
||||
|
|
14
MenuBar.qml
14
MenuBar.qml
|
@ -82,18 +82,4 @@ Item {
|
|||
function clear(){
|
||||
root.trueItem.clear()
|
||||
}
|
||||
|
||||
/*!
|
||||
\qmlmethod void MenuBar::addShortcut(keysequence sequence, var trigger)
|
||||
Little hack to make Action shortcuts work properly.
|
||||
*/
|
||||
function addShortcut(sequence, trigger) {
|
||||
var newShortcut = Qt.createQmlObject(`
|
||||
import QtQuick 2.12;
|
||||
Shortcut {
|
||||
context: Qt.ApplicationShortcut
|
||||
}`, root, "shortcut" + sequence);
|
||||
newShortcut.sequence = sequence
|
||||
newShortcut.activated.connect(trigger)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -42,7 +42,9 @@ Item {
|
|||
property bool enabled: true
|
||||
property font font: trueItem.font
|
||||
property string text: ""
|
||||
property alias icon: controlsMenuItem.icon
|
||||
property alias iconName: controlsMenuItem.icon.name
|
||||
property alias iconSource: controlsMenuItem.icon.source
|
||||
property alias iconColor: controlsMenuItem.icon.color
|
||||
|
||||
Native.MenuItem {
|
||||
id: nativeMenuItem
|
||||
|
|
|
@ -23,7 +23,10 @@ When switching from QtQuick.Controls 2 to MixedMenu, the following changes need
|
|||
|
||||
|QtQuick.Controls2/Qt.labs | > |eu.ad5001.MixedMenu |
|
||||
|-------------------------------------|---|--------------------------------------------------------|
|
||||
|`import import QtQuick.Controls 2.12`| > |`import eu.ad5001.MixedMenu 1.1` |
|
||||
|`import import QtQuick.Controls 2.12`| > |`import eu.ad5001.MixedMenu 1.0` |
|
||||
|`icon.name: ...` | > |`iconName: ...` |
|
||||
|`icon.source: ...` | > |`iconSource: ...` |
|
||||
|`icon.color: ...` | > |`iconColor: ...` |
|
||||
|`menuBar: MenuBar {}` | > |`MenuBar { id: appMenu }`<br>`menuBar: appMenu.trueItem`|
|
||||
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
*/
|
||||
|
||||
/*!
|
||||
\qmlmodule eu.ad5001.MixedMenu 1.1
|
||||
\qmlmodule eu.ad5001.MixedMenu 1.0
|
||||
\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.
|
||||
|
||||
|
|
10
qmldir
10
qmldir
|
@ -1,6 +1,6 @@
|
|||
module eu.ad5001.MixedMenu
|
||||
MenuBar 1.1 MenuBar.qml
|
||||
MenuItem 1.1 MenuItem.qml
|
||||
Action 1.1 Action.qml
|
||||
Menu 1.1 Menu.qml
|
||||
MenuSeparator 1.1 MenuSeparator.qml
|
||||
MenuBar 1.0 MenuBar.qml
|
||||
MenuItem 1.0 MenuItem.qml
|
||||
Action 1.0 Action.qml
|
||||
Menu 1.0 Menu.qml
|
||||
MenuSeparator 1.0 MenuSeparator.qml
|
||||
|
|
Loading…
Reference in a new issue