Merge lp://staging/~josharenson/unity8/dashboard-manager into lp://staging/unity8
- dashboard-manager
- Merge into trunk
Status: | Needs review |
---|---|
Proposed branch: | lp://staging/~josharenson/unity8/dashboard-manager |
Merge into: | lp://staging/unity8 |
Diff against target: |
459 lines (+362/-3) 10 files modified
qml/Dash/DashSectionHeader.qml (+3/-1) qml/Dash/Dashboard/DashboardManager.qml (+61/-0) qml/Dash/Dashboard/DashboardManagerCategory.qml (+85/-0) qml/Dash/Dashboard/DashboardManagerScope.qml (+91/-0) tests/CMakeLists.txt (+16/-1) tests/mocks/Unity/CMakeLists.txt (+1/-0) tests/mocks/Unity/fake_scopesoverview.cpp (+1/-1) tests/qmltests/CMakeLists.txt (+1/-0) tests/qmltests/Dash/Dashboard/tst_DashboardManager.qml (+85/-0) tests/utils/modules/Unity/Test/UnityTestCase.qml (+18/-0) |
To merge this branch: | bzr merge lp://staging/~josharenson/unity8/dashboard-manager |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Unity8 CI Bot | continuous-integration | Approve | |
Matthew Paul Thomas (community) | design | Needs Information | |
Andrea Cimitan (community) | Needs Fixing | ||
Review via email: mp+319522@code.staging.launchpad.net |
Commit message
Implement the scopes Dashboard Manger window
Description of the change
* Are there any related MPs required for this MP to build/function as expected? Please list.
No, originally this depended on Lukas's Dashboard branch, but I've removed that dependency
* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes, but not with a real scope, only the mocks. I have some concerns about how the model's artowrk will behave in production.
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A for now
* If you changed the UI, has there been a design review?
Adding mpt
- 2844. By Josh Arenson
-
Add license
- 2845. By Josh Arenson
-
Cleanup
- 2846. By Josh Arenson
-
One more cleanup
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
- 2847. By Josh Arenson
-
Fix tests
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2846
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:2847
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Andrea Cimitan (cimi) wrote : | # |
comments inline - will think of other small tests we can possibly add
- 2848. By Josh Arenson
-
Work around dividers
- 2849. By Josh Arenson
-
Resolve most review comments
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2849
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
- 2850. By Josh Arenson
-
Fix whitespace
- 2851. By Josh Arenson
-
Merge trunk
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2850
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2851
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Andrea Cimitan (cimi) : | # |
Andrea Cimitan (cimi) : | # |
- 2852. By Josh Arenson
-
Review fixes
- 2853. By Josh Arenson
-
Add animation
- 2854. By Josh Arenson
-
Match ui of system settings
Josh Arenson (josharenson) wrote : | # |
Fixed some things and added a "displacement" animation but I'm not crazy about it. Welcome any suggestions for improving.
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2852
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:2854
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Andrea Cimitan (cimi) wrote : | # |
> Fixed some things and added a "displacement" animation but I'm not crazy about
> it. Welcome any suggestions for improving.
I spent a lot of time this morning playing with different animations, I think it's good enough, it's hard to achieve something better because the unpinned item disappears and we can't animate that. FastDuration is correct duration as you used - great. Please put the end bracket in line or add indentation to the rest of the transition :)
Still if you can do the suggestion to make the delegate model-agnostic, exposing properties like title and icon source... thanks!
- 2855. By Josh Arenson
-
Abstract better
Josh Arenson (josharenson) wrote : | # |
Broke the delegate into 2 separate files and removed all knowledge of parent models to help with abstraction
- 2856. By Josh Arenson
-
Use listDividers
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:2855
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:2856
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Andrea Cimitan (cimi) wrote : | # |
Pretty good so far, just two minor things:
- why do the dividers have margins?
- we can get rid of the _source and "../" if we change the mocks to return a QVariant with qrc like we do in fake_previewwid
Andrea Cimitan (cimi) wrote : | # |
Also, we don't neet QtQuick.Window in qml/Dash/
- 2857. By Josh Arenson
-
Remove unused import
- 2858. By Josh Arenson
-
Prelim solution
- 2859. By Josh Arenson
-
Autogen qrc file
- 2860. By Josh Arenson
-
Filter pngs
Josh Arenson (josharenson) wrote : | # |
Added some, cmake magic (that is either neat, or unacceptable...) that serves up graphics using the qt resource system. This allowed for deleting the nastyness in the qml view. There are a few options here:
1. You like this idea and keep it as is
1a. Refactor tests that depend on tests/graphics to use qrc
2. Ditch the cmake magic, keep a hardcoded qrc file
2a. Do this and implement 1a.
3. Something else entirely
As for the margins, I saw that they were in dragItem and not really thinking about how thats an entirely different use case, added them here. I'll remove them in the next commit.
- 2861. By Josh Arenson
-
Remove margins
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2860
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2861
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2861
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Andrea Cimitan (cimi) wrote : | # |
the qrc doesn't work for me (trying rebranching), also be sure that the other files/tests using that art will still work (maybe something around genericoscopeview or dashcontent)
- 2862. By Josh Arenson
-
Fix changed path
- 2863. By Josh Arenson
-
Switch back to old list divider
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:2862
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:2863
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Matthew Paul Thomas (mpt) wrote : | # |
If you’d like a design review, please link before-and-after movies or screenshots, as appropriate.
Andrea Cimitan (cimi) wrote : | # |
http://
Left is current system settings, middle this dashboard manager, right the current overview scope list - we tried being consistent with the system settings app, we might also tweak the font for the categories names to be of the same color and style of system settings now that I see
- 2864. By Josh Arenson
-
merge trunk
- 2865. By Josh Arenson
-
Change header font/color to look like system-settings
Andrea Cimitan (cimi) wrote : | # |
> http://
>
> Left is current system settings, middle this dashboard manager, right the
> current overview scope list - we tried being consistent with the system
> settings app, we might also tweak the font for the categories names to be of
> the same color and style of system settings now that I see
we just changed into http://
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:2865
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unmerged revisions
- 2865. By Josh Arenson
-
Change header font/color to look like system-settings
- 2864. By Josh Arenson
-
merge trunk
- 2863. By Josh Arenson
-
Switch back to old list divider
- 2862. By Josh Arenson
-
Fix changed path
- 2861. By Josh Arenson
-
Remove margins
- 2860. By Josh Arenson
-
Filter pngs
- 2859. By Josh Arenson
-
Autogen qrc file
- 2858. By Josh Arenson
-
Prelim solution
- 2857. By Josh Arenson
-
Remove unused import
- 2856. By Josh Arenson
-
Use listDividers
FAILED: Continuous integration, rev:2843 /unity8- jenkins. ubuntu. com/job/ lp-unity8- ci/3331/ /unity8- jenkins. ubuntu. com/job/ build/4382/ console /unity8- jenkins. ubuntu. com/job/ build-0- fetch/4410 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 4243/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= zesty/4243/ console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 4243/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= zesty/4243/ console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 4243/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= zesty/4243/ console
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild: /unity8- jenkins. ubuntu. com/job/ lp-unity8- ci/3331/ rebuild
https:/