git.iko.soy/unity8
on xenial help sign in
MenuItemFactory: use a slots for adding the buttonSectionMenu
5f1806bMarco Trevisan (Treviño)
qml/Panel/Indicators/MenuItemFactory.qml+5−7
compare with xenial
unifiedsplit
@@ -965,14 +965,12 @@ Item {
965 menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-extra-label': 'string'});
965 menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-extra-label': 'string'});
966 }
966 }
967
967
968− component: Component {
969− Button {
968+ slots: Button {
970− objectName: "buttonSectionMenuControl"
969+ objectName: "buttonSectionMenuControl"
971− text: getExtendedProperty(extendedData, "xCanonicalExtraLabel", "")
970+ text: getExtendedProperty(extendedData, "xCanonicalExtraLabel", "")
972
971
973− onClicked: {
972+ onClicked: {
974− menuModel.activate(menuIndex);
973+ menuModel.activate(menuIndex);
975− }
976 }
974 }
977 }
975 }
978 }
976 }
tests/mocks/Unity/Indicators/IndicatorsModel.qml+1−1
@@ -124,7 +124,7 @@ Indicators.FakeIndicatorsModel {
124
124
125 Indicators.UnityMenuModelCache.setCachedModelData("/com/canonical/indicators/fake0",
125 Indicators.UnityMenuModelCache.setCachedModelData("/com/canonical/indicators/fake0",
126 getUnityMenuModelData("indicator-keyboard",
126 getUnityMenuModelData("indicator-keyboard",
127− "Czech (F)",
127+ "English (F)",
128 "",
128 "",
129 [ "image://theme/input-keyboard-symbolic" ]));
129 [ "image://theme/input-keyboard-symbolic" ]));
130 Indicators.UnityMenuModelCache.setCachedModelData("/com/canonical/indicators/fake1",
130 Indicators.UnityMenuModelCache.setCachedModelData("/com/canonical/indicators/fake1",