1
=== modified file 'src/imports/ContactEdit/ContactDetailWithTypeEditor.qml'
2
--- src/imports/ContactEdit/ContactDetailWithTypeEditor.qml	2013-11-22 01:05:52 +0000
3
+++ src/imports/ContactEdit/ContactDetailWithTypeEditor.qml	2014-02-06 22:32:59 +0000
4
@@ -71,13 +71,14 @@
5
71
    focus: true
71
    focus: true
6
72
    // disable listview mouse area
72
    // disable listview mouse area
7
73
    __mouseArea.visible: false
73
    __mouseArea.visible: false
9
74
74
    enabled: root.detail ? !root.detail.readOnly : false
10
75
    implicitHeight: detailTypeSelector.height + fieldValues.height + units.gu(2)
75
    implicitHeight: detailTypeSelector.height + fieldValues.height + units.gu(2)
12
76
76
    opacity: enabled ? 1.0 : 0.5
13
77
    ValueSelector {
77
    ValueSelector {
14
78
        id: detailTypeSelector
78
        id: detailTypeSelector
15
79
        objectName: detail ? "type_" + detailToString(detail.type, -1) + "_" + index : ""
79
        objectName: detail ? "type_" + detailToString(detail.type, -1) + "_" + index : ""
16
80
80
17
81
        readOnly: root.detail ? root.detail.readOnly : false
18
81
        visible: (currentIndex != -1)
82
        visible: (currentIndex != -1)
19
82
        active: root.active
83
        active: root.active
20
83
        anchors {
84
        anchors {
21
84
85
22
=== modified file 'src/imports/ContactEdit/TextInputDetail.qml'
23
--- src/imports/ContactEdit/TextInputDetail.qml	2013-10-08 12:58:44 +0000
24
+++ src/imports/ContactEdit/TextInputDetail.qml	2014-02-06 22:32:59 +0000
25
@@ -31,6 +31,7 @@
26
31
31
27
32
    Component.onCompleted: makeMeVisible(root)
32
    Component.onCompleted: makeMeVisible(root)
28
33
33
29
34
    readOnly: detail ? detail.readOnly : true
30
34
    focus: true
35
    focus: true
31
35
    text: originalValue ? originalValue : ""
36
    text: originalValue ? originalValue : ""
32
36
    style: TextFieldStyle {
37
    style: TextFieldStyle {
33
37
38
34
=== modified file 'src/imports/ContactEdit/ValueSelector.qml'
35
--- src/imports/ContactEdit/ValueSelector.qml	2013-11-22 00:47:10 +0000
36
+++ src/imports/ContactEdit/ValueSelector.qml	2014-02-06 22:32:59 +0000
37
@@ -20,6 +20,7 @@
38
20
Item {
20
Item {
39
21
    id: root
21
    id: root
40
22
22
41
23
    property bool readOnly: false
42
23
    property bool active: false
24
    property bool active: false
43
24
    property alias values: listView.model
25
    property alias values: listView.model
44
25
    property alias currentIndex: listView.currentIndex
26
    property alias currentIndex: listView.currentIndex
45
@@ -120,7 +121,7 @@
46
120
    MouseArea {
121
    MouseArea {
47
121
        anchors.fill: parent
122
        anchors.fill: parent
48
122
        propagateComposedEvents: true
123
        propagateComposedEvents: true
50
123
        onClicked: root.state = "expanded"
124
        onClicked: if (!readOnly) root.state = "expanded"
51
124
    }
125
    }
52
125
126
53
126
    ListView {
127
    ListView {
Reviewer	Review Type	Date Requested	Status
Bill Filler (community)		2014-02-06	Approve on 2014-02-25
PS Jenkins bot	continuous-integration		Approve on 2014-02-12
Review via email: mp+205270@code.launchpad.net
1	=== modified file 'src/imports/ContactEdit/ContactDetailWithTypeEditor.qml'
2	--- src/imports/ContactEdit/ContactDetailWithTypeEditor.qml 2013-11-22 01:05:52 +0000
3	+++ src/imports/ContactEdit/ContactDetailWithTypeEditor.qml 2014-02-06 22:32:59 +0000
4	@@ -71,13 +71,14 @@
5	71	focus: true	71	focus: true
6	72	// disable listview mouse area	72	// disable listview mouse area
7	73	__mouseArea.visible: false	73	__mouseArea.visible: false
9	74		74	enabled: root.detail ? !root.detail.readOnly : false
10	75	implicitHeight: detailTypeSelector.height + fieldValues.height + units.gu(2)	75	implicitHeight: detailTypeSelector.height + fieldValues.height + units.gu(2)
12	76		76	opacity: enabled ? 1.0 : 0.5
13	77	ValueSelector {	77	ValueSelector {
14	78	id: detailTypeSelector	78	id: detailTypeSelector
15	79	objectName: detail ? "type_" + detailToString(detail.type, -1) + "_" + index : ""	79	objectName: detail ? "type_" + detailToString(detail.type, -1) + "_" + index : ""
16	80		80
17			81	readOnly: root.detail ? root.detail.readOnly : false
18	81	visible: (currentIndex != -1)	82	visible: (currentIndex != -1)
19	82	active: root.active	83	active: root.active
20	83	anchors {	84	anchors {
21	84		85
22	=== modified file 'src/imports/ContactEdit/TextInputDetail.qml'
23	--- src/imports/ContactEdit/TextInputDetail.qml 2013-10-08 12:58:44 +0000
24	+++ src/imports/ContactEdit/TextInputDetail.qml 2014-02-06 22:32:59 +0000
25	@@ -31,6 +31,7 @@
26	31		31
27	32	Component.onCompleted: makeMeVisible(root)	32	Component.onCompleted: makeMeVisible(root)
28	33		33
29			34	readOnly: detail ? detail.readOnly : true
30	34	focus: true	35	focus: true
31	35	text: originalValue ? originalValue : ""	36	text: originalValue ? originalValue : ""
32	36	style: TextFieldStyle {	37	style: TextFieldStyle {
33	37		38
34	=== modified file 'src/imports/ContactEdit/ValueSelector.qml'
35	--- src/imports/ContactEdit/ValueSelector.qml 2013-11-22 00:47:10 +0000
36	+++ src/imports/ContactEdit/ValueSelector.qml 2014-02-06 22:32:59 +0000
37	@@ -20,6 +20,7 @@
38	20	Item {	20	Item {
39	21	id: root	21	id: root
40	22		22
41			23	property bool readOnly: false
42	23	property bool active: false	24	property bool active: false
43	24	property alias values: listView.model	25	property alias values: listView.model
44	25	property alias currentIndex: listView.currentIndex	26	property alias currentIndex: listView.currentIndex
45	@@ -120,7 +121,7 @@
46	120	MouseArea {	121	MouseArea {
47	121	anchors.fill: parent	122	anchors.fill: parent
48	122	propagateComposedEvents: true	123	propagateComposedEvents: true
50	123	onClicked: root.state = "expanded"	124	onClicked: if (!readOnly) root.state = "expanded"
51	124	}	125	}
52	125		126
53	126	ListView {	127	ListView {