git.iko.soy/unity8
on xenial help sign in
MenuItemFactory: use a slots for adding the buttonSectionMenu
commit5f1806b088629f74655520613ac202c017e72be1 authorMarco Trevisan (Treviño) <mail@3v1n0.net> dateThu 22 Sep 2016, 11:21 (10 years ago) parent395ed1d
2 files changed+6−8
compare with xenial
unifiedsplit
qml/Panel/Indicators/MenuItemFactory.qml+5−7 tests/mocks/Unity/Indicators/IndicatorsModel.qml+1−1
qml/Panel/Indicators/MenuItemFactory.qml+5−7
@@ -965,14 +965,12 @@ Item {
965965 menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-extra-label': 'string'});
966966 }
967967
968− component: Component {
969− Button {
970− objectName: "buttonSectionMenuControl"
971− text: getExtendedProperty(extendedData, "xCanonicalExtraLabel", "")
968+ slots: Button {
969+ objectName: "buttonSectionMenuControl"
970+ text: getExtendedProperty(extendedData, "xCanonicalExtraLabel", "")
972971
973− onClicked: {
974− menuModel.activate(menuIndex);
975− }
972+ onClicked: {
973+ menuModel.activate(menuIndex);
976974 }
977975 }
978976 }
tests/mocks/Unity/Indicators/IndicatorsModel.qml+1−1
@@ -124,7 +124,7 @@ Indicators.FakeIndicatorsModel {
124124
125125 Indicators.UnityMenuModelCache.setCachedModelData("/com/canonical/indicators/fake0",
126126 getUnityMenuModelData("indicator-keyboard",
127− "Czech (F)",
127+ "English (F)",
128128 "",
129129 [ "image://theme/input-keyboard-symbolic" ]));
130130 Indicators.UnityMenuModelCache.setCachedModelData("/com/canonical/indicators/fake1",