Merge lp:~tpeeters/ubuntu-ui-toolkit/arrows into lp:ubuntu-ui-toolkit/staging

Proposed by Tim Peeters
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 2092
Merged at revision: 2096
Proposed branch: lp:~tpeeters/ubuntu-ui-toolkit/arrows
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 57 lines (+3/-9)
2 files modified
debian/control (+2/-2)
src/imports/Components/Themes/Ambiance/1.3/ScrollingActionBarStyle.qml (+1/-7)
To merge this branch: bzr merge lp:~tpeeters/ubuntu-ui-toolkit/arrows
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Zoltan Balogh Approve
Review via email: mp+304296@code.launchpad.net

Commit message

Use the new arrow icons from the suru-icon-theme in the scrolling ActionBar.

Description of the change

Use the icons from this MR: https://code.launchpad.net/~tiheum/ubuntu-themes/toolkit-arrows/+merge/298609

First release of the icons since that change was 14.04+16.10.20160720-0ubuntu1 (see http://bazaar.launchpad.net/~ubuntu-art-pkg/ubuntu-themes/trunk/changes ). The versioning seems a bit strange to me, but it appears that after the version I need, the following releases are 16.10* so they have higher numbers which should be fine.

The visual changes can be checked by running this in the branch:
qmake && make -j4
source export_modules_dir.sh
cd tests/unit/visual
# export GRID_UNIT_PX=14 (optional)
../../../ubuntu-ui-toolkit-launcher/ubuntu-ui-toolkit-launcher tst_actionbar.13.qml

and then, click the switch at the top to switch to "Scrolling" mode.

To post a comment you must log in.
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Zoltan Balogh (bzoltan) wrote :

Go

review: Approve
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
2089. By Tim Peeters

kick

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
2090. By Tim Peeters

sync staging

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
2091. By Tim Peeters

kick

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
2092. By Tim Peeters

sync staging

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2016-08-22 05:35:24 +0000
3+++ debian/control 2016-09-12 09:07:36 +0000
4@@ -55,7 +55,7 @@
5 qtsvg5-doc-html,
6 qttools5-dev-tools,
7 qtwebkit5-doc-html,
8- suru-icon-theme,
9+ suru-icon-theme (>= 14.04+16.10.20160720),
10 unity-action-doc,
11 uuid-runtime,
12 xvfb,
13@@ -80,7 +80,7 @@
14 qml-module-ubuntu-components-labs,
15 qml-module-ubuntu-performancemetrics,
16 qtdeclarative5-unity-action-plugin (>= 1.1.0),
17- suru-icon-theme,
18+ suru-icon-theme (>= 14.04+16.10.20160720),
19 ttf-ubuntu-font-family,
20 ubuntu-ui-toolkit-theme (= ${binary:Version}),
21 ${misc:Depends},
22
23=== modified file 'src/imports/Components/Themes/Ambiance/1.3/ScrollingActionBarStyle.qml'
24--- src/imports/Components/Themes/Ambiance/1.3/ScrollingActionBarStyle.qml 2016-08-22 14:53:02 +0000
25+++ src/imports/Components/Themes/Ambiance/1.3/ScrollingActionBarStyle.qml 2016-09-12 09:07:36 +0000
26@@ -162,14 +162,10 @@
27 : actionBarStyle.scrollButtons.backgroundColor
28 }
29 Icon {
30- // FIXME: Use new theme icon from
31- // https://code.launchpad.net/~tiheum/ubuntu-themes/toolkit-arrows/+merge/298609
32- // after it lands in overlay and archive.
33 anchors.centerIn: parent
34 width: units.gu(1)
35 height: units.gu(1)
36- rotation: iconRotation
37- name: "chevron"
38+ name: scrollDirection === 1 ? "toolkit_arrow-left" : "toolkit_arrow-right"
39 color: scrollButton.pressed ? actionBarStyle.scrollButtons.pressedForegroundColor
40 : actionBarStyle.scrollButtons.foregroundColor
41 }
42@@ -182,7 +178,6 @@
43 bottom: parent.bottom
44 }
45 sourceComponent: scrollButtonComponent
46- property int iconRotation: 180
47 property real buttonOpacity: actionsListView.atXBeginning ? 0.0 : 1.0
48 property int scrollDirection: 1
49 property string buttonName: "leading_scroll_button"
50@@ -194,7 +189,6 @@
51 bottom: parent.bottom
52 }
53 sourceComponent: scrollButtonComponent
54- property int iconRotation: 0
55 property real buttonOpacity: actionsListView.atXEnd ? 0.0 : 1.0
56 property int scrollDirection: -1
57 property string buttonName: "trailing_scroll_button"

Subscribers

People subscribed via source and target branches