d17fd66 · unity8 · git.iko.soy

Components/CrossFadeImage.qmldeleted−151

compare with xenial

unifiedsplit

@@ -1,151 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−import QtQuick 2.0

18−

19−Item {

20− property url source

21−

22− /*

23− * true: fade out old image in parallel with fading in the new one.

24− * false: fade in new image above old one.

25− *

26− * The reason why this is required is that crossfading has the isse that in

27− * the middle of the animation, both images are only 50% opaque which make

28− * any background shine through. Not wanted for background images etc, but

29− * wanted for overlays.

30− */

31− property bool crossFade: true

32−

33− /*

34− * true: the very first source url should be faded in already.

35− * false: the very first source url should just be shown without animation.

36− */

37− property bool fadeInFirst: true

38−

39− readonly property size sourceSize: __currentImage.sourceSize

40− readonly property var status: __currentImage ? __currentImage.status : Image.Null

41− readonly property bool running: crossFadeImages.running || nextImageFadeIn.running

42−

43− property Image __currentImage: image1

44− property Image __nextImage: image2

45−

46− function swapImages() {

47− __currentImage.z = 0

48− __nextImage.z = 1

49− if (crossFade) {

50− crossFadeImages.start();

51− } else {

52− nextImageFadeIn.start();

53− }

54−

55− var tmpImage = __currentImage

56− __currentImage = __nextImage

57− __nextImage = tmpImage

58− }

59−

60− onSourceChanged: {

61− // On creation, the souce handler is called before image pointers are set.

62− if (__currentImage === null) {

63− __currentImage = image1;

64− __nextImage = image2;

65− }

66−

67− crossFadeImages.stop();

68− nextImageFadeIn.stop();

69−

70− // Don't fade in initial picture, only fade changes

71− if (__currentImage.source == "" && !fadeInFirst) {

72− __currentImage.source = source;

73− } else {

74− nextImageFadeIn.stop();

75− __nextImage.opacity = 0.0;

76− __nextImage.source = source;

77−

78− // If case the image is still in QML's cache, status will be "Ready" immediately

79− if (__nextImage.status == Image.Ready || __nextImage.source == "") {

80− swapImages();

81− }

82− }

83− }

84−

85− Connections {

86− target: __nextImage

87− onStatusChanged: {

88− if (__nextImage.status == Image.Ready || __nextImage.status == Image.Error) {

89− swapImages();

90− }

91− }

92− }

93−

94− Image {

95− id: image1

96− anchors.fill: parent

97− cache: false

98− asynchronous: true

99− fillMode: Image.PreserveAspectCrop

100− z: 1

101− }

102−

103− Image {

104− id: image2

105− anchors.fill: parent

106− cache: false

107− asynchronous: true

108− fillMode: Image.PreserveAspectCrop

109− z: 0

110− }

111−

112− NumberAnimation {

113− id: nextImageFadeIn

114− target: __nextImage

115− property: "opacity"

116− duration: 400

117− to: 1.0

118− easing.type: Easing.InOutQuad

119−

120− onRunningChanged: {

121− if (!running) {

122− __nextImage.source = "";

123− }

124− }

125− }

126−

127− ParallelAnimation {

128− id: crossFadeImages

129− NumberAnimation {

130− target: __nextImage

131− property: "opacity"

132− duration: 400

133− to: 1.0

134− easing.type: Easing.InOutQuad

135− }

136−

137− NumberAnimation {

138− target: __currentImage

139− property: "opacity"

140− duration: 400

141− to: 0

142− easing.type: Easing.InOutQuad

143− }

144−

145− onRunningChanged: {

146− if (!running) {

147− __nextImage.source = "";

148− }

149− }

150− }

151−}

Components/EdgeDemo.qml+1−1

@@ -169,7 +169,7 @@ Item {

169 "edge": "bottom",

170 "title": i18n.tr("Close"),

171 "text": i18n.tr("Swipe up again to close the settings screen"),

172− "anchors.fill": demo.indicators,

172+ "anchors.fill": demo.indicators.content,

173 });

174 }

175 if (d.bottomEdgeDemo) {

Components/EdgeDemoOverlay.qml+3

@@ -153,7 +153,10 @@ Showable {

153 font.underline: true

154

155 MouseArea {

156+ // Make clickable area bigger than just the link because

157+ // otherwise, the edge demo will feel hard to dismiss.

156 anchors.fill: parent

158 anchors.fill: parent

159+ anchors.margins: -units.gu(5)

157 onClicked: overlay.doSkip()

160 onClicked: overlay.doSkip()

158 }

161 }

159 }

162 }

Components/LazyImage.qmlnew file+172

@@ -0,0 +1,172 @@

1+/*

3+ *

4+ * Authors:

5+ * Michał Sawicz <michal.sawicz@canonical.com>

6+ *

7+ * This program is free software; you can redistribute it and/or modify

8+ * it under the terms of the GNU General Public License as published by

9+ * the Free Software Foundation; version 3.

10+ *

11+ * This program is distributed in the hope that it will be useful,

12+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

13+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

14+ * GNU General Public License for more details.

15+ *

16+ * You should have received a copy of the GNU General Public License

17+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

18+ */

19+

20+import QtQuick 2.0

21+import Ubuntu.Components 0.1

22+

23+Item {

24+ id: root

25+

26+ property url source

27+ // TODO convert into enums when available in QML

28+ property string scaleTo

29+

30+ property real initialWidth: units.gu(10)

31+ property real initialHeight: units.gu(10)

32+

33+ property alias sourceSize: image.sourceSize

34+ property alias fillMode: image.fillMode

35+ property alias asynchronous: image.asynchronous

36+ property alias cache: image.cache

37+ property alias horizontalAlignment: image.horizontalAlignment

38+ property alias verticalAlignment: image.verticalAlignment

39+

40+ state: "default"

41+

42+ onSourceChanged: {

43+ if (state === "ready") {

44+ state = "default";

45+ image.nextSource = source;

46+ } else {

47+ image.source = source;

48+ }

49+ }

50+

51+ UbuntuShape {

52+ id: placeholder

53+ objectName: "placeholder"

54+ color: "#22FFFFFF"

55+ anchors.fill: parent

56+ visible: opacity != 0

57+

58+ ActivityIndicator {

59+ id: activity

60+ anchors.centerIn: parent

61+ opacity: 0

62+ visible: opacity != 0

63+

64+ running: visible

65+ }

66+

67+ Image {

68+ id: errorImage

69+ objectName: "errorImage"

70+ anchors.centerIn: parent

71+ opacity: 0

72+ visible: opacity != 0

73+

74+ source: "graphics/close.png"

75+ sourceSize { width: units.gu(3); height: units.gu(3) }

76+ }

77+ }

78+

79+ UbuntuShape {

80+ id: shape

81+ objectName: "shape"

82+ anchors.fill: parent

83+ opacity: 0

84+ visible: opacity != 0

85+

86+ image: Image {

87+ id: image

88+ objectName: "image"

89+

90+ property url nextSource

91+

92+ width: root.scaleTo == "height" ? implicitWidth * root.height / implicitHeight : implicitWidth

93+ height: root.scaleTo == "width" ? implicitHeight * root.width / implicitWidth : implicitHeight

94+ fillMode: Image.PreserveAspectCrop

95+ asynchronous: true

96+ cache: false

97+ horizontalAlignment: Image.AlignHCenter

98+ verticalAlignment: Image.AlignVCenter

99+ sourceSize.width: root.scaleTo == "width" ? root.width : 0

100+ sourceSize.height: root.scaleTo == "height" ? root.height : 0

101+ }

102+ }

103+

104+ states: [

105+ State {

106+ name: "default"

107+ when: image.source == ""

108+ PropertyChanges { target: root; implicitWidth: root.initialWidth; implicitHeight: root.initialHeight }

109+ PropertyChanges { target: errorImage; opacity: 0 }

110+ },

111+ State {

112+ name: "loading"

113+ extend: "default"

114+ when: image.status === Image.Loading

115+ PropertyChanges { target: activity; opacity: 1 }

116+ },

117+ State {

118+ name: "ready"

119+ when: image.status === Image.Ready && image.source != ""

120+ PropertyChanges { target: root; implicitWidth: image.width; implicitHeight: image.height }

121+ PropertyChanges { target: shape; opacity: 1 }

122+ PropertyChanges { target: placeholder; opacity: 0 }

123+ },

124+ State {

125+ name: "error"

126+ extend: "default"

127+ when: image.status === Image.Error

128+ PropertyChanges { target: errorImage; opacity: 1.0 }

129+ }

130+ ]

131+

132+ transitions: [

133+ Transition {

134+ to: "ready"

135+ objectName: "readyTransition"

136+ SequentialAnimation {

137+ PropertyAction { target: shape; property: "visible" }

138+ ParallelAnimation {

139+ NumberAnimation { target: shape; property: "opacity"; easing.type: Easing.Linear }

140+ UbuntuNumberAnimation { target: root; properties: "implicitWidth,implicitHeight" }

141+ NumberAnimation {

142+ targets: [placeholder, activity, errorImage]; property: "opacity";

143+ easing.type: Easing.Linear; duration: UbuntuAnimation.SnapDuration

144+ }

145+ }

146+ }

147+ },

148+

149+ Transition {

150+ to: "*"

151+ objectName: "genericTransition"

152+ SequentialAnimation {

153+ ParallelAnimation {

154+ NumberAnimation { target: shape; property: "opacity"; easing.type: Easing.Linear }

155+ NumberAnimation {

156+ targets: [placeholder, activity, errorImage]; property: "opacity";

157+ easing.type: Easing.Linear; duration: UbuntuAnimation.SnapDuration

158+ }

159+ UbuntuNumberAnimation { target: root; properties: "implicitWidth,implicitHeight" }

160+ }

161+ PropertyAction { target: shape; property: "visible" }

162+ }

163+

164+ onRunningChanged: {

165+ if (!running && state === "default" && image.nextSource !== "") {

166+ image.source = image.nextSource;

167+ image.nextSource = "";

168+ }

169+ }

170+ }

171+ ]

172+}

Components/ResponsiveGridView.qml+1−1

@@ -67,7 +67,7 @@ Item {

67

68 function columnsForSpacing(spacing) {

69 // minimum margin is half of the spacing

70− return Math.floor((parent.width - spacing/2) / (delegateWidth + spacing));

70+ return Math.max(1, Math.floor((parent.width - spacing/2) / (delegateWidth + spacing)));

71 }

72

73 property real allocatableHorizontalSpace: parent.width - columns * delegateWidth

Components/graphics/close@20.pngnew file

Binary file not shown.

Dash/Apps/AppPreview.qml+11

@@ -110,6 +110,10 @@ DashPreview {

110 onFinished: {

111 root.previewData.execute(progressBar.model[0].id, { })

112 }

113+

114+ onError: {

115+ root.previewData.execute(progressBar.model[1].id, { "error": error });

116+ }

113 }

117 }

114

118

115 }

119 }

@@ -187,12 +191,19 @@ DashPreview {

187 ListItem.ThinDivider { }

191 ListItem.ThinDivider { }

188

192

189 AppReviews {

193 AppReviews {

194+ id: appReviews

190 objectName: "appReviews"

195 objectName: "appReviews"

196+ // TODO: This should make this visible when the feature for reviews/comments is complete.

197+ visible: false

191 anchors { left: parent.left; right: parent.right }

198 anchors { left: parent.left; right: parent.right }

192

199

193 model: root.previewData.infoMap["comments"] ? root.previewData.infoMap["comments"].value : undefined

200 model: root.previewData.infoMap["comments"] ? root.previewData.infoMap["comments"].value : undefined

194

201

195 onSendReview: root.sendUserReview(review);

202 onSendReview: root.sendUserReview(review);

203+

204+ onEditing: {

205+ root.ensureVisible(appReviews.textArea);

206+ }

196 }

207 }

197 }

208 }

198 }

209 }

Dash/Apps/AppReviews.qml+3

@@ -23,8 +23,10 @@ Column {

23 id: root

24

25 property var model

26+ property alias textArea: reviewField

26

27

27 signal sendReview(string review)

28 signal sendReview(string review)

29+ signal editing

28

30

29 spacing: units.gu(2)

31 spacing: units.gu(2)

30 state: ""

32 state: ""

@@ -93,6 +95,7 @@ Column {

93 if(reviewField.focus){

95 if(reviewField.focus){

94 root.state = "editing";

96 root.state = "editing";

95 reviewField.selectAll();

97 reviewField.selectAll();

98+ root.editing();

96 }

99 }

97 }

100 }

98

101

Dash/DashPreview.qml+13

@@ -20,6 +20,7 @@ import Ubuntu.Components 0.1

20Rectangle {

21 id: root

22

23+ property int keyboardSize: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0

23 property var previewData

24 property var previewData

24

25

25 property string title: ""

26 property string title: ""

@@ -38,6 +39,14 @@ Rectangle {

38 color: Qt.rgba(0, 0, 0, .3)

39 color: Qt.rgba(0, 0, 0, .3)

39 clip: true

40 clip: true

40

41

42+ function ensureVisible(item) {

43+ var o = leftFlickable.mapFromItem(item, 0, 0, item.width, item.height);

44+ var keyboardY = shell.height - root.keyboardSize;

45+ if ((o.y + o.height) > keyboardY) {

46+ leftFlickable.contentY += o.y + o.height - keyboardY;

47+ }

48+ }

49+

41 Connections {

50 Connections {

42 target: shell.applicationManager

51 target: shell.applicationManager

43 onMainStageFocusedApplicationChanged: {

52 onMainStageFocusedApplicationChanged: {

@@ -128,12 +137,16 @@ Rectangle {

128

137

129 Flickable {

138 Flickable {

130 id: leftFlickable

139 id: leftFlickable

140+ objectName: "leftFlickable"

131 anchors.top: parent.top

141 anchors.top: parent.top

132 anchors.bottom: parent.bottom

142 anchors.bottom: parent.bottom

133 width: root.narrowMode ? contentRow.width : contentRow.width * root.previewWidthRatio

143 width: root.narrowMode ? contentRow.width : contentRow.width * root.previewWidthRatio

134 contentHeight: leftColumn.height

144 contentHeight: leftColumn.height

145+ anchors.bottomMargin: root.keyboardSize

135 clip: true

146 clip: true

136

147

148+ Behavior on contentY { NumberAnimation { duration: 300 } }

149+

137 Column {

150 Column {

138 id: leftColumn

151 id: leftColumn

139 objectName: "leftColumn"

152 objectName: "leftColumn"

Dash/GenericScopeView.qml+14−7

@@ -50,6 +50,12 @@ ScopeView {

50 }

51 }

52

53+ Connections {

54+ target: scopeView.scope

55+ onShowDash: previewLoader.open = false;

56+ onHideDash: previewLoader.open = false;

57+ }

58+

53 ScopeListView {

59 ScopeListView {

54 id: categoryView

60 id: categoryView

55 anchors.fill: parent

61 anchors.fill: parent

@@ -59,13 +65,14 @@ ScopeView {

59 onAtYEndChanged: if (atYEnd) endReached()

65 onAtYEndChanged: if (atYEnd) endReached()

60 onMovingChanged: if (moving && atYEnd) endReached()

66 onMovingChanged: if (moving && atYEnd) endReached()

61

67

62− property int expandedIndex: -1

68+ property string expandedCategoryId: ""

63

69

64 delegate: ListItems.Base {

70 delegate: ListItems.Base {

65 highlightWhenPressed: false

71 highlightWhenPressed: false

66

72

67 readonly property bool expandable: rendererLoader.item ? rendererLoader.item.expandable : false

73 readonly property bool expandable: rendererLoader.item ? rendererLoader.item.expandable : false

68 readonly property bool filtered: rendererLoader.item ? rendererLoader.item.filter : true

74 readonly property bool filtered: rendererLoader.item ? rendererLoader.item.filter : true

75+ readonly property string category: categoryId

69

76

70 Loader {

77 Loader {

71 id: rendererLoader

78 id: rendererLoader

@@ -87,7 +94,7 @@ ScopeView {

87 }

94 }

88 item.objectName = Qt.binding(function() { return categoryId })

95 item.objectName = Qt.binding(function() { return categoryId })

89 if (item.expandable) {

96 if (item.expandable) {

90− var shouldFilter = index != categoryView.expandedIndex;

97+ var shouldFilter = categoryId != categoryView.expandedCategoryId;

91 if (shouldFilter != item.filter) {

98 if (shouldFilter != item.filter) {

92 item.filter = shouldFilter;

99 item.filter = shouldFilter;

93 }

100 }

@@ -123,10 +130,10 @@ ScopeView {

123 }

130 }

124 Connections {

131 Connections {

125 target: categoryView

132 target: categoryView

126− onExpandedIndexChanged: {

133+ onExpandedCategoryIdChanged: {

127 var item = rendererLoader.item;

134 var item = rendererLoader.item;

128 if (item.expandable) {

135 if (item.expandable) {

129− var shouldFilter = index != categoryView.expandedIndex;

136+ var shouldFilter = categoryId != categoryView.expandedCategoryId;

130 if (shouldFilter != item.filter) {

137 if (shouldFilter != item.filter) {

131 // If the filter animation will be seen start it, otherwise, just flip the switch

138 // If the filter animation will be seen start it, otherwise, just flip the switch

132 var shrinkingVisible = shouldFilter && y + item.collapsedHeight < categoryView.height;

139 var shrinkingVisible = shouldFilter && y + item.collapsedHeight < categoryView.height;

@@ -157,10 +164,10 @@ ScopeView {

157 return "";

164 return "";

158 }

165 }

159 onClicked: {

166 onClicked: {

160− if (categoryView.expandedIndex != delegateIndex)

167+ if (categoryView.expandedCategoryId != delegate.category)

161− categoryView.expandedIndex = delegateIndex;

168+ categoryView.expandedCategoryId = delegate.category;

162 else

169 else

163− categoryView.expandedIndex = -1;

170+ categoryView.expandedCategoryId = "";

164 }

171 }

165 }

172 }

166 pageHeader: PageHeader {

173 pageHeader: PageHeader {

Greeter/GreeterContent.qml+1−1

@@ -47,7 +47,7 @@ MouseArea {

47 id: wallpaper

48 objectName: "wallpaper"

49 anchors.fill: parent

50− fadeInFirst: false

50+ fillMode: Image.PreserveAspectCrop

51 }

52

53 // See Shell.qml's backgroundSettings treatment for why we need a separate

Panel/Indicators.qml+1

@@ -35,6 +35,7 @@ Showable {

35 property bool partiallyOpened: height > panelHeight && !fullyOpened

36 property real visualBottom: Math.max(y+height, y+indicatorRow.y+indicatorRow.height)

37 property bool contentEnabled: true

38+ readonly property alias content: menuContent

38

39

39 // TODO: Perhaps we need a animation standard for showing/hiding? Each showable seems to

40 // TODO: Perhaps we need a animation standard for showing/hiding? Each showable seems to

40 // use its own values. Need to ask design about this.

41 // use its own values. Need to ask design about this.

Panel/IndicatorsDataModel.qml+2−2

@@ -42,8 +42,8 @@ Indicators.IndicatorsModel {

42 'indicator-messages' : {

43 'title': 'Messaging',

44 'description' : '',

45− 'widgetSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/MessagingIndicatorWidget.qml',

45+ 'widgetSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorWidget2.qml',

46− 'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/MessagingIndicatorPage.qml'

46+ 'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorPage2.qml'

47 },

48 'indicator-sound' : {

49 'title': 'Sound',

Shell.qml+2−1

@@ -198,6 +198,7 @@ FocusScope {

198

199 anchors.fill: parent

200 source: shell.background

201+ fillMode: Image.PreserveAspectCrop

201 }

202 }

202

203

203 Rectangle {

204 Rectangle {

@@ -624,7 +625,7 @@ FocusScope {

624 Bottombar {

625 Bottombar {

625 theHud: hud

626 theHud: hud

626 anchors.fill: parent

627 anchors.fill: parent

627− enabled: !panel.indicators.shown

628+ enabled: hud.available

628 applicationIsOnForeground: applicationFocused

629 applicationIsOnForeground: applicationFocused

629 }

630 }

630

631

debian/changelog+55

@@ -1,3 +1,58 @@

1+unity8 (7.81.3+13.10.20130927.3-0ubuntu1) saucy; urgency=low

2+

3+ [ Michal Hruby ]

4+ * Correctly handle image URI scheme in results.

5+

6+ [ Michał Sawicz ]

7+ * Make SHOW_DASH and HIDE_DASH close the current preview. (LP:

8+ #1231404)

9+ * Add a LazyImage component that shows an activity spinner for long-

10+ loading images and handles aspect ratio properly.

11+ * Fix Qt 5.1 FTBFS and suppress some build warnings.

12+

13+ [ Albert Astals ]

14+ * Make sure we always have least have one column in the gridview. (LP:

15+ #1225391)

16+ * LVWPH: Make sure we always overshoot vertically. (LP: #1229851)

17+ * Remember the expanded categoryId and not the expanded index The

18+ index can change on search, and we still want to maintain it

19+ expanded in that case. (LP: #1230216)

20+ * Fix showHeader in an edge case of notShownByItsOwn Not all the tests

21+ i've added fail without the code fix, but i've added them just to be

22+ more covered . (LP: #1230187)

23+

24+ [ Diego Sarmentero ]

25+ * Handling error signal from the DownloadTracker plugin (BUG:

26+ #1229744). (LP: #1229744)

27+ * Remove "Reviews and Comments" section from Application Preview until

28+ the feature is ready (BUG: #1226632) - Detect when the keyboard is

29+ being shown to allow the user to scroll the Preview even more if

30+ necessary to interact with the components at the bottom of that

31+ preview, and don't leave those components obscured behind the

32+ keyboard (BUG: #1226638). (LP: #1226632, #1224717, #1226638)

33+

34+ [ Nick Dedekind ]

35+ * Brought messaging indicator inline with UnityMenuModel &

36+ UnityMenuAction. (LP: #1217676, #1217678)

37+

38+ [ Pawel Stolowski ]

39+ * Support canned search queries returned by Home Scope.

40+ * Cancel previous actions and previews on new activation / preview.

41+ Expose previewed data row in Preview object.

42+

43+ [ Michael Terry ]

44+ * Only enable the Bottombar when the HUD is available. (LP: #1220306)

45+ * Increase the "Skip intro" clickable area, making dismissing the edge

46+ demo intro feel more natural. (LP: #1220632)

47+

48+ [ Michael Zanetti ]

49+ * drop our CrossFadeImage in favor of the SDK one. (LP: #1227783)

50+

51+ [ Ubuntu daily release ]

52+ * Automatic snapshot from revision 358

53+

54+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 27 Sep 2013 14:13:22 +0000

55+

1unity8 (7.81.3+13.10.20130924.2-0ubuntu1) saucy; urgency=low

56unity8 (7.81.3+13.10.20130924.2-0ubuntu1) saucy; urgency=low

2

57

3 [ Michal Hruby ]

58 [ Michal Hruby ]

debian/control+1−1

@@ -21,7 +21,7 @@ Build-Depends: cmake,

21 libqt5v8-5-private-dev,

22 libsigc++-2.0-dev,

23 libunity-api-dev (>= 7.80.3),

24− libunity-core-6.0-dev (<< 7.80),

24+ libunity-core-6.0-dev (>= 7.1.1),

25 libunity-dev (>= 7.0.12),

26 libunity-mir-dev,

27 libunity-scopes-json-def-phone,

debian/unity8.install−1

@@ -13,4 +13,3 @@ usr/share/unity8/Panel

13usr/share/unity8/Shell.qml

14usr/share/unity8/SideStage

15usr/share/unity8/graphics

16−usr/share/unity8/unity/indicators/*

plugins/ListViewWithPageHeader/listviewwithpageheader.cpp+7−1

@@ -170,6 +170,8 @@ ListViewWithPageHeader::ListViewWithPageHeader()

170 connect(this, SIGNAL(contentHeightChanged()), this, SLOT(onContentHeightChanged()));

171 connect(this, SIGNAL(heightChanged()), this, SLOT(onHeightChanged()));

172 connect(m_contentYAnimation, SIGNAL(stopped()), this, SLOT(onShowHeaderAnimationFinished()));

173+

174+ setFlickableDirection(VerticalFlick);

173}

175}

174

176

175ListViewWithPageHeader::~ListViewWithPageHeader()

177ListViewWithPageHeader::~ListViewWithPageHeader()

@@ -483,7 +485,7 @@ void ListViewWithPageHeader::viewportMoved(Qt::Orientations orient)

483 // or the header is partially shown and we are not doing a maximizeVisibleArea either

485 // or the header is partially shown and we are not doing a maximizeVisibleArea either

484 const bool scrolledUp = m_previousContentY > contentY();

486 const bool scrolledUp = m_previousContentY > contentY();

485 const bool notRebounding = contentY() + height() < contentHeight();

487 const bool notRebounding = contentY() + height() < contentHeight();

486− const bool notShownByItsOwn = contentY() + diff > m_headerItem->y() + m_headerItem->height();

488+ const bool notShownByItsOwn = contentY() + diff >= m_headerItem->y() + m_headerItem->height();

487 const bool maximizeVisibleAreaRunning = m_contentYAnimation->isRunning() && contentYAnimationType == ContentYAnimationMaximizeVisibleArea;

489 const bool maximizeVisibleAreaRunning = m_contentYAnimation->isRunning() && contentYAnimationType == ContentYAnimationMaximizeVisibleArea;

488

490

489 if (!scrolledUp && contentY() == -m_minYExtent) {

491 if (!scrolledUp && contentY() == -m_minYExtent) {

@@ -1007,7 +1009,11 @@ void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool

1007 }

1009 }

1008 }

1010 }

1009

1011

1012+#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

1010 Q_FOREACH(const QQuickChangeSet::Change &change, changeSet.changes()) {

1013 Q_FOREACH(const QQuickChangeSet::Change &change, changeSet.changes()) {

1014+#else

1015+ Q_FOREACH(const QQmlChangeSet::Change &change, changeSet.changes()) {

1016+#endif

1011// qDebug() << "ListViewWithPageHeader::onModelUpdated Change" << change.index << change.count;

1017// qDebug() << "ListViewWithPageHeader::onModelUpdated Change" << change.index << change.count;

1012 for (int i = change.index; i < change.count; ++i) {

1018 for (int i = change.index; i < change.count; ++i) {

1013 ListItem *item = itemAtIndex(i);

1019 ListItem *item = itemAtIndex(i);

plugins/Unity/CMakeLists.txt+1

@@ -43,6 +43,7 @@ set(QMLPLUGIN_SRC

43 preview.cpp

44 previewaction.cpp

45 previewinfohint.cpp

46+ result.cpp

46 showallfilteroption.cpp

47 showallfilteroption.cpp

47 signalslist.cpp

48 signalslist.cpp

48 socialpreview.cpp

49 socialpreview.cpp

plugins/Unity/Indicators/CMakeLists.txt+1

@@ -12,6 +12,7 @@ find_package(Qt5Core REQUIRED)

12find_package(Qt5Quick REQUIRED)

13

14add_subdirectory(qml)

15+add_subdirectory(Messaging)

15add_subdirectory(Network)

16add_subdirectory(Network)

16

17

17include_directories(

18include_directories(

plugins/Unity/IndicatorsLegacy/Messaging/CMakeLists.txt → plugins/Unity/Indicators/Messaging/CMakeLists.txtrenamed

The content is the same.

plugins/Unity/IndicatorsLegacy/Messaging/qml/ActionButton.qml → plugins/Unity/Indicators/Messaging/qml/ActionButton.qmlrenamed

The content is the same.

plugins/Unity/IndicatorsLegacy/Messaging/qml/ActionTextField.qml → plugins/Unity/Indicators/Messaging/qml/ActionTextField.qmlrenamed+10−7

@@ -22,11 +22,12 @@ import QtQuick 2.0

22import Ubuntu.Components 0.1

23

24Item {

25− property alias actionGroup: sendButton.actionGroup

25+ id: textField

26− property alias action: sendButton.action

27−

28 property alias text: replyField.text

26 property alias text: replyField.text

29 property alias buttonText: sendButton.text

27 property alias buttonText: sendButton.text

28+ property bool activateEnabled: false

29+

30+ signal activate(var value)

30

31

31 TextField {

32 TextField {

32 id: replyField

33 id: replyField

@@ -50,17 +51,19 @@ Item {

50 }

51 }

52 }

52

53

53− ActionButton {

54+ Button {

54 id: sendButton

55 id: sendButton

55−

56− actionParameter: replyField.text

57 anchors {

56 anchors {

58 top: parent.top

57 top: parent.top

59 bottom: parent.bottom

58 bottom: parent.bottom

60 right: parent.right

59 right: parent.right

61 }

60 }

62 width: units.gu(9)

61 width: units.gu(9)

63− enabled: replyField.text !== ""

62+ enabled: replyField.text !== "" && textField.activateEnabled

64 color: enabled ? "#c94212" : "#bababa"

63 color: enabled ? "#c94212" : "#bababa"

64+

65+ onClicked: {

66+ textField.activate(replyField.text);

67+ }

65 }

68 }

66}

69}

plugins/Unity/Indicators/Messaging/qml/CMakeLists.txtnew file+5

@@ -0,0 +1,5 @@

1+# export_qmlfiles macro

2+include(Plugins)

3+

4+# export the qmldir, *.qml files.

5+export_qmlfiles(Unity.Indicators.Messaging Unity/Indicators/Messaging)

plugins/Unity/IndicatorsLegacy/Messaging/qml/GroupedMessage.qml → plugins/Unity/Indicators/Messaging/qml/GroupedMessage.qmlrenamed+13−18

@@ -20,20 +20,19 @@

20

21import QtQuick 2.0

22import Ubuntu.Components 0.1

23−import Unity.IndicatorsLegacy 0.1 as Indicators

23+import Unity.Indicators 0.1 as Indicators

24

25−Indicators.BasicMenuItem {

25+Indicators.BaseMenuItem {

26 id: groupedMessage

27+

28+ property alias title: __title.text

27 property alias count: label.text

29 property alias count: label.text

30+ property string appIcon: "qrc:/indicators/artwork/messaging/default_app.svg"

28

31

29− color: "#221e1b"

32+ signal activateApp()

30− implicitHeight: units.gu(10)

33+ signal dismiss()

31

34

32− Indicators.MenuAction {

35+ implicitHeight: units.gu(10)

33− id: menuAction

34− actionGroup: groupedMessage.actionGroup

35− action: menu ? menu.action : ""

36− }

37

36

38 Row {

37 Row {

39 anchors.fill: parent

38 anchors.fill: parent

@@ -44,17 +43,17 @@ Indicators.BasicMenuItem {

44 height: units.gu(6)

43 height: units.gu(6)

45 width: units.gu(6)

44 width: units.gu(6)

46 image: Image {

45 image: Image {

47− source: menu && (menu.extra.canonical_icon.length > 0) ? "image://theme/" + encodeURI(menu.extra.canonical_icon) : "qrc:/indicators/artwork/messaging/default_app.svg"

46+ source: groupedMessage.appIcon

48 fillMode: Image.PreserveAspectFit

47 fillMode: Image.PreserveAspectFit

49 }

48 }

50 }

49 }

51

50

52 Label {

51 Label {

52+ id: __title

53 anchors.verticalCenter: parent.verticalCenter

54 color: "#e8e1d0"

55 font.weight: Font.DemiBold

56 fontSize: "medium"

57− text: menu && menu.label ? menu.label : ""

58 }

57 }

59

58

60 Label {

59 Label {

@@ -65,7 +64,7 @@ Indicators.BasicMenuItem {

65 color: "#e8e1d0"

64 color: "#e8e1d0"

66 font.weight: Font.DemiBold

65 font.weight: Font.DemiBold

67 fontSize: "medium"

66 fontSize: "medium"

68− text: menuAction.valid ? menuAction.state[0] : "0"

67+ text: "0"

69 }

68 }

70 }

69 }

71

70

@@ -82,15 +81,11 @@ Indicators.BasicMenuItem {

82 MouseArea {

81 MouseArea {

83 anchors.fill: parent

82 anchors.fill: parent

84 onClicked: {

83 onClicked: {

85− if (menuAction.valid) {

84+ groupedMessage.activateApp();

86− menuAction.activate(true);

87− }

88 }

85 }

89 }

86 }

90

87

91 onItemRemoved: {

88 onItemRemoved: {

92− if (menuAction.valid) {

89+ groupedMessage.dismiss();

93− menuAction.activate(false);

94− }

95 }

90 }

96}

91}

plugins/Unity/IndicatorsLegacy/Messaging/qml/HeroMessage.qml → plugins/Unity/Indicators/Messaging/qml/HeroMessage.qmlrenamed+25−22

@@ -20,25 +20,30 @@

20

21import QtQuick 2.0

22import Ubuntu.Components 0.1

23−import Unity.IndicatorsLegacy 0.1 as Indicators

23+import Unity.Indicators 0.1 as Indicators

24

25−Indicators.BasicMenuItem {

25+Indicators.BaseMenuItem {

26 id: heroMessage

27

28− property variant actionsDescription: null

29 property alias heroMessageHeader: __heroMessageHeader

28 property alias heroMessageHeader: __heroMessageHeader

30 property real collapsedHeight: heroMessageHeader.y + heroMessageHeader.bodyBottom + units.gu(2)

29 property real collapsedHeight: heroMessageHeader.y + heroMessageHeader.bodyBottom + units.gu(2)

31 property real expandedHeight: collapsedHeight

30 property real expandedHeight: collapsedHeight

32

31

33− color: "#221e1c"

32+ property alias avatar: __heroMessageHeader.avatar

33+ property alias appIcon: __heroMessageHeader.icon

34+

35+ signal activateApp

36+ signal dismiss

34

37

35 removable: state !== "expanded"

38 removable: state !== "expanded"

36 implicitHeight: collapsedHeight

39 implicitHeight: collapsedHeight

37

40

38− Indicators.MenuAction {

41+ Rectangle {

39− id: menuAction

42+ id: background

40− actionGroup: heroMessage.actionGroup

43+ property real alpha: 0.0

41− action: menu ? menu.action : ""

44+ anchors.fill: parent

45+ color: Qt.rgba(1.0, 1.0, 1.0, alpha)

46+ z: -1

42 }

47 }

43

48

44 HeroMessageHeader {

49 HeroMessageHeader {

@@ -48,25 +53,22 @@ Indicators.BasicMenuItem {

48 anchors.left: parent.left

53 anchors.left: parent.left

49 anchors.right: parent.right

54 anchors.right: parent.right

50

55

51− avatar: menu && (menu.extra.canonical_icon.length > 0) ? "image://theme/" + encodeURI(menu.extra.canonical_icon) : "qrc:/indicators/artwork/messaging/default_contact.png"

56+ avatar: "qrc:/indicators/artwork/messaging/default_contact.png"

52− icon: menu && (menu.extra.canonical_app_icon.length > 0) ? "image://theme/" + encodeURI(menu.extra.canonical_app_icon) : ""

53 appIcon: icon

57 appIcon: icon

54

58

55 state: heroMessage.state

59 state: heroMessage.state

56

60

57 onAppIconClicked: {

61 onAppIconClicked: {

58− if (menuAction.valid) {

62+ deselectMenu();

59− deactivateMenu();

63+ heroMessage.activateApp();

60− action.activate(true);

61− }

62 }

64 }

63 }

65 }

64

66

65 onClicked: {

67 onClicked: {

66− if (menuActivated) {

68+ if (menuSelected) {

67− deactivateMenu();

69+ deselectMenu();

68 } else {

70 } else {

69− activateMenu();

71+ selectMenu();

70 }

72 }

71 }

73 }

72

74

@@ -84,13 +86,16 @@ Indicators.BasicMenuItem {

84

86

85 states: State {

87 states: State {

86 name: "expanded"

88 name: "expanded"

87− when: menuActivated

89+ when: menuSelected

88

90

89 PropertyChanges {

91 PropertyChanges {

90 target: heroMessage

92 target: heroMessage

91− color: "#333130"

92 implicitHeight: heroMessage.expandedHeight

93 implicitHeight: heroMessage.expandedHeight

93 }

94 }

95+ PropertyChanges {

96+ target: background

97+ alpha: 0.05

98+ }

94 PropertyChanges {

99 PropertyChanges {

95 target: __topHLine

100 target: __topHLine

96 opacity: 0.0

101 opacity: 0.0

@@ -113,8 +118,6 @@ Indicators.BasicMenuItem {

113 }

118 }

114

119

115 onItemRemoved: {

120 onItemRemoved: {

116− if (menuAction.valid) {

121+ heroMessage.dismiss();

117− menuAction.activate(false);

118− }

119 }

122 }

120}

123}

plugins/Unity/IndicatorsLegacy/Messaging/qml/HeroMessageHeader.qml → plugins/Unity/Indicators/Messaging/qml/HeroMessageHeader.qmlrenamed

The content is the same.

plugins/Unity/Indicators/Messaging/qml/MessageMenuItemFactory.qmlnew file+180

@@ -0,0 +1,180 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Renato Araujo Oliveira Filho <renato@canonical.com>

18+ * Olivier Tilloy <olivier.tilloy@canonical.com>

19+ */

20+

21+import QtQuick 2.0

22+import Ubuntu.Components 0.1

23+import Unity.Indicators 0.1 as Indicators

24+import QMenuModel 0.1 as QMenuModel

25+import "utils.js" as Utils

26+

27+Indicators.BaseMenuItem {

28+ id: menuItem

29+ property var actionsDescription: menu ? menu.ext.xCanonicalMessageActions : undefined

30+

31+ implicitHeight: contents.status == Loader.Ready ? contents.item.implicitHeight : 0

32+

33+ property var model: null

34+

35+ Loader {

36+ id: contents

37+ anchors.fill: parent

38+

39+ sourceComponent: loadMessage(actionsDescription);

40+

41+ // Binding all properties for the item, to make sure that any change in the

42+ // property will be propagated to the contents.item at any time

43+ Binding {

44+ target: contents.item

45+ property: "menuSelected"

46+ value: menuSelected

47+ when: (contents.status == Loader.Ready)

48+ }

49+

50+ Binding {

51+ target: contents.item

52+ property: "menu"

53+ value: menu

54+ when: (contents.status == Loader.Ready)

55+ }

56+

57+ Connections {

58+ target: contents.item ? contents.item : null

59+ onSelectMenu: selectMenu()

60+ onDeselectMenu: deselectMenu()

61+ }

62+

63+ Component {

64+ id: simpleTextMessage

65+ SimpleTextMessage {

66+ // text

67+ title: menu && menu.label ? menu.label : ""

68+ time: menu ? Utils.formatDate(menu.ext.xCanonicalTime) : ""

69+ message: menu && menu.ext.xCanonicalText ? menu.ext.xCanonicalText : ""

70+ // icons

71+ avatar: menu && menu.ext.icon !== undefined ? menu.ext.icon : "qrc:/indicators/artwork/messaging/default_contact.png"

72+ appIcon: menu && menu.ext.xCanonicalAppIcon !== undefined ? menu.ext.xCanonicalAppIcon : "qrc:/indicators/artwork/messaging/default_app.svg"

73+

74+ onActivateApp: {

75+ menuItem.model.activate(modelIndex, true);

76+ }

77+ onDismiss: {

78+ menuItem.model.activate(modelIndex, false);

79+ }

80+ }

81+ }

82+ Component {

83+ id: textMessage

84+ TextMessage {

85+ property var replyAction: QMenuModel.UnityMenuAction {

86+ model: menuItem.model

87+ index: modelIndex

88+ name: menu && actionsDescription[0].name ? actionsDescription[0].name : ""

89+ }

90+

91+ // text

92+ title: menu && menu.label ? menu.label : ""

93+ time: menu ? Utils.formatDate(menu.ext.xCanonicalTime) : ""

94+ message: menu && menu.ext.xCanonicalText ? menu.ext.xCanonicalText : ""

95+ replyButtonText: actionsDescription && actionsDescription[0].label ? actionsDescription[0].label : "Send"

96+ // icons

97+ avatar: menu && menu.ext.icon !== undefined ? menu.ext.icon : "qrc:/indicators/artwork/messaging/default_contact.png"

98+ appIcon: menu && menu.ext.xCanonicalAppIcon !== undefined ? menu.ext.xCanonicalAppIcon : "qrc:/indicators/artwork/messaging/default_app.svg"

99+ // actions

100+ replyEnabled: replyAction.valid && replyAction.enabled

101+

102+ onActivateApp: {

103+ menuItem.model.activate(modelIndex, true);

104+ }

105+ onDismiss: {

106+ menuItem.model.activate(modelIndex, false);

107+ }

108+ onReply: {

109+ replyAction.activate(value);

110+ }

111+ }

112+ }

113+ Component {

114+ id: snapDecision

115+ SnapDecision {

116+ property var activateAction: QMenuModel.UnityMenuAction {

117+ model: menuItem.model

118+ index: modelIndex

119+ name: menu && actionsDescription[0].name ? actionsDescription[0].name : ""

120+ }

121+ property var replyAction: QMenuModel.UnityMenuAction {

122+ model: menuItem.model

123+ index: modelIndex

124+ name: menu && actionsDescription[1].name ? actionsDescription[1].name : ""

125+ }

126+

127+ // text

128+ title: menu && menu.label ? menu.label : ""

129+ time: menu ? Utils.formatDate(menu.ext.xCanonicalTime) : ""

130+ message: menu && menu.ext.xCanonicalText ? menu.ext.xCanonicalText : ""

131+ actionButtonText: actionsDescription && actionsDescription[0].label ? actionsDescription[0].label : "Call back"

132+ replyButtonText: actionsDescription && actionsDescription[1].label ? actionsDescription[1].label : "Send"

133+ replyMessages: actionsDescription && actionsDescription[1]["parameter-hint"] ? actionsDescription[1]["parameter-hint"] : ""

134+ // icons

135+ avatar: menu && menu.ext.icon !== undefined ? menu.ext.icon : "qrc:/indicators/artwork/messaging/default_contact.png"

136+ appIcon: menu && menu.ext.xCanonicalAppIcon !== undefined ? menu.ext.xCanonicalAppIcon : "qrc:/indicators/artwork/messaging/default_app.svg"

137+ // actions

138+ activateEnabled: activateAction.valid && activateAction.enabled

139+ replyEnabled: replyAction.valid && replyAction.enabled

140+

141+ onActivateApp: {

142+ menuItem.model.activate(modelIndex, true);

143+ }

144+ onDismiss: {

145+ menuItem.model.activate(modelIndex, false);

146+ }

147+ onActivate: {

148+ activateAction.activate();

149+ }

150+ onReply: {

151+ replyAction.activate(value);

152+ }

153+ }

154+ }

155+ }

156+

157+ function loadMessage(actions)

158+ {

159+ var parameterType = ""

160+ for (var actIndex in actions) {

161+ var desc = actions[actIndex];

162+ if (desc["parameter-type"] !== undefined) {

163+ parameterType += desc["parameter-type"];

164+ } else {

165+ parameterType += "_";

166+ }

167+ }

168+

169+ if (parameterType === "") {

170+ return simpleTextMessage;

171+ } else if (parameterType === "s") {

172+ return textMessage;

173+ } else if (parameterType === "_s") {

174+ return snapDecision;

175+ } else {

176+ console.debug("Unknown paramater type: " + parameterType);

177+ }

178+ return undefined;

179+ }

180+}

plugins/Unity/IndicatorsLegacy/Messaging/qml/QuickReply.qml → plugins/Unity/Indicators/Messaging/qml/QuickReply.qmlrenamed+10−5

@@ -23,12 +23,13 @@ import Ubuntu.Components 0.1

23import Unity.IndicatorsLegacy 0.1 as Indicators

24

25Item {

26− property alias actionGroup: actionTextField.actionGroup

26+ id: quickReply

27− property alias action: actionTextField.action

28−

29 property alias buttonText: actionTextField.buttonText

27 property alias buttonText: actionTextField.buttonText

30 property real expandedHeight: childrenRect.height

28 property real expandedHeight: childrenRect.height

31 property alias messages : messagelistRepeater.model

29 property alias messages : messagelistRepeater.model

30+ property alias replyEnabled: actionTextField.activateEnabled

31+

32+ signal reply(var value)

32

33

33 Item {

34 Item {

34 id: header

35 id: header

@@ -83,10 +84,9 @@ Item {

83

84

84 height: childrenRect.height

85 height: childrenRect.height

85

86

86− Rectangle {

87+ Item {

87 width: messagelist.width

88 width: messagelist.width

88 height: units.gu(5)

89 height: units.gu(5)

89− color: "#333230"

90

91 Label {

92 id: __label

@@ -150,6 +150,11 @@ Item {

150

151 anchors.fill: parent

152 anchors.margins: units.gu(1)

153+ activateEnabled: replyEnabled

154+

155+ onActivate: {

156+ quickReply.reply(value)

157+ }

153 }

158 }

154

159

155 Indicators.HLine {

160 Indicators.HLine {

plugins/Unity/IndicatorsLegacy/Messaging/qml/SimpleTextMessage.qml → plugins/Unity/Indicators/Messaging/qml/SimpleTextMessage.qmlrenamed+7−4

@@ -20,17 +20,20 @@

20

21import QtQuick 2.0

22import Ubuntu.Components 0.1

23−import "utils.js" as Utils

24

23

25HeroMessage {

24HeroMessage {

26 id: __heroMessage

25 id: __heroMessage

27

26

27+ property string title: ""

28+ property string time: ""

29+ property string message: ""

30+

28 property alias footer: footerLoader.sourceComponent

31 property alias footer: footerLoader.sourceComponent

29

32

30 expandedHeight: fullMessage.y + fullMessage.height + units.gu(2)

33 expandedHeight: fullMessage.y + fullMessage.height + units.gu(2)

31− heroMessageHeader.titleText.text: menu ? menu.label : ""

34+ heroMessageHeader.titleText.text: title

32− heroMessageHeader.subtitleText.text: menu ? Utils.formatDate(menu.extra.canonical_time) : ""

35+ heroMessageHeader.subtitleText.text: time

33− heroMessageHeader.bodyText.text: menu ? menu.extra.canonical_text : ""

36+ heroMessageHeader.bodyText.text: message

34

37

35 Item {

38 Item {

36 id: fullMessage

39 id: fullMessage

plugins/Unity/IndicatorsLegacy/Messaging/qml/SnapDecision.qml → plugins/Unity/Indicators/Messaging/qml/SnapDecision.qmlrenamed+33−14

@@ -20,19 +20,33 @@

20

21import QtQuick 2.0

22import Ubuntu.Components 0.1

23−import Unity.IndicatorsLegacy 0.1 as Indicators

23+import Unity.Indicators 0.1 as Indicators

24import "utils.js" as Utils

25

26HeroMessage {

27 id: snapDecision

28

29+ property string title: ""

30+ property string time: ""

31+ property string message: ""

32+

33+ property bool activateEnabled: true

34+ property alias actionButtonText: actionButton.text

35+

36+ property bool replyEnabled: true

37+ property alias replyMessages: quickreply.messages

38+ property alias replyButtonText: quickreply.buttonText

39+

29 expandedHeight: buttons.y + buttons.height + quickreply.height + units.gu(2)

40 expandedHeight: buttons.y + buttons.height + quickreply.height + units.gu(2)

30− heroMessageHeader.titleText.text: menu ? menu.label : ""

41+ heroMessageHeader.titleText.text: title

31− heroMessageHeader.subtitleText.text: menu ? menu.extra.canonical_text : ""

42+ heroMessageHeader.subtitleText.text: message

32 heroMessageHeader.subtitleText.color: "#e8e1d0"

43 heroMessageHeader.subtitleText.color: "#e8e1d0"

33− heroMessageHeader.bodyText.text: menu ? Utils.formatDate(menu.extra.canonical_time) : ""

44+ heroMessageHeader.bodyText.text: time

34 heroMessageHeader.bodyText.color: "#8f8f88"

45 heroMessageHeader.bodyText.color: "#8f8f88"

35

46

47+ signal activate

48+ signal reply(string value)

49+

36 Item {

50 Item {

37 id: buttons

51 id: buttons

38

52

@@ -62,16 +76,19 @@ HeroMessage {

62 }

76 }

63 }

77 }

64

78

65− ActionButton {

79+ Button {

66− actionGroup: snapDecision.actionGroup

80+ id: actionButton

67− action: actionsDescription[0].name

81+ text: "Call back"

68−

69− text: actionsDescription ? actionsDescription[0].label : "Call back"

70− color: "#c94212"

82+ color: enabled ? "#c94212" : "#bababa"

71 anchors.right: parent.right

83 anchors.right: parent.right

72 anchors.top: parent.top

84 anchors.top: parent.top

73 anchors.bottom: parent.bottom

85 anchors.bottom: parent.bottom

74 width: (parent.width - units.gu(1)) / 2

86 width: (parent.width - units.gu(1)) / 2

87+ enabled: snapDecision.activateEnabled

88+

89+ onClicked: {

90+ snapDecision.activate();

91+ }

75 }

92 }

76

93

77 states: State {

94 states: State {

@@ -95,11 +112,12 @@ HeroMessage {

95 QuickReply {

112 QuickReply {

96 id: quickreply

113 id: quickreply

97

114

115+ onReply: {

98− actionGroup: snapDecision.actionGroup

116+ snapDecision.reply(value);

99− action: actionsDescription[1].name

117+ }

100

118

101− messages: actionsDescription ? actionsDescription[1]["parameter-hint"] : ""

119+ messages: ""

102− buttonText: actionsDescription ? actionsDescription[1].label : "send"

120+ buttonText: "Send"

103 anchors {

121 anchors {

104 top: buttons.bottom

122 top: buttons.bottom

105 topMargin: units.gu(2)

123 topMargin: units.gu(2)

@@ -109,6 +127,7 @@ HeroMessage {

109 height: 0

127 height: 0

110 opacity: 0.0

128 opacity: 0.0

111 enabled: false

129 enabled: false

130+ replyEnabled: snapDecision.replyEnabled

112

131

113 states: State {

132 states: State {

114 name: "expanded"

133 name: "expanded"

plugins/Unity/IndicatorsLegacy/Messaging/qml/TextMessage.qml → plugins/Unity/Indicators/Messaging/qml/TextMessage.qmlrenamed+12−4

@@ -20,16 +20,24 @@

20

21import QtQuick 2.0

22import Ubuntu.Components 0.1

23−import Unity.IndicatorsLegacy 0.1 as Indicators

23+import Unity.Indicators 0.1 as Indicators

24

25SimpleTextMessage {

26 id: simpleMessage

27

28+ property bool replyEnabled: false

29+ property string replyButtonText: "Send"

30+

31+ signal reply(string value)

32+

28 footer: ActionTextField {

33 footer: ActionTextField {

29 anchors.fill: parent

34 anchors.fill: parent

30− actionGroup: simpleMessage.actionGroup

31− action: actionsDescription[0].name

32

35

33− buttonText: actionsDescription ? actionsDescription[0].label : "Send"

36+ activateEnabled: simpleMessage.replyEnabled

37+ buttonText: simpleMessage.replyButtonText

38+

39+ onActivate: {

40+ simpleMessage.reply(value);

41+ }

34 }

42 }

35}

43}

plugins/Unity/IndicatorsLegacy/Messaging/qml/qmldir → plugins/Unity/Indicators/Messaging/qml/qmldirrenamed+2−2

@@ -1,11 +1,11 @@

1−module Unity.IndicatorsLegacy.Messaging

1+module Unity.Indicators.Messaging

2

3ActionButton 0.1 ActionButton.qml

4ActionTextField 0.1 ActionTextField.qml

5GroupedMessage 0.1 GroupedMessage.qml

6HeroMessage 0.1 HeroMessage.qml

7HeroMessageHeader 0.1 HeroMessageHeader.qml

8−MessageMenuItem 0.1 MessageMenuItem.qml

8+MessageMenuItemFactory 0.1 MessageMenuItemFactory.qml

9QuickReply 0.1 QuickReply.qml

10SimpleTextMessage 0.1 SimpleTextMessage.qml

11SnapDecision 0.1 SnapDecision.qml

plugins/Unity/IndicatorsLegacy/Messaging/qml/utils.js → plugins/Unity/Indicators/Messaging/qml/utils.jsrenamed

The content is the same.

plugins/Unity/Indicators/plugin.cpp+2

@@ -42,6 +42,8 @@ static QObject* menuModelCacheSingleton(QQmlEngine* engine, QJSEngine* scriptEng

42

43void Indicators2Plugin::registerTypes(const char *uri)

44{

45+ Q_INIT_RESOURCE(indicators);

46+

45 qmlRegisterType<IndicatorsManager>(uri, 0, 1, "IndicatorsManager");

47 qmlRegisterType<IndicatorsManager>(uri, 0, 1, "IndicatorsManager");

46 qmlRegisterType<IndicatorsModel>(uri, 0, 1, "IndicatorsModel");

48 qmlRegisterType<IndicatorsModel>(uri, 0, 1, "IndicatorsModel");

47 qmlRegisterType<MenuContentActivator>(uri, 0, 1, "MenuContentActivator");

49 qmlRegisterType<MenuContentActivator>(uri, 0, 1, "MenuContentActivator");

plugins/Unity/Indicators/qml/BaseMenuItem.qml+1−1

@@ -24,7 +24,7 @@ import Ubuntu.Components.ListItems 0.1 as ListItem

24ListItem.Standard {

25 id: baseMenu

26

27− property bool menuActivated: false

27+ property bool menuSelected: false

28

29 signal selectMenu()

30 signal deselectMenu()

plugins/Unity/Indicators/qml/IndicatorPage.qml+33−6

@@ -60,7 +60,34 @@ IndicatorBase {

60 // Only allow flicking if the content doesn't fit on the page

61 interactive: contentHeight > height

62

63+ property int selectedIndex: -1

64+ property bool blockCurrentIndexChange: false

65+ // for count = 0

66+ onCountChanged: {

67+ if (count == 0 && selectedIndex != -1) {

68+ selectedIndex = -1;

69+ }

70+ }

71+ // for highlight following

72+ onSelectedIndexChanged: {

63− currentIndex: -1

73+ if (currentIndex != selectedIndex) {

74+ var blocked = blockCurrentIndexChange;

75+ blockCurrentIndexChange = true;

76+

77+ currentIndex = selectedIndex;

78+

79+ blockCurrentIndexChange = blocked;

80+ }

81+ }

82+ // for item addition/removal

83+ onCurrentIndexChanged: {

84+ if (!blockCurrentIndexChange) {

85+ if (selectedIndex != -1 && selectedIndex != currentIndex) {

86+ selectedIndex = currentIndex;

87+ }

88+ }

89+ }

90+

64 delegate: Item {

91 delegate: Item {

65 id: menuDelegate

92 id: menuDelegate

66

93

@@ -89,10 +116,10 @@ IndicatorBase {

89 menuStack.push(mainMenu.model.submenu(index));

116 menuStack.push(mainMenu.model.submenu(index));

90 }

117 }

91

118

92− if (item.hasOwnProperty("menuActivated")) {

119+ if (item.hasOwnProperty("menuSelected")) {

93− item.menuActivated = Qt.binding(function() { return ListView.isCurrentItem; });

120+ item.menuSelected = Qt.binding(function() { return mainMenu.selectedIndex == index; });

94− item.selectMenu.connect(function() { ListView.view.currentIndex = index });

121+ item.selectMenu.connect(function() { mainMenu.selectedIndex = index; });

95− item.deselectMenu.connect(function() { ListView.view.currentIndex = -1 });

122+ item.deselectMenu.connect(function() { mainMenu.selectedIndex = -1; });

96 }

123 }

97 if (item.hasOwnProperty("menu")) {

124 if (item.hasOwnProperty("menu")) {

98 item.menu = Qt.binding(function() { return model; });

125 item.menu = Qt.binding(function() { return model; });

@@ -149,7 +176,7 @@ IndicatorBase {

149

176

150 function reset()

177 function reset()

151 {

178 {

152− mainMenu.currentIndex = -1;

179+ mainMenu.selectedIndex = -1;

153 mainMenu.positionViewAtBeginning();

180 mainMenu.positionViewAtBeginning();

154 }

181 }

155}

182}

plugins/Unity/Indicators/qml/MenuItemFactory.qml+62−12

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

20import QtQuick 2.0

21import Unity.Indicators 0.1 as Indicators

22import Unity.Indicators.Network 0.1 as ICNetwork

23+import Unity.Indicators.Messaging 0.1 as ICMessaging

23import QMenuModel 0.1 as QMenuModel

24import QMenuModel 0.1 as QMenuModel

24

25

25Item {

26Item {

@@ -38,6 +39,9 @@ Item {

38 "com.canonical.indicator.slider" : sliderMenu,

39 "com.canonical.indicator.slider" : sliderMenu,

39 "com.canonical.indicator.switch" : switchMenu,

40 "com.canonical.indicator.switch" : switchMenu,

40

41

42+ "com.canonical.indicator.messages.messageitem" : messageItem,

43+ "com.canonical.indicator.messages.sourceitem" : groupedMessage,

44+

41 "com.canonical.unity.slider" : sliderMenu,

45 "com.canonical.unity.slider" : sliderMenu,

42 "com.canonical.unity.switch" : switchMenu,

46 "com.canonical.unity.switch" : switchMenu,

43

47

@@ -45,15 +49,17 @@ Item {

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

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

46 }

50 }

47

51

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

53+

48 Component {

54 Component {

49 id: sliderMenu;

55 id: sliderMenu;

50 Indicators.SliderMenuItem {

56 Indicators.SliderMenuItem {

51 property QtObject menu: null

57 property QtObject menu: null

52

58

53 text: menu && menu.label ? menu.label : ""

59 text: menu && menu.label ? menu.label : ""

54− icon: menu ? menu.icon : ""

60+ icon: menu && menu.icon ? menu.icon : ""

55− minIcon: menu.ext.minIcon

61+ minIcon: menu && menu.ext.minIcon ? menu.ext.minIcon : ""

56− maxIcon: menu.ext.maxIcon

62+ maxIcon: menu && menu.ext.maxIcon ? menu.ext.maxIcon : ""

57

63

58 minimumValue: menu.ext.minValue ? menu.ext.minValue : 0.0

64 minimumValue: menu.ext.minValue ? menu.ext.minValue : 0.0

59 maximumValue: {

65 maximumValue: {

@@ -79,8 +85,6 @@ Item {

79 }

85 }

80 }

86 }

81

87

82− Component { id: divMenu; Indicators.DivMenuItem {} }

83−

84 Component {

88 Component {

85 id: buttonMenu;

89 id: buttonMenu;

86 Indicators.ButtonMenuItem {

90 Indicators.ButtonMenuItem {

@@ -89,7 +93,9 @@ Item {

89 text: menu && menu.label ? menu.label : ""

93 text: menu && menu.label ? menu.label : ""

90 enabled: menu ? menu.sensitive : false

94 enabled: menu ? menu.sensitive : false

91

95

96+ onActivate: {

92− onActivate: model.activate(modelIndex);

97+ model.activate(modelIndex);

98+ }

93 }

99 }

94 }

100 }

95 Component {

101 Component {

@@ -118,12 +124,14 @@ Item {

118 property QtObject menu: null

124 property QtObject menu: null

119

125

120 text: menu && menu.label ? menu.label : ""

126 text: menu && menu.label ? menu.label : ""

121− icon: menu ? menu.icon : ""

127+ icon: menu && menu.icon ? menu.icon : ""

122 checkable: menu ? (menu.isCheck || menu.isRadio) : false

128 checkable: menu ? (menu.isCheck || menu.isRadio) : false

123 checked: checkable ? menu.isToggled : false

129 checked: checkable ? menu.isToggled : false

124 enabled: menu ? menu.sensitive : false

130 enabled: menu ? menu.sensitive : false

125

131

132+ onActivate: {

126− onActivate: model.activate(modelIndex);

133+ model.activate(modelIndex);

134+ }

127 }

135 }

128 }

136 }

129

137

@@ -133,11 +141,13 @@ Item {

133 property QtObject menu: null

141 property QtObject menu: null

134

142

135 text: menu && menu.label ? menu.label : ""

143 text: menu && menu.label ? menu.label : ""

136− icon: menu ? menu.icon : ""

144+ icon: menu && menu.icon ? menu.icon : ""

137 checked: menu ? menu.isToggled : false

145 checked: menu ? menu.isToggled : false

138 enabled: menu ? menu.sensitive : false

146 enabled: menu ? menu.sensitive : false

139

147

148+ onActivate: {

140− onActivate: model.activate(modelIndex);

149+ model.activate(modelIndex);

150+ }

141 }

151 }

142 }

152 }

143

153

@@ -161,11 +171,11 @@ Item {

161 property QtObject menu: null

171 property QtObject menu: null

162 property var strengthAction: QMenuModel.UnityMenuAction {

172 property var strengthAction: QMenuModel.UnityMenuAction {

163 model: menuFactory.model ? menuFactory.model : null

173 model: menuFactory.model ? menuFactory.model : null

174+ index: modelIndex

164 name: menu ? menu.ext.xCanonicalWifiApStrengthAction : ""

175 name: menu ? menu.ext.xCanonicalWifiApStrengthAction : ""

165 }

176 }

166

177

167 text: menu && menu.label ? menu.label : ""

178 text: menu && menu.label ? menu.label : ""

168− icon: menu ? menu.icon : ""

169 secure: menu ? menu.ext.xCanonicalWifiApIsSecure : false

179 secure: menu ? menu.ext.xCanonicalWifiApIsSecure : false

170 adHoc: menu ? menu.ext.xCanonicalWifiApIsAdhoc : false

180 adHoc: menu ? menu.ext.xCanonicalWifiApIsAdhoc : false

171 checked: menu ? menu.isToggled : false

181 checked: menu ? menu.isToggled : false

@@ -177,7 +187,47 @@ Item {

177 'x-canonical-wifi-ap-is-secure': 'bool',

187 'x-canonical-wifi-ap-is-secure': 'bool',

178 'x-canonical-wifi-ap-strength-action': 'string'});

188 'x-canonical-wifi-ap-strength-action': 'string'});

179 }

189 }

190+ onActivate: {

180− onActivate: model.activate(modelIndex);

191+ model.activate(modelIndex);

192+ }

193+ }

194+ }

195+

196+ Component {

197+ id: messageItem

198+ ICMessaging.MessageMenuItemFactory {

199+

200+ property QtObject menu: null

201+ model: menuFactory.model ? menuFactory.model : null

202+

203+ Component.onCompleted: {

204+ model.loadExtendedAttributes(modelIndex, {'x-canonical-time': 'int64',

205+ 'x-canonical-text': 'string',

206+ 'x-canonical-message-actions': 'variant',

207+ 'icon': 'icon',

208+ 'x-canonical-app-icon': 'icon'});

209+ }

210+ }

211+ }

212+

213+ Component {

214+ id: groupedMessage

215+ ICMessaging.GroupedMessage {

216+ property QtObject menu: null

217+

218+ title: menu && menu.label ? menu.label : ""

219+ count: menu && menu.actionState[0] ? menu.actionState[0] : "0"

220+ appIcon: menu && menu.ext.icon !== undefined ? menu.ext.icon : "qrc:/indicators/artwork/messaging/default_app.svg"

221+

222+ Component.onCompleted: {

223+ model.loadExtendedAttributes(modelIndex, {'icon': 'icon'});

224+ }

225+ onActivateApp: {

226+ model.activate(modelIndex, true);

227+ }

228+ onDismiss: {

229+ model.activate(modelIndex, false);

230+ }

181 }

231 }

182 }

232 }

183

233

plugins/Unity/IndicatorsLegacy/resources/artwork/messaging/default_app.svg → plugins/Unity/Indicators/resources/artwork/messaging/default_app.svgrenamed

The content is the same.

plugins/Unity/IndicatorsLegacy/resources/artwork/messaging/default_contact.png → plugins/Unity/Indicators/resources/artwork/messaging/default_contact.pngrenamed

Binary file not shown.

plugins/Unity/IndicatorsLegacy/resources/artwork/messaging/message_sms01_54px.png → plugins/Unity/Indicators/resources/artwork/messaging/message_sms01_54px.pngrenamed

Binary file not shown.

plugins/Unity/Indicators/resources/indicators.qrc+3

@@ -1,5 +1,8 @@

1<RCC>

2 <qresource prefix="/indicators">

3 <file>artwork/network/secure.svg</file>

4+ <file>artwork/messaging/default_contact.png</file>

5+ <file>artwork/messaging/default_app.svg</file>

6+ <file>artwork/messaging/message_sms01_54px.png</file>

4 </qresource>

7 </qresource>

5</RCC>

8</RCC>

plugins/Unity/IndicatorsLegacy/CMakeLists.txt−1

@@ -8,7 +8,6 @@ find_package(Qt5Core REQUIRED)

8find_package(Qt5Quick REQUIRED)

9

10add_subdirectory(qml)

11−add_subdirectory(Messaging)

12add_subdirectory(Network)

11add_subdirectory(Network)

13

12

14include_directories(

13include_directories(

plugins/Unity/IndicatorsLegacy/Messaging/qml/CMakeLists.txtdeleted−5

@@ -1,5 +0,0 @@

1−# export_qmlfiles macro

2−include(Plugins)

3−

4−# export the qmldir, *.qml files.

5−export_qmlfiles(Unity.IndicatorsLegacy.Messaging Unity/IndicatorsLegacy/Messaging)

plugins/Unity/IndicatorsLegacy/Messaging/qml/MessageMenuItem.qmldeleted−96

@@ -1,96 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU Lesser General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU Lesser General Public License for more details.

12− *

13− * You should have received a copy of the GNU Lesser General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− *

16− * Authors:

17− * Renato Araujo Oliveira Filho <renato@canonical.com>

18− * Olivier Tilloy <olivier.tilloy@canonical.com>

19− */

20−

21−import QtQuick 2.0

22−import Ubuntu.Components 0.1

23−import Unity.IndicatorsLegacy 0.1 as Indicators

24−

25−Indicators.BasicMenuItem {

26− property variant actionsDescription: menu ? menu.extra.canonical_message_actions : undefined

27−

28− onActionGroupChanged: loadItem()

29− onActionsDescriptionChanged: loadItem()

30− implicitHeight: contents.status == Loader.Ready ? contents.item.implicitHeight : 0

31−

32− Loader {

33− id: contents

34−

35− anchors.fill: parent

36− // Binding all properties for the item, to make sure that any change in the

37− // property will be propagated to the contents.item at any time

38− Binding {

39− target: contents.item

40− property: "menuActivated"

41− value: menuActivated

42− when: (contents.status == Loader.Ready)

43− }

44−

45− Binding {

46− target: contents.item

47− property: "actionGroup"

48− value: actionGroup

49− when: (contents.status == Loader.Ready)

50− }

51−

52− Binding {

53− target: contents.item

54− property: "menu"

55− value: menu

56− when: (contents.status == Loader.Ready)

57− }

58−

59− Binding {

60− target: contents.item

61− property: "actionsDescription"

62− value: actionsDescription

63− when: (contents.status == Loader.Ready)

64− }

65−

66− Connections {

67− target: contents.item ? contents.item : null

68− onActivateMenu: activateMenu()

69− onDeactivateMenu: deactivateMenu()

70− }

71− }

72−

73−

74− function loadItem()

75− {

76− var parameterType = ""

77− for (var actIndex in actionsDescription) {

78− var desc = actionsDescription[actIndex];

79− if (desc["parameter-type"] !== undefined) {

80− parameterType += desc["parameter-type"];

81− } else {

82− parameterType += "_";

83− }

84− }

85−

86− if (parameterType === "") {

87− contents.source = "SimpleTextMessage.qml";

88− } else if (parameterType === "s") {

89− contents.source = "TextMessage.qml";

90− } else if (parameterType === "_s") {

91− contents.source = "SnapDecision.qml";

92− } else {

93− console.debug("Unknown paramater type: " + parameterType);

94− }

95− }

96−}

plugins/Unity/IndicatorsLegacy/qml/MenuItemFactory.qml−8

@@ -19,7 +19,6 @@

19

20import QtQuick 2.0

21import Unity.IndicatorsLegacy 0.1 as Indicators

22−import Unity.IndicatorsLegacy.Messaging 0.1 as ICMessaging

23import Unity.IndicatorsLegacy.Network 0.1 as ICNetwork

22import Unity.IndicatorsLegacy.Network 0.1 as ICNetwork

24

23

25Item {

24Item {

@@ -47,10 +46,6 @@ Item {

47 "com.canonical.indicator.slider" : sliderMenu,

46 "com.canonical.indicator.slider" : sliderMenu,

48 "com.canonical.indicator.switch" : switchMenu,

47 "com.canonical.indicator.switch" : switchMenu,

49

48

50− "com.canonical.indicator.messages.messageitem" : messageItem,

51− "com.canonical.indicator.messages.snapdecision" : snapDecision,

52− "com.canonical.indicator.messages.sourceitem" : groupedMessage,

53−

54 "unity.widget.systemsettings.tablet.sectiontitle" : wifiSection,

49 "unity.widget.systemsettings.tablet.sectiontitle" : wifiSection,

55 "unity.widgets.systemsettings.tablet.wifisection" : wifiSection,

50 "unity.widgets.systemsettings.tablet.wifisection" : wifiSection,

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

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

@@ -62,9 +57,6 @@ Item {

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

57 Component { id: divMenu; Indicators.DivMenuItem {} }

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

58 Component { id: sectionMenu; Indicators.SectionMenuItem {} }

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

59 Component { id: progressMenu; Indicators.ProgressMenuItem {} }

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

66− Component { id: snapDecision; ICMessaging.SnapDecision {} }

67− Component { id: groupedMessage; ICMessaging.GroupedMessage {} }

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

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

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

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

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

62 Component { id: indicatorMenu; Indicators.MenuItem {} }

plugins/Unity/IndicatorsLegacy/resources/indicators.qrc−3

@@ -1,7 +1,4 @@

1<RCC>

2 <qresource prefix="/indicators">

3− <file>artwork/messaging/default_contact.png</file>

4− <file>artwork/messaging/default_app.svg</file>

5− <file>artwork/messaging/message_sms01_54px.png</file>

6 </qresource>

3 </qresource>

7</RCC>

4</RCC>

plugins/Unity/iconutils.cpp+1−1

@@ -30,7 +30,7 @@ QString gIconToDeclarativeImageProviderString(QString const &giconString)

30 if (giconString.isEmpty()) return giconString;

31

32 if (giconString.startsWith('/') || giconString.startsWith(QLatin1String("http")) ||

33− giconString.startsWith(QLatin1String("file:"))) {

33+ giconString.startsWith(QLatin1String("file:")) || giconString.startsWith(QLatin1String("image:"))) {

34 return giconString;

35 }

36

plugins/Unity/plugin.cpp+2

@@ -35,6 +35,7 @@

35#include "categoryresults.h"

36#include "bottombarvisibilitycommunicatorshell.h"

37#include "genericoptionsmodel.h"

38+#include "result.h"

38

39

39// libqtdee

40// libqtdee

40#include "deelistmodel.h"

41#include "deelistmodel.h"

@@ -50,6 +51,7 @@ void UnityPlugin::registerTypes(const char *uri)

50 qmlRegisterUncreatableType<PreviewInfoHint>(uri, 0, 1, "PreviewInfoHint", "Can't create PreviewInfoHint object in QML.");

51 qmlRegisterUncreatableType<PreviewInfoHint>(uri, 0, 1, "PreviewInfoHint", "Can't create PreviewInfoHint object in QML.");

51 qmlRegisterUncreatableType<SocialPreviewComment>(uri, 0, 1, "SocialPreviewComment", "Can't create SocialPreviewComment object in QML.");

52 qmlRegisterUncreatableType<SocialPreviewComment>(uri, 0, 1, "SocialPreviewComment", "Can't create SocialPreviewComment object in QML.");

52 qmlRegisterUncreatableType<GenericOptionsModel>(uri, 0, 1, "GenericOptionsModel", "Can't create options model in QML.");

53 qmlRegisterUncreatableType<GenericOptionsModel>(uri, 0, 1, "GenericOptionsModel", "Can't create options model in QML.");

54+ qmlRegisterUncreatableType<Result>(uri, 0, 1, "Result", "Can't create result object in QML.");

53 qmlRegisterType<Scope>(uri, 0, 1, "Scope");

55 qmlRegisterType<Scope>(uri, 0, 1, "Scope");

54 qmlRegisterType<Scopes>(uri, 0, 1, "Scopes");

56 qmlRegisterType<Scopes>(uri, 0, 1, "Scopes");

55 qmlRegisterType<Categories>(uri, 0, 1, "Categories");

57 qmlRegisterType<Categories>(uri, 0, 1, "Categories");

plugins/Unity/preview.cpp+17−2

@@ -39,9 +39,12 @@

39#include <UnityCore/MusicPreview.h>

40#include <UnityCore/SocialPreview.h>

41

42+#include <UnityCore/GLibWrapper.h>

43+

42Preview::Preview(QObject *parent):

44Preview::Preview(QObject *parent):

43 QObject(parent),

45 QObject(parent),

44− m_unityPreview(nullptr)

46+ m_unityPreview(nullptr),

47+ m_result(new Result(this))

45{

48{

46}

49}

47

50

@@ -123,6 +126,11 @@ QString Preview::imageSourceUri() const

123 return QString::null;

126 return QString::null;

124}

127}

125

128

129+QVariant Preview::result() const

130+{

131+ return QVariant::fromValue(m_result);

132+}

133+

126Preview* Preview::newFromUnityPreview(unity::dash::Preview::Ptr unityPreview)

134Preview* Preview::newFromUnityPreview(unity::dash::Preview::Ptr unityPreview)

127{

135{

128 Preview* preview = nullptr;

136 Preview* preview = nullptr;

@@ -151,6 +159,7 @@ Preview* Preview::newFromUnityPreview(unity::dash::Preview::Ptr unityPreview)

151void Preview::setUnityPreviewBase(unity::dash::Preview::Ptr unityPreview)

159void Preview::setUnityPreviewBase(unity::dash::Preview::Ptr unityPreview)

152{

160{

153 m_unityPreview = unityPreview;

161 m_unityPreview = unityPreview;

162+ m_result->setPreview(unityPreview);

154

163

155 qDeleteAll(m_infoHints);

164 qDeleteAll(m_infoHints);

156 m_infoHints.clear();

165 m_infoHints.clear();

@@ -181,8 +190,14 @@ void Preview::execute(const QString& actionId, const QHash<QString, QVariant>& h

181{

190{

182 if (m_unityPreview) {

191 if (m_unityPreview) {

183 auto unityHints = convertToHintsMap(hints);

192 auto unityHints = convertToHintsMap(hints);

193+ m_actionCancellable.Renew();

184− m_unityPreview->PerformAction(actionId.toStdString(), unityHints);

194+ m_unityPreview->PerformAction(actionId.toStdString(), unityHints, nullptr, m_actionCancellable);

185 } else {

195 } else {

186 qWarning() << "Preview not set";

196 qWarning() << "Preview not set";

187 }

197 }

188}

198}

199+

200+void Preview::cancelAction()

201+{

202+ m_actionCancellable.Cancel();

203+}

plugins/Unity/preview.h+7

@@ -31,7 +31,9 @@

31#include <UnityCore/Preview.h>

32

33// local

34+#include "result.h"

34#include "previewaction.h"

35#include "previewaction.h"

36+#include <UnityCore/GLibWrapper.h>

35

37

36class Q_DECL_EXPORT Preview : public QObject

38class Q_DECL_EXPORT Preview : public QObject

37{

39{

@@ -46,6 +48,7 @@ class Q_DECL_EXPORT Preview : public QObject

46 Q_PROPERTY(QVariantMap infoMap READ infoHintsHash NOTIFY previewChanged)

48 Q_PROPERTY(QVariantMap infoMap READ infoHintsHash NOTIFY previewChanged)

47 Q_PROPERTY(QString image READ image NOTIFY previewChanged)

49 Q_PROPERTY(QString image READ image NOTIFY previewChanged)

48 Q_PROPERTY(QString imageSourceUri READ imageSourceUri NOTIFY previewChanged)

50 Q_PROPERTY(QString imageSourceUri READ imageSourceUri NOTIFY previewChanged)

51+ Q_PROPERTY(QVariant result READ result NOTIFY previewChanged)

49

52

50public:

53public:

51 explicit Preview(QObject *parent = 0);

54 explicit Preview(QObject *parent = 0);

@@ -60,8 +63,10 @@ public:

60 QVariantMap infoHintsHash() const;

63 QVariantMap infoHintsHash() const;

61 QString image() const;

64 QString image() const;

62 QString imageSourceUri() const;

65 QString imageSourceUri() const;

66+ QVariant result() const;

63

67

64 Q_INVOKABLE void execute(const QString& actionId, const QHash<QString, QVariant>& hints);

68 Q_INVOKABLE void execute(const QString& actionId, const QHash<QString, QVariant>& hints);

69+ Q_INVOKABLE void cancelAction();

65

70

66Q_SIGNALS:

71Q_SIGNALS:

67 void previewChanged();

72 void previewChanged();

@@ -70,6 +75,7 @@ protected:

70 virtual void setUnityPreview(unity::dash::Preview::Ptr unityPreview);

75 virtual void setUnityPreview(unity::dash::Preview::Ptr unityPreview);

71

76

72 unity::dash::Preview::Ptr m_unityPreview;

77 unity::dash::Preview::Ptr m_unityPreview;

78+ Result* m_result;

73

79

74private:

80private:

75 void setUnityPreviewBase(unity::dash::Preview::Ptr unityPreview);

81 void setUnityPreviewBase(unity::dash::Preview::Ptr unityPreview);

@@ -77,6 +83,7 @@ private:

77 QList<QObject *> m_actions;

83 QList<QObject *> m_actions;

78 QList<QObject *> m_infoHints;

84 QList<QObject *> m_infoHints;

79 QVariantMap m_infoHintsHash;

85 QVariantMap m_infoHintsHash;

86+ unity::glib::Cancellable m_actionCancellable;

80};

87};

81

88

82Q_DECLARE_METATYPE(Preview *)

89Q_DECLARE_METATYPE(Preview *)

plugins/Unity/result.cppnew file+82

@@ -0,0 +1,82 @@

1+/*

3+ *

4+ * Authors:

5+ * Pawel Stolowski <pawel.stolowski@canonical.com>

6+ *

7+ * This program is free software; you can redistribute it and/or modify

8+ * it under the terms of the GNU General Public License as published by

9+ * the Free Software Foundation; version 3.

10+ *

11+ * This program is distributed in the hope that it will be useful,

12+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

13+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

14+ * GNU General Public License for more details.

15+ *

16+ * You should have received a copy of the GNU General Public License

17+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

18+ */

19+

20+#include "result.h"

21+#include "variantutils.h"

22+

23+Result::Result(QObject *parent) :

24+ QObject(parent)

25+{

26+}

27+

28+Result::Result(unity::dash::Preview::Ptr preview, QObject *parent) :

29+ QObject(parent),

30+ m_preview(preview)

31+{

32+}

33+

34+void Result::setPreview(unity::dash::Preview::Ptr preview)

35+{

36+ m_preview = preview;

37+}

38+

39+QString Result::uri() const

40+{

41+ return m_preview != nullptr ? QString::fromStdString(m_preview->preview_result.uri) : QString::null;

42+}

43+

44+QString Result::iconHint() const

45+{

46+ return m_preview != nullptr ? QString::fromStdString(m_preview->preview_result.icon_hint) : QString::null;

47+}

48+

49+unsigned Result::categoryIndex() const

50+{

51+ return m_preview != nullptr ? m_preview->preview_result.category_index : 0;

52+}

53+

54+unsigned Result::resultType() const

55+{

56+ return m_preview != nullptr ? m_preview->preview_result.result_type : 0;

57+}

58+

59+QString Result::mimeType() const

60+{

61+ return m_preview != nullptr ? QString::fromStdString(m_preview->preview_result.mimetype) : QString::null;

62+}

63+

64+QString Result::title() const

65+{

66+ return m_preview != nullptr ? QString::fromStdString(m_preview->preview_result.name) : QString::null;

67+}

68+

69+QString Result::comment() const

70+{

71+ return m_preview != nullptr ? QString::fromStdString(m_preview->preview_result.comment) : QString::null;

72+}

73+

74+QString Result::dndUri() const

75+{

76+ return m_preview != nullptr ? QString::fromStdString(m_preview->preview_result.dnd_uri) : QString::null;

77+}

78+

79+QVariant Result::metadata() const

80+{

81+ return m_preview != nullptr ? convertToQVariantHash(m_preview->preview_result.hints) : QVariant();

82+}

plugins/Unity/result.hnew file+69

@@ -0,0 +1,69 @@

1+/*

3+ *

4+ * Authors:

5+ * Pawel Stolowski <pawel.stolowski@canonical.com>

6+ *

7+ * This program is free software; you can redistribute it and/or modify

8+ * it under the terms of the GNU General Public License as published by

9+ * the Free Software Foundation; version 3.

10+ *

11+ * This program is distributed in the hope that it will be useful,

12+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

13+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

14+ * GNU General Public License for more details.

15+ *

16+ * You should have received a copy of the GNU General Public License

17+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

18+ */

19+

20+#ifndef RESULT_H

21+#define RESULT_H

22+

23+// Qt

24+#include <QObject>

25+#include <QVariant>

26+

27+// libunity-core

28+#include <UnityCore/Preview.h>

29+

30+class Q_DECL_EXPORT Result : public QObject

31+{

32+ Q_OBJECT

33+

34+ Q_PROPERTY(QString uri READ uri CONSTANT)

35+ Q_PROPERTY(QString iconHint READ iconHint CONSTANT)

36+ Q_PROPERTY(unsigned categoryIndex READ categoryIndex CONSTANT)

37+ Q_PROPERTY(unsigned resultType READ resultType CONSTANT)

38+ Q_PROPERTY(QString mimeType READ mimeType CONSTANT)

39+ Q_PROPERTY(QString title READ title CONSTANT)

40+ Q_PROPERTY(QString comment READ comment CONSTANT)

41+ Q_PROPERTY(QString dndUri READ dndUri CONSTANT)

42+ Q_PROPERTY(QVariant metadata READ metadata CONSTANT)

43+

44+public:

45+ Result(QObject *parent = nullptr);

46+ Result(unity::dash::Preview::Ptr preview, QObject *parent = nullptr);

47+

48+ void setPreview(unity::dash::Preview::Ptr preview);

49+

50+ QString uri() const;

51+ QString iconHint() const;

52+ unsigned categoryIndex() const;

53+ unsigned resultType() const;

54+ QString mimeType() const;

55+ QString title() const;

56+ QString comment() const;

57+ QString dndUri() const;

58+ QVariant metadata() const;

59+

60+private:

61+ /* Keep reference to the original preview to access result attributes via it, rather than keeping copies of them;

62+ this will save us a bit on copying, especially as UI is mostly interested in just uri.

63+ */

64+ unity::dash::Preview::Ptr m_preview;

65+};

66+

67+Q_DECLARE_METATYPE(Result *)

68+

69+#endif

plugins/Unity/scope.cpp+8−1

@@ -175,14 +175,21 @@ void Scope::preview(const QVariant &uri, const QVariant &icon_hint, const QVaria

175 const QVariant &comment, const QVariant &dnd_uri, const QVariant &metadata)

176{

177 auto res = createLocalResult(uri, icon_hint, category, result_type, mimetype, title, comment, dnd_uri, metadata);

178+ m_previewCancellable.Renew();

179+

178 // canned queries don't have previews, must be activated

180 // canned queries don't have previews, must be activated

179 if (uri.toString().startsWith("x-unity-no-preview-scopes-query://")) {

181 if (uri.toString().startsWith("x-unity-no-preview-scopes-query://")) {

180 m_unityScope->Activate(res);

182 m_unityScope->Activate(res);

181 } else {

183 } else {

182− m_unityScope->Preview(res);

184+ m_unityScope->Preview(res, nullptr, m_previewCancellable);

183 }

185 }

184}

186}

185

187

188+void Scope::cancelActivation()

189+{

190+ m_previewCancellable.Cancel();

191+}

192+

186void Scope::onActivated(unity::dash::LocalResult const& result, unity::dash::ScopeHandledType type, unity::glib::HintsMap const& hints)

193void Scope::onActivated(unity::dash::LocalResult const& result, unity::dash::ScopeHandledType type, unity::glib::HintsMap const& hints)

187{

194{

188 // note: we will not get called on SHOW_PREVIEW, instead UnityCore will signal preview_ready.

195 // note: we will not get called on SHOW_PREVIEW, instead UnityCore will signal preview_ready.

plugins/Unity/scope.h+3

@@ -82,6 +82,8 @@ public:

82 Q_INVOKABLE void preview(const QVariant &uri, const QVariant &icon_hint, const QVariant &category,

83 const QVariant &result_type, const QVariant &mimetype, const QVariant &title,

84 const QVariant &comment, const QVariant &dnd_uri, const QVariant &metadata);

85+ Q_INVOKABLE void cancelActivation();

86+

85 void setUnityScope(const unity::dash::Scope::Ptr& scope);

87 void setUnityScope(const unity::dash::Scope::Ptr& scope);

86 unity::dash::Scope::Ptr unityScope() const;

88 unity::dash::Scope::Ptr unityScope() const;

87

89

@@ -131,6 +133,7 @@ private:

131 QString m_searchQuery;

133 QString m_searchQuery;

132 QString m_noResultsHint;

134 QString m_noResultsHint;

133 QString m_formFactor;

135 QString m_formFactor;

136+ unity::glib::Cancellable m_previewCancellable;

134};

137};

135

138

136Q_DECLARE_METATYPE(Scope*)

139Q_DECLARE_METATYPE(Scope*)

plugins/Unity/variantutils.cpp+9

@@ -40,3 +40,12 @@ unity::glib::HintsMap convertToHintsMap(const QVariant &var)

40 }

41 return unity::glib::HintsMap();

42}

43+

44+QVariantHash convertToQVariantHash(const unity::glib::HintsMap& var)

45+{

46+ QVariantHash hash;

47+ for (auto hint: var) {

48+ hash.insert(QString::fromStdString(hint.first), DeeListModel::VariantForData(hint.second));

49+ }

50+ return hash;

51+}

plugins/Unity/variantutils.h+1

@@ -28,5 +28,6 @@

28

29unity::glib::HintsMap convertToHintsMap(const QHash<QString, QVariant> &val);

30unity::glib::HintsMap convertToHintsMap(const QVariant &var);

31+QVariantHash convertToQVariantHash(const unity::glib::HintsMap& var);

31

32

32#endif

33#endif

po/ca.po+23−17

@@ -8,15 +8,15 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2013-08-27 13:36-0400\n"

11−"PO-Revision-Date: 2013-09-11 10:30+0000\n"

11+"PO-Revision-Date: 2013-09-28 07:38+0000\n"

12"Last-Translator: David Planella <david.planella@ubuntu.com>\n"

13"Language-Team: Catalan <ca@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-09-12 08:06+0000\n"

18+"X-Launchpad-Export-Date: 2013-09-29 06:18+0000\n"

19−"X-Generator: Launchpad (build 16761)\n"

19+"X-Generator: Launchpad (build 16774)\n"

20

21#: Applications/applications.js:23

22msgid "Phone"

@@ -88,7 +88,7 @@ msgstr "YouTube"

88

89#: Components/EdgeDemoOverlay.qml:145

90msgid "Skip intro"

91−msgstr ""

91+msgstr "Omet la introducció"

92

93#: Components/EdgeDemo.qml:98

94msgid "Right edge"

@@ -97,6 +97,7 @@ msgstr "Vora dreta"

97#: Components/EdgeDemo.qml:99

98msgid "Try swiping from the right edge to unlock the phone"

99msgstr ""

100+"Proveu de lliscar el dit des de la vora dreta per desblocar el telèfon"

100

101

101#: Components/EdgeDemo.qml:135

102#: Components/EdgeDemo.qml:135

102msgid "Top edge"

103msgid "Top edge"

@@ -105,14 +106,17 @@ msgstr "Vora superior"

105#: Components/EdgeDemo.qml:136

106#: Components/EdgeDemo.qml:136

106msgid "Try swiping from the top edge to access the indicators"

107msgid "Try swiping from the top edge to access the indicators"

107msgstr ""

108msgstr ""

109+"Proveu de lliscar el dit des de la vora superior per accedir als indicadors"

108

110

109#: Components/EdgeDemo.qml:161

111#: Components/EdgeDemo.qml:161

110msgid "Close"

112msgid "Close"

111−msgstr ""

113+msgstr "Tanca"

112

114

113#: Components/EdgeDemo.qml:162

115#: Components/EdgeDemo.qml:162

114msgid "Swipe up again to close the settings screen"

116msgid "Swipe up again to close the settings screen"

115msgstr ""

117msgstr ""

118+"Llisqueu el dit cap amunt una altra vegada per tancar la pantalla de "

119+"configuració"

116

120

117#: Components/EdgeDemo.qml:189

121#: Components/EdgeDemo.qml:189

118msgid "Left edge"

122msgid "Left edge"

@@ -121,6 +125,8 @@ msgstr "Vora esquerra"

121#: Components/EdgeDemo.qml:190

125#: Components/EdgeDemo.qml:190

122msgid "Swipe from the left to reveal the launcher for quick access to apps"

126msgid "Swipe from the left to reveal the launcher for quick access to apps"

123msgstr ""

127msgstr ""

128+"Llisqueu el dit des de la vora esquerra per mostrar el llançador i accedir "

129+"ràpidament a les aplicacions"

124

130

125#: Components/EdgeDemo.qml:217

131#: Components/EdgeDemo.qml:217

126msgid "Well done"

132msgid "Well done"

@@ -145,8 +151,8 @@ msgstr "(%1)"

145#, qt-format

151#, qt-format

146msgid "%1 review"

152msgid "%1 review"

147msgid_plural "%1 reviews"

153msgid_plural "%1 reviews"

148−msgstr[0] ""

154+msgstr[0] "%1 ressenya"

149−msgstr[1] ""

155+msgstr[1] "%1 ressenyes"

150

156

151#: Dash/Apps/AppPreview.qml:175

157#: Dash/Apps/AppPreview.qml:175

152msgid "Rate this"

158msgid "Rate this"

@@ -154,7 +160,7 @@ msgstr ""

154

160

155#: Dash/Apps/AppReviews.qml:72

161#: Dash/Apps/AppReviews.qml:72

156msgid "Add a review"

162msgid "Add a review"

157−msgstr ""

163+msgstr "Afegiu una ressenya"

158

164

159#: Dash/Apps/AppReviews.qml:84

165#: Dash/Apps/AppReviews.qml:84

160msgid "Review"

166msgid "Review"

@@ -162,7 +168,7 @@ msgstr "Ressenya"

162

168

163#: Dash/Apps/AppReviews.qml:118

169#: Dash/Apps/AppReviews.qml:118

164msgid "Send"

170msgid "Send"

165−msgstr ""

171+msgstr "Envia"

166

172

167#: Dash/Apps/AppReviews.qml:136

173#: Dash/Apps/AppReviews.qml:136

168msgid "Comments:"

174msgid "Comments:"

@@ -178,11 +184,11 @@ msgstr "Recents"

178

184

179#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30

185#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30

180msgid "New Releases"

186msgid "New Releases"

181−msgstr ""

187+msgstr "Novetats"

182

188

183#: Dash/DashMusic.qml:30

189#: Dash/DashMusic.qml:30

184msgid "Top Charting"

190msgid "Top Charting"

185−msgstr ""

191+msgstr "El millor de les llistes"

186

192

187#: Dash/DashMusic.qml:91

193#: Dash/DashMusic.qml:91

188msgid "Music"

194msgid "Music"

@@ -190,7 +196,7 @@ msgstr "Música"

190

196

191#: Dash/DashVideos.qml:31

197#: Dash/DashVideos.qml:31

192msgid "Popular Online"

198msgid "Popular Online"

193−msgstr ""

199+msgstr "Popular a la xarxa"

194

200

195#: Dash/DashVideos.qml:146

201#: Dash/DashVideos.qml:146

196msgid "Videos"

202msgid "Videos"

@@ -198,11 +204,11 @@ msgstr "Vídeos"

198

204

199#: Dash/Video/VideoPreview.qml:130

205#: Dash/Video/VideoPreview.qml:130

200msgid "Directed by:"

206msgid "Directed by:"

201−msgstr ""

207+msgstr "Dirigit per:"

202

208

203#: Dash/Video/VideoPreview.qml:153

209#: Dash/Video/VideoPreview.qml:153

204msgid "Starring:"

210msgid "Starring:"

205−msgstr ""

211+msgstr "Protagonistes:"

206

212

207#: Dash/Video/VideoPreview.qml:176

213#: Dash/Video/VideoPreview.qml:176

208msgid "Author:"

214msgid "Author:"

@@ -210,12 +216,12 @@ msgstr "Autor:"

210

216

211#: Greeter/Lockscreen.qml:134

217#: Greeter/Lockscreen.qml:134

212msgid "Emergency Call"

218msgid "Emergency Call"

213−msgstr ""

219+msgstr "Trucada d'emergència"

214

220

215#: Greeter/PassphraseLockscreen.qml:59

221#: Greeter/PassphraseLockscreen.qml:59

216#, qt-format

222#, qt-format

217msgid "Hello %1"

223msgid "Hello %1"

218−msgstr ""

224+msgstr "Hola %1"

219

225

220#: Greeter/PassphraseLockscreen.qml:59

226#: Greeter/PassphraseLockscreen.qml:59

221msgid "Hello"

227msgid "Hello"

@@ -252,4 +258,4 @@ msgstr "No hi ha res que coincideixi amb la cerca"

252#: Shell.qml:429

258#: Shell.qml:429

253#, qt-format

259#, qt-format

254msgid "Please enter %1"

260msgid "Please enter %1"

255−msgstr ""

261+msgstr "Introduïu %1"

po/en_AU.po+27−26

@@ -8,15 +8,15 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2013-08-27 13:36-0400\n"

11−"PO-Revision-Date: 2013-06-27 01:13+0000\n"

11+"PO-Revision-Date: 2013-09-28 07:46+0000\n"

12−"Last-Translator: Jackson Doak <Doak.jackson@gmail.com>\n"

12+"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"

13"Language-Team: English (Australia) <en_AU@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2013-09-29 06:18+0000\n"

19−"X-Generator: Launchpad (build 16750)\n"

19+"X-Generator: Launchpad (build 16774)\n"

20

21#: Applications/applications.js:23

22msgid "Phone"

@@ -88,47 +88,48 @@ msgstr "YouTube"

88

89#: Components/EdgeDemoOverlay.qml:145

90msgid "Skip intro"

91−msgstr ""

91+msgstr "Skip intro"

92

93#: Components/EdgeDemo.qml:98

94msgid "Right edge"

95−msgstr ""

95+msgstr "Right edge"

96

97#: Components/EdgeDemo.qml:99

98msgid "Try swiping from the right edge to unlock the phone"

99−msgstr ""

99+msgstr "Try swiping from the right edge to unlock the phone"

100

101#: Components/EdgeDemo.qml:135

102msgid "Top edge"

103−msgstr ""

103+msgstr "Top edge"

104

105#: Components/EdgeDemo.qml:136

106msgid "Try swiping from the top edge to access the indicators"

107−msgstr ""

107+msgstr "Try swiping from the top edge to access the indicators"

108

109#: Components/EdgeDemo.qml:161

110msgid "Close"

111−msgstr ""

111+msgstr "Close"

112

113#: Components/EdgeDemo.qml:162

114msgid "Swipe up again to close the settings screen"

115−msgstr ""

115+msgstr "Swipe up again to close the settings screen"

116

117#: Components/EdgeDemo.qml:189

118msgid "Left edge"

119−msgstr ""

119+msgstr "Left edge"

120

121#: Components/EdgeDemo.qml:190

122msgid "Swipe from the left to reveal the launcher for quick access to apps"

123−msgstr ""

123+msgstr "Swipe from the left to reveal the launcher for quick access to apps"

124

125#: Components/EdgeDemo.qml:217

126msgid "Well done"

127−msgstr ""

127+msgstr "Well done"

128

129#: Components/EdgeDemo.qml:218

130msgid "You have now mastered the edge gestures and can start using the phone"

131msgstr ""

132+"You have now mastered the edge gestures and can start using the phone"

132

133

133#: Components/PageHeader.qml:298

134#: Components/PageHeader.qml:298

134msgid "Recent searches"

135msgid "Recent searches"

@@ -138,35 +139,35 @@ msgstr "Recent searches"

138#: Dash/Apps/AppInfo.qml:73

139#: Dash/Apps/AppInfo.qml:73

139#, qt-format

140#, qt-format

140msgid "(%1)"

141msgid "(%1)"

141−msgstr ""

142+msgstr "(%1)"

142

143

143#. TRANSLATORS: Number of persons who wrote reviews for this app

144#. TRANSLATORS: Number of persons who wrote reviews for this app

144#: Dash/Apps/AppInfo.qml:85

145#: Dash/Apps/AppInfo.qml:85

145#, qt-format

146#, qt-format

146msgid "%1 review"

147msgid "%1 review"

147msgid_plural "%1 reviews"

148msgid_plural "%1 reviews"

148−msgstr[0] ""

149+msgstr[0] "%1 review"

149−msgstr[1] ""

150+msgstr[1] "%1 reviews"

150

151

151#: Dash/Apps/AppPreview.qml:175

152#: Dash/Apps/AppPreview.qml:175

152msgid "Rate this"

153msgid "Rate this"

153−msgstr ""

154+msgstr "Rate this"

154

155

155#: Dash/Apps/AppReviews.qml:72

156#: Dash/Apps/AppReviews.qml:72

156msgid "Add a review"

157msgid "Add a review"

157−msgstr ""

158+msgstr "Add a review"

158

159

159#: Dash/Apps/AppReviews.qml:84

160#: Dash/Apps/AppReviews.qml:84

160msgid "Review"

161msgid "Review"

161−msgstr ""

162+msgstr "Review"

162

163

163#: Dash/Apps/AppReviews.qml:118

164#: Dash/Apps/AppReviews.qml:118

164msgid "Send"

165msgid "Send"

165−msgstr ""

166+msgstr "Send"

166

167

167#: Dash/Apps/AppReviews.qml:136

168#: Dash/Apps/AppReviews.qml:136

168msgid "Comments:"

169msgid "Comments:"

169−msgstr ""

170+msgstr "Comments:"

170

171

171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

172#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

172msgid "Featured"

173msgid "Featured"

@@ -210,16 +211,16 @@ msgstr "Author:"

210

211

211#: Greeter/Lockscreen.qml:134

212#: Greeter/Lockscreen.qml:134

212msgid "Emergency Call"

213msgid "Emergency Call"

213−msgstr ""

214+msgstr "Emergency Call"

214

215

215#: Greeter/PassphraseLockscreen.qml:59

216#: Greeter/PassphraseLockscreen.qml:59

216#, qt-format

217#, qt-format

217msgid "Hello %1"

218msgid "Hello %1"

218−msgstr ""

219+msgstr "Hello %1"

219

220

220#: Greeter/PassphraseLockscreen.qml:59

221#: Greeter/PassphraseLockscreen.qml:59

221msgid "Hello"

222msgid "Hello"

222−msgstr ""

223+msgstr "Hello"

223

224

224#: Hud/HudParametrizedActionsPage.qml:132

225#: Hud/HudParametrizedActionsPage.qml:132

225msgid "Confirm"

226msgid "Confirm"

@@ -252,4 +253,4 @@ msgstr "Sorry, there is nothing that matches your search."

252#: Shell.qml:429

253#: Shell.qml:429

253#, qt-format

254#, qt-format

254msgid "Please enter %1"

255msgid "Please enter %1"

255−msgstr ""

256+msgstr "Please enter %1"

po/es.po+5−5

@@ -8,15 +8,15 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2013-08-27 13:36-0400\n"

11−"PO-Revision-Date: 2013-09-04 22:12+0000\n"

11+"PO-Revision-Date: 2013-09-28 07:35+0000\n"

12−"Last-Translator: Adolfo Jayme Barrientos <fitoschido@gmail.com>\n"

12+"Last-Translator: Paco Molinero <paco@byasl.com>\n"

13"Language-Team: Spanish <es@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-09-05 05:35+0000\n"

18+"X-Launchpad-Export-Date: 2013-09-29 06:18+0000\n"

19−"X-Generator: Launchpad (build 16758)\n"

19+"X-Generator: Launchpad (build 16774)\n"

20

21#: Applications/applications.js:23

22msgid "Phone"

@@ -48,7 +48,7 @@ msgstr "GMail"

48

49#: Applications/applications.js:62

50msgid "Weather"

51−msgstr "Metereología"

51+msgstr "Meteorología"

52

53#: Applications/applications.js:68

54msgid "Notepad"

po/fi.po+15−15

@@ -8,15 +8,15 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2013-08-27 13:36-0400\n"

11−"PO-Revision-Date: 2013-08-23 16:15+0000\n"

11+"PO-Revision-Date: 2013-09-26 09:25+0000\n"

12−"Last-Translator: Timo Jyrinki <timo.jyrinki@canonical.com>\n"

12+"Last-Translator: Jiri Grönroos <Unknown>\n"

13"Language-Team: Finnish <fi@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2013-09-27 06:43+0000\n"

19−"X-Generator: Launchpad (build 16750)\n"

19+"X-Generator: Launchpad (build 16774)\n"

20

21#: Applications/applications.js:23

22msgid "Phone"

@@ -88,47 +88,47 @@ msgstr "YouTube"

88

89#: Components/EdgeDemoOverlay.qml:145

90msgid "Skip intro"

91−msgstr ""

91+msgstr "Ohita esittely"

92

93#: Components/EdgeDemo.qml:98

94msgid "Right edge"

95−msgstr ""

95+msgstr "Oikea reuna"

96

97#: Components/EdgeDemo.qml:99

98msgid "Try swiping from the right edge to unlock the phone"

99−msgstr ""

99+msgstr "Vedä oikealta avataksesi puhelimen lukituksen"

100

101#: Components/EdgeDemo.qml:135

102msgid "Top edge"

103−msgstr ""

103+msgstr "Yläreuna"

104

105#: Components/EdgeDemo.qml:136

106msgid "Try swiping from the top edge to access the indicators"

107−msgstr ""

107+msgstr "Vedä yläreunasta käyttääksesi ilmaisimia"

108

109#: Components/EdgeDemo.qml:161

110msgid "Close"

111−msgstr ""

111+msgstr "Sulje"

112

113#: Components/EdgeDemo.qml:162

114msgid "Swipe up again to close the settings screen"

115−msgstr ""

115+msgstr "Vedä uudestaan sulkeaksesi asetusnäkymän"

116

117#: Components/EdgeDemo.qml:189

118msgid "Left edge"

119−msgstr ""

119+msgstr "Vasen reuna"

120

121#: Components/EdgeDemo.qml:190

122msgid "Swipe from the left to reveal the launcher for quick access to apps"

123−msgstr ""

123+msgstr "Vedä vasemmalta saattaaksesi sovellusten käynnistimen esiin"

124

125#: Components/EdgeDemo.qml:217

126msgid "Well done"

127−msgstr ""

127+msgstr "Hyvin tehty"

128

129#: Components/EdgeDemo.qml:218

130msgid "You have now mastered the edge gestures and can start using the phone"

131−msgstr ""

131+msgstr "Hallitset nyt reunaeleet, joten voit aloittaa puhelimen käytön"

132

133#: Components/PageHeader.qml:298

134msgid "Recent searches"

po/gl.po+29−29

@@ -8,99 +8,99 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2013-08-27 13:36-0400\n"

11−"PO-Revision-Date: 2013-06-27 03:38+0000\n"

11+"PO-Revision-Date: 2013-09-29 11:14+0000\n"

12−"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

12+"Last-Translator: Marcos Lans <Unknown>\n"

13"Language-Team: Galician <gl@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2013-09-30 05:57+0000\n"

19−"X-Generator: Launchpad (build 16750)\n"

19+"X-Generator: Launchpad (build 16774)\n"

20

21#: Applications/applications.js:23

22msgid "Phone"

23−msgstr ""

23+msgstr "Teléfono"

24

25#: Applications/applications.js:29

26msgid "Camera"

27−msgstr ""

27+msgstr "Cámara"

28

29#: Applications/applications.js:35

30msgid "Gallery"

31−msgstr ""

31+msgstr "Galería"

32

33#: Applications/applications.js:40

34msgid "Facebook"

35−msgstr ""

35+msgstr "Facebook"

36

37#: Applications/applications.js:46

38msgid "Browser"

39−msgstr ""

39+msgstr "Navegador"

40

41#: Applications/applications.js:51

42msgid "Twitter"

43−msgstr ""

43+msgstr "Twitter"

44

45#: Applications/applications.js:57

46msgid "GMail"

47−msgstr ""

47+msgstr "GMail"

48

49#: Applications/applications.js:62

50msgid "Weather"

51−msgstr ""

51+msgstr "O tempo"

52

53#: Applications/applications.js:68

54msgid "Notepad"

55−msgstr ""

55+msgstr "Bloc de notas"

56

57#: Applications/applications.js:74

58msgid "Calendar"

59−msgstr ""

59+msgstr "Calendario"

60

61#: Applications/applications.js:80

62msgid "Media Player"

63−msgstr ""

63+msgstr "Reprodutor multimedia"

64

65#: Applications/applications.js:86

66msgid "Evernote"

67−msgstr ""

67+msgstr "Evernote"

68

69#: Applications/applications.js:91

70msgid "Map"

71−msgstr ""

71+msgstr "Mapa"

72

73#: Applications/applications.js:96

74msgid "Pinterest"

75−msgstr ""

75+msgstr "Pinterest"

76

77#: Applications/applications.js:101

78msgid "SoundCloud"

79−msgstr ""

79+msgstr "SoundCloud"

80

81#: Applications/applications.js:106

82msgid "Wikipedia"

83−msgstr ""

83+msgstr "Wikipedia"

84

85#: Applications/applications.js:111

86msgid "YouTube"

87−msgstr ""

87+msgstr "YouTube"

88

89#: Components/EdgeDemoOverlay.qml:145

90msgid "Skip intro"

91−msgstr ""

91+msgstr "Saltar introdución"

92

93#: Components/EdgeDemo.qml:98

94msgid "Right edge"

95−msgstr ""

95+msgstr "Bordo dereito"

96

97#: Components/EdgeDemo.qml:99

98msgid "Try swiping from the right edge to unlock the phone"

99−msgstr ""

99+msgstr "Probe a arrastrar desde o bordo dereito para desbloquear o teléfono"

100

101#: Components/EdgeDemo.qml:135

102msgid "Top edge"

103−msgstr ""

103+msgstr "Bordo superior"

104

105#: Components/EdgeDemo.qml:136

106msgid "Try swiping from the top edge to access the indicators"

@@ -108,7 +108,7 @@ msgstr ""

108

109#: Components/EdgeDemo.qml:161

110msgid "Close"

111−msgstr ""

111+msgstr "Pechar"

112

113#: Components/EdgeDemo.qml:162

114msgid "Swipe up again to close the settings screen"

@@ -116,7 +116,7 @@ msgstr ""

116

117#: Components/EdgeDemo.qml:189

118msgid "Left edge"

119−msgstr ""

119+msgstr "Bordo esquerdo"

120

121#: Components/EdgeDemo.qml:190

122msgid "Swipe from the left to reveal the launcher for quick access to apps"

@@ -124,7 +124,7 @@ msgstr ""

124

125#: Components/EdgeDemo.qml:217

126msgid "Well done"

127−msgstr ""

127+msgstr "Ben feito"

128

129#: Components/EdgeDemo.qml:218

130msgid "You have now mastered the edge gestures and can start using the phone"

@@ -138,7 +138,7 @@ msgstr "Buscas recentes"

138#: Dash/Apps/AppInfo.qml:73

139#, qt-format

140msgid "(%1)"

141−msgstr ""

141+msgstr "(%1)"

142

143#. TRANSLATORS: Number of persons who wrote reviews for this app

144#: Dash/Apps/AppInfo.qml:85

po/it.po+55−48

@@ -8,127 +8,134 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2013-08-27 13:36-0400\n"

11−"PO-Revision-Date: 2013-06-27 05:14+0000\n"

11+"PO-Revision-Date: 2013-09-28 10:05+0000\n"

12−"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

12+"Last-Translator: Claudio Arseni <claudio.arseni@gmail.com>\n"

13"Language-Team: Italian <it@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2013-09-29 06:18+0000\n"

19−"X-Generator: Launchpad (build 16750)\n"

19+"X-Generator: Launchpad (build 16774)\n"

20

21#: Applications/applications.js:23

22msgid "Phone"

23−msgstr ""

23+msgstr "Telefono"

24

25#: Applications/applications.js:29

26msgid "Camera"

27−msgstr ""

27+msgstr "Fotocamera"

28

29#: Applications/applications.js:35

30msgid "Gallery"

31−msgstr ""

31+msgstr "Galleria"

32

33#: Applications/applications.js:40

34msgid "Facebook"

35−msgstr ""

35+msgstr "Facebook"

36

37#: Applications/applications.js:46

38msgid "Browser"

39−msgstr ""

39+msgstr "Browser"

40

41#: Applications/applications.js:51

42msgid "Twitter"

43−msgstr ""

43+msgstr "Twitter"

44

45#: Applications/applications.js:57

46msgid "GMail"

47−msgstr ""

47+msgstr "GMail"

48

49#: Applications/applications.js:62

50msgid "Weather"

51−msgstr ""

51+msgstr "Meteo"

52

53#: Applications/applications.js:68

54msgid "Notepad"

55−msgstr ""

55+msgstr "Blocco note"

56

57#: Applications/applications.js:74

58msgid "Calendar"

59−msgstr ""

59+msgstr "Calendario"

60

61#: Applications/applications.js:80

62msgid "Media Player"

63−msgstr ""

63+msgstr "Riproduttore multimediale"

64

65#: Applications/applications.js:86

66msgid "Evernote"

67−msgstr ""

67+msgstr "Evernote"

68

69#: Applications/applications.js:91

70msgid "Map"

71−msgstr ""

71+msgstr "Mappa"

72

73#: Applications/applications.js:96

74msgid "Pinterest"

75−msgstr ""

75+msgstr "Pinterest"

76

77#: Applications/applications.js:101

78msgid "SoundCloud"

79−msgstr ""

79+msgstr "SoundCloud"

80

81#: Applications/applications.js:106

82msgid "Wikipedia"

83−msgstr ""

83+msgstr "Wikipedia"

84

85#: Applications/applications.js:111

86msgid "YouTube"

87−msgstr ""

87+msgstr "YouTube"

88

89#: Components/EdgeDemoOverlay.qml:145

90msgid "Skip intro"

91−msgstr ""

91+msgstr "Salta introduzione"

92

93#: Components/EdgeDemo.qml:98

94msgid "Right edge"

95−msgstr ""

95+msgstr "Bordo destro"

96

97#: Components/EdgeDemo.qml:99

98msgid "Try swiping from the right edge to unlock the phone"

99−msgstr ""

99+msgstr "Provare a far scorrere dal bordo destro per sbloccare il telefono"

100

101#: Components/EdgeDemo.qml:135

102msgid "Top edge"

103−msgstr ""

103+msgstr "Bordo superiore"

104

105#: Components/EdgeDemo.qml:136

106msgid "Try swiping from the top edge to access the indicators"

107msgstr ""

108+"Provare a far scorrere dal bordo in alto per accedere agli indicatori"

108

109

109#: Components/EdgeDemo.qml:161

110#: Components/EdgeDemo.qml:161

110msgid "Close"

111msgid "Close"

111−msgstr ""

112+msgstr "Chiudi"

112

113

113#: Components/EdgeDemo.qml:162

114#: Components/EdgeDemo.qml:162

114msgid "Swipe up again to close the settings screen"

115msgid "Swipe up again to close the settings screen"

115msgstr ""

116msgstr ""

117+"Far scorrere verso l'alto nuovamente per chiudere la schermata delle "

118+"impostazioni"

116

119

117#: Components/EdgeDemo.qml:189

120#: Components/EdgeDemo.qml:189

118msgid "Left edge"

121msgid "Left edge"

119−msgstr ""

122+msgstr "Bordo sinistro"

120

123

121#: Components/EdgeDemo.qml:190

124#: Components/EdgeDemo.qml:190

122msgid "Swipe from the left to reveal the launcher for quick access to apps"

125msgid "Swipe from the left to reveal the launcher for quick access to apps"

123msgstr ""

126msgstr ""

127+"Far scorrere il bordo sinistro per mostrare il Launcher e avere un rapido "

128+"accesso alle applicazioni"

124

129

125#: Components/EdgeDemo.qml:217

130#: Components/EdgeDemo.qml:217

126msgid "Well done"

131msgid "Well done"

127−msgstr ""

132+msgstr "Ben fatto"

128

133

129#: Components/EdgeDemo.qml:218

134#: Components/EdgeDemo.qml:218

130msgid "You have now mastered the edge gestures and can start using the phone"

135msgid "You have now mastered the edge gestures and can start using the phone"

131msgstr ""

136msgstr ""

137+"I gesti sui bordi dello schermo sono ora configurato ed è possibile usare il "

138+"telefono"

132

139

133#: Components/PageHeader.qml:298

140#: Components/PageHeader.qml:298

134msgid "Recent searches"

141msgid "Recent searches"

@@ -138,51 +145,51 @@ msgstr "Ricerche recenti"

138#: Dash/Apps/AppInfo.qml:73

145#: Dash/Apps/AppInfo.qml:73

139#, qt-format

146#, qt-format

140msgid "(%1)"

147msgid "(%1)"

141−msgstr ""

148+msgstr "(%1)"

142

149

143#. TRANSLATORS: Number of persons who wrote reviews for this app

150#. TRANSLATORS: Number of persons who wrote reviews for this app

144#: Dash/Apps/AppInfo.qml:85

151#: Dash/Apps/AppInfo.qml:85

145#, qt-format

152#, qt-format

146msgid "%1 review"

153msgid "%1 review"

147msgid_plural "%1 reviews"

154msgid_plural "%1 reviews"

148−msgstr[0] ""

155+msgstr[0] "%1 recensione"

149−msgstr[1] ""

156+msgstr[1] "%1 recensioni"

150

157

151#: Dash/Apps/AppPreview.qml:175

158#: Dash/Apps/AppPreview.qml:175

152msgid "Rate this"

159msgid "Rate this"

153−msgstr ""

160+msgstr "Valuta"

154

161

155#: Dash/Apps/AppReviews.qml:72

162#: Dash/Apps/AppReviews.qml:72

156msgid "Add a review"

163msgid "Add a review"

157−msgstr ""

164+msgstr "Aggiungi una recensione"

158

165

159#: Dash/Apps/AppReviews.qml:84

166#: Dash/Apps/AppReviews.qml:84

160msgid "Review"

167msgid "Review"

161−msgstr ""

168+msgstr "Recensisci"

162

169

163#: Dash/Apps/AppReviews.qml:118

170#: Dash/Apps/AppReviews.qml:118

164msgid "Send"

171msgid "Send"

165−msgstr ""

172+msgstr "Invia"

166

173

167#: Dash/Apps/AppReviews.qml:136

174#: Dash/Apps/AppReviews.qml:136

168msgid "Comments:"

175msgid "Comments:"

169−msgstr ""

176+msgstr "Commenti:"

170

177

171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

178#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

172msgid "Featured"

179msgid "Featured"

173−msgstr ""

180+msgstr "In evidenza"

174

181

175#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29

182#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29

176msgid "Recent"

183msgid "Recent"

177−msgstr ""

184+msgstr "Recenti"

178

185

179#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30

186#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30

180msgid "New Releases"

187msgid "New Releases"

181−msgstr ""

188+msgstr "Nuovi rilasci"

182

189

183#: Dash/DashMusic.qml:30

190#: Dash/DashMusic.qml:30

184msgid "Top Charting"

191msgid "Top Charting"

185−msgstr ""

192+msgstr "Più votate"

186

193

187#: Dash/DashMusic.qml:91

194#: Dash/DashMusic.qml:91

188msgid "Music"

195msgid "Music"

@@ -190,7 +197,7 @@ msgstr "Musica"

190

197

191#: Dash/DashVideos.qml:31

198#: Dash/DashVideos.qml:31

192msgid "Popular Online"

199msgid "Popular Online"

193−msgstr ""

200+msgstr "Popolari online"

194

201

195#: Dash/DashVideos.qml:146

202#: Dash/DashVideos.qml:146

196msgid "Videos"

203msgid "Videos"

@@ -198,28 +205,28 @@ msgstr "Video"

198

205

199#: Dash/Video/VideoPreview.qml:130

206#: Dash/Video/VideoPreview.qml:130

200msgid "Directed by:"

207msgid "Directed by:"

201−msgstr ""

208+msgstr "Diretto da:"

202

209

203#: Dash/Video/VideoPreview.qml:153

210#: Dash/Video/VideoPreview.qml:153

204msgid "Starring:"

211msgid "Starring:"

205−msgstr ""

212+msgstr "Valutazioni:"

206

213

207#: Dash/Video/VideoPreview.qml:176

214#: Dash/Video/VideoPreview.qml:176

208msgid "Author:"

215msgid "Author:"

209−msgstr ""

216+msgstr "Autore:"

210

217

211#: Greeter/Lockscreen.qml:134

218#: Greeter/Lockscreen.qml:134

212msgid "Emergency Call"

219msgid "Emergency Call"

213−msgstr ""

220+msgstr "Chiamata di emergenza"

214

221

215#: Greeter/PassphraseLockscreen.qml:59

222#: Greeter/PassphraseLockscreen.qml:59

216#, qt-format

223#, qt-format

217msgid "Hello %1"

224msgid "Hello %1"

218−msgstr ""

225+msgstr "Ciao %1"

219

226

220#: Greeter/PassphraseLockscreen.qml:59

227#: Greeter/PassphraseLockscreen.qml:59

221msgid "Hello"

228msgid "Hello"

222−msgstr ""

229+msgstr "Ciao"

223

230

224#: Hud/HudParametrizedActionsPage.qml:132

231#: Hud/HudParametrizedActionsPage.qml:132

225msgid "Confirm"

232msgid "Confirm"

@@ -252,4 +259,4 @@ msgstr "Nessun risultato corrispondente alla ricerca."

252#: Shell.qml:429

259#: Shell.qml:429

253#, qt-format

260#, qt-format

254msgid "Please enter %1"

261msgid "Please enter %1"

255−msgstr ""

262+msgstr "Inserire %1"

po/lv.po+21−21

@@ -8,59 +8,59 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2013-08-27 13:36-0400\n"

11−"PO-Revision-Date: 2013-06-27 06:31+0000\n"

11+"PO-Revision-Date: 2013-09-28 16:29+0000\n"

12−"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

12+"Last-Translator: Jānis-Marks Gailis <jeanmarc.gailis@gmail.com>\n"

13"Language-Team: Latvian <lv@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"

18−"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2013-09-29 06:18+0000\n"

19−"X-Generator: Launchpad (build 16750)\n"

19+"X-Generator: Launchpad (build 16774)\n"

20

21#: Applications/applications.js:23

22msgid "Phone"

23−msgstr ""

23+msgstr "Tālrunis"

24

25#: Applications/applications.js:29

26msgid "Camera"

27−msgstr ""

27+msgstr "Fotokamera"

28

29#: Applications/applications.js:35

30msgid "Gallery"

31−msgstr ""

31+msgstr "Galerija"

32

33#: Applications/applications.js:40

34msgid "Facebook"

35−msgstr ""

35+msgstr "Facebook"

36

37#: Applications/applications.js:46

38msgid "Browser"

39−msgstr ""

39+msgstr "Pārlūkprogramma"

40

41#: Applications/applications.js:51

42msgid "Twitter"

43−msgstr ""

43+msgstr "Twitter"

44

45#: Applications/applications.js:57

46msgid "GMail"

47−msgstr ""

47+msgstr "GMail"

48

49#: Applications/applications.js:62

50msgid "Weather"

51−msgstr ""

51+msgstr "Laikapstākļi"

52

53#: Applications/applications.js:68

54msgid "Notepad"

55−msgstr ""

55+msgstr "Bloknots"

56

57#: Applications/applications.js:74

58msgid "Calendar"

59−msgstr ""

59+msgstr "Kalendārs"

60

61#: Applications/applications.js:80

62msgid "Media Player"

63−msgstr ""

63+msgstr "Mēdiju Atskaņotājs"

64

65#: Applications/applications.js:86

66msgid "Evernote"

@@ -68,23 +68,23 @@ msgstr ""

68

69#: Applications/applications.js:91

70msgid "Map"

71−msgstr ""

71+msgstr "Karte"

72

73#: Applications/applications.js:96

74msgid "Pinterest"

75−msgstr ""

75+msgstr "Pinterest"

76

77#: Applications/applications.js:101

78msgid "SoundCloud"

79−msgstr ""

79+msgstr "SoundCloud"

80

81#: Applications/applications.js:106

82msgid "Wikipedia"

83−msgstr ""

83+msgstr "Vikipēdija"

84

85#: Applications/applications.js:111

86msgid "YouTube"

87−msgstr ""

87+msgstr "YouTube"

88

89#: Components/EdgeDemoOverlay.qml:145

90msgid "Skip intro"

@@ -92,7 +92,7 @@ msgstr ""

92

93#: Components/EdgeDemo.qml:98

94msgid "Right edge"

95−msgstr ""

95+msgstr "Labā mala"

96

97#: Components/EdgeDemo.qml:99

98msgid "Try swiping from the right edge to unlock the phone"

po/ru.po+32−26

@@ -8,16 +8,16 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2013-08-27 13:36-0400\n"

11−"PO-Revision-Date: 2013-06-28 06:40+0000\n"

11+"PO-Revision-Date: 2013-09-29 09:11+0000\n"

12−"Last-Translator: Eugene Marshal <Unknown>\n"

12+"Last-Translator: Устин <ustinershovskiy@yandex.ru>\n"

13"Language-Team: Russian <ru@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Launchpad-Export-Date: 2013-09-30 05:57+0000\n"

20−"X-Generator: Launchpad (build 16750)\n"

20+"X-Generator: Launchpad (build 16774)\n"

21

22#: Applications/applications.js:23

23msgid "Phone"

@@ -89,47 +89,54 @@ msgstr "YouTube"

89

90#: Components/EdgeDemoOverlay.qml:145

91msgid "Skip intro"

92−msgstr ""

92+msgstr "Пропустить обучение"

93

94#: Components/EdgeDemo.qml:98

95msgid "Right edge"

96−msgstr ""

96+msgstr "Правый край"

97

98#: Components/EdgeDemo.qml:99

99msgid "Try swiping from the right edge to unlock the phone"

100msgstr ""

101+"Попробуйте переместить палец от правого края к левому для разблокировки "

102+"устройства"

101

103

102#: Components/EdgeDemo.qml:135

104#: Components/EdgeDemo.qml:135

103msgid "Top edge"

105msgid "Top edge"

104−msgstr ""

106+msgstr "Верхний край"

105

107

106#: Components/EdgeDemo.qml:136

108#: Components/EdgeDemo.qml:136

107msgid "Try swiping from the top edge to access the indicators"

109msgid "Try swiping from the top edge to access the indicators"

108msgstr ""

110msgstr ""

111+"Попробуйте переместить палец от верхнего края вниз для доступа к индикаторам"

109

112

110#: Components/EdgeDemo.qml:161

113#: Components/EdgeDemo.qml:161

111msgid "Close"

114msgid "Close"

112−msgstr ""

115+msgstr "Закрыть"

113

116

114#: Components/EdgeDemo.qml:162

117#: Components/EdgeDemo.qml:162

115msgid "Swipe up again to close the settings screen"

118msgid "Swipe up again to close the settings screen"

116−msgstr ""

119+msgstr "Снова переместите палец вверх для закрытия экрана настроек"

117

120

118#: Components/EdgeDemo.qml:189

121#: Components/EdgeDemo.qml:189

119msgid "Left edge"

122msgid "Left edge"

120−msgstr ""

123+msgstr "Левый край"

121

124

122#: Components/EdgeDemo.qml:190

125#: Components/EdgeDemo.qml:190

123msgid "Swipe from the left to reveal the launcher for quick access to apps"

126msgid "Swipe from the left to reveal the launcher for quick access to apps"

124msgstr ""

127msgstr ""

128+"Переместите палец от левого края вправо для открытия лаунчера для быстрого "

129+"доступа к приложениям"

125

130

126#: Components/EdgeDemo.qml:217

131#: Components/EdgeDemo.qml:217

127msgid "Well done"

132msgid "Well done"

128−msgstr ""

133+msgstr "Великолепно"

129

134

130#: Components/EdgeDemo.qml:218

135#: Components/EdgeDemo.qml:218

131msgid "You have now mastered the edge gestures and can start using the phone"

136msgid "You have now mastered the edge gestures and can start using the phone"

132msgstr ""

137msgstr ""

138+"Теперь вы научились экранным жестам и можете приступить к использованию "

139+"устройства"

133

140

134#: Components/PageHeader.qml:298

141#: Components/PageHeader.qml:298

135msgid "Recent searches"

142msgid "Recent searches"

@@ -139,39 +146,38 @@ msgstr "Последние поисковые запросы"

139#: Dash/Apps/AppInfo.qml:73

146#: Dash/Apps/AppInfo.qml:73

140#, qt-format

147#, qt-format

141msgid "(%1)"

148msgid "(%1)"

142−msgstr ""

149+msgstr "(%1)"

143

150

144#. TRANSLATORS: Number of persons who wrote reviews for this app

151#. TRANSLATORS: Number of persons who wrote reviews for this app

145#: Dash/Apps/AppInfo.qml:85

152#: Dash/Apps/AppInfo.qml:85

146#, qt-format

153#, qt-format

147msgid "%1 review"

154msgid "%1 review"

148msgid_plural "%1 reviews"

155msgid_plural "%1 reviews"

149−msgstr[0] ""

156+msgstr[0] "%1 отзыв"

150−msgstr[1] ""

151

157

152#: Dash/Apps/AppPreview.qml:175

158#: Dash/Apps/AppPreview.qml:175

153msgid "Rate this"

159msgid "Rate this"

154−msgstr ""

160+msgstr "Оцените это"

155

161

156#: Dash/Apps/AppReviews.qml:72

162#: Dash/Apps/AppReviews.qml:72

157msgid "Add a review"

163msgid "Add a review"

158−msgstr ""

164+msgstr "Добавьте отзыв"

159

165

160#: Dash/Apps/AppReviews.qml:84

166#: Dash/Apps/AppReviews.qml:84

161msgid "Review"

167msgid "Review"

162−msgstr ""

168+msgstr "Отзыв"

163

169

164#: Dash/Apps/AppReviews.qml:118

170#: Dash/Apps/AppReviews.qml:118

165msgid "Send"

171msgid "Send"

166−msgstr ""

172+msgstr "Отправить"

167

173

168#: Dash/Apps/AppReviews.qml:136

174#: Dash/Apps/AppReviews.qml:136

169msgid "Comments:"

175msgid "Comments:"

170−msgstr ""

176+msgstr "Комментарии:"

171

177

172#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

178#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

173msgid "Featured"

179msgid "Featured"

174−msgstr ""

180+msgstr "Рекомендованное"

175

181

176#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29

182#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29

177msgid "Recent"

183msgid "Recent"

@@ -183,7 +189,7 @@ msgstr "Новые релизы"

183

189

184#: Dash/DashMusic.qml:30

190#: Dash/DashMusic.qml:30

185msgid "Top Charting"

191msgid "Top Charting"

186−msgstr ""

192+msgstr "Наиболее популярное"

187

193

188#: Dash/DashMusic.qml:91

194#: Dash/DashMusic.qml:91

189msgid "Music"

195msgid "Music"

@@ -191,7 +197,7 @@ msgstr "Музыка"

191

197

192#: Dash/DashVideos.qml:31

198#: Dash/DashVideos.qml:31

193msgid "Popular Online"

199msgid "Popular Online"

194−msgstr ""

200+msgstr "Популярное в Интернете"

195

201

196#: Dash/DashVideos.qml:146

202#: Dash/DashVideos.qml:146

197msgid "Videos"

203msgid "Videos"

@@ -211,20 +217,20 @@ msgstr "Автор:"

211

217

212#: Greeter/Lockscreen.qml:134

218#: Greeter/Lockscreen.qml:134

213msgid "Emergency Call"

219msgid "Emergency Call"

214−msgstr ""

220+msgstr "Экстренный вызов"

215

221

216#: Greeter/PassphraseLockscreen.qml:59

222#: Greeter/PassphraseLockscreen.qml:59

217#, qt-format

223#, qt-format

218msgid "Hello %1"

224msgid "Hello %1"

219−msgstr ""

225+msgstr "Привет, %1"

220

226

221#: Greeter/PassphraseLockscreen.qml:59

227#: Greeter/PassphraseLockscreen.qml:59

222msgid "Hello"

228msgid "Hello"

223−msgstr ""

229+msgstr "Привет"

224

230

225#: Hud/HudParametrizedActionsPage.qml:132

231#: Hud/HudParametrizedActionsPage.qml:132

226msgid "Confirm"

232msgid "Confirm"

227−msgstr "Подвердить"

233+msgstr "Подтвердить"

228

234

229#: Hud/Hud.qml:61 Hud/Hud.qml:99 Hud/Hud.qml:372

235#: Hud/Hud.qml:61 Hud/Hud.qml:99 Hud/Hud.qml:372

230msgid "Type or say a command"

236msgid "Type or say a command"

po/sl.po+6−6

@@ -8,7 +8,7 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2013-08-27 13:36-0400\n"

11−"PO-Revision-Date: 2013-09-19 19:48+0000\n"

11+"PO-Revision-Date: 2013-09-28 09:53+0000\n"

12"Last-Translator: Damir Jerovšek <Unknown>\n"

13"Language-Team: Slovenian <sl@li.org>\n"

14"MIME-Version: 1.0\n"

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "

18"n%100==4 ? 3 : 0);\n"

19−"X-Launchpad-Export-Date: 2013-09-20 06:21+0000\n"

19+"X-Launchpad-Export-Date: 2013-09-29 06:18+0000\n"

20−"X-Generator: Launchpad (build 16765)\n"

20+"X-Generator: Launchpad (build 16774)\n"

21

22#: Applications/applications.js:23

23msgid "Phone"

@@ -204,15 +204,15 @@ msgstr "Videi"

204

205#: Dash/Video/VideoPreview.qml:130

206msgid "Directed by:"

207−msgstr ""

207+msgstr "Režija:"

208

209#: Dash/Video/VideoPreview.qml:153

210msgid "Starring:"

211−msgstr ""

211+msgstr "Igrajo:"

212

213#: Dash/Video/VideoPreview.qml:176

214msgid "Author:"

215−msgstr ""

215+msgstr "Avtor:"

216

217#: Greeter/Lockscreen.qml:134

218msgid "Emergency Call"

po/uk.po+26−21

@@ -8,16 +8,16 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2013-08-27 13:36-0400\n"

11−"PO-Revision-Date: 2013-07-21 05:47+0000\n"

11+"PO-Revision-Date: 2013-09-28 07:54+0000\n"

12−"Last-Translator: Ярослав Смук <Smuk.Slavko@yandex.ua>\n"

12+"Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"

13"Language-Team: Ukrainian <uk@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

19+"X-Launchpad-Export-Date: 2013-09-29 06:18+0000\n"

20−"X-Generator: Launchpad (build 16750)\n"

20+"X-Generator: Launchpad (build 16774)\n"

21

22#: Applications/applications.js:23

23msgid "Phone"

@@ -89,47 +89,51 @@ msgstr "YouTube"

89

90#: Components/EdgeDemoOverlay.qml:145

91msgid "Skip intro"

92−msgstr ""

92+msgstr "Пропустити вступ"

93

94#: Components/EdgeDemo.qml:98

95msgid "Right edge"

96−msgstr ""

96+msgstr "Правий край"

97

98#: Components/EdgeDemo.qml:99

99msgid "Try swiping from the right edge to unlock the phone"

100−msgstr ""

100+msgstr "Спробуйте провести пальцем від правою краю, щоб розблокувати телефон"

101

102#: Components/EdgeDemo.qml:135

103msgid "Top edge"

104−msgstr ""

104+msgstr "Верхній край"

105

106#: Components/EdgeDemo.qml:136

107msgid "Try swiping from the top edge to access the indicators"

108msgstr ""

109+"Спробуйте провести пальцем від верхнього краю, щоб розблокувати телефон"

109

110

110#: Components/EdgeDemo.qml:161

111#: Components/EdgeDemo.qml:161

111msgid "Close"

112msgid "Close"

112−msgstr ""

113+msgstr "Закрити"

113

114

114#: Components/EdgeDemo.qml:162

115#: Components/EdgeDemo.qml:162

115msgid "Swipe up again to close the settings screen"

116msgid "Swipe up again to close the settings screen"

116−msgstr ""

117+msgstr "Проведіть пальцем ще раз, щоб закрити вікно параметрів"

117

118

118#: Components/EdgeDemo.qml:189

119#: Components/EdgeDemo.qml:189

119msgid "Left edge"

120msgid "Left edge"

120−msgstr ""

121+msgstr "Лівий край"

121

122

122#: Components/EdgeDemo.qml:190

123#: Components/EdgeDemo.qml:190

123msgid "Swipe from the left to reveal the launcher for quick access to apps"

124msgid "Swipe from the left to reveal the launcher for quick access to apps"

124msgstr ""

125msgstr ""

126+"Проведіть пальцем від лівого краю, щоб відкрити панель запуску для "

127+"пришвидшення доступу до програм"

125

128

126#: Components/EdgeDemo.qml:217

129#: Components/EdgeDemo.qml:217

127msgid "Well done"

130msgid "Well done"

128−msgstr ""

131+msgstr "Добре"

129

132

130#: Components/EdgeDemo.qml:218

133#: Components/EdgeDemo.qml:218

131msgid "You have now mastered the edge gestures and can start using the phone"

134msgid "You have now mastered the edge gestures and can start using the phone"

132msgstr ""

135msgstr ""

136+"Вами налаштовано жести від країв, ви можете почати користуватися телефоном"

133

137

134#: Components/PageHeader.qml:298

138#: Components/PageHeader.qml:298

135msgid "Recent searches"

139msgid "Recent searches"

@@ -139,35 +143,36 @@ msgstr "Нещодавні пошуки"

139#: Dash/Apps/AppInfo.qml:73

143#: Dash/Apps/AppInfo.qml:73

140#, qt-format

144#, qt-format

141msgid "(%1)"

145msgid "(%1)"

142−msgstr ""

146+msgstr "(%1)"

143

147

144#. TRANSLATORS: Number of persons who wrote reviews for this app

148#. TRANSLATORS: Number of persons who wrote reviews for this app

145#: Dash/Apps/AppInfo.qml:85

149#: Dash/Apps/AppInfo.qml:85

146#, qt-format

150#, qt-format

147msgid "%1 review"

151msgid "%1 review"

148msgid_plural "%1 reviews"

152msgid_plural "%1 reviews"

149−msgstr[0] ""

153+msgstr[0] "%1 рецензія"

150−msgstr[1] ""

154+msgstr[1] "%1 рецензії"

155+msgstr[2] "%1 рецензій"

151

156

152#: Dash/Apps/AppPreview.qml:175

157#: Dash/Apps/AppPreview.qml:175

153msgid "Rate this"

158msgid "Rate this"

154−msgstr ""

159+msgstr "Оцінити"

155

160

156#: Dash/Apps/AppReviews.qml:72

161#: Dash/Apps/AppReviews.qml:72

157msgid "Add a review"

162msgid "Add a review"

158−msgstr ""

163+msgstr "Додати рецензію"

159

164

160#: Dash/Apps/AppReviews.qml:84

165#: Dash/Apps/AppReviews.qml:84

161msgid "Review"

166msgid "Review"

162−msgstr ""

167+msgstr "Рецензія"

163

168

164#: Dash/Apps/AppReviews.qml:118

169#: Dash/Apps/AppReviews.qml:118

165msgid "Send"

170msgid "Send"

166−msgstr ""

171+msgstr "Надіслати"

167

172

168#: Dash/Apps/AppReviews.qml:136

173#: Dash/Apps/AppReviews.qml:136

169msgid "Comments:"

174msgid "Comments:"

170−msgstr ""

175+msgstr "Коментарі:"

171

176

172#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

177#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

173msgid "Featured"

178msgid "Featured"

@@ -211,7 +216,7 @@ msgstr "Автор:"

211

216

212#: Greeter/Lockscreen.qml:134

217#: Greeter/Lockscreen.qml:134

213msgid "Emergency Call"

218msgid "Emergency Call"

214−msgstr ""

219+msgstr "Терміновий виклик"

215

220

216#: Greeter/PassphraseLockscreen.qml:59

221#: Greeter/PassphraseLockscreen.qml:59

217#, qt-format

222#, qt-format

po/xh.ponew file+255

@@ -0,0 +1,255 @@

1+# Xhosa translation for unity8

3+# This file is distributed under the same license as the unity8 package.

4+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.

5+#

6+msgid ""

7+msgstr ""

8+"Project-Id-Version: unity8\n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

11+"PO-Revision-Date: 2013-09-28 13:20+0000\n"

12+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13+"Language-Team: Xhosa <xh@li.org>\n"

14+"MIME-Version: 1.0\n"

15+"Content-Type: text/plain; charset=UTF-8\n"

16+"Content-Transfer-Encoding: 8bit\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2013-09-29 06:18+0000\n"

19+"X-Generator: Launchpad (build 16774)\n"

20+

21+#: Applications/applications.js:23

22+msgid "Phone"

23+msgstr ""

24+

25+#: Applications/applications.js:29

26+msgid "Camera"

27+msgstr ""

28+

29+#: Applications/applications.js:35

30+msgid "Gallery"

31+msgstr ""

32+

33+#: Applications/applications.js:40

34+msgid "Facebook"

35+msgstr ""

36+

37+#: Applications/applications.js:46

38+msgid "Browser"

39+msgstr ""

40+

41+#: Applications/applications.js:51

42+msgid "Twitter"

43+msgstr ""

44+

45+#: Applications/applications.js:57

46+msgid "GMail"

47+msgstr ""

48+

49+#: Applications/applications.js:62

50+msgid "Weather"

51+msgstr ""

52+

53+#: Applications/applications.js:68

54+msgid "Notepad"

55+msgstr ""

56+

57+#: Applications/applications.js:74

58+msgid "Calendar"

59+msgstr ""

60+

61+#: Applications/applications.js:80

62+msgid "Media Player"

63+msgstr ""

64+

65+#: Applications/applications.js:86

66+msgid "Evernote"

67+msgstr ""

68+

69+#: Applications/applications.js:91

70+msgid "Map"

71+msgstr ""

72+

73+#: Applications/applications.js:96

74+msgid "Pinterest"

75+msgstr ""

76+

77+#: Applications/applications.js:101

78+msgid "SoundCloud"

79+msgstr ""

80+

81+#: Applications/applications.js:106

82+msgid "Wikipedia"

83+msgstr ""

84+

85+#: Applications/applications.js:111

86+msgid "YouTube"

87+msgstr ""

88+

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:135

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:136

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:161

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:162

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:189

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:190

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:217

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:218

130+msgid "You have now mastered the edge gestures and can start using the phone"

131+msgstr ""

132+

133+#: Components/PageHeader.qml:298

134+msgid "Recent searches"

135+msgstr ""

136+

137+#. TRANSLATORS: Number of persons who rated this app

138+#: Dash/Apps/AppInfo.qml:73

139+#, qt-format

140+msgid "(%1)"

141+msgstr ""

142+

143+#. TRANSLATORS: Number of persons who wrote reviews for this app

144+#: Dash/Apps/AppInfo.qml:85

145+#, qt-format

146+msgid "%1 review"

147+msgid_plural "%1 reviews"

148+msgstr[0] ""

149+msgstr[1] ""

150+

151+#: Dash/Apps/AppPreview.qml:175

152+msgid "Rate this"

153+msgstr ""

154+

155+#: Dash/Apps/AppReviews.qml:72

156+msgid "Add a review"

157+msgstr ""

158+

159+#: Dash/Apps/AppReviews.qml:84

160+msgid "Review"

161+msgstr ""

162+

163+#: Dash/Apps/AppReviews.qml:118

164+msgid "Send"

165+msgstr ""

166+

167+#: Dash/Apps/AppReviews.qml:136

168+msgid "Comments:"

169+msgstr ""

170+

171+#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

172+msgid "Featured"

173+msgstr ""

174+

175+#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29

176+msgid "Recent"

177+msgstr ""

178+

179+#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30

180+msgid "New Releases"

181+msgstr ""

182+

183+#: Dash/DashMusic.qml:30

184+msgid "Top Charting"

185+msgstr ""

186+

187+#: Dash/DashMusic.qml:91

188+msgid "Music"

189+msgstr ""

190+

191+#: Dash/DashVideos.qml:31

192+msgid "Popular Online"

193+msgstr ""

194+

195+#: Dash/DashVideos.qml:146

196+msgid "Videos"

197+msgstr ""

198+

199+#: Dash/Video/VideoPreview.qml:130

200+msgid "Directed by:"

201+msgstr ""

202+

203+#: Dash/Video/VideoPreview.qml:153

204+msgid "Starring:"

205+msgstr ""

206+

207+#: Dash/Video/VideoPreview.qml:176

208+msgid "Author:"

209+msgstr ""

210+

211+#: Greeter/Lockscreen.qml:134

212+msgid "Emergency Call"

213+msgstr ""

214+

215+#: Greeter/PassphraseLockscreen.qml:59

216+#, qt-format

217+msgid "Hello %1"

218+msgstr ""

219+

220+#: Greeter/PassphraseLockscreen.qml:59

221+msgid "Hello"

222+msgstr ""

223+

224+#: Hud/HudParametrizedActionsPage.qml:132

225+msgid "Confirm"

226+msgstr ""

227+

228+#: Hud/Hud.qml:61 Hud/Hud.qml:99 Hud/Hud.qml:372

229+msgid "Type or say a command"

230+msgstr ""

231+

232+#: Hud/Hud.qml:84

233+msgid "Loading. Please Wait..."

234+msgstr ""

235+

236+#: Hud/Hud.qml:89

237+msgid "Speak Now..."

238+msgstr ""

239+

240+#: Hud/Hud.qml:94

241+msgid "Speaking..."

242+msgstr ""

243+

244+#: Panel/SearchIndicator.qml:27

245+msgid "Search"

246+msgstr ""

247+

248+#: plugins/Unity/scope.cpp:317

249+msgid "Sorry, there is nothing that matches your search."

250+msgstr ""

251+

252+#: Shell.qml:429

253+#, qt-format

254+msgid "Please enter %1"

255+msgstr ""

src/Panel/Indicators/CMakeLists.txt−1

@@ -1,2 +1 @@

1add_subdirectory(client)

2−add_subdirectory(servicefiles)

src/Panel/Indicators/servicefiles/CMakeLists.txtdeleted−14

@@ -1,14 +0,0 @@

1−file(GLOB INDICATOR_SERVICE_FILES

2− ${CMAKE_CURRENT_SOURCE_DIR}/com.canonical.indicator.messages

3−)

4−

5−# copy indicators files into build directory for shadow builds

6−add_custom_target(IndicatorsServiceFiles ALL

7− COMMAND mkdir -p ${CMAKE_BINARY_DIR}/share/unity/indicators

8− COMMAND cp ${INDICATOR_SERVICE_FILES} ${CMAKE_BINARY_DIR}/share/unity/indicators

9− DEPENDS ${INDICATOR_SERVICE_FILES}

10−)

11−

12−install(FILES ${INDICATOR_SERVICE_FILES}

13− DESTINATION ${SHELL_APP_DIR}/unity/indicators

14−)

src/Panel/Indicators/servicefiles/com.canonical.indicator.messagesdeleted−10

@@ -1,10 +0,0 @@

1−[Indicator Service]

2−Name=indicator-messages

3−ObjectPath=/com/canonical/indicator/messages

4−Position=50

5−

6−[phone]

7−ObjectPath=/com/canonical/indicator/messages/phone

8−

9−[desktop]

10−ObjectPath=/com/canonical/indicator/messages/menu

tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.cpp+5

@@ -63,5 +63,10 @@ void MockDownloadTracker::startService()

63 if(!m_service.isEmpty() && !m_dbusPath.isEmpty()) {

64 m_active = true;

65 Q_EMIT serviceReadyChanged(m_active);

66+ if(m_dbusPath == "finish") {

67+ Q_EMIT finished("downloadComplete");

68+ }else if(m_dbusPath == "error") {

69+ Q_EMIT error("DOWNLOAD ERROR");

70+ }

66 }

71 }

67}

72}

tests/mocks/Unity/fake_preview.cpp+2

@@ -63,4 +63,6 @@ QString Preview::imageSourceUri() const

63

64void Preview::execute(const QString& actionId, const QHash<QString, QVariant>& hints)

65{

66+ Q_UNUSED(actionId);

67+ Q_UNUSED(hints);

66}

68}

tests/mocks/Unity/fake_scope.h+2

@@ -90,6 +90,8 @@ Q_SIGNALS:

90 // signals triggered by activate(..) or preview(..) requests.

91 void previewReady(Preview *preview);

92 void activateApplication(const QString &desktop);

93+ void showDash();

94+ void hideDash();

93

95

94protected:

96protected:

95

97

tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp+161

@@ -1655,6 +1655,167 @@ private Q_SLOTS:

1655 QCOMPARE(spy.count(), 0);

1656 }

1657

1658+ void testOvershootOnSameSize()

1659+ {

1660+ QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 0), Q_ARG(QVariant, 6));

1661+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 0);

1662+ QCOMPARE(lvwph->m_minYExtent, 0.);

1663+ QCOMPARE(lvwph->m_clipItem->y(), 0.);

1664+ QCOMPARE(lvwph->m_clipItem->clip(), false);

1665+ QCOMPARE(lvwph->m_headerItem->y(), 0.);

1666+ QCOMPARE(lvwph->m_headerItem->height(), 50.);

1667+ QCOMPARE(lvwph->contentY(), 0.);

1668+

1669+ QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 0), Q_ARG(QVariant, 100));

1670+ QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 0), Q_ARG(QVariant, 392));

1671+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 2);

1672+ QCOMPARE(lvwph->m_firstVisibleIndex, 0);

1673+ verifyItem(0, 50., 392., false);

1674+ verifyItem(1, 442., 100., false);

1675+

1676+ QCOMPARE(lvwph->contentHeight(), lvwph->height());

1677+

1678+ QTest::mousePress(view, Qt::LeftButton, Qt::NoModifier, QPoint(0, 0));

1679+ QTest::qWait(100);

1680+ QTest::mouseMove(view, QPoint(0, 5));

1681+ QTest::qWait(100);

1682+ QTest::mouseMove(view, QPoint(0, 10));

1683+ QTest::qWait(100);

1684+ QTest::mouseMove(view, QPoint(0, 15));

1685+ QTest::qWait(100);

1686+ QTest::mouseMove(view, QPoint(0, 20));

1687+ QTest::qWait(100);

1688+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 2);

1689+ QCOMPARE(lvwph->m_firstVisibleIndex, 0);

1690+ verifyItem(0, 55., 392., false);

1691+ verifyItem(1, 447., 100., false);

1692+ QCOMPARE(lvwph->m_minYExtent, 0.);

1693+ QCOMPARE(lvwph->m_clipItem->y(), -5.);

1694+

1695+ QTest::mouseRelease(view, Qt::LeftButton, Qt::NoModifier, QPoint(0, 15));

1696+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 2);

1697+ QCOMPARE(lvwph->m_firstVisibleIndex, 0);

1698+ verifyItem(0, 50., 392., false);

1699+ verifyItem(1, 442., 100., false);

1700+ }

1701+

1702+ void testMaximizeVisibleAreaMoveDownAndShowHeader()

1703+ {

1704+ model->setProperty(0, "size", 800);

1705+ verifyItem(0, 50., 800., false);

1706+

1707+ lvwph->maximizeVisibleArea(0);

1708+ QTRY_COMPARE(lvwph->contentY(), 50.);

1709+

1710+ changeContentY(10);

1711+ QTRY_COMPARE(lvwph->contentY(), 60.);

1712+

1713+ lvwph->showHeader();

1714+ QTRY_VERIFY(!lvwph->m_contentYAnimation->isRunning());

1715+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 2);

1716+ QCOMPARE(lvwph->m_minYExtent, 50.);

1717+ QCOMPARE(lvwph->m_clipItem->y(), 60.);

1718+ QCOMPARE(lvwph->m_clipItem->clip(), true);

1719+ QCOMPARE(lvwph->m_headerItem->y(), 10.);

1720+ QCOMPARE(lvwph->m_headerItem->height(), 50.);

1721+ QCOMPARE(lvwph->contentY(), 10.);

1722+ verifyItem(0, -60., 800., false);

1723+ }

1724+

1725+ void testMaximizeVisibleAreaMoveUpAndShowHeader()

1726+ {

1727+ model->setProperty(0, "size", 800);

1728+ verifyItem(0, 50., 800., false);

1729+

1730+ lvwph->maximizeVisibleArea(0);

1731+ QTRY_COMPARE(lvwph->contentY(), 50.);

1732+

1733+ changeContentY(-10);

1734+ QTRY_COMPARE(lvwph->contentY(), 40.);

1735+

1736+ lvwph->showHeader();

1737+ QTRY_VERIFY(!lvwph->m_contentYAnimation->isRunning());

1738+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 2);

1739+ QCOMPARE(lvwph->m_minYExtent, 40.);

1740+ QCOMPARE(lvwph->m_clipItem->y(), 50.);

1741+ QCOMPARE(lvwph->m_clipItem->clip(), true);

1742+ QTRY_COMPARE(lvwph->m_headerItem->y(), 0.);

1743+ QCOMPARE(lvwph->m_headerItem->height(), 50.);

1744+ QCOMPARE(lvwph->contentY(), 0.);

1745+ verifyItem(0, -40., 800., false);

1746+ }

1747+

1748+ void testMaximizeVisibleAreaMoveDownAndUpAndShowHeader()

1749+ {

1750+ model->setProperty(0, "size", 800);

1751+ verifyItem(0, 50., 800., false);

1752+

1753+ lvwph->maximizeVisibleArea(0);

1754+ QTRY_COMPARE(lvwph->contentY(), 50.);

1755+

1756+ changeContentY(-10);

1757+ QTRY_COMPARE(lvwph->contentY(), 40.);

1758+ changeContentY(10);

1759+ QTRY_COMPARE(lvwph->contentY(), 50.);

1760+

1761+ lvwph->showHeader();

1762+ QTRY_VERIFY(!lvwph->m_contentYAnimation->isRunning());

1763+

1764+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 2);

1765+ QCOMPARE(lvwph->m_minYExtent, 50.);

1766+ QCOMPARE(lvwph->m_clipItem->y(), 50.);

1767+ QCOMPARE(lvwph->m_clipItem->clip(), true);

1768+ QCOMPARE(lvwph->m_headerItem->y(), 0.);

1769+ QCOMPARE(lvwph->m_headerItem->height(), 50.);

1770+ QCOMPARE(lvwph->contentY(), 0.);

1771+ verifyItem(0, -50., 800., false);

1772+ }

1773+

1774+ void testMaximizeVisibleAreaMoveUpAndDownAndShowHeader()

1775+ {

1776+ model->setProperty(0, "size", 800);

1777+ verifyItem(0, 50., 800., false);

1778+

1779+ lvwph->maximizeVisibleArea(0);

1780+ QTRY_COMPARE(lvwph->contentY(), 50.);

1781+

1782+ changeContentY(10);

1783+ QTRY_COMPARE(lvwph->contentY(), 60.);

1784+ changeContentY(-10);

1785+ QTRY_COMPARE(lvwph->contentY(), 50.);

1786+

1787+ lvwph->showHeader();

1788+ QTRY_VERIFY(!lvwph->m_contentYAnimation->isRunning());

1789+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 2);

1790+ QCOMPARE(lvwph->m_minYExtent, 40.);

1791+ QCOMPARE(lvwph->m_clipItem->y(), 60.);

1792+ QCOMPARE(lvwph->m_clipItem->clip(), true);

1793+ QCOMPARE(lvwph->m_headerItem->y(), 10.);

1794+ QCOMPARE(lvwph->m_headerItem->height(), 50.);

1795+ QCOMPARE(lvwph->contentY(), 10.);

1796+ verifyItem(0, -50., 800., false);

1797+ }

1798+

1799+ void testMaximizeVisibleAreaAndShowHeader()

1800+ {

1801+ model->setProperty(0, "size", 800);

1802+ verifyItem(0, 50., 800., false);

1803+

1804+ lvwph->maximizeVisibleArea(0);

1805+ QTRY_COMPARE(lvwph->contentY(), 50.);

1806+

1807+ lvwph->showHeader();

1808+ QTRY_VERIFY(!lvwph->m_contentYAnimation->isRunning());

1809+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 2);

1810+ QCOMPARE(lvwph->m_minYExtent, 50.);

1811+ QCOMPARE(lvwph->m_clipItem->y(), 50.);

1812+ QCOMPARE(lvwph->m_clipItem->clip(), true);

1813+ QCOMPARE(lvwph->m_headerItem->y(), 0.);

1814+ QCOMPARE(lvwph->m_headerItem->height(), 50.);

1815+ QCOMPARE(lvwph->contentY(), 0.);

1816+ verifyItem(0, -50., 800., false);

1817+ }

1818+

1658private:

1819private:

1659 QQuickView *view;

1820 QQuickView *view;

1660 ListViewWithPageHeader *lvwph;

1821 ListViewWithPageHeader *lvwph;

tests/plugins/Unity/previewbindingstest.cpp+27

@@ -19,6 +19,7 @@

19

20#include <UnityCore/Preview.h>

21#include <UnityCore/GLibWrapper.h>

22+#include <UnityCore/Variant.h>

22#include <unity-protocol.h>

23#include <unity-protocol.h>

23

24

24#include "genericpreview.h"

25#include "genericpreview.h"

@@ -48,7 +49,23 @@ void PreviewBindingsTest::testGenericPreview()

48 UNITY_PROTOCOL_LAYOUT_HINT_LEFT);

49 UNITY_PROTOCOL_LAYOUT_HINT_LEFT);

49 unity::glib::Object<GObject> genPrv(rawPreview);

50 unity::glib::Object<GObject> genPrv(rawPreview);

50

51

52+ // create local result

53+ unity::glib::HintsMap hints;

54+ hints["a"] = unity::glib::Variant(g_variant_new_string("b"));

55+ unity::dash::LocalResult localResult;

56+ localResult.uri = "http://foo";

57+ localResult.icon_hint = "xyz";

58+ localResult.category_index = 1;

59+ localResult.result_type = 2;

60+ localResult.mimetype = "abc";

61+ localResult.name = "baz";

62+ localResult.comment = "qwerty";

63+ localResult.dnd_uri = "zzz";

64+ localResult.hints = hints;

65+

51 auto corePrv = unity::dash::Preview::PreviewForProtocolObject(genPrv);

66 auto corePrv = unity::dash::Preview::PreviewForProtocolObject(genPrv);

67+ corePrv->preview_result = localResult;

68+

52 auto prv = Preview::newFromUnityPreview(corePrv);

69 auto prv = Preview::newFromUnityPreview(corePrv);

53

70

54 QCOMPARE(prv != nullptr, true);

71 QCOMPARE(prv != nullptr, true);

@@ -64,6 +81,16 @@ void PreviewBindingsTest::testGenericPreview()

64 QCOMPARE(act->displayName(), QString("Action1"));

81 QCOMPARE(act->displayName(), QString("Action1"));

65 QCOMPARE(act->iconHint(), QString("/foo.png"));

82 QCOMPARE(act->iconHint(), QString("/foo.png"));

66

83

84+ Result* res = prv->result().value<Result*>();

85+ QCOMPARE(res->uri(), QString("http://foo"));

86+ QCOMPARE(res->iconHint(), QString("xyz"));

87+ QCOMPARE(res->categoryIndex(), 1u);

88+ QCOMPARE(res->resultType(), 2u);

89+ QCOMPARE(res->mimeType(), QString("abc"));

90+ QCOMPARE(res->title(), QString("baz"));

91+ QCOMPARE(res->dndUri(), QString("zzz"));

92+ QCOMPARE(res->metadata().toHash()["a"].toString(), QString("b"));

93+

67 g_object_unref(icon);

94 g_object_unref(icon);

68 g_object_unref(iconFile);

95 g_object_unref(iconFile);

69}

96}

tests/plugins/Unity/resultstest.cpp+1

@@ -71,6 +71,7 @@ void ResultsTest::testIconColumn_data()

71 QTest::newRow("absolute path") << "/usr/share/icons/example.png" << "/usr/share/icons/example.png";

72 QTest::newRow("file uri") << "file:///usr/share/icons/example.png" << "file:///usr/share/icons/example.png";

73 QTest::newRow("http uri") << "http://images.ubuntu.com/example.jpg" << "http://images.ubuntu.com/example.jpg";

74+ QTest::newRow("image uri") << "image://thumbnail/with/arguments?passed_to=ImageProvider" << "image://thumbnail/with/arguments?passed_to=ImageProvider";

74 QTest::newRow("themed icon") << "accessories-other" << "image://theme/accessories-other";

75 QTest::newRow("themed icon") << "accessories-other" << "image://theme/accessories-other";

75 QTest::newRow("fileicon") << ". GFileIcon http://example.org/resource.gif" << "http://example.org/resource.gif";

76 QTest::newRow("fileicon") << ". GFileIcon http://example.org/resource.gif" << "http://example.org/resource.gif";

76 QTest::newRow("themedicon") << ". GThemedIcon accessories-other accessories generic" << "image://theme/accessories-other,accessories,generic";

77 QTest::newRow("themedicon") << ". GThemedIcon accessories-other accessories generic" << "image://theme/accessories-other,accessories,generic";

tests/qmltests/CMakeLists.txt+1−1

@@ -13,7 +13,6 @@ set(qmltest_DEFAULT_NO_ADD_TEST FALSE)

13set(qmltest_DEFAULT_PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")

14add_qml_test(Components AnimationControllerWithSignals)

15add_qml_test(Components Carousel)

16−add_qml_test(Components CrossFadeImage)

17add_qml_test(Components MathLocal)

16add_qml_test(Components MathLocal)

18add_qml_test(Components OpenEffect)

17add_qml_test(Components OpenEffect)

19add_qml_test(Components RatingStars)

18add_qml_test(Components RatingStars)

@@ -32,6 +31,7 @@ add_manual_qml_test(Components DragHandle IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugi

32add_qml_test(Components DraggingArea)

31add_qml_test(Components DraggingArea)

33add_qml_test(Components EdgeDemoOverlay)

32add_qml_test(Components EdgeDemoOverlay)

34add_qml_test(Components FilterGrid IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)

33add_qml_test(Components FilterGrid IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)

34+add_qml_test(Components LazyImage)

35add_qml_test(Components ResponsiveFlowView)

36add_qml_test(Components ResponsiveGridView)

37add_qml_test(Components Revealer)

tests/qmltests/Components/tst_CrossFadeImage.qmldeleted−125

@@ -1,125 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−import QtQuick 2.0

18−import QtTest 1.0

19−import "../../../Components"

20−

21−TestCase {

22− name: "CrossFadeImage"

23−

24− property alias status: crossFadeImage.status

25− property alias source: crossFadeImage.source

26− property alias crossFade: crossFadeImage.crossFade

27− property alias fadeInFirst: crossFadeImage.fadeInFirst

28− property alias running: crossFadeImage.running

29−

30− CrossFadeImage {

31− id: crossFadeImage

32− }

33−

34− SignalSpy {

35− id: signalSpy

36− target: crossFadeImage

37− }

38−

39− function initTestFunction(argCrossFade, argFadeInFirst) {

40− source = ""

41− crossFade = argCrossFade

42− fadeInFirst = argFadeInFirst

43− compare(status, Image.Null, "Could not reset CrossFadeImage")

44− }

45−

46− function loadImage(url) {

47− console.log("Loading image...")

48− source = url

49−

50− signalSpy.signalName = "statusChanged"

51− signalSpy.wait()

52−

53− if (status == Image.Null) {

54− signalSpy.clear()

55− signalSpy.wait()

56− }

57−

58− if (status == Image.Loading) {

59− signalSpy.clear()

60− signalSpy.wait()

61− }

62−

63− compare(status, Image.Ready, "Image not ready")

64− console.log("Image loaded.")

65− }

66−

67− function waitForAnimation() {

68− signalSpy.signalName = "runningChanged"

69−

70− if (!running) {

71− signalSpy.clear()

72− signalSpy.wait()

73− compare(running, true, "Animation did not start")

74− }

75−

76− signalSpy.clear()

77− console.log("Waiting for animation to finish...")

78− signalSpy.wait()

79− compare(running, false, "Animation did not stop within 5 seconds.")

80− }

81−

82− function cleanupTest() {

83− compare(running, false, "Animation is running after testcase")

84− compare(crossFadeImage.__nextImage.source, "", "nextimage source is not reset")

85− }

86−

87− function test_fadeFirst() {

88− initTestFunction(true, true)

89−

90− loadImage("../../../graphics/phone_background.jpg")

91−

92− waitForAnimation()

93−

94− cleanupTest()

95− }

96−

97− function test_no_fadeFirst() {

98− initTestFunction(true, false)

99−

100− loadImage("../../../graphics/phone_background.jpg")

101−

102− cleanupTest()

103− }

104−

105− function test_crossFade() {

106− initTestFunction(true, false)

107−

108− loadImage("../../../graphics/phone_background.jpg")

109−

110− loadImage("../../../graphics/tablet_background.jpg")

111−

112− // Due to the internal implementation, __currentImage and __nextImage are swapped before the animation starts

113− // Make sure z order reflects that too.

114− compare(crossFadeImage.__currentImage.z > crossFadeImage.__nextImage.z, true, "new image should be above old image")

115− compare(crossFadeImage.__currentImage.opacity < 0.5, true)

116− compare(crossFadeImage.__nextImage.opacity > 0.5, true)

117−

118− waitForAnimation()

119−

120− compare(crossFadeImage.__currentImage.opacity > 0.5, true)

121− compare(crossFadeImage.__nextImage.opacity < 0.5, true)

122−

123− cleanupTest()

124− }

125−}

tests/qmltests/Components/tst_LazyImage.qmlnew file+156

@@ -0,0 +1,156 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import QtTest 1.0

19+import "../../../Components"

20+import Ubuntu.Components 0.1

21+import Unity.Test 0.1 as UT

22+import "tst_LazyImage"

23+

24+Rectangle {

25+ width: units.gu(120)

26+ height: units.gu(70)

27+

28+ Rectangle {

29+ id: baseRect

30+ anchors {

31+ fill: parent

32+ rightMargin: 2 * parent.width / 3

33+ }

34+

35+ color: "grey"

36+

37+ Column {

38+ anchors { fill: parent; margins: units.gu(5) }

39+

40+ Label {

41+ height: units.gu(4)

42+ text: "Unbound"

43+ color: "white"

44+ verticalAlignment: Text.AlignBottom

45+ }

46+

47+ LazyImage {

48+ id: lazy1

49+ }

50+

51+ Label {

52+ height: units.gu(4)

53+ text: "Width-bound"

54+ color: "white"

55+ verticalAlignment: Text.AlignBottom

56+ }

57+

58+ LazyImage {

59+ id: lazy2

60+ width: units.gu(30)

61+ scaleTo: "width"

62+ }

63+

64+ Label {

65+ height: units.gu(4)

66+ text: "Height-bound"

67+ color: "white"

68+ verticalAlignment: Text.AlignBottom

69+ }

70+

71+ LazyImage {

72+ id: lazy3

73+ height: units.gu(10)

74+ scaleTo: "height"

75+ }

76+ }

77+ }

78+

79+ Rectangle {

80+ id: controlsRect

81+ anchors {

82+ fill: parent

83+ leftMargin: parent.width / 3

84+ }

85+

86+ color: "lightgrey"

87+

88+ Column {

89+ id: controls

90+ spacing: units.gu(1)

91+

92+ anchors { fill: parent; margins: units.gu(3) }

93+

94+ ImageControls { id: controls1; image: lazy1 }

95+ ImageControls { id: controls2; image: lazy2 }

96+ ImageControls { id: controls3; image: lazy3 }

97+ }

98+ }

99+

100+ UT.UnityTestCase {

101+ name: "Stage"

102+ when: windowShown

103+

104+ function cleanup() {

105+ controls1.blank();

106+ tryCompare(lazy1, "width", units.gu(10));

107+ controls2.blank();

108+ tryCompare(lazy2, "height", units.gu(10));

109+ controls3.blank();

110+ tryCompare(lazy3, "width", units.gu(10));

111+ }

112+

113+ function test_lazyimage_data() {

114+ return [

115+ {tag: "Unbound Blank", image: lazy1, func: controls1.blank, width: units.gu(10), height: units.gu(10), placeholder: true},

116+ {tag: "Unbound Wide", image: lazy1, func: controls1.wide, transition: "readyTransition", width: 160, height: 80},

117+ {tag: "Unbound Square", image: lazy1, func: controls1.square, transition: "readyTransition", width: 160, height: 160},

118+ {tag: "Unbound Portrait", image: lazy1, func: controls1.portrait, transition: "readyTransition", width: 80, height: 160},

119+ {tag: "Unbound Bad path", image: lazy1, func: controls1.badpath, transition: "genericTransition", width: units.gu(10), height: units.gu(10), placeholder: true, error: true},

120+ {tag: "Width-bound Blank", image: lazy2, func: controls2.blank, width: units.gu(30), height: units.gu(10), placeholder: true},

121+ {tag: "Width-bound Wide", image: lazy2, func: controls2.wide, transition: "readyTransition", width: units.gu(30), height: units.gu(15)},

122+ {tag: "Width-bound Square", image: lazy2, func: controls2.square, transition: "readyTransition", width: units.gu(30), height: units.gu(30)},

123+ {tag: "Width-bound Portrait", image: lazy2, func: controls2.portrait, transition: "readyTransition", width: units.gu(30), height: units.gu(60)},

124+ {tag: "Width-bound Bad path", image: lazy2, func: controls2.badpath, transition: "genericTransition", width: units.gu(30), height: units.gu(10), placeholder: true, error: true},

125+ {tag: "Height-bound Blank", image: lazy3, func: controls3.blank, width: units.gu(10), height: units.gu(10), placeholder: true},

126+ {tag: "Height-bound Wide", image: lazy3, func: controls3.wide, transition: "readyTransition", width: units.gu(20), height: units.gu(10)},

127+ {tag: "Height-bound Square", image: lazy3, func: controls3.square, transition: "readyTransition", width: units.gu(10), height: units.gu(10)},

128+ {tag: "Height-bound Portrait", image: lazy3, func: controls3.portrait, transition: "readyTransition", width: units.gu(5), height: units.gu(10)},

129+ {tag: "Height-bound Bad path", image: lazy3, func: controls3.badpath, transition: "genericTransition", width: units.gu(10), height: units.gu(10), placeholder: true, error: true},

130+ ]

131+ }

132+

133+ function test_lazyimage(data) {

134+ data.func();

135+

136+ if (data.transition) {

137+ // wait for the transition to complete

138+ var transition = findInvisibleChild(data.image, data.transition);

139+ tryCompare(transition, "running", true);

140+ tryCompare(transition, "running", false);

141+ }

142+

143+ // check the dimensions

144+ compare(data.image.width, data.width);

145+ compare(data.image.height, data.height);

146+

147+ // check the placeholder

148+ var placeholder = findChild(data.image, "placeholder");

149+ compare(placeholder.visible, data.placeholder ? true : false);

150+

151+ // check the error image

152+ var error = findChild(data.image, "errorImage");

153+ compare(error.visible, data.error ? true : false);

154+ }

155+ }

156+}

tests/qmltests/Components/tst_LazyImage/ImageControls.qmlnew file+67

@@ -0,0 +1,67 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import "../../../../Components"

20+

21+Row {

22+ property LazyImage image

23+

24+ anchors { left: parent.left; right: parent.right }

25+ spacing: units.gu(1)

26+

27+ function blank() { blankButton.clicked() }

28+ function wide() { wideButton.clicked() }

29+ function square() { squareButton.clicked() }

30+ function portrait() { portraitButton.clicked() }

31+ function badpath() { badpathButton.clicked() }

32+

33+ Button {

34+ id: blankButton

35+ width: parent / 5

36+ text: "Blank"

37+ onClicked: image.source = ""

38+ }

39+

40+ Button {

41+ id: wideButton

42+ width: parent / 5

43+ text: "Wide"

44+ onClicked: image.source = "wide.png"

45+ }

46+

47+ Button {

48+ id: squareButton

49+ width: parent / 5

50+ text: "Square"

51+ onClicked: image.source = "square.png"

52+ }

53+

54+ Button {

55+ id: portraitButton

56+ width: parent / 5

57+ text: "Portrait"

58+ onClicked: image.source = "portrait.png"

59+ }

60+

61+ Button {

62+ id: badpathButton

63+ width: parent / 5

64+ text: "Bad path"

65+ onClicked: image.source = "bad/path"

66+ }

67+}

tests/qmltests/Components/tst_LazyImage/portrait.pngnew file

Binary file not shown.

tests/qmltests/Components/tst_LazyImage/square.pngnew file

Binary file not shown.

tests/qmltests/Components/tst_LazyImage/wide.pngnew file

Binary file not shown.

tests/qmltests/Dash/Apps/tst_AppPreview.qml+75−2

@@ -25,6 +25,9 @@ Item {

25 width: units.gu(60)

26 height: units.gu(80)

27

28+ // Fake shell

29+ QtObject { id: shell; property int height: appPreview.height }

30+

28 property var calls: []

31 property var calls: []

29

32

30 SignalSpy {

33 SignalSpy {

@@ -45,6 +48,8 @@ Item {

45 ["Unity User", 10, "10/02/2013", root.commentary],

48 ["Unity User", 10, "10/02/2013", root.commentary],

46 ]

49 ]

47 }

50 }

51+ QtObject { id: showProgress; property bool value: true }

52+ QtObject { id: progressSource; property string value: "service" }

48

53

49 QtObject {

54 QtObject {

50 id: data

55 id: data

@@ -66,8 +71,30 @@ Item {

66 ]

71 ]

67 }

72 }

68

73

74+ QtObject {

75+ id: dataProgress

76+ property string title: "Unity App"

77+ property string appIcon: "fake_image.png"

78+ property string description: "This is an Application description"

79+ property real rating: rating.value

80+ property int numRatings: reviews.value

81+ property var execute: root.fake_call

82+ property var infoMap: {

83+ "show_progressbar": showProgress,

84+ "more-screenshots": screenshots,

85+ "rated": rated,

86+ "comments": comments,

87+ "progressbar_source": progressSource

88+ }

89+ property var actions: [

90+ { "id": 123, "displayName": "action1" },

91+ { "id": 456, "displayName": "action2" },

92+ { "id": 789, "displayName": "action3" },

93+ ]

94+ }

95+

69 function fake_call(id, data){

96 function fake_call(id, data){

70− root.calls[root.calls.length] = id;

97+ root.calls[root.calls.length] = [id, data];

71 }

98 }

72

99

73 // The component under test

100 // The component under test

@@ -89,6 +116,10 @@ Item {

89 reviewField.focus = false;

116 reviewField.focus = false;

90 reviewField.text = "";

117 reviewField.text = "";

91 data.rating = rating.value;

118 data.rating = rating.value;

119+ dataProgress.infoMap["progressbar_source"].value = "service";

120+ var appReviews = findChild(appPreview, "appReviews");

121+ appReviews.visible = false;

122+ appPreview.keyboardSize = 0;

92 }

123 }

93

124

94 function test_actions() {

125 function test_actions() {

@@ -102,7 +133,7 @@ Item {

102

133

103 var actions = data.actions;

134 var actions = data.actions;

104 for(var i = 0; i < actions.length; i++) {

135 for(var i = 0; i < actions.length; i++) {

105− compare(root.calls[i], actions[i].id, "Id of action not found.");

136+ compare(root.calls[i][0], actions[i].id, "Id of action not found.");

106 }

137 }

107 }

138 }

108

139

@@ -124,6 +155,7 @@ Item {

124

155

125 function test_review_focus() {

156 function test_review_focus() {

126 var appReviews = findChild(appPreview, "appReviews");

157 var appReviews = findChild(appPreview, "appReviews");

158+ appReviews.visible = true;

127 var sendButton = findChild(appReviews, "sendButton");

159 var sendButton = findChild(appReviews, "sendButton");

128 var reviewField = findChild(appReviews, "reviewField");

160 var reviewField = findChild(appReviews, "reviewField");

129

161

@@ -162,5 +194,46 @@ Item {

162 verify(buttons.visible == true);

194 verify(buttons.visible == true);

163 }

195 }

164

196

197+ function test_progress_show() {

198+ appPreview.previewData = dataProgress;

199+ var progress = findChild(appPreview, "progressBar");

200+ verify(progress.visible == true);

201+ }

202+

203+ function test_progress_download_finish() {

204+ appPreview.previewData = dataProgress;

205+ var progress = findChild(appPreview, "progressBar");

206+ dataProgress.infoMap["progressbar_source"].value = "finish";

207+

208+ var actions = dataProgress.actions;

209+ compare(root.calls[0][0], actions[0].id, "Id of action not found.");

210+ compare(root.calls[0][1], {}, "Data of action not found.");

211+ }

212+

213+ function test_progress_download_error() {

214+ appPreview.previewData = dataProgress;

215+ var progress = findChild(appPreview, "progressBar");

216+ dataProgress.infoMap["progressbar_source"].value = "error";

217+

218+ var actions = dataProgress.actions;

219+ compare(root.calls[0][0], actions[1].id, "Id of action not found.");

220+ compare(root.calls[0][1], {"error": "DOWNLOAD ERROR"}, "Data of action not found.");

221+ }

222+

223+ function test_automatic_scroll_on_keyboard_shown() {

224+ waitForRendering(appPreview);

225+ var appReviews = findChild(appPreview, "appReviews");

226+ appReviews.visible = true;

227+

228+ var leftFlickable = findChild(appPreview, "leftFlickable");

229+ leftFlickable.contentY = leftFlickable.contentHeight;

230+ var reviewField = findChild(appReviews, "reviewField");

231+ appPreview.keyboardSize = 400;

232+ appReviews.editing(reviewField);

233+ var newFlickPos = leftFlickable.contentY;

234+ var keyboardY = shell.height - appPreview.keyboardSize;

235+ verify(newFlickPos < keyboardY);

236+ }

237+

165 }

238 }

166}

239}

tests/qmltests/Dash/tst_GenericScopeView.qml+14

@@ -52,6 +52,20 @@ Item {

52 tryCompare(pageHeader, "searchQuery", "")

53 tryCompare(genericScopeView, "previewShown", false);

54 }

55+

56+ function test_showDash() {

57+ var previewLoader = findChild(genericScopeView, "previewLoader");

58+ previewLoader.open = true;

59+ scopes.get(0).showDash();

60+ tryCompare(genericScopeView, "previewShown", false);

61+ }

62+

63+ function test_hideDash() {

64+ var previewLoader = findChild(genericScopeView, "previewLoader");

65+ previewLoader.open = true;

66+ scopes.get(0).hideDash();

67+ tryCompare(genericScopeView, "previewShown", false);

68+ }

55 }

69 }

56 }

70 }

57}

71}

tests/qmltests/Greeter/tst_Phone.qml+1−1

@@ -19,9 +19,9 @@ import QtTest 1.0

19import ".."

20import "../../../Greeter"

21import AccountsService 0.1

22+import LightDM 0.1 as LightDM

22import Ubuntu.Components 0.1

23import Ubuntu.Components 0.1

23import Unity.Test 0.1 as UT

24import Unity.Test 0.1 as UT

24−import AccountsService 0.1

25

26Item {

27 width: units.gu(60)