git.iko.soy/unity8
on xenial help sign in
MenuItemFactory: use Menus.RadioMenu and Menus.ButtonMenu
28d1c5cBileto Bot
debian/changelog+2
compare with xenial
unifiedsplit
@@ -5,6 +5,8 @@ unity8 (8.15) UNRELEASED; urgency=medium
5 Adds support for showing the calendar at the requested date, marking days
5 Adds support for showing the calendar at the requested date, marking days
6 with events properly and toggling the visibility of the week number.
6 with events properly and toggling the visibility of the week number.
7
7
8+ * MenuItemFactory: use Menus.RadioMenu and Menus.ButtonMenu
9+
8 * Bump version as USC breaks with unity8 << 8.14
10 * Bump version as USC breaks with unity8 << 8.14
9
11
10 -- Marco Trevisan (Treviño) <marco@ubuntu.com> Thu, 27 Oct 2016 14:03:03 +0200
12 -- Marco Trevisan (Treviño) <marco@ubuntu.com> Thu, 27 Oct 2016 14:03:03 +0200
qml/Panel/Indicators/MenuItemFactory.qml+36−10
@@ -362,6 +362,35 @@ Item {
362 }
362 }
363 }
363 }
364
364
365+ Component {
366+ id: radioMenu;
367+
368+ Menus.RadioMenu {
369+ id: radioItem
370+ objectName: "radioMenu"
371+ property QtObject menuData: null
372+ property int menuIndex: -1
373+ property bool serverChecked: menuData && menuData.isToggled || false
374+
375+ text: menuData && menuData.label || ""
376+ enabled: menuData && menuData.sensitive || false
377+ checked: serverChecked
378+ highlightWhenPressed: false
379+
380+ ServerPropertySynchroniser {
381+ objectName: "sync"
382+ syncTimeout: Utils.Constants.indicatorValueTimeout
383+
384+ serverTarget: radioItem
385+ serverProperty: "serverChecked"
386+ userTarget: radioItem
387+ userProperty: "checked"
388+
389+ onSyncTriggered: menuModel.activate(radioItem.menuIndex)
390+ }
391+ }
392+ }
393+
365 Component {
394 Component {
366 id: switchMenu;
395 id: switchMenu;
367
396
@@ -1003,7 +1032,7 @@ Item {
1003 Component {
1032 Component {
1004 id: buttonSectionMenu;
1033 id: buttonSectionMenu;
1005
1034
1006− Menus.StandardMenu {
1035+ Menus.ButtonMenu {
1007 objectName: "buttonSectionMenu"
1036 objectName: "buttonSectionMenu"
1008 property QtObject menuData: null
1037 property QtObject menuData: null
1009 property var menuModel: menuFactory.menuModel
1038 property var menuModel: menuFactory.menuModel
@@ -1015,6 +1044,7 @@ Item {
1015 highlightWhenPressed: false
1044 highlightWhenPressed: false
1016 text: menuData && menuData.label || ""
1045 text: menuData && menuData.label || ""
1017 foregroundColor: theme.palette.normal.backgroundText
1046 foregroundColor: theme.palette.normal.backgroundText
1047+ buttonText: getExtendedProperty(extendedData, "xCanonicalExtraLabel", "")
1018
1048
1019 onMenuModelChanged: {
1049 onMenuModelChanged: {
1020 loadAttributes();
1050 loadAttributes();
@@ -1027,14 +1057,7 @@ Item {
1027 menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-extra-label': 'string'});
1057 menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-extra-label': 'string'});
1028 }
1058 }
1029
1059
1030− slots: Button {
1031− objectName: "buttonSectionMenuControl"
1032− text: getExtendedProperty(extendedData, "xCanonicalExtraLabel", "")
1033−
1034− onClicked: {
1035− menuModel.activate(menuIndex);
1060+ onButtonClicked: menuModel.activate(menuIndex);
1036− }
1037− }
1038 }
1061 }
1039 }
1062 }
1040
1063
@@ -1053,9 +1076,12 @@ Item {
1053 return component;
1076 return component;
1054 }
1077 }
1055
1078
1056− if (modelData.isCheck || modelData.isRadio) {
1079+ if (modelData.isCheck) {
1057 return checkableMenu;
1080 return checkableMenu;
1058 }
1081 }
1082+ if (modelData.isRadio) {
1083+ return radioMenu;
1084+ }
1059 if (modelData.isSeparator) {
1085 if (modelData.isSeparator) {
1060 return separatorMenu;
1086 return separatorMenu;
1061 }
1087 }
tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml+26−5
@@ -144,13 +144,12 @@ Item {
144 }
144 }
145
145
146 function test_create_radio() {
146 function test_create_radio() {
147− skip("No radio component");
148 menuData.isRadio = true;
147 menuData.isRadio = true;
149
148
150 loader.data = menuData;
149 loader.data = menuData;
151 loader.sourceComponent = factory.load(menuData);
150 loader.sourceComponent = factory.load(menuData);
152 tryCompareFunction(function() { return loader.item != undefined; }, true);
151 tryCompareFunction(function() { return loader.item != undefined; }, true);
153− compare(loader.item.objectName, "checkableMenu", "Should have created a checkable menu");
152+ compare(loader.item.objectName, "radioMenu", "Should have created a radio menu");
154 }
153 }
155
154
156 function test_create_separator() {
155 function test_create_separator() {
@@ -344,6 +343,30 @@ Item {
344 compare(loader.item.enabled, data.enabled, "Enabled does not match data");
343 compare(loader.item.enabled, data.enabled, "Enabled does not match data");
345 }
344 }
346
345
346+ function test_create_radioMenu_data() {
347+ return [
348+ {label: "testLabel1", enabled: true, checked: false },
349+ {label: "testLabel2", enabled: false, checked: true },
350+ ];
351+ }
352+
353+ function test_create_radioMenu(data) {
354+ menuData.type = "";
355+ menuData.label = data.label;
356+ menuData.sensitive = data.enabled;
357+ menuData.isRadio = true;
358+ menuData.isToggled = data.checked;
359+
360+ loader.data = menuData;
361+ loader.sourceComponent = factory.load(menuData);
362+ tryCompareFunction(function() { return loader.item != undefined; }, true);
363+ compare(loader.item.objectName, "radioMenu", "Should have created a radio menu");
364+
365+ compare(loader.item.text, data.label, "Label does not match data");
366+ compare(loader.item.checked, data.checked, "Checked does not match data");
367+ compare(loader.item.enabled, data.enabled, "Enabled does not match data");
368+ }
369+
347 function test_create_switchMenu_data() {
370 function test_create_switchMenu_data() {
348 return [
371 return [
349 {label: "testLabel1", enabled: true, checked: false, icon: "file:///testIcon1" },
372 {label: "testLabel1", enabled: true, checked: false, icon: "file:///testIcon1" },
@@ -537,9 +560,7 @@ Item {
537 compare(loader.item.iconSource, data.icon, "Icon does not match data");
560 compare(loader.item.iconSource, data.icon, "Icon does not match data");
538 compare(loader.item.enabled, data.enabled, "Enabled does not match data");
561 compare(loader.item.enabled, data.enabled, "Enabled does not match data");
539
562
540− var button = findChild(loader.item, "buttonSectionMenuControl");
541− verify(button !== null);
542− compare(button.text, data.buttonText, "Button text does not match data");
563+ compare(loader.item.buttonText, data.buttonText, "Button text does not match data");
543 }
564 }
544
565
545 function test_create_wifiSection_data() {
566 function test_create_wifiSection_data() {