← Back to branch summary

~mzanetti/unity8/launcher-follow-unity-api

~mzanetti/unity8/launcher-follow-unity-api

« back to all changes in this revision

Viewing changes to Bottombar/HudButton.qml

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

plugins/Ubuntu/Gestures/Direction.cpp

plugins/Ubuntu/Gestures/Direction.h

po/bg.po

tests/qmltests/plugins/Unity/Notifications

tests/qmltests/plugins/Unity/Notifications/notification.js

tests/qmltests/plugins/Unity/Notifications/qmldir

tests/uqmlscene

tests/uqmlscene/CMakeLists.txt

tests/uqmlscene/README

tests/uqmlscene/main.cpp

files removed:
Dash/DashPeople.qml

Dash/People

Dash/People/CarouselDelegatePeople.qml

Dash/People/Data.qml

Dash/People/Delegate.qml

Dash/People/PeopleCarousel.qml

Dash/People/PeopleFilterGrid.qml

Dash/People/PeoplePreview.qml

Dash/People/Preview

Dash/People/Preview/Address.qml

Dash/People/Preview/Base.qml

Dash/People/Preview/Generic.qml

Dash/People/Preview/Phone.qml

Dash/People/Preview/Status.qml

Dash/People/graphics

Dash/People/graphics/bottomshape@18.png

Dash/People/graphics/bottomshape@18.sci

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/lensIcons

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

build_unity

plugins/Unity/peoplepreviewdata.cpp

plugins/Unity/peoplepreviewdata.h

tests/qmltests/Dash/People

tests/qmltests/Dash/People/tst_PeopleFilterGrid.qml

tests/qmltests/Dash/tst_PeoplePreview.qml

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

Bottombar/HudButton.qml

Bottombar/graphics/hud_invoke_button_active@20.png

Components/Stage.qml

Components/graphics/icon_star_off@20.png

Components/graphics/icon_star_on@20.png

Components/graphics/non-selected@18.png

Dash/Apps/ApplicationsFilterGrid.qml

Dash/Apps/graphics/close_btn@9.png

Dash/Dash.qml

Dash/DashApps.qml

Dash/DashBar.qml

Dash/DashContent.qml

Dash/DashHome.qml

Dash/DashMusic.qml

Dash/DashVideos.qml

Dash/Music/MusicFilterGrid.qml

Dash/Video/VideosFilterGrid.qml

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/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/Lockscreen.qml

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/Launcher.qml

Launcher/graphics/highlight@18.png

Launcher/graphics/non-selected@18.png

Launcher/graphics/selected@18.png

Launcher/graphics/triangle@18.png

Notifications/Notification.qml

Notifications/Notifications.qml

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

Shell.qml

build

cmake/modules/QmlTest.cmake

debian/changelog

debian/control

debian/rules

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

plugins/Ubuntu/Gestures/CMakeLists.txt

plugins/Ubuntu/Gestures/DirectionalDragArea.cpp

plugins/Ubuntu/Gestures/DirectionalDragArea.h

plugins/Ubuntu/Gestures/plugin.cpp

plugins/Unity/CMakeLists.txt

plugins/Unity/categories.cpp

plugins/Unity/categories.h

plugins/Unity/plugin.cpp

po/ar.po

po/az.po

po/ca.po

po/de.po

po/el.po

po/en_AU.po

po/en_GB.po

po/eo.po

po/es.po

po/fi.po

po/fo.po

po/fr.po

po/gl.po

po/he.po

po/hr.po

po/hu.po

po/hy.po

po/id.po

po/it.po

po/ja.po

po/kn.po

po/ko.po

po/ky.po

po/lv.po

po/my.po

po/nb.po

po/nl.po

po/pl.po

po/pt_BR.po

po/ro.po

po/ru.po

po/si.po

po/sl.po

po/sr.po

po/sv.po

po/te.po

po/tr.po

po/ug.po

po/uk.po

po/unity8.pot

po/zh_CN.po

po/zh_TW.po

run

run_on_device

tests/CMakeLists.txt

tests/autopilot/unity8/tests/helpers.py

tests/autopilot/unity8/tests/testhud.py

tests/autopilot/unity8/tests/testlockscreen.py

tests/mocks/LightDM/demo/GreeterPrivate.cpp

tests/mocks/LightDM/demo/InfographicModelPrivate.cpp

tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml

tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml

tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml

tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml

tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp

tests/qmltests/CMakeLists.txt

tests/qmltests/Dash/tst_Dash.qml

tests/qmltests/Dash/tst_DashBar.qml

tests/qmltests/Dash/tst_DashContent.qml

tests/qmltests/Dash/tst_FilterGrids.qml

tests/qmltests/Greeter/tst_Lockscreen.qml

tests/qmltests/Notifications/tst_Notifications.qml

tests/qmltests/plugins/Unity/CMakeLists.txt

tests/qmltests/plugins/Unity/fake_unity_plugin.cpp

Show diffs side-by-side

added added

removed removed

Bottombar/HudButton.qml

20

20

Item {

21

21

id: item

22

22

23

property bool mouseOver

24

23

25

property int bottomMargin: units.gu(2)

24

property bool mouseOver: contains(mouse)

25

26

26

property point mouse: Qt.point(-1,-1)

27

signal clicked()

27

28

28

29

readonly property real scaleOnMouseOver: 1.2

29

30

Older »