330fb96 · unity8 · git.iko.soy

qml/ApplicationMenus/MenuBar.qml+2−1

@@ -157,7 +157,8 @@ Item {

157 height: _title.height

158

159 action: Action {

160+ // FIXME - SDK Action:text modifies menu text with html underline for mnemonic

160− text: model.label.replace("_", "&")

161+ text: model.label.replace("_", "&").replace("<u>", "&").replace("</u>", "")

161

162

162 onTriggered: {

163 onTriggered: {

163 visualItem.show();

164 visualItem.show();

qml/ApplicationMenus/MenuItem.qml+2−1

@@ -46,7 +46,8 @@ ActionItem {

46 enabled: menuData ? menuData.sensitive : false

47

48 action: Action {

49+ // FIXME - SDK Action:text modifies menu text with html underline for mnemonic

49− text: menuData.label.replace("_", "&")

50+ text: menuData.label.replace("_", "&").replace("<u>", "&").replace("</u>", "")

50 checkable: menuData.isCheck || menuData.isRadio

51 checkable: menuData.isCheck || menuData.isRadio

51 checked: menuData.isToggled

52 checked: menuData.isToggled

52 }

53 }

qml/OrientedShell.qml+6

@@ -98,6 +98,12 @@ Item {

98 deviceFilter: InputInfo.TouchScreen

99 }

100

101+ Binding {

102+ target: QuickUtils

103+ property: "keyboardAttached"

104+ value: keyboardsModel.count > 0

105+ }

106+

101 readonly property int pointerInputDevices: miceModel.count + touchPadModel.count

107 readonly property int pointerInputDevices: miceModel.count + touchPadModel.count

102 onPointerInputDevicesChanged: calculateUsageMode()

108 onPointerInputDevicesChanged: calculateUsageMode()

103

109