Viewing all changes in revision 24.
- Committer: Michael Zanetti
- Date: 2013-06-26 09:26:51 UTC
- mfrom: (22.1.24 unity)
- Revision ID: michael.zanetti@canonical.com-20130626092651-ku85xmvlt2pjgypx
merge trunk
- files added:
- Components/IconUtil.js
- tests/qmltests/plugins/Unity/Notifications
- tests/uqmlscene
- files removed:
- Dash/DashPeople.qml
- Dash/People
- Dash/People/Preview
- Dash/People/graphics
- Dash/graphics/lensIcons
- tests/qmltests/Dash/People
- files renamed:
- Dash/GenericLensView.qml => Dash/GenericScopeView.qml
- Dash/LensDelegateMapper.qml => Dash/ScopeDelegateMapper.qml
- Dash/LensView.qml => Dash/ScopeView.qml
- plugins/Unity/lens.cpp => plugins/Unity/scope.cpp
- plugins/Unity/lens.h => plugins/Unity/scope.h
- plugins/Unity/lenses.cpp => plugins/Unity/scopes.cpp
- plugins/Unity/lenses.h => plugins/Unity/scopes.h
- tests/qmltests/Dash/qml/FakeLensView.qml => tests/qmltests/Dash/qml/FakeScopeView.qml
- tests/qmltests/Dash/qml/fake_generic_lensView.qml => tests/qmltests/Dash/qml/fake_generic_scopeView.qml
- tests/qmltests/Dash/qml/fake_lensView1.qml => tests/qmltests/Dash/qml/fake_scopeView1.qml
- tests/qmltests/Dash/qml/fake_lensView2.qml => tests/qmltests/Dash/qml/fake_scopeView2.qml
- tests/qmltests/Dash/qml/fake_lensView3.qml => tests/qmltests/Dash/qml/fake_scopeView3.qml
- tests/qmltests/Dash/qml/fake_lensView4.qml => tests/qmltests/Dash/qml/fake_scopeView4.qml
- tests/qmltests/Dash/tst_GenericLensView.qml => tests/qmltests/Dash/tst_GenericScopeView.qml
- tests/qmltests/Dash/tst_LensView.qml => tests/qmltests/Dash/tst_ScopeView.qml
- tests/qmltests/plugins/Unity/fake_lens.cpp => tests/qmltests/plugins/Unity/fake_scope.cpp
- tests/qmltests/plugins/Unity/fake_lens.h => tests/qmltests/plugins/Unity/fake_scope.h
- tests/qmltests/plugins/Unity/fake_lenses.cpp => tests/qmltests/plugins/Unity/fake_scopes.cpp
- tests/qmltests/plugins/Unity/fake_lenses.h => tests/qmltests/plugins/Unity/fake_scopes.h
- files modified:
- Bottombar/Bottombar.qml
expand all
collapse all
added
removed
Bottombar/graphics/hud_invoke_button_active@20.png
Components/graphics/icon_star_off@20.png
Components/graphics/icon_star_on@20.png
Components/graphics/non-selected@18.png
Dash/Apps/graphics/close_btn@9.png
Dash/People/graphics/bottomshape@18.png
Dash/People/graphics/icon_facebook@18.png
Dash/People/graphics/icon_offline@18.png
Dash/People/graphics/icon_online@18.png
Dash/People/graphics/icon_twitter@18.png
Dash/People/graphics/icon_unknown@18.png
Dash/People/graphics/icon_write_text@18.png
Dash/People/graphics/star_favourite@18.png
Dash/People/graphics/star_not_favourite@18.png
Dash/graphics/icon_clear@20.png
Dash/graphics/icon_listview_clear@20.png
Dash/graphics/icon_search_active@20.png
Dash/graphics/icon_search_inactive@20.png
Dash/graphics/lensIcons/Applications@18.png
Dash/graphics/lensIcons/Home@18.png
Dash/graphics/lensIcons/Music@18.png
Dash/graphics/lensIcons/People@18.png
Dash/graphics/lensIcons/Videos@18.png
Dash/graphics/phone/home.png
Dash/graphics/phone/music.png
Dash/graphics/phone/screenshots/angrybirds@12.png
Dash/graphics/phone/screenshots/browser@12.png
Dash/graphics/phone/screenshots/camera@12.png
Dash/graphics/phone/screenshots/facebook@12.png
Dash/graphics/phone/screenshots/gallery@12.png
Dash/graphics/phone/screenshots/map@12.png
Dash/graphics/phone/screenshots/music@12.png
Dash/graphics/phone/screenshots/phone@12.png
Dash/graphics/phone/screenshots/settings@12.png
Dash/graphics/phone/screenshots/twitter@12.png
Dash/graphics/phone/videos.png
Dash/graphics/play_button@18.png
Dash/graphics/play_button_active@18.png
Dash/graphics/play_button_active_big@20.png
Dash/graphics/play_button_big@20.png
Dash/graphics/tablet/apps.png
Dash/graphics/tablet/home.png
Dash/graphics/tablet/icon_close_preview@20.png
Dash/graphics/tablet/music.png
Dash/graphics/tablet/people.png
Dash/graphics/tablet/videos.png
Greeter/graphics/dot_empty.png
Greeter/graphics/dot_filled.png
Greeter/graphics/dot_pointer.png
Greeter/graphics/infographic_circle.png
Hud/graphics/hud_bg@20.png
Hud/graphics/hud_handlearrow@20.png
Hud/graphics/hud_handlebar@20.png
Hud/graphics/icon_clear@20.png
Hud/graphics/icon_search@20.png
Launcher/graphics/highlight@18.png
Launcher/graphics/non-selected@18.png
Launcher/graphics/selected@18.png
Launcher/graphics/triangle@18.png
Panel/graphics/Battery@18.png
Panel/graphics/Bluetooth@18.png
Panel/graphics/Clock@18.png
Panel/graphics/Location@18.png
Panel/graphics/Messages@18.png
Panel/graphics/Network@18.png
Panel/graphics/Sound@18.png
Panel/graphics/Sync@18.png
Panel/graphics/System@18.png
Panel/graphics/Time@18.png
Panel/graphics/VerticalDivider@18.png
Panel/graphics/rectangular_dropshadow@30.png
Panel/graphics/search@12.png
graphics/12_10_background_wide@12.png
graphics/applicationIcons/angrybirds@18.png
graphics/applicationIcons/camera@18.png
graphics/applicationIcons/dash@18.png
graphics/applicationIcons/evernote@18.png
graphics/applicationIcons/gallery@18.png
graphics/applicationIcons/map@18.png
graphics/applicationIcons/music@18.png
graphics/applicationIcons/phone-app@18.png
graphics/applicationIcons/pinterest@18.png
graphics/applicationIcons/ski_safari@18.png
graphics/applicationIcons/skype@18.png
graphics/applicationIcons/twitter@18.png
graphics/applicationIcons/youtube@18.png
graphics/avatars/amanda@12.png
graphics/avatars/anna_olsson@12.png
graphics/avatars/funky@12.png
graphics/clock@18.png
