← Back to branch summary

~mhr3/unity8/use-dee-filtermodel

~mhr3/unity8/use-dee-filtermodel

Viewing all changes in revision 55.

Committer: Michal Hruby
Date: 2013-07-03 17:15:35 UTC
mfrom: (46.1.30 trunk)
Revision ID: michal.mhr@gmail.com-20130703171535-isx8r9j5mz8coj1b

Merge trunk

files added:
plugins/Unity/applicationpreview.cpp

plugins/Unity/applicationpreview.h

plugins/Unity/genericpreview.cpp

plugins/Unity/genericpreview.h

plugins/Unity/moviepreview.cpp

plugins/Unity/moviepreview.h

plugins/Unity/musicpreview.cpp

plugins/Unity/musicpreview.h

plugins/Unity/preview.cpp

plugins/Unity/preview.h

plugins/Unity/previewaction.cpp

plugins/Unity/previewaction.h

plugins/Unity/previewinfohint.cpp

plugins/Unity/previewinfohint.h

plugins/Unity/variantutils.cpp

plugins/Unity/variantutils.h

tests/mocks/libusermetrics

tests/mocks/libusermetrics/CMakeLists.txt

tests/mocks/libusermetrics/ColorTheme.cpp

tests/mocks/libusermetrics/ColorTheme.h

tests/mocks/libusermetrics/libusermetricsoutput

tests/mocks/libusermetrics/libusermetricsoutput/ColorTheme.h

tests/mocks/libusermetrics/libusermetricsoutput/UserMetrics.h

tests/plugins/Unity

tests/plugins/Unity/CMakeLists.txt

tests/plugins/Unity/previewbindingstest.cpp

tests/plugins/Unity/previewbindingstest.h

files removed:
Notifications/timings.js

plugins/LightDM/InfographicModel.h

tests/mocks/LightDM/InfographicModelPrivate.h

files renamed:
tests/mocks/LightDM/InfographicModel.cpp => tests/mocks/libusermetrics/UserMetrics.cpp

tests/mocks/LightDM/InfographicModel.h => tests/mocks/libusermetrics/UserMetrics.h

files modified:
Components/DragHandle.qml

Greeter/GreeterContent.qml

Notifications/Notification.qml

Notifications/Notifications.qml

Panel/Indicators.qml

Panel/MenuContent.qml

Panel/Panel.qml

debian/control

debian/rules

plugins/LightDM/CMakeLists.txt

plugins/LightDM/Greeter.cpp

plugins/LightDM/Greeter.h

plugins/LightDM/plugin.cpp

plugins/ListViewWithPageHeader/listviewwithpageheader.cpp

plugins/Ubuntu/Gestures/DirectionalDragArea.cpp

plugins/Ubuntu/Gestures/DirectionalDragArea.h

plugins/Unity/CMakeLists.txt

plugins/Unity/plugin.cpp

plugins/Unity/scope.cpp

plugins/Unity/scope.h

plugins/Utils/qlimitproxymodelqml.cpp

run

tests/autopilot/unity8/tests/__init__.py

tests/mocks/CMakeLists.txt

tests/mocks/LightDM/CMakeLists.txt

tests/mocks/LightDM/demo/CMakeLists.txt

tests/mocks/LightDM/demo/UsersModelPrivate.cpp

tests/mocks/LightDM/full/CMakeLists.txt

tests/mocks/LightDM/single-passphrase/CMakeLists.txt

tests/mocks/LightDM/single-passphrase/UsersModelPrivate.cpp

tests/mocks/LightDM/single-pin/CMakeLists.txt

tests/mocks/LightDM/single-pin/UsersModelPrivate.cpp

tests/mocks/LightDM/single/CMakeLists.txt

tests/mocks/LightDM/single/UsersModelPrivate.cpp

tests/plugins/CMakeLists.txt

tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp

tests/plugins/Utils/qlimitproxymodeltest.cpp

tests/qmltests/CMakeLists.txt

tests/qmltests/Notifications/tst_Notifications.qml

tests/qmltests/Panel/tst_Indicators.qml

tests/qmltests/Panel/tst_Panel.qml

Show diffs side-by-side

added added

removed removed

Components/DragHandle.qml

Greeter/GreeterContent.qml

Notifications/Notification.qml

Notifications/Notifications.qml

Notifications/timings.js

Panel/Indicators.qml

Panel/MenuContent.qml

Panel/Panel.qml

plugins/LightDM/CMakeLists.txt

plugins/LightDM/Greeter.cpp

plugins/LightDM/Greeter.h

plugins/LightDM/InfographicModel.h

plugins/LightDM/plugin.cpp

plugins/ListViewWithPageHeader/listviewwithpageheader.cpp

plugins/Ubuntu/Gestures/DirectionalDragArea.cpp

plugins/Ubuntu/Gestures/DirectionalDragArea.h

plugins/Unity/CMakeLists.txt

plugins/Unity/applicationpreview.cpp

plugins/Unity/applicationpreview.h

plugins/Unity/genericpreview.cpp

plugins/Unity/genericpreview.h

plugins/Unity/moviepreview.cpp

plugins/Unity/moviepreview.h

plugins/Unity/musicpreview.cpp

plugins/Unity/musicpreview.h

plugins/Unity/plugin.cpp

plugins/Unity/preview.cpp

plugins/Unity/preview.h

plugins/Unity/previewaction.cpp

plugins/Unity/previewaction.h

plugins/Unity/previewinfohint.cpp

plugins/Unity/previewinfohint.h

plugins/Unity/scope.cpp

plugins/Unity/scope.h

plugins/Unity/variantutils.cpp

plugins/Unity/variantutils.h

plugins/Utils/qlimitproxymodelqml.cpp

tests/autopilot/unity8/tests/__init__.py

tests/mocks/CMakeLists.txt

tests/mocks/LightDM/CMakeLists.txt

tests/mocks/LightDM/InfographicModelPrivate.h

tests/mocks/LightDM/demo/CMakeLists.txt

tests/mocks/LightDM/demo/UsersModelPrivate.cpp

tests/mocks/LightDM/full/CMakeLists.txt

tests/mocks/LightDM/single-passphrase/CMakeLists.txt

tests/mocks/LightDM/single-passphrase/UsersModelPrivate.cpp

tests/mocks/LightDM/single-pin/CMakeLists.txt

tests/mocks/LightDM/single-pin/UsersModelPrivate.cpp

tests/mocks/LightDM/single/CMakeLists.txt

tests/mocks/LightDM/single/UsersModelPrivate.cpp

tests/mocks/libusermetrics/

tests/mocks/libusermetrics/CMakeLists.txt

tests/mocks/libusermetrics/ColorTheme.cpp

tests/mocks/libusermetrics/ColorTheme.h

tests/mocks/libusermetrics/UserMetrics.cpp

tests/mocks/libusermetrics/UserMetrics.h

tests/mocks/libusermetrics/libusermetricsoutput/

tests/mocks/libusermetrics/libusermetricsoutput/ColorTheme.h@

tests/mocks/libusermetrics/libusermetricsoutput/UserMetrics.h@

tests/plugins/CMakeLists.txt

tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp

tests/plugins/Unity/

tests/plugins/Unity/CMakeLists.txt

tests/plugins/Unity/previewbindingstest.cpp

tests/plugins/Unity/previewbindingstest.h

tests/plugins/Utils/qlimitproxymodeltest.cpp

tests/qmltests/CMakeLists.txt

tests/qmltests/Notifications/tst_Notifications.qml

tests/qmltests/Panel/tst_Indicators.qml

tests/qmltests/Panel/tst_Panel.qml

Older »