From b9d04b6f5c92f0ef4e30e2bf436be503f739a74d Mon Sep 17 00:00:00 2001 From: Gabriel de Dietrich Date: Mon, 11 Mar 2013 15:43:29 +0100 Subject: Menu: Rename 'text' property to 'title' Change-Id: Ib0b1445593ff48df56cd8d4d20122880c2dacca5 Reviewed-by: J-P Nurmi --- src/controls/Menu.qml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/controls/Menu.qml') diff --git a/src/controls/Menu.qml b/src/controls/Menu.qml index cb6264f7..8641a0e1 100644 --- a/src/controls/Menu.qml +++ b/src/controls/Menu.qml @@ -51,7 +51,7 @@ import "Styles/Settings.js" as Settings \code Menu { - text: "Edit" + title: "Edit" MenuItem { text: "Cut" @@ -74,7 +74,7 @@ import "Styles/Settings.js" as Settings MenuSeparator { } Menu { - text: "More Stuff" + title: "More Stuff" MenuItem { text: "Do Nothing" @@ -246,9 +246,10 @@ MenuPrivate { id: menuItemLoader property var menuItem: modelData - property bool isSeparator: menuItem ? !menuItem.hasOwnProperty("text") : false + property bool isSeparator: menuItem ? !menuItem.hasOwnProperty("enabled") : true property bool hasSubmenu: menuItem ? !!menuItem["items"] : false property bool selected: !isSeparator && root.__currentIndex === index + property string text: hasSubmenu ? menuItem.title : !isSeparator ? menuItem.text : "" property int menuItemIndex: index -- cgit v1.2.1