e507710 · unity8 · git.iko.soy

git.iko.soy/unity8

Renamed indicator menus to menu items.

commite50771072b5ee04ff85711cfc2cb328ed00605f0 authorNick Dedekind <nicholas.dedekind@gmail.com> dateThu 27 Jun 2013, 15:46 (13 years ago) parentb512b17

21 files changed+41−42

compare with xenial

unifiedsplit

Panel/Indicators/client/IndicatorsList.qml+1−1

@@ -38,7 +38,7 @@ Page {

3838 anchors.fill: parent

3939 model: indicatorsModel

4040

41− delegate: Indicators.Menu {

41+ delegate: Indicators.MenuItem {

4242 anchors.left: parent.left

4343 anchors.right: parent.right

4444 progression: isValid

modules/Unity/Indicators/qml/BasicMenu.qml → modules/Unity/Indicators/qml/BasicMenuItem.qmlrenamed

The content is the same.

modules/Unity/Indicators/qml/ButtonMenu.qml → modules/Unity/Indicators/qml/ButtonMenuItem.qmlrenamed+1−1

@@ -20,7 +20,7 @@

2020import QtQuick 2.0

2121import Ubuntu.Components 0.1

2222

23−BasicMenu {

23+BasicMenuItem {

2424 property variant action: menu && menu.action!="" && actionGroup ? actionGroup.action(menu.action) : null

2525

2626 color: "#221e1b"

modules/Unity/Indicators/qml/DivMenu.qml → modules/Unity/Indicators/qml/DivMenuItem.qmlrenamed

The content is the same.

modules/Unity/Indicators/qml/IndicatorPage.qml+2−2

@@ -106,7 +106,7 @@ IndicatorBase {

106106

107107 anchors.fill: parent

108108

109− DivMenu {

109+ DivMenuItem {

110110 id: div

111111

112112 anchors.left: parent.left

@@ -125,7 +125,7 @@ IndicatorBase {

125125 }

126126 }

127127

128− MenuFactory {

128+ MenuItemFactory {

129129 id: factory

130130

131131 actionGroup: main.actionGroup

modules/Unity/Indicators/qml/Menu.qml → modules/Unity/Indicators/qml/MenuItem.qmlrenamed+1−1

@@ -21,7 +21,7 @@ import QtQuick 2.0

2121import Ubuntu.Components 0.1

2222import Ubuntu.Components.ListItems 0.1 as ListItem

2323

24−BasicMenu {

24+BasicMenuItem {

2525 id: __menu

2626 objectName: menu ? menu.action : ""

2727 progression: menu && (menu.linkSubMenu !== undefined)

modules/Unity/Indicators/qml/MenuFactory.qml → modules/Unity/Indicators/qml/MenuItemFactory.qmlrenamed+8−9

@@ -56,18 +56,18 @@ Item {

5656 "unity.widgets.systemsettings.tablet.accesspoint" : accessPoint,

5757 }

5858

59− Component { id: sliderMenu; Indicators.SliderMenu {} }

60− Component { id: switchMenu; Indicators.SwitchMenu {} }

61− Component { id: buttonMenu; Indicators.ButtonMenu {} }

62− Component { id: divMenu; Indicators.DivMenu {} }

63− Component { id: sectionMenu; Indicators.SectionMenu {} }

64− Component { id: progressMenu; Indicators.ProgressMenu {} }

65− Component { id: messageItem; ICMessaging.MessageItem {} }

59+ Component { id: sliderMenu; Indicators.SliderMenuItem {} }

60+ Component { id: switchMenu; Indicators.SwitchMenuItem {} }

61+ Component { id: buttonMenu; Indicators.ButtonMenuItem {} }

62+ Component { id: divMenu; Indicators.DivMenuItem {} }

63+ Component { id: sectionMenu; Indicators.SectionMenuItem {} }

64+ Component { id: progressMenu; Indicators.ProgressMenuItem {} }

65+ Component { id: messageItem; ICMessaging.MessageMenuItem {} }

6666 Component { id: snapDecision; ICMessaging.SnapDecision {} }

6767 Component { id: groupedMessage; ICMessaging.GroupedMessage {} }

6868 Component { id: wifiSection; ICNetwork.WifiSection {} }

6969 Component { id: accessPoint; ICNetwork.AccessPoint {} }

70− Component { id: indicatorMenu; Indicators.Menu {} }

70+ Component { id: indicatorMenu; Indicators.MenuItem {} }

7171

7272 Loader {

7373 id: __loader

@@ -93,7 +93,6 @@ Item {

9393 return indicatorMenu;

9494 }

9595 }

96− return undefined;

9796 }

9897

9998 onLoaded: {

modules/Unity/Indicators/qml/ProgressMenu.qml → modules/Unity/Indicators/qml/ProgressMenuItem.qmlrenamed+1−1

@@ -20,7 +20,7 @@

2020import QtQuick 2.0

2121import Ubuntu.Components 0.1

2222

23−Menu {

23+MenuItem {

2424

2525 property alias value : progressBar.value

2626

modules/Unity/Indicators/qml/SectionMenu.qml → modules/Unity/Indicators/qml/SectionMenuItem.qmlrenamed+1−1

@@ -21,7 +21,7 @@ import QtQuick 2.0

2121import Ubuntu.Components 0.1

2222import Ubuntu.Components.ListItems 0.1 as ListItem

2323

24−BasicMenu {

24+BasicMenuItem {

2525 id: __sectionMenu

2626

2727 property string label: menu && menu.label ? menu.label : ""

modules/Unity/Indicators/qml/SliderMenu.qml → modules/Unity/Indicators/qml/SliderMenuItem.qmlrenamed+1−1

@@ -20,7 +20,7 @@

2020import QtQuick 2.0

2121import Ubuntu.Components 0.1

2222

23−Menu {

23+MenuItem {

2424 id: _sliderMenu

2525

2626 property alias minimumValue: slider.minimumValue

modules/Unity/Indicators/qml/SwitchMenu.qml → modules/Unity/Indicators/qml/SwitchMenuItem.qmlrenamed+1−1

@@ -20,7 +20,7 @@

2020import QtQuick 2.0

2121import Ubuntu.Components 0.1

2222

23−Menu {

23+MenuItem {

2424 id: _switchMenu

2525

2626 property alias checked: switcher.checked

modules/Unity/Indicators/qml/TextMenu.qml → modules/Unity/Indicators/qml/TextMenuItem.qmlrenamed+1−1

@@ -20,7 +20,7 @@

2020import QtQuick 2.0

2121import Ubuntu.Components 0.1

2222

23−Menu {

23+MenuItem {

2424 id: _textMenu

2525

2626 property alias text: _textField.text

modules/Unity/Indicators/qml/messaging/GroupedMessage.qml+1−1

@@ -22,7 +22,7 @@ import QtQuick 2.0

2222import Ubuntu.Components 0.1

2323import Unity.Indicators 0.1 as Indicators

2424

25−Indicators.BasicMenu {

25+Indicators.BasicMenuItem {

2626 property variant action: menu && menu.action!="" && actionGroup ? actionGroup.action(menu.action) : null

2727 property alias count: label.text

2828

modules/Unity/Indicators/qml/messaging/HeroMessage.qml+1−1

@@ -22,7 +22,7 @@ import QtQuick 2.0

2222import Ubuntu.Components 0.1

2323import Unity.Indicators 0.1 as Indicators

2424

25−Indicators.BasicMenu {

25+Indicators.BasicMenuItem {

2626 id: __heroMessage

2727

2828 property variant actionsDescription: null

modules/Unity/Indicators/qml/messaging/MessageItem.qml → modules/Unity/Indicators/qml/messaging/MessageMenuItem.qmlrenamed+1−1

@@ -22,7 +22,7 @@ import QtQuick 2.0

2222import Ubuntu.Components 0.1

2323import Unity.Indicators 0.1 as Indicators

2424

25−Indicators.BasicMenu {

25+Indicators.BasicMenuItem {

2626 id: __messageItem

2727

2828 property variant actionsDescription: menu ? menu.extra.canonical_message_actions : undefined

modules/Unity/Indicators/qml/messaging/qmldir+1−1

@@ -5,7 +5,7 @@ ActionTextField 0.1 ActionTextField.qml

55GroupedMessage 0.1 GroupedMessage.qml

66HeroMessage 0.1 HeroMessage.qml

77HeroMessageHeader 0.1 HeroMessageHeader.qml

8−MessageItem 0.1 MessageItem.qml

8+MessageMenuItem 0.1 MessageMenuItem.qml

99QuickReply 0.1 QuickReply.qml

1010SimpleTextMessage 0.1 SimpleTextMessage.qml

1111SnapDecision 0.1 SnapDecision.qml

modules/Unity/Indicators/qml/network/AccessPoint.qml+1−1

@@ -22,7 +22,7 @@ import Ubuntu.Components 0.1

2222import Ubuntu.Components.ListItems 0.1 as ListItem

2323import Unity.Indicators 0.1 as Indicators

2424

25−Indicators.Menu {

25+Indicators.MenuItem {

2626 property variant actionWifiApStrength : menu && actionGroup ? actionGroup.action(menu.extra.canonical_wifi_ap_strength_action) : null

2727 property variant wifiApStrength : actionWifiApStrength && actionWifiApStrength.valid ? actionWifiApStrength.state : "0"

2828

modules/Unity/Indicators/qml/network/PasswordPage.qml+3−3

@@ -37,17 +37,17 @@ Page {

3737 right: parent.right

3838 }

3939

40− Indicators.SectionMenu {

40+ Indicators.SectionMenuItem {

4141 label: "Authentication"

4242 }

4343

44− Indicators.TextMenu {

44+ Indicators.TextMenuItem {

4545 id: _password

4646

4747 password: true

4848 }

4949

50− Indicators.Menu {

50+ Indicators.MenuItem {

5151 Row {

5252 anchors {

5353 right: parent.right

modules/Unity/Indicators/qml/network/WifiSection.qml+1−1

@@ -21,7 +21,7 @@ import QtQuick 2.0

2121import Ubuntu.Components 0.1

2222import Unity.Indicators 0.1 as Indicators

2323

24−Indicators.SectionMenu {

24+Indicators.SectionMenuItem {

2525 property variant busyAction : actionGroup ? actionGroup.action(menu.extra.canonical_busy_action) : undefined

2626 busy: busyAction && busyAction.valid ? busyAction.state : false

2727}

modules/Unity/Indicators/qml/qmldir+13−14

@@ -1,21 +1,20 @@

11module Unity.Indicators

22plugin IndicatorsQml

4−IndicatorBase 0.1 IndicatorBase.qml

5−IndicatorWidget 0.1 IndicatorWidget.qml

6−IndicatorPage 0.1 IndicatorPage.qml

7−BasicMenu 0.1 BasicMenu.qml

8−ButtonMenu 0.1 ButtonMenu.qml

4+BasicMenuItem 0.1 BasicMenuItem.qml

5+ButtonMenuItem 0.1 ButtonMenuItem.qml

96DBusActionState 0.1 DBusActionState.qml

10−DivMenu 0.1 DivMenu.qml

11−MenuFactory 0.1 MenuFactory.qml

7+DivMenuItem 0.1 DivMenuItem.qml

128HLine 0.1 HLine.qml

13−Menu 0.1 Menu.qml

14−RemovableMenu 0.1 RemovableMenu.qml

15−SectionMenu 0.1 SectionMenu.qml

16−SliderMenu 0.1 SliderMenu.qml

17−SwitchMenu 0.1 SwitchMenu.qml

18−TextMenu 0.1 TextMenu.qml

19−ProgressMenu 0.1 ProgressMenu.qml

9+IndicatorBase 0.1 IndicatorBase.qml

10+IndicatorPage 0.1 IndicatorPage.qml

11+IndicatorWidget 0.1 IndicatorWidget.qml

12+MenuItem 0.1 MenuItem.qml

13+MenuItemFactory 0.1 MenuItemFactory.qml

14+ProgressMenuItem 0.1 ProgressMenuItem.qml

15+SectionMenuItem 0.1 SectionMenuItem.qml

16+SliderMenuItem 0.1 SliderMenuItem.qml

17+SwitchMenuItem 0.1 SwitchMenuItem.qml

18+TextMenuItem 0.1 TextMenuItem.qml

2019

2120internal RemoveBackground RemoveBackground.qml

unity8.qmlproject+1

@@ -18,6 +18,7 @@ Project {

1818 /* List of plugin directories passed to QML runtime */

1919 importPaths: [

2020 "builddir/plugins",

21+ "builddir/modules",

2122 "builddir/tests/plugins",

2223 "builddir/tests/utils/modules"

2324 ]