~aacid/unity8/dash_overview

« back to all changes in this revision

Viewing changes to qml/Dash/CardTool.qml

Committer: Albert Astals
Date: 2014-08-07 15:27:32 UTC
mfrom: (1155.1.29 do_merged)
Revision ID: albert.astals@canonical.com-20140807152732-0zf22298f1lsxrz8

Merge

files added:
qml/Components/graphics/pagination_dot_off@30.png

qml/Components/graphics/pagination_dot_on@30.png

qml/Dash/Previews/PreviewExpandable.qml

qml/Panel/Indicators/ModemInfoItem.qml

qml/Panel/Indicators/RoamingIndication.qml

tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml

files removed:
qml/Components/SeeMore.qml

tests/qmltests/Components/tst_SeeMore.qml

files renamed:
qml/Dash/DashDepartments.qml => qml/Dash/DashNavigation.qml

qml/Dash/DashDepartmentsList.qml => qml/Dash/DashNavigationList.qml

tests/mocks/Unity/fake_department.cpp => tests/mocks/Unity/fake_navigation.cpp

tests/mocks/Unity/fake_department.h => tests/mocks/Unity/fake_navigation.h

files modified:
cmake/modules/QmlTest.cmake

debian/control

plugins/Dash/CardCreator.js

plugins/Dash/ScopeStyle.qml

po/sl.po

qml/Components/EdgeDemo.qml

qml/Components/PageHeader.qml

qml/Dash/CardTool.qml

qml/Dash/Dash.qml

qml/Dash/DashApplication.qml

qml/Dash/DashContent.qml

qml/Dash/GenericScopeView.qml

qml/Dash/PreviewListView.qml

qml/Dash/Previews/PreviewImageGallery.qml

qml/Dash/Previews/PreviewTextSummary.qml

qml/Dash/Previews/PreviewWidget.qml

qml/Dash/Previews/PreviewWidgetFactory.qml

qml/Dash/ScopesOverview.qml

qml/Greeter/Greeter.qml

qml/Notifications/NotificationMenuItemFactory.qml

qml/Panel/Indicators/MenuItemFactory.qml

qml/ScopeTool.qml

qml/Shell.qml

run_on_device.sh

src/Dash/main.cpp

tests/autopilot/unity8/shell/emulators/dash.py

tests/mocks/Unity/CMakeLists.txt

tests/mocks/Unity/Unity.qmltypes

tests/mocks/Unity/fake_scope.cpp

tests/mocks/Unity/fake_scope.h

tests/mocks/Unity/fake_scopes.cpp

tests/mocks/Unity/fake_scopes.h

tests/mocks/Unity/fake_scopesoverview.cpp

tests/mocks/Unity/fake_scopesoverview.h

tests/mocks/Unity/fake_unity_plugin.cpp

tests/plugins/Dash/cardcreator/1.res

tests/plugins/Dash/cardcreator/1.tst

tests/plugins/Dash/cardcreator/2.res

tests/plugins/Dash/cardcreator/2.tst

tests/plugins/Dash/cardcreator/3.res

tests/plugins/Dash/cardcreator/3.tst

tests/plugins/Dash/cardcreator/4.res

tests/plugins/Dash/cardcreator/4.tst

tests/plugins/Dash/cardcreator/5.res

tests/plugins/Dash/cardcreator/5.tst

tests/plugins/Dash/cardcreator/6.res

tests/plugins/Dash/cardcreator/6.tst

tests/plugins/Dash/cardcreator/7.res

tests/plugins/Dash/cardcreator/7.tst

tests/plugins/Dash/cardcreatortest.cpp

tests/plugins/Dash/tst_ScopeStyle.qml

tests/qmltests/CMakeLists.txt

tests/qmltests/Components/tst_PageHeader.qml

tests/qmltests/Dash/CardHelpers.js

tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml

tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml

tests/qmltests/Dash/tst_Card.qml

tests/qmltests/Dash/tst_Dash.qml

tests/qmltests/Dash/tst_DashContent.qml

tests/qmltests/Dash/tst_GenericScopeView.qml

tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml

Show diffs side-by-side

added added

removed removed

qml/Dash/CardTool.qml

126

type:real \brief Height of the card's header.

127

128

readonly property int headerHeight: cardLoader.item ? cardLoader.item.headerHeight : 0

129

readonly property size artShapeSize: cardLoader.item ? cardLoader.item.artShapeSize : 0

129

property size artShapeSize: cardLoader.item ? cardLoader.item.artShapeSize : 0

130

131

/*!

132

\brief Desired alignment of header components.

Older »