git.iko.soy/unity8
on xenial help sign in
adding fixes before the tests
6423926Diego Sarmentero
Dash/Apps/AppInfo.qml+8−8
compare with xenial
unifiedsplit
@@ -20,8 +20,8 @@ import "../../Components"
20
20
21Row {
21Row {
22 id: root
22 id: root
23− property alias icon: imgIcon.source
23+ property alias icon: image.source
24− property alias appName: lblAppName.text
24+ property alias appName: appNameLabel.text
25 property alias rating: ratingStars.rating
25 property alias rating: ratingStars.rating
26 property int rated: 0
26 property int rated: 0
27 property int reviews: 0
27 property int reviews: 0
@@ -29,12 +29,12 @@ Row {
29 spacing: units.gu(2)
29 spacing: units.gu(2)
30
30
31 UbuntuShape {
31 UbuntuShape {
32− id: imgShape
32+ id: imageShape
33 width: units.gu(6)
33 width: units.gu(6)
34 height: units.gu(6)
34 height: units.gu(6)
35 image: Image {
35 image: Image {
36− id: imgIcon
36+ id: image
37− sourceSize { width: imgShape.width; height: imgShape.height }
37+ sourceSize { width: imageShape.width; height: imageShape.height }
38 asynchronous: true
38 asynchronous: true
39 fillMode: Image.PreserveAspectFit
39 fillMode: Image.PreserveAspectFit
40 }
40 }
@@ -44,7 +44,7 @@ Row {
44 spacing: units.gu(1)
44 spacing: units.gu(1)
45
45
46 Label {
46 Label {
47− id: lblAppName
47+ id: appNameLabel
48 fontSize: "large"
48 fontSize: "large"
49 color: "white"
49 color: "white"
50 style: Text.Raised
50 style: Text.Raised
@@ -61,7 +61,7 @@ Row {
61 }
61 }
62
62
63 Label {
63 Label {
64− id: lblRated
64+ id: ratedLabel
65 fontSize: "medium"
65 fontSize: "medium"
66 color: "white"
66 color: "white"
67 style: Text.Raised
67 style: Text.Raised
@@ -72,7 +72,7 @@ Row {
72 }
72 }
73
73
74 Label {
74 Label {
75− id: lblReviews
75+ id: reviewsLabel
76 fontSize: "medium"
76 fontSize: "medium"
77 color: "white"
77 color: "white"
78 style: Text.Raised
78 style: Text.Raised
Dash/Apps/AppPreview.qml+2−1
@@ -94,9 +94,10 @@ DashPreview {
94 left: parent.left
94 left: parent.left
95 right: parent.right
95 right: parent.right
96 }
96 }
97− height: childrenRect.height
97+ height: rateLabel.height
98
98
99 Label {
99 Label {
100+ id: rateLabel
100 fontSize: "medium"
101 fontSize: "medium"
101 color: "white"
102 color: "white"
102 style: Text.Raised
103 style: Text.Raised
Dash/Apps/AppReviews.qml+8−1
@@ -75,7 +75,7 @@ Column {
75 spacing: units.gu(1)
75 spacing: units.gu(1)
76 width: root.width
76 width: root.width
77
77
78− TextField {
78+ TextArea {
79 id: reviewField
79 id: reviewField
80 placeholderText: i18n.tr("Review")
80 placeholderText: i18n.tr("Review")
81 width: parent.width
81 width: parent.width
@@ -84,6 +84,12 @@ Column {
84 onFocusChanged: {
84 onFocusChanged: {
85 root.state = "editing";
85 root.state = "editing";
86 }
86 }
87+
88+ onTextChanged: {
89+ if (reviewField.text == "") {
90+ reviewField.focus = false;
91+ }
92+ }
87 }
93 }
88
94
89 Button {
95 Button {
@@ -96,6 +102,7 @@ Column {
96 onClicked: {
102 onClicked: {
97 root.sendReview(reviewField.text);
103 root.sendReview(reviewField.text);
98 root.state = "";
104 root.state = "";
105+ reviewField.text = "";
99 }
106 }
100 }
107 }
101 }
108 }
Dash/Apps/ApplicationsFilterGrid.qml+3−2
@@ -30,9 +30,10 @@ FilterGrid {
30 delegateHeight: units.gu(9.5)
30 delegateHeight: units.gu(9.5)
31 verticalSpacing: units.gu(2)
31 verticalSpacing: units.gu(2)
32
32
33− signal clicked(int index, variant data)
33+ signal clicked(int index, variant data, real itemY)
34
34
35 delegate: Tile {
35 delegate: Tile {
36+ id: tile
36 objectName: "delegate" + index
37 objectName: "delegate" + index
37 Application {
38 Application {
38 id: application
39 id: application
@@ -52,6 +53,6 @@ FilterGrid {
52 imageWidth: units.gu(8)
53 imageWidth: units.gu(8)
53 imageHeight: units.gu(7.5)
54 imageHeight: units.gu(7.5)
54 source: IconUtil.from_gicon(icon)
55 source: IconUtil.from_gicon(icon)
55− onClicked: filterGrid.clicked(index, application.desktopFile);
56+ onClicked: filterGrid.clicked(index, application.desktopFile, tile.y);
56 }
57 }
57}
58}
Dash/DashApps.qml+6−3
@@ -132,9 +132,12 @@ ScopeView {
132 item.canEnableTerminationMode =
132 item.canEnableTerminationMode =
133 Qt.binding(function() { return isCurrent; })
133 Qt.binding(function() { return isCurrent; })
134 } else {
134 } else {
135− function activateApplication(index, data) {
135+ function activateApplication(index, data, itemY) {
136+ // FOR NEXT BRANCH
137+// effect.positionPx = mapToItem(categoryView, 0, itemY).y
136− previewLoader.previewData = data;
138+// previewLoader.previewData = data;
137− previewLoader.open = true;
139+// previewLoader.open = true;
140+ shell.activateApplication(data);
138 }
141 }
139
142
140 item.model = Qt.binding(function() { return categoryModels[modelName]; });
143 item.model = Qt.binding(function() { return categoryModels[modelName]; });