← Back to branch summary

~ci-train-bot/ubuntu-settings-components/ubuntu-settings-components-ubuntu-zesty-2106

« back to all changes in this revision

Viewing changes to plugins/Ubuntu/Settings/Menus/TransferMenu.qml

  • Committer: Bileto Bot
  • Date: 2016-11-11 16:52:44 UTC
  • mfrom: (146.4.57 touch+pointer-styles)
  • Revision ID: ci-train-bot@canonical.com-20161111165244-r1asz00gkwjgslp9
* Menus: add Pointer and Touch styles to be used depending on the user
  interaction with components
  Menu items now have a new Style property that defines some common properties
  such as shared colors and sizes that change depending on the UX journey. I'm
  only defining Pointer and TouchStyles for now, but they can be easily
  overridden in case.
  Removed some deprecated properties and adapted colors and sizes to new
  style.
* Bump package version as there's a new API for various components

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/Ubuntu/Settings/Menus/TransferMenu.qml
31
31
    property alias maximum: progressBar.maximumValue
32
32
    property bool active: false
33
33
 
34
 
    implicitHeight: slotsLayout.height + (divider.visible ? divider.height : 0)
 
34
    menuHeight: slotsLayout.height
35
35
 
36
 
    SlotsLayout {
 
36
    StyledSlotsLayout {
37
37
        id: slotsLayout
38
38
        objectName: "transferMenuSlotsLayout"
 
39
        style: menuStyle
39
40
 
40
41
        UbuntuShape {
41
42
            SlotsLayout.position: SlotsLayout.Leading
42
 
            width: units.gu(6)
 
43
            width: menuStyle.avatarSize
43
44
            height: width
44
45
 
45
46
            source: ShaderEffectSource {
52
53
 
53
54
                color: {
54
55
                    if (String(source).match(/^image:\/\/theme/)) {
55
 
                        return theme.palette.normal.backgroundText;
 
56
                        return menuStyle.iconColor;
56
57
                    }
57
58
                    return Qt.rgba(0.0, 0.0, 0.0, 0.0);
58
59
                }
68
69
                anchors { left: parent.left; right: parent.right }
69
70
                elide: Text.ElideRight
70
71
                maximumLineCount: 1
 
72
                color: menu.foregroundColor
71
73
                font.weight: Font.DemiBold
 
74
                font.pixelSize: menuStyle.fontSize
72
75
            }
73
76
 
74
77
            ProgressBar {
85
88
                id: stateLabel
86
89
                objectName: "stateText"
87
90
                anchors { left: parent.left; right: parent.right }
 
91
                font.pixelSize: menuStyle.subtitleFontSize
 
92
                color: menu.foregroundColor
88
93
                visible: menu.active
89
 
                fontSize: "x-small"
90
94
                elide: Text.ElideRight
91
95
                maximumLineCount: 1
92
96
            }