f9806f9 · unity8 · git.iko.soy

po/es.po+1−1

compare with xenial

unifiedsplit

@@ -15,7 +15,7 @@ msgstr ""

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: 2014-02-20 05:47+0000\n"

18+"X-Launchpad-Export-Date: 2014-02-21 06:42+0000\n"

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

qml/Components/ResponsiveGridView.qml−1

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

56 fill: parent

57 leftMargin: margin/2

58 rightMargin: margin/2

59− topMargin: verticalSpacing

60 }

59 }

61 clip: parent.height != totalContentHeight

60 clip: parent.height != totalContentHeight

62

61

qml/Dash/Card.qml+2

@@ -161,6 +161,8 @@ AbstractButton {

161 title: cardData && cardData["title"] || ""

162 subtitle: cardData && cardData["subtitle"] || ""

163

164+ titleWeight: components && components["subtitle"] ? Font.DemiBold : Font.Normal

165+

164 opacity: showHeader ? 1 : 0

166 opacity: showHeader ? 1 : 0

165 inOverlay: root.template && root.template["overlay"] === true

167 inOverlay: root.template && root.template["overlay"] === true

166 fontColor: inOverlay ? "white" : summary.color

168 fontColor: inOverlay ? "white" : summary.color

qml/Dash/CardHeader.qml+2

@@ -26,6 +26,8 @@ Item {

26 property alias oldPrice: oldPriceLabel.text

27 property alias altPrice: altPriceLabel.text

28

29+ property alias titleWeight: titleLabel.font.weight

30+

29 // FIXME: Saviq, used to scale fonts down in Carousel

31 // FIXME: Saviq, used to scale fonts down in Carousel

30 property real fontScale: 1.0

32 property real fontScale: 1.0

31

33

qml/Dash/Dash.qml+2

@@ -41,6 +41,8 @@ Showable {

41 return

42 }

43

44+ dashContent.closePreview();

45+

44 if (scopeIndex == dashContent.currentIndex && !reset) {

46 if (scopeIndex == dashContent.currentIndex && !reset) {

45 // the scope is already the current one

47 // the scope is already the current one

46 return

48 return

qml/Dash/DashContent.qml+4

@@ -87,6 +87,10 @@ Item {

87 dashContentList.currentItem.theScope.closeScope(scope)

88 }

89

90+ function closePreview() {

91+ previewListView.open = false;

92+ }

93+

90 Item {

94 Item {

91 id: dashContentListHolder

95 id: dashContentListHolder

92 anchors.fill: parent

96 anchors.fill: parent

qml/Dash/GenericScopeView.qml+1

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

137 id: baseItem

138 objectName: "dashCategory" + category

139 highlightWhenPressed: false

140+ showDivider: false

140

141

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

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

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

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

qml/Dash/PreviewListView.qml+1−1

@@ -181,7 +181,7 @@ Item {

181

182 ActivityIndicator {

183 anchors.centerIn: parent

184− visible: parent.enabled

184+ visible: root.onScreen && parent.enabled

185 running: visible

186 }

187 }

qml/Dash/Previews/PreviewZoomableImage.qml+2−5

@@ -30,11 +30,8 @@ PreviewWidget {

30

31 LazyImage {

32 objectName: "image"

33− anchors {

33+ anchors.fill: parent

34− top: parent.top

35− bottom: parent.bottom

36− }

37− scaleTo: "height"

34+ scaleTo: "fit"

38 source: widgetData["source"]

35 source: widgetData["source"]

39 initialWidth: units.gu(13)

36 initialWidth: units.gu(13)

40 }

37 }

tests/qmltests/Dash/tst_Card.qml+14

@@ -182,6 +182,7 @@ Rectangle {

182 when: windowShown

183

184 property Item header: findChild(card, "cardHeader")

185+ property Item title: findChild(header, "titleLabel")

185 property Item art: findChild(card, "artShape")

186 property Item art: findChild(card, "artShape")

186 property Item artImage: findChild(card, "artImage")

187 property Item artImage: findChild(card, "artImage")

187 property Item summary: findChild(card, "summaryLabel")

188 property Item summary: findChild(card, "summaryLabel")

@@ -413,5 +414,18 @@ Rectangle {

413 tryCompare(backgroundImage, "source", data.image);

414 tryCompare(backgroundImage, "source", data.image);

414 }

415 }

416 }

417+

418+ function test_font_weights_data() {

419+ return [

420+ { tag: "Title only", index: 8, weight: Font.Normal },

421+ { tag: "Title, subtitle", index: 0, weight: Font.DemiBold },

422+ ]

423+ }

424+

425+ function test_font_weights(data) {

426+ selector.selectedIndex = data.index;

427+

428+ tryCompare(testCase.title.font, "weight", data.weight);

429+ }

416 }

430 }

417}

431}