Ubuntu UI Toolkit

Merge lp://staging/~mterry/ubuntu-ui-toolkit/blue-spinner into lp://staging/ubuntu-ui-toolkit

  1. blue-spinner
  2. Merge into trunk
Proposed by Michael Terry
Status: Superseded
Proposed branch: lp://staging/~mterry/ubuntu-ui-toolkit/blue-spinner
Merge into: lp://staging/ubuntu-ui-toolkit
Diff against target: 7431 lines (+5766/-504)
67 files modified
app-launch-profiler/app-launch-tracepoints.c (+2/-2)
components.api (+14/-3)
debian/control (+1/-0)
debian/control.gles (+1/-0)
debian/libubuntugestures5-dev.install (+0/-1)
debian/libubuntumetrics5-dev.install (+0/-1)
debian/libubuntutoolkit5-dev.install (+0/-1)
debian/rules (+1/-0)
documentation/overview.qdoc (+16/-0)
src/Ubuntu/Components/1.2/ActivityIndicator.qml (+5/-0)
src/Ubuntu/Components/1.3/ActionList.qml (+0/-47)
src/Ubuntu/Components/1.3/ActivityIndicator.qml (+5/-0)
src/Ubuntu/Components/ComponentModule.pro (+0/-1)
src/Ubuntu/Components/Popups/1.3/Popover.qml (+30/-25)
src/Ubuntu/Components/Popups/1.3/popupUtils.js (+5/-0)
src/Ubuntu/Components/Themes/Ambiance/1.2/ActivityIndicatorStyle.qml (+0/-2)
src/Ubuntu/Components/Themes/Ambiance/1.3/ActivityIndicatorStyle.qml (+0/-2)
src/Ubuntu/Components/Themes/Ambiance/1.3/ScrollbarStyle.qml (+49/-28)
src/Ubuntu/Components/Themes/Ambiance/1.3/ScrollingActionBarStyle.qml (+203/-0)
src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro (+1/-0)
src/Ubuntu/Components/Themes/Ambiance/qmldir (+1/-0)
src/Ubuntu/Components/qmldir (+0/-1)
src/Ubuntu/Test/UbuntuTestCase13.qml (+1/-1)
src/Ubuntu/UbuntuMetrics/applicationmonitor.cpp (+3/-1)
src/Ubuntu/UbuntuToolkit/UbuntuToolkit.pro (+22/-4)
src/Ubuntu/UbuntuToolkit/actionlist.cpp (+158/-0)
src/Ubuntu/UbuntuToolkit/actionlist_p.h (+58/-0)
src/Ubuntu/UbuntuToolkit/exclusivegroup.cpp (+168/-0)
src/Ubuntu/UbuntuToolkit/exclusivegroup_p.h (+62/-0)
src/Ubuntu/UbuntuToolkit/menu.cpp (+671/-0)
src/Ubuntu/UbuntuToolkit/menu_p.h (+75/-0)
src/Ubuntu/UbuntuToolkit/menu_p_p.h (+95/-0)
src/Ubuntu/UbuntuToolkit/menubar.cpp (+340/-0)
src/Ubuntu/UbuntuToolkit/menubar_p.h (+65/-0)
src/Ubuntu/UbuntuToolkit/menubar_p_p.h (+78/-0)
src/Ubuntu/UbuntuToolkit/menugroup.cpp (+164/-0)
src/Ubuntu/UbuntuToolkit/menugroup_p.h (+60/-0)
src/Ubuntu/UbuntuToolkit/privates/splitviewhandler.cpp (+137/-0)
src/Ubuntu/UbuntuToolkit/privates/splitviewhandler_p_p.h (+52/-0)
src/Ubuntu/UbuntuToolkit/quickutils.cpp (+4/-2)
src/Ubuntu/UbuntuToolkit/quickutils_p.h (+1/-0)
src/Ubuntu/UbuntuToolkit/splitview.cpp (+675/-0)
src/Ubuntu/UbuntuToolkit/splitview_p.h (+160/-0)
src/Ubuntu/UbuntuToolkit/splitview_p_p.h (+154/-0)
src/Ubuntu/UbuntuToolkit/splitviewlayout.cpp (+252/-0)
src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.cpp (+18/-4)
src/Ubuntu/UbuntuToolkit/ucaction.cpp (+186/-37)
src/Ubuntu/UbuntuToolkit/ucaction_p.h (+33/-7)
src/Ubuntu/UbuntuToolkit/uclistitem.cpp (+46/-22)
src/Ubuntu/UbuntuToolkit/ucmathutils_p.h (+4/-4)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_actionbar.py (+43/-11)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py (+13/-13)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/MyDialog.qml (+36/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_actionbar.ActionBarTestCase.qml (+13/-1)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_actionbar.ScrollingActionBarTestCase.qml (+79/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_actionbar.py (+18/-8)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_popups.WindowTestCase.qml (+36/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_popups.py (+19/-0)
tests/unit/components/tst_action.qml (+107/-1)
tests/unit/components/tst_activityindicator.qml (+7/-0)
tests/unit/components/tst_menu.qml (+137/-0)
tests/unit/visual/ScrollbarTestCase13.qml (+3/-0)
tests/unit/visual/tst_actionbar.13.qml (+299/-148)
tests/unit/visual/tst_scrollbar.13.qml (+238/-126)
tests/unit/visual/tst_splitview.13.qml (+383/-0)
tests/unit/visual/tst_splitview_page.13.qml (+143/-0)
tests/unit/visual/tst_splitview_repeater.13.qml (+116/-0)
To merge this branch: bzr merge lp://staging/~mterry/ubuntu-ui-toolkit/blue-spinner
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Pending
Ubuntu SDK team Pending
Review via email: mp+295475@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2016-09-06.

Commit message

Make ActivityIndicator spinner blue instead of orange.

Description of the change

In my continuing quest to make Ubuntu color-consistent, I've gone ahead and updated the spinner asset from the old activity color (orange -- actually, we were using the old orange DD4814 instead of new orange E95420; tsk, tsk) to the new activity color (blue).

I just did this using Gimp's color exchange dialog. So no room for human error I hope. Looks good to me anyway.

To post a comment you must log in.
Revision history for this message
Michael Terry (mterry) wrote :

When talking with Paty about this, she said: "The activity indicator/spinner should also be blue, but I've just checked with Rae (<email address hidden> // irc: raeshambrook) who is the visual designer in charge of the colour palette and she said there were some issues with that spinner. So she is going to check this and confirm which is the right asset. Sooo... I'll come back to you as soon as she does."

So I'm waiting on that.

Revision history for this message
Cris Dywan (kalikiana) wrote :

Any update?

Revision history for this message
Michael Terry (mterry) wrote :

From the linked bug:

Rae Shambrook (raecontreras) wrote on 2016-06-16:
A new blue spinner asset has been given to Zsombor to implement

So I guess this is out of my hands. Maybe this MP should be marked rejected and Zsombor should be poked.

Though if I had known how long that would take, I would have argued for just landing this palette swap MP in the meantime...

Revision history for this message
Zsombor Egri (zsombi) wrote :

> From the linked bug:
>
> Rae Shambrook (raecontreras) wrote on 2016-06-16:
> A new blue spinner asset has been given to Zsombor to implement
>
> So I guess this is out of my hands. Maybe this MP should be marked rejected
> and Zsombor should be poked.
>
> Though if I had known how long that would take, I would have argued for just
> landing this palette swap MP in the meantime...

These assets look exactly the same as the ones you gave me, so I'd say let's get it in

Revision history for this message
Michael Terry (mterry) wrote :

Ah, nm. Let's land this one.

<zsombi> mterry: well, my asset is nothing else than the previous one having the blue color, so in that sense if yours si the same, we can proceed with that :)
<mterry> Michael Terry zsombi: seriously? GUH! I had palette-swapped the existing asset in gimp like months ago and then Design said, "wait, we want to change the asset too"
<zsombi> mterry: I am patching the progress bar visuals right now, and had no plans to have the new activity indicator design, only the color - eventually
<mterry> Michael Terry zsombi: so yours looks like http://bazaar.launchpad.net/~mterry/ubuntu-ui-toolkit/blue-spinner/download/head:/spinner30.png-20130227062500-zxb8nbsbac23o3la-1/spinner%4030.png ?
<zsombi> mterry: they wanted us to rewrite teh whole component, with some fancy animation here'n'there, but just told them it's not gonna happen, there are way many more compponents that need love but the ActivityIndicator... so I got a new asset :D
<zsombi> mterry: haha, it does, let's get yours in then :)

lp://staging/~mterry/ubuntu-ui-toolkit/blue-spinner updated
1324. By Michael Terry

Merge staging

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: