Merge lp:~tpeeters/ubuntu-ui-toolkit/disable-namespace into lp:ubuntu-ui-toolkit/staging
- disable-namespace
- Merge into staging
Proposed by
Tim Peeters
| Status: | Merged |
|---|---|
| Merge reported by: | Tim Peeters |
| Merged at revision: | not available |
| Proposed branch: | lp:~tpeeters/ubuntu-ui-toolkit/disable-namespace |
| Merge into: | lp:ubuntu-ui-toolkit/staging |
| Diff against target: |
895 lines (+191/-186) 11 files modified
.qmake.conf (+2/-1) components.api (+167/-167) src/Ubuntu/Components/plugin/plugin.cpp (+2/-2) src/Ubuntu/UbuntuGestures/timer.cpp (+1/-1) src/Ubuntu/UbuntuGestures/timesource.cpp (+1/-1) src/Ubuntu/UbuntuGestures/ucswipearea.cpp (+2/-2) src/Ubuntu/UbuntuGestures/ucswipearea_p_p.h (+6/-6) tests/unit/bottomedge/tst_bottomedge.cpp (+4/-4) tests/unit/subtheming/tst_subtheming.cpp (+4/-0) tests/unit/swipearea/GestureTest.h (+1/-1) tests/unit/swipearea/tst_swipearea.cpp (+1/-1) |
| To merge this branch: | bzr merge lp:~tpeeters/ubuntu-ui-toolkit/disable-namespace |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| ubuntu-sdk-build-bot | continuous-integration | Approve | |
| Ubuntu SDK team | Pending | ||
|
Review via email:
|
|||
Commit message
Don't approve. I need the unit test results.
Description of the change
To post a comment you must log in.
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2044
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2044
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2044
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2044
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
review:
Needs Fixing
(continuous-integration)
- 2045. By Tim Peeters
-
update components.api
- 2046. By Tim Peeters
-
don't explicitly use namespace in tst_bottomedge when the namespace is already being used.
- 2047. By Tim Peeters
-
fix subtheming unit test failure
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2045
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2045
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2045
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2045
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
review:
Approve
(continuous-integration)
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2045
https:/
Executed test runs:
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2047
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
review:
Approve
(continuous-integration)
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2047
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
review:
Approve
(continuous-integration)
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2047
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
review:
Approve
(continuous-integration)
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2047
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
review:
Approve
(continuous-integration)
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2047
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file '.qmake.conf' | |||
| 2 | --- .qmake.conf 2016-07-08 14:28:48 +0000 | |||
| 3 | +++ .qmake.conf 2016-07-25 23:21:11 +0000 | |||
| 4 | @@ -24,7 +24,8 @@ | |||
| 5 | 24 | } | 24 | } |
| 6 | 25 | } | 25 | } |
| 7 | 26 | 26 | ||
| 8 | 27 | # FIXME: Fix bug 1606247 and enable the UbuntuToolkit namespace. | ||
| 9 | 27 | # build UbuntuToolkit without namespace | 28 | # build UbuntuToolkit without namespace |
| 11 | 28 | # DEFINES += UBUNTUTOOLKIT_NO_NAMESPACE | 29 | DEFINES += UBUNTUTOOLKIT_NO_NAMESPACE |
| 12 | 29 | # build UbuntuGestures without namespace | 30 | # build UbuntuGestures without namespace |
| 13 | 30 | # DEFINES += UBUNTUGESTURES_NO_NAMESPACE | 31 | # DEFINES += UBUNTUGESTURES_NO_NAMESPACE |
| 14 | 31 | 32 | ||
| 15 | === modified file 'components.api' | |||
| 16 | --- components.api 2016-07-14 13:51:41 +0000 | |||
| 17 | +++ components.api 2016-07-25 23:21:11 +0000 | |||
| 18 | @@ -3,13 +3,13 @@ | |||
| 19 | 3 | signal clicked() | 3 | signal clicked() |
| 20 | 4 | signal pressAndHold() | 4 | signal pressAndHold() |
| 21 | 5 | property bool pressed | 5 | property bool pressed |
| 23 | 6 | Ubuntu.Components.AbstractButton 1.3 UbuntuToolkit::UCAbstractButton: ActionItem | 6 | Ubuntu.Components.AbstractButton 1.3 UCAbstractButton: ActionItem |
| 24 | 7 | readonly property bool hovered | 7 | readonly property bool hovered |
| 25 | 8 | signal clicked() | 8 | signal clicked() |
| 26 | 9 | signal pressAndHold() | 9 | signal pressAndHold() |
| 27 | 10 | readonly property bool pressed | 10 | readonly property bool pressed |
| 28 | 11 | readonly property UCMargins sensingMargins | 11 | readonly property UCMargins sensingMargins |
| 30 | 12 | Ubuntu.Components.Action 1.3 1.0 0.1 UbuntuToolkit::UCAction: QtObject | 12 | Ubuntu.Components.Action 1.3 1.0 0.1 UCAction: QtObject |
| 31 | 13 | property string description | 13 | property string description |
| 32 | 14 | property bool enabled | 14 | property bool enabled |
| 33 | 15 | property string iconName | 15 | property string iconName |
| 34 | @@ -24,13 +24,6 @@ | |||
| 35 | 24 | property var shortcut 1.3 | 24 | property var shortcut 1.3 |
| 36 | 25 | property string text | 25 | property string text |
| 37 | 26 | property bool visible | 26 | property bool visible |
| 38 | 27 | Ubuntu.Components.Action.Type: Enum | ||
| 39 | 28 | Bool | ||
| 40 | 29 | Integer | ||
| 41 | 30 | None | ||
| 42 | 31 | Object | ||
| 43 | 32 | Real | ||
| 44 | 33 | String | ||
| 45 | 34 | Ubuntu.Components.ActionBar 1.3: StyledItem | 27 | Ubuntu.Components.ActionBar 1.3: StyledItem |
| 46 | 35 | property list<Action> actions | 28 | property list<Action> actions |
| 47 | 36 | property Component delegate | 29 | property Component delegate |
| 48 | @@ -43,12 +36,12 @@ | |||
| 49 | 43 | property string overflowIconName | 36 | property string overflowIconName |
| 50 | 44 | property url overflowIconSource | 37 | property url overflowIconSource |
| 51 | 45 | property string overflowText | 38 | property string overflowText |
| 53 | 46 | Ubuntu.Components.ActionContext 1.0 0.1 UbuntuToolkit::UCActionContext: QtObject | 39 | Ubuntu.Components.ActionContext 1.0 0.1 UCActionContext: QtObject |
| 54 | 47 | default property list<Action> actions | 40 | default property list<Action> actions |
| 55 | 48 | property bool active | 41 | property bool active |
| 56 | 49 | function addAction(Action action) | 42 | function addAction(Action action) |
| 57 | 50 | function removeAction(Action action) | 43 | function removeAction(Action action) |
| 59 | 51 | Ubuntu.Components.ActionItem 1.0 0.1 UbuntuToolkit::UCActionItem: StyledItem | 44 | Ubuntu.Components.ActionItem 1.0 0.1 UCActionItem: StyledItem |
| 60 | 52 | property Action action | 45 | property Action action |
| 61 | 53 | property string iconName | 46 | property string iconName |
| 62 | 54 | property url iconSource | 47 | property url iconSource |
| 63 | @@ -69,7 +62,7 @@ | |||
| 64 | 69 | Ubuntu.Components.ActionList 1.3: QtObject | 62 | Ubuntu.Components.ActionList 1.3: QtObject |
| 65 | 70 | property list<Action> actions | 63 | property list<Action> actions |
| 66 | 71 | default property list<Action> children | 64 | default property list<Action> children |
| 68 | 72 | Ubuntu.Components.ActionManager 1.0 0.1 UbuntuToolkit::UCActionManager: QtObject | 65 | Ubuntu.Components.ActionManager 1.0 0.1 UCActionManager: QtObject |
| 69 | 73 | default property list<Action> actions | 66 | default property list<Action> actions |
| 70 | 74 | readonly property ActionContext globalContext | 67 | readonly property ActionContext globalContext |
| 71 | 75 | property list<ActionContext> localContexts | 68 | property list<ActionContext> localContexts |
| 72 | @@ -101,7 +94,7 @@ | |||
| 73 | 101 | function var removePages(var page) | 94 | function var removePages(var page) |
| 74 | 102 | property Page primaryPage | 95 | property Page primaryPage |
| 75 | 103 | property var primaryPageSource | 96 | property var primaryPageSource |
| 77 | 104 | Ubuntu.Components.Alarm 1.0 0.1 UbuntuToolkit::UCAlarm: QtObject | 97 | Ubuntu.Components.Alarm 1.0 0.1 UCAlarm: QtObject |
| 78 | 105 | property QDateTime date | 98 | property QDateTime date |
| 79 | 106 | property DaysOfWeek daysOfWeek | 99 | property DaysOfWeek daysOfWeek |
| 80 | 107 | property bool enabled | 100 | property bool enabled |
| 81 | @@ -114,58 +107,20 @@ | |||
| 82 | 114 | property url sound | 107 | property url sound |
| 83 | 115 | readonly property Status status | 108 | readonly property Status status |
| 84 | 116 | property AlarmType type | 109 | property AlarmType type |
| 86 | 117 | Ubuntu.Components.Alarm.AlarmType: Enum | 110 | Ubuntu.Components.AlarmModel 1.0 0.1 UCAlarmModel: QAbstractListModel |
| 87 | 111 | readonly property int count | ||
| 88 | 112 | function refresh() 1.0 | ||
| 89 | 113 | function Alarm get(int index) | ||
| 90 | 114 | Ubuntu.Components.AlarmType: Enum | ||
| 91 | 118 | OneTime | 115 | OneTime |
| 92 | 119 | Repeating | 116 | Repeating |
| 136 | 120 | Ubuntu.Components.Alarm.DayOfWeek: Enum | 117 | Ubuntu.Components.Argument 1.0 0.1 UCArgument: QtObject |
| 94 | 121 | AutoDetect | ||
| 95 | 122 | Daily | ||
| 96 | 123 | Friday | ||
| 97 | 124 | Monday | ||
| 98 | 125 | Saturday | ||
| 99 | 126 | Sunday | ||
| 100 | 127 | Thursday | ||
| 101 | 128 | Tuesday | ||
| 102 | 129 | Wednesday | ||
| 103 | 130 | Ubuntu.Components.Alarm.DaysOfWeek: Flag | ||
| 104 | 131 | AutoDetect | ||
| 105 | 132 | Daily | ||
| 106 | 133 | Friday | ||
| 107 | 134 | Monday | ||
| 108 | 135 | Saturday | ||
| 109 | 136 | Sunday | ||
| 110 | 137 | Thursday | ||
| 111 | 138 | Tuesday | ||
| 112 | 139 | Wednesday | ||
| 113 | 140 | Ubuntu.Components.Alarm.Error: Enum | ||
| 114 | 141 | AdaptationError | ||
| 115 | 142 | EarlyDate | ||
| 116 | 143 | InvalidDate | ||
| 117 | 144 | InvalidEvent | ||
| 118 | 145 | NoDaysOfWeek | ||
| 119 | 146 | NoError | ||
| 120 | 147 | OneTimeOnMoreDays | ||
| 121 | 148 | OperationPending | ||
| 122 | 149 | Ubuntu.Components.Alarm.Operation: Enum | ||
| 123 | 150 | Canceling | ||
| 124 | 151 | NoOperation | ||
| 125 | 152 | Reseting | ||
| 126 | 153 | Saving | ||
| 127 | 154 | Ubuntu.Components.Alarm.Status: Enum | ||
| 128 | 155 | Fail | ||
| 129 | 156 | InProgress | ||
| 130 | 157 | Ready | ||
| 131 | 158 | Ubuntu.Components.AlarmModel 1.0 0.1 UbuntuToolkit::UCAlarmModel: QAbstractListModel | ||
| 132 | 159 | readonly property int count | ||
| 133 | 160 | function refresh() 1.0 | ||
| 134 | 161 | function Alarm get(int index) | ||
| 135 | 162 | Ubuntu.Components.Argument 1.0 0.1 UbuntuToolkit::UCArgument: QtObject | ||
| 137 | 163 | property string help | 118 | property string help |
| 138 | 164 | function var at(int i) | 119 | function var at(int i) |
| 139 | 165 | property string name | 120 | property string name |
| 140 | 166 | property bool required | 121 | property bool required |
| 141 | 167 | property QStringList valueNames | 122 | property QStringList valueNames |
| 143 | 168 | Ubuntu.Components.Arguments 1.0 0.1 UbuntuToolkit::UCArguments: QtObject | 123 | Ubuntu.Components.Arguments 1.0 0.1 UCArguments: QtObject |
| 144 | 169 | default property list<Argument> arguments | 124 | default property list<Argument> arguments |
| 145 | 170 | property Argument defaultArgument | 125 | property Argument defaultArgument |
| 146 | 171 | readonly property bool error | 126 | readonly property bool error |
| 147 | @@ -174,6 +129,13 @@ | |||
| 148 | 174 | function quitWithError(string errorMessage) | 129 | function quitWithError(string errorMessage) |
| 149 | 175 | function quitWithError() | 130 | function quitWithError() |
| 150 | 176 | readonly property QQmlPropertyMap values | 131 | readonly property QQmlPropertyMap values |
| 151 | 132 | Ubuntu.Components.Aspect: Enum | ||
| 152 | 133 | DropShadow | ||
| 153 | 134 | Flat | ||
| 154 | 135 | Inset | ||
| 155 | 136 | Ubuntu.Components.BackgroundMode: Enum | ||
| 156 | 137 | SolidColor | ||
| 157 | 138 | VerticalGradient | ||
| 158 | 177 | Ubuntu.Components.ListItems.Base 1.0 0.1: Empty | 139 | Ubuntu.Components.ListItems.Base 1.0 0.1: Empty |
| 159 | 178 | property string fallbackIconName | 140 | property string fallbackIconName |
| 160 | 179 | property url fallbackIconSource | 141 | property url fallbackIconSource |
| 161 | @@ -186,7 +148,7 @@ | |||
| 162 | 186 | property var icon | 148 | property var icon |
| 163 | 187 | property bool iconFrame | 149 | property bool iconFrame |
| 164 | 188 | property bool progression | 150 | property bool progression |
| 166 | 189 | Ubuntu.Components.BottomEdge 1.3 UbuntuToolkit::UCBottomEdge: StyledItem | 151 | Ubuntu.Components.BottomEdge 1.3 UCBottomEdge: StyledItem |
| 167 | 190 | readonly property BottomEdgeRegion activeRegion | 152 | readonly property BottomEdgeRegion activeRegion |
| 168 | 191 | property Component contentComponent | 153 | property Component contentComponent |
| 169 | 192 | readonly property Item contentItem | 154 | readonly property Item contentItem |
| 170 | @@ -195,8 +157,8 @@ | |||
| 171 | 195 | readonly property double dragProgress | 157 | readonly property double dragProgress |
| 172 | 196 | readonly property BottomEdgeHint hint | 158 | readonly property BottomEdgeHint hint |
| 173 | 197 | signal dragProgressChanged(double dragProgress) | 159 | signal dragProgressChanged(double dragProgress) |
| 176 | 198 | signal dragDirectionChanged(BottomEdge.DragDirection direction) | 160 | signal dragDirectionChanged(DragDirection direction) |
| 177 | 199 | signal statusChanged(BottomEdge.Status status) | 161 | signal statusChanged(Status status) |
| 178 | 200 | signal contentChanged(url url) | 162 | signal contentChanged(url url) |
| 179 | 201 | signal contentComponentChanged(Component component) | 163 | signal contentComponentChanged(Component component) |
| 180 | 202 | signal activeRegionChanged(BottomEdgeRegion activeRegion) | 164 | signal activeRegionChanged(BottomEdgeRegion activeRegion) |
| 181 | @@ -209,26 +171,13 @@ | |||
| 182 | 209 | property bool preloadContent | 171 | property bool preloadContent |
| 183 | 210 | property list<BottomEdgeRegion> regions | 172 | property list<BottomEdgeRegion> regions |
| 184 | 211 | readonly property Status status | 173 | readonly property Status status |
| 194 | 212 | Ubuntu.Components.BottomEdge.DragDirection: Enum | 174 | Ubuntu.Components.BottomEdgeHint 1.3 UCBottomEdgeHint: ActionItem |
| 186 | 213 | Downwards | ||
| 187 | 214 | Undefined | ||
| 188 | 215 | Upwards | ||
| 189 | 216 | Ubuntu.Components.BottomEdge.Status: Enum | ||
| 190 | 217 | Committed | ||
| 191 | 218 | Hidden | ||
| 192 | 219 | Revealed | ||
| 193 | 220 | Ubuntu.Components.BottomEdgeHint 1.3 UbuntuToolkit::UCBottomEdgeHint: ActionItem | ||
| 195 | 221 | property int deactivateTimeout | 175 | property int deactivateTimeout |
| 196 | 222 | property Flickable flickable | 176 | property Flickable flickable |
| 197 | 223 | signal clicked() | 177 | signal clicked() |
| 198 | 224 | property Status status | 178 | property Status status |
| 199 | 225 | readonly property SwipeArea swipeArea | 179 | readonly property SwipeArea swipeArea |
| 206 | 226 | Ubuntu.Components.BottomEdgeHint.Status: Enum | 180 | Ubuntu.Components.BottomEdgeRegion 1.3 UCBottomEdgeRegion: QtObject |
| 201 | 227 | Active | ||
| 202 | 228 | Hidden | ||
| 203 | 229 | Inactive | ||
| 204 | 230 | Locked | ||
| 205 | 231 | Ubuntu.Components.BottomEdgeRegion 1.3 UbuntuToolkit::UCBottomEdgeRegion: QtObject | ||
| 207 | 232 | property Component contentComponent | 181 | property Component contentComponent |
| 208 | 233 | property url contentUrl | 182 | property url contentUrl |
| 209 | 234 | property bool enabled | 183 | property bool enabled |
| 210 | @@ -239,7 +188,7 @@ | |||
| 211 | 239 | signal exited() | 188 | signal exited() |
| 212 | 240 | signal dragEnded() | 189 | signal dragEnded() |
| 213 | 241 | property double to | 190 | property double to |
| 215 | 242 | Ubuntu.Components.Styles.BottomEdgeStyle 1.3 UbuntuToolkit::UCBottomEdgeStyle: Item | 191 | Ubuntu.Components.Styles.BottomEdgeStyle 1.3 UCBottomEdgeStyle: Item |
| 216 | 243 | property Item contentItem | 192 | property Item contentItem |
| 217 | 244 | property Item panel | 193 | property Item panel |
| 218 | 245 | property Animation panelAnimation | 194 | property Animation panelAnimation |
| 219 | @@ -273,6 +222,9 @@ | |||
| 220 | 273 | property int captionStyle | 222 | property int captionStyle |
| 221 | 274 | readonly property Label subtitle | 223 | readonly property Label subtitle |
| 222 | 275 | readonly property Label title | 224 | readonly property Label title |
| 223 | 225 | Ubuntu.Components.CaptionsStyle: Enum | ||
| 224 | 226 | SummaryCaptionStyle | ||
| 225 | 227 | TitleCaptionStyle | ||
| 226 | 276 | Ubuntu.Components.CheckBox 1.0 0.1: AbstractButton | 228 | Ubuntu.Components.CheckBox 1.0 0.1: AbstractButton |
| 227 | 277 | property bool checked | 229 | property bool checked |
| 228 | 278 | Ubuntu.Components.CheckBox 1.3: AbstractButton | 230 | Ubuntu.Components.CheckBox 1.3: AbstractButton |
| 229 | @@ -379,6 +331,26 @@ | |||
| 230 | 379 | readonly property int week | 331 | readonly property int week |
| 231 | 380 | readonly property int year | 332 | readonly property int year |
| 232 | 381 | Ubuntu.Components.DateUtils 0.1 1.0 1.3 | 333 | Ubuntu.Components.DateUtils 0.1 1.0 1.3 |
| 233 | 334 | Ubuntu.Components.DayOfWeek: Enum | ||
| 234 | 335 | AutoDetect | ||
| 235 | 336 | Daily | ||
| 236 | 337 | Friday | ||
| 237 | 338 | Monday | ||
| 238 | 339 | Saturday | ||
| 239 | 340 | Sunday | ||
| 240 | 341 | Thursday | ||
| 241 | 342 | Tuesday | ||
| 242 | 343 | Wednesday | ||
| 243 | 344 | Ubuntu.Components.DaysOfWeek: Flag | ||
| 244 | 345 | AutoDetect | ||
| 245 | 346 | Daily | ||
| 246 | 347 | Friday | ||
| 247 | 348 | Monday | ||
| 248 | 349 | Saturday | ||
| 249 | 350 | Sunday | ||
| 250 | 351 | Thursday | ||
| 251 | 352 | Tuesday | ||
| 252 | 353 | Wednesday | ||
| 253 | 382 | Ubuntu.Components.Popups.DefaultSheet 1.0 0.1: SheetBase | 354 | Ubuntu.Components.Popups.DefaultSheet 1.0 0.1: SheetBase |
| 254 | 383 | property bool doneButton | 355 | property bool doneButton |
| 255 | 384 | signal closeClicked() | 356 | signal closeClicked() |
| 256 | @@ -441,6 +413,10 @@ | |||
| 257 | 441 | property string title | 413 | property string title |
| 258 | 442 | Ubuntu.Components.ListItems.Divider 1.0 0.1: QQuickImageBase | 414 | Ubuntu.Components.ListItems.Divider 1.0 0.1: QQuickImageBase |
| 259 | 443 | Ubuntu.Components.ListItems.Divider 1.3: QQuickImageBase | 415 | Ubuntu.Components.ListItems.Divider 1.3: QQuickImageBase |
| 260 | 416 | Ubuntu.Components.DragDirection: Enum | ||
| 261 | 417 | Downwards | ||
| 262 | 418 | Undefined | ||
| 263 | 419 | Upwards | ||
| 264 | 444 | Ubuntu.Components.ListItems.Empty 1.0 0.1: AbstractButton | 420 | Ubuntu.Components.ListItems.Empty 1.0 0.1: AbstractButton |
| 265 | 445 | property list<Item> backgroundIndicator | 421 | property list<Item> backgroundIndicator |
| 266 | 446 | property bool confirmRemoval | 422 | property bool confirmRemoval |
| 267 | @@ -465,6 +441,15 @@ | |||
| 268 | 465 | property bool showDivider | 441 | property bool showDivider |
| 269 | 466 | readonly property string swipingState | 442 | readonly property string swipingState |
| 270 | 467 | readonly property bool waitingConfirmationForRemoval | 443 | readonly property bool waitingConfirmationForRemoval |
| 271 | 444 | Ubuntu.Components.Error: Enum | ||
| 272 | 445 | AdaptationError | ||
| 273 | 446 | EarlyDate | ||
| 274 | 447 | InvalidDate | ||
| 275 | 448 | InvalidEvent | ||
| 276 | 449 | NoDaysOfWeek | ||
| 277 | 450 | NoError | ||
| 278 | 451 | OneTimeOnMoreDays | ||
| 279 | 452 | OperationPending | ||
| 280 | 468 | Ubuntu.Components.ListItems.Expandable 1.0 0.1: Empty | 453 | Ubuntu.Components.ListItems.Expandable 1.0 0.1: Empty |
| 281 | 469 | property bool collapseOnClick | 454 | property bool collapseOnClick |
| 282 | 470 | property double collapsedHeight | 455 | property double collapsedHeight |
| 283 | @@ -483,9 +468,28 @@ | |||
| 284 | 483 | readonly property var expandedItem | 468 | readonly property var expandedItem |
| 285 | 484 | function var expandItem(var item) | 469 | function var expandItem(var item) |
| 286 | 485 | function var collapse() | 470 | function var collapse() |
| 287 | 471 | Ubuntu.Components.ExpansionFlag: Enum | ||
| 288 | 472 | CollapseOnOutsidePress | ||
| 289 | 473 | Exclusive | ||
| 290 | 474 | UnlockExpanded | ||
| 291 | 475 | Ubuntu.Components.FillMode: Enum | ||
| 292 | 476 | Pad | ||
| 293 | 477 | PreserveAspectCrop | ||
| 294 | 478 | PreserveAspectFit | ||
| 295 | 479 | Stretch | ||
| 296 | 486 | Ubuntu.Components.FilterBehavior 1.1: QtObject | 480 | Ubuntu.Components.FilterBehavior 1.1: QtObject |
| 297 | 487 | property QRegExp pattern | 481 | property QRegExp pattern |
| 298 | 488 | property string property | 482 | property string property |
| 299 | 483 | Ubuntu.Components.Frequency: Enum | ||
| 300 | 484 | Disabled | ||
| 301 | 485 | Hour | ||
| 302 | 486 | Minute | ||
| 303 | 487 | Relative | ||
| 304 | 488 | Second | ||
| 305 | 489 | Ubuntu.Components.HAlignment: Enum | ||
| 306 | 490 | AlignHCenter | ||
| 307 | 491 | AlignLeft | ||
| 308 | 492 | AlignRight | ||
| 309 | 489 | Ubuntu.Components.Haptics 1.0 0.1: QtObject singleton | 493 | Ubuntu.Components.Haptics 1.0 0.1: QtObject singleton |
| 310 | 490 | readonly property QtObject effect | 494 | readonly property QtObject effect |
| 311 | 491 | readonly property bool enabled | 495 | readonly property bool enabled |
| 312 | @@ -511,7 +515,7 @@ | |||
| 313 | 511 | property bool useDeprecatedToolbar | 515 | property bool useDeprecatedToolbar |
| 314 | 512 | Ubuntu.Components.ListItems.Header 1.3 ListItemHeader: Item | 516 | Ubuntu.Components.ListItems.Header 1.3 ListItemHeader: Item |
| 315 | 513 | property string text | 517 | property string text |
| 317 | 514 | Ubuntu.Components.Header 1.3 UbuntuToolkit::UCHeader: StyledItem | 518 | Ubuntu.Components.Header 1.3 UCHeader: StyledItem |
| 318 | 515 | property bool automaticHeight | 519 | property bool automaticHeight |
| 319 | 516 | property bool exposed | 520 | property bool exposed |
| 320 | 517 | property Flickable flickable | 521 | property Flickable flickable |
| 321 | @@ -528,8 +532,8 @@ | |||
| 322 | 528 | property color keyColor | 532 | property color keyColor |
| 323 | 529 | property string name | 533 | property string name |
| 324 | 530 | property url source | 534 | property url source |
| 327 | 531 | Ubuntu.Components.InverseMouse 1.0 0.1 UbuntuToolkit::UCInverseMouse: Mouse | 535 | Ubuntu.Components.InverseMouse 1.0 0.1 UCInverseMouse: Mouse |
| 328 | 532 | Ubuntu.Components.InverseMouseArea 1.0 0.1 UbuntuToolkit::InverseMouseAreaType: MouseArea | 536 | Ubuntu.Components.InverseMouseArea 1.0 0.1 InverseMouseAreaType: MouseArea |
| 329 | 533 | function bool contains(QPointF point) | 537 | function bool contains(QPointF point) |
| 330 | 534 | property Item sensingArea | 538 | property Item sensingArea |
| 331 | 535 | property bool topmostItem | 539 | property bool topmostItem |
| 332 | @@ -561,20 +565,13 @@ | |||
| 333 | 561 | property int selectedIndex | 565 | property int selectedIndex |
| 334 | 562 | Ubuntu.Components.Label 1.0 0.1: Text | 566 | Ubuntu.Components.Label 1.0 0.1: Text |
| 335 | 563 | property string fontSize | 567 | property string fontSize |
| 337 | 564 | Ubuntu.Components.Label 1.3 UbuntuToolkit::UCLabel: Text | 568 | Ubuntu.Components.Label 1.3 UCLabel: Text |
| 338 | 565 | property string fontSize | 569 | property string fontSize |
| 339 | 566 | property TextSize textSize | 570 | property TextSize textSize |
| 340 | 567 | Ubuntu.Components.Label.TextSize: Enum | ||
| 341 | 568 | Large | ||
| 342 | 569 | Medium | ||
| 343 | 570 | Small | ||
| 344 | 571 | XLarge | ||
| 345 | 572 | XSmall | ||
| 346 | 573 | XxSmall | ||
| 347 | 574 | Ubuntu.Layouts.Layouts 1.0 0.1 ULLayouts: Item | 571 | Ubuntu.Layouts.Layouts 1.0 0.1 ULLayouts: Item |
| 348 | 575 | readonly property string currentLayout | 572 | readonly property string currentLayout |
| 349 | 576 | property list<ConditionalLayout> layouts | 573 | property list<ConditionalLayout> layouts |
| 351 | 577 | Ubuntu.Components.ListItem 1.3 1.2 UbuntuToolkit::UCListItem: StyledItem | 574 | Ubuntu.Components.ListItem 1.3 1.2 UCListItem: StyledItem |
| 352 | 578 | property Action action | 575 | property Action action |
| 353 | 579 | property color color | 576 | property color color |
| 354 | 580 | readonly property Item contentItem | 577 | readonly property Item contentItem |
| 355 | @@ -597,7 +594,7 @@ | |||
| 356 | 597 | property bool swipeEnabled 1.3 | 594 | property bool swipeEnabled 1.3 |
| 357 | 598 | readonly property bool swiped 1.3 | 595 | readonly property bool swiped 1.3 |
| 358 | 599 | property ListItemActions trailingActions | 596 | property ListItemActions trailingActions |
| 360 | 600 | Ubuntu.Components.ListItemActions 1.2 UbuntuToolkit::UCListItemActions: QtObject | 597 | Ubuntu.Components.ListItemActions 1.2 UCListItemActions: QtObject |
| 361 | 601 | property list<Action> actions | 598 | property list<Action> actions |
| 362 | 602 | default property list<QtObject> data | 599 | default property list<QtObject> data |
| 363 | 603 | property Component delegate | 600 | property Component delegate |
| 364 | @@ -608,15 +605,11 @@ | |||
| 365 | 608 | property int minimumIndex | 605 | property int minimumIndex |
| 366 | 609 | readonly property Status status | 606 | readonly property Status status |
| 367 | 610 | readonly property int to | 607 | readonly property int to |
| 373 | 611 | Ubuntu.Components.ListItemDrag.Status: Enum | 608 | Ubuntu.Components.ListItemLayout 1.3 UCListItemLayout: SlotsLayout |
| 369 | 612 | Dropped | ||
| 370 | 613 | Moving | ||
| 371 | 614 | Started | ||
| 372 | 615 | Ubuntu.Components.ListItemLayout 1.3 UbuntuToolkit::UCListItemLayout: SlotsLayout | ||
| 374 | 616 | readonly property Label subtitle | 609 | readonly property Label subtitle |
| 375 | 617 | readonly property Label summary | 610 | readonly property Label summary |
| 376 | 618 | readonly property Label title | 611 | readonly property Label title |
| 378 | 619 | Ubuntu.Components.Styles.ListItemStyle 1.3 1.2 UbuntuToolkit::UCListItemStyle: Item | 612 | Ubuntu.Components.Styles.ListItemStyle 1.3 1.2 UCListItemStyle: Item |
| 379 | 620 | readonly property bool animatePanels | 613 | readonly property bool animatePanels |
| 380 | 621 | property Item dragPanel | 614 | property Item dragPanel |
| 381 | 622 | property PropertyAnimation dropAnimation | 615 | property PropertyAnimation dropAnimation |
| 382 | @@ -625,16 +618,10 @@ | |||
| 383 | 625 | function swipeEvent(SwipeEvent event) | 618 | function swipeEvent(SwipeEvent event) |
| 384 | 626 | function rebound() | 619 | function rebound() |
| 385 | 627 | property Animation snapAnimation | 620 | property Animation snapAnimation |
| 387 | 628 | Ubuntu.Components.LiveTimer 1.3 UbuntuToolkit::LiveTimer: QtObject | 621 | Ubuntu.Components.LiveTimer 1.3 LiveTimer: QtObject |
| 388 | 629 | property Frequency frequency | 622 | property Frequency frequency |
| 389 | 630 | signal trigger() | 623 | signal trigger() |
| 390 | 631 | property QDateTime relativeTime | 624 | property QDateTime relativeTime |
| 391 | 632 | Ubuntu.Components.LiveTimer.Frequency: Enum | ||
| 392 | 633 | Disabled | ||
| 393 | 634 | Hour | ||
| 394 | 635 | Minute | ||
| 395 | 636 | Relative | ||
| 396 | 637 | Second | ||
| 397 | 638 | Ubuntu.Components.MainView 1.0 0.1: MainViewBase | 625 | Ubuntu.Components.MainView 1.0 0.1: MainViewBase |
| 398 | 639 | property bool automaticOrientation | 626 | property bool automaticOrientation |
| 399 | 640 | default property list<QtObject> contentsItem | 627 | default property list<QtObject> contentsItem |
| 400 | @@ -645,7 +632,7 @@ | |||
| 401 | 645 | Ubuntu.Components.MainView 1.3: MainViewBase | 632 | Ubuntu.Components.MainView 1.3: MainViewBase |
| 402 | 646 | property bool automaticOrientation | 633 | property bool automaticOrientation |
| 403 | 647 | default property list<QtObject> contentsItem | 634 | default property list<QtObject> contentsItem |
| 405 | 648 | Ubuntu.Components.MainViewBase 1.3 UbuntuToolkit::UCMainViewBase: PageTreeNode | 635 | Ubuntu.Components.MainViewBase 1.3 UCMainViewBase: PageTreeNode |
| 406 | 649 | readonly property PopupContext actionContext | 636 | readonly property PopupContext actionContext |
| 407 | 650 | readonly property ActionManager actionManager | 637 | readonly property ActionManager actionManager |
| 408 | 651 | property list<Action> actions | 638 | property list<Action> actions |
| 409 | @@ -666,14 +653,14 @@ | |||
| 410 | 666 | function double lerp(double delta, double from, double to) | 653 | function double lerp(double delta, double from, double to) |
| 411 | 667 | function double projectValue(double x, double xmin, double xmax, double ymin, double ymax) | 654 | function double projectValue(double x, double xmin, double xmax, double ymin, double ymax) |
| 412 | 668 | function double clampAndProject(double x, double xmin, double xmax, double ymin, double ymax) | 655 | function double clampAndProject(double x, double xmin, double xmax, double ymin, double ymax) |
| 414 | 669 | Ubuntu.Components.MimeData 1.0 0.1 UbuntuToolkit::QQuickMimeData: QtObject | 656 | Ubuntu.Components.MimeData 1.0 0.1 QQuickMimeData: QtObject |
| 415 | 670 | property color color | 657 | property color color |
| 416 | 671 | property var data | 658 | property var data |
| 417 | 672 | readonly property QStringList formats | 659 | readonly property QStringList formats |
| 418 | 673 | property string html | 660 | property string html |
| 419 | 674 | property string text | 661 | property string text |
| 420 | 675 | property list<url> urls | 662 | property list<url> urls |
| 422 | 676 | Ubuntu.Components.Mouse 1.0 0.1 UbuntuToolkit::UCMouse: QtObject | 663 | Ubuntu.Components.Mouse 1.0 0.1 UCMouse: QtObject |
| 423 | 677 | readonly property Qt.MouseButtons acceptedButtons | 664 | readonly property Qt.MouseButtons acceptedButtons |
| 424 | 678 | property int clickAndHoldThreshold | 665 | property int clickAndHoldThreshold |
| 425 | 679 | property bool enabled | 666 | property bool enabled |
| 426 | @@ -689,9 +676,6 @@ | |||
| 427 | 689 | signal entered(QQuickMouseEvent event, Item host) | 676 | signal entered(QQuickMouseEvent event, Item host) |
| 428 | 690 | signal exited(QQuickMouseEvent event, Item host) | 677 | signal exited(QQuickMouseEvent event, Item host) |
| 429 | 691 | property Priority priority | 678 | property Priority priority |
| 430 | 692 | Ubuntu.Components.Mouse.Priority: Enum | ||
| 431 | 693 | AfterItem | ||
| 432 | 694 | BeforeItem | ||
| 433 | 695 | Ubuntu.Test.MouseTouchAdaptor 1.0: QtObject singleton | 679 | Ubuntu.Test.MouseTouchAdaptor 1.0: QtObject singleton |
| 434 | 696 | property bool enabled | 680 | property bool enabled |
| 435 | 697 | signal enabledChanged(bool value) | 681 | signal enabledChanged(bool value) |
| 436 | @@ -701,6 +685,11 @@ | |||
| 437 | 701 | property var values | 685 | property var values |
| 438 | 702 | Ubuntu.Components.Object 1.0 0.1: QtObject | 686 | Ubuntu.Components.Object 1.0 0.1: QtObject |
| 439 | 703 | default property list<QtObject> children | 687 | default property list<QtObject> children |
| 440 | 688 | Ubuntu.Components.Operation: Enum | ||
| 441 | 689 | Canceling | ||
| 442 | 690 | NoOperation | ||
| 443 | 691 | Reseting | ||
| 444 | 692 | Saving | ||
| 445 | 704 | Ubuntu.Components.OptionSelector 1.0 0.1: Empty | 693 | Ubuntu.Components.OptionSelector 1.0 0.1: Empty |
| 446 | 705 | property bool colourImage | 694 | property bool colourImage |
| 447 | 706 | property double containerHeight | 695 | property double containerHeight |
| 448 | @@ -862,7 +851,7 @@ | |||
| 449 | 862 | function var push(var page, var properties) | 851 | function var push(var page, var properties) |
| 450 | 863 | function var pop() | 852 | function var pop() |
| 451 | 864 | function var clear() | 853 | function var clear() |
| 453 | 865 | Ubuntu.Components.PageTreeNode 1.3 UbuntuToolkit::UCPageTreeNode: StyledItem | 854 | Ubuntu.Components.PageTreeNode 1.3 UCPageTreeNode: StyledItem |
| 454 | 866 | property bool active | 855 | property bool active |
| 455 | 867 | readonly property Item activeLeafNode | 856 | readonly property Item activeLeafNode |
| 456 | 868 | property bool isLeaf | 857 | property bool isLeaf |
| 457 | @@ -1023,8 +1012,11 @@ | |||
| 458 | 1023 | property bool grabDismissAreaEvents | 1012 | property bool grabDismissAreaEvents |
| 459 | 1024 | function var show() | 1013 | function var show() |
| 460 | 1025 | function var hide() | 1014 | function var hide() |
| 462 | 1026 | Ubuntu.Components.PopupContext 1.3 UbuntuToolkit::UCPopupContext: ActionContext | 1015 | Ubuntu.Components.PopupContext 1.3 UCPopupContext: ActionContext |
| 463 | 1027 | Ubuntu.Components.Popups.PopupUtils 0.1 1.0 1.3 | 1016 | Ubuntu.Components.Popups.PopupUtils 0.1 1.0 1.3 |
| 464 | 1017 | Ubuntu.Components.Priority: Enum | ||
| 465 | 1018 | AfterItem | ||
| 466 | 1019 | BeforeItem | ||
| 467 | 1028 | Ubuntu.Components.ProgressBar 1.0 0.1: AnimatedItem | 1020 | Ubuntu.Components.ProgressBar 1.0 0.1: AnimatedItem |
| 468 | 1029 | property bool indeterminate | 1021 | property bool indeterminate |
| 469 | 1030 | property double maximumValue | 1022 | property double maximumValue |
| 470 | @@ -1046,7 +1038,7 @@ | |||
| 471 | 1046 | property color keyColor | 1038 | property color keyColor |
| 472 | 1047 | property string name | 1039 | property string name |
| 473 | 1048 | property url source | 1040 | property url source |
| 475 | 1049 | Ubuntu.Components.ProportionalShape 1.3 UbuntuToolkit::UCProportionalShape: UbuntuShape | 1041 | Ubuntu.Components.ProportionalShape 1.3 UCProportionalShape: UbuntuShape |
| 476 | 1050 | Ubuntu.Components.PullToRefresh 1.1: StyledItem | 1042 | Ubuntu.Components.PullToRefresh 1.1: StyledItem |
| 477 | 1051 | property Component content | 1043 | property Component content |
| 478 | 1052 | signal refresh() | 1044 | signal refresh() |
| 479 | @@ -1093,7 +1085,7 @@ | |||
| 480 | 1093 | property color selectedSectionColor | 1085 | property color selectedSectionColor |
| 481 | 1094 | property int textSize | 1086 | property int textSize |
| 482 | 1095 | property color underlineColor | 1087 | property color underlineColor |
| 484 | 1096 | Ubuntu.Components.ServiceProperties 1.1 UbuntuToolkit::UCServiceProperties: QtObject | 1088 | Ubuntu.Components.ServiceProperties 1.1 UCServiceProperties: QtObject |
| 485 | 1097 | property string adaptorInterface 1.1 | 1089 | property string adaptorInterface 1.1 |
| 486 | 1098 | readonly property string error 1.1 | 1090 | readonly property string error 1.1 |
| 487 | 1099 | property string path 1.1 | 1091 | property string path 1.1 |
| 488 | @@ -1101,15 +1093,10 @@ | |||
| 489 | 1101 | property string serviceInterface 1.1 | 1093 | property string serviceInterface 1.1 |
| 490 | 1102 | readonly property Status status 1.1 | 1094 | readonly property Status status 1.1 |
| 491 | 1103 | property ServiceType type 1.1 | 1095 | property ServiceType type 1.1 |
| 493 | 1104 | Ubuntu.Components.ServiceProperties.ServiceType: Enum | 1096 | Ubuntu.Components.ServiceType: Enum |
| 494 | 1105 | Session | 1097 | Session |
| 495 | 1106 | System | 1098 | System |
| 496 | 1107 | Undefined | 1099 | Undefined |
| 497 | 1108 | Ubuntu.Components.ServiceProperties.Status: Enum | ||
| 498 | 1109 | Active | ||
| 499 | 1110 | ConnectionError | ||
| 500 | 1111 | Inactive | ||
| 501 | 1112 | Synchronizing | ||
| 502 | 1113 | Ubuntu.Components.Popups.SheetBase 1.0 0.1: PopupBase | 1100 | Ubuntu.Components.Popups.SheetBase 1.0 0.1: PopupBase |
| 503 | 1114 | default property list<QtObject> container | 1101 | default property list<QtObject> container |
| 504 | 1115 | property double contentsHeight | 1102 | property double contentsHeight |
| 505 | @@ -1151,15 +1138,10 @@ | |||
| 506 | 1151 | Ubuntu.Components.SlotsAttached 1.3: QtObject | 1138 | Ubuntu.Components.SlotsAttached 1.3: QtObject |
| 507 | 1152 | property bool overrideVerticalPositioning | 1139 | property bool overrideVerticalPositioning |
| 508 | 1153 | readonly property SlotsLayoutPadding padding | 1140 | readonly property SlotsLayoutPadding padding |
| 511 | 1154 | property SlotsLayout.UCSlotPosition position | 1141 | property UCSlotPosition position |
| 512 | 1155 | Ubuntu.Components.SlotsLayout 1.3 UbuntuToolkit::UCSlotsLayout: Item | 1142 | Ubuntu.Components.SlotsLayout 1.3 UCSlotsLayout: Item |
| 513 | 1156 | property Item mainSlot | 1143 | property Item mainSlot |
| 514 | 1157 | readonly property SlotsLayoutPadding padding | 1144 | readonly property SlotsLayoutPadding padding |
| 515 | 1158 | Ubuntu.Components.SlotsLayout.UCSlotPosition: Enum | ||
| 516 | 1159 | First | ||
| 517 | 1160 | Last | ||
| 518 | 1161 | Leading | ||
| 519 | 1162 | Trailing | ||
| 520 | 1163 | Ubuntu.Components.SlotsLayoutPadding 1.3: QtObject | 1145 | Ubuntu.Components.SlotsLayoutPadding 1.3: QtObject |
| 521 | 1164 | property double bottom | 1146 | property double bottom |
| 522 | 1165 | property double leading | 1147 | property double leading |
| 523 | @@ -1168,7 +1150,7 @@ | |||
| 524 | 1168 | Ubuntu.Components.SortBehavior 1.1: QtObject | 1150 | Ubuntu.Components.SortBehavior 1.1: QtObject |
| 525 | 1169 | property Qt.SortOrder order | 1151 | property Qt.SortOrder order |
| 526 | 1170 | property string property | 1152 | property string property |
| 528 | 1171 | Ubuntu.Components.SortFilterModel 1.1 UbuntuToolkit::QSortFilterProxyModelQML: QSortFilterProxyModel | 1153 | Ubuntu.Components.SortFilterModel 1.1 QSortFilterProxyModelQML: QSortFilterProxyModel |
| 529 | 1172 | readonly property int count | 1154 | readonly property int count |
| 530 | 1173 | readonly property FilterBehavior filter | 1155 | readonly property FilterBehavior filter |
| 531 | 1174 | function QVariantMap get(int row) | 1156 | function QVariantMap get(int row) |
| 532 | @@ -1189,10 +1171,36 @@ | |||
| 533 | 1189 | property var icon | 1171 | property var icon |
| 534 | 1190 | property bool iconFrame | 1172 | property bool iconFrame |
| 535 | 1191 | property bool progression | 1173 | property bool progression |
| 538 | 1192 | Ubuntu.Components.StateSaver 1.0 0.1 UbuntuToolkit::UCStateSaver: QtObject | 1174 | Ubuntu.Components.StateSaver 1.0 0.1 UCStateSaver: QtObject |
| 539 | 1193 | Ubuntu.Components.StyleHints 1.3 UbuntuToolkit::UCStyleHints: QtObject | 1175 | Ubuntu.Components.Status: Enum |
| 540 | 1176 | Finished | ||
| 541 | 1177 | Started | ||
| 542 | 1178 | Updated | ||
| 543 | 1179 | Ubuntu.Components.Status: Enum | ||
| 544 | 1180 | Active | ||
| 545 | 1181 | ConnectionError | ||
| 546 | 1182 | Inactive | ||
| 547 | 1183 | Synchronizing | ||
| 548 | 1184 | Ubuntu.Components.Status: Enum | ||
| 549 | 1185 | Dropped | ||
| 550 | 1186 | Moving | ||
| 551 | 1187 | Started | ||
| 552 | 1188 | Ubuntu.Components.Status: Enum | ||
| 553 | 1189 | Active | ||
| 554 | 1190 | Hidden | ||
| 555 | 1191 | Inactive | ||
| 556 | 1192 | Locked | ||
| 557 | 1193 | Ubuntu.Components.Status: Enum | ||
| 558 | 1194 | Committed | ||
| 559 | 1195 | Hidden | ||
| 560 | 1196 | Revealed | ||
| 561 | 1197 | Ubuntu.Components.Status: Enum | ||
| 562 | 1198 | Fail | ||
| 563 | 1199 | InProgress | ||
| 564 | 1200 | Ready | ||
| 565 | 1201 | Ubuntu.Components.StyleHints 1.3 UCStyleHints: QtObject | ||
| 566 | 1194 | property bool ignoreUnknownProperties | 1202 | property bool ignoreUnknownProperties |
| 568 | 1195 | Ubuntu.Components.StyledItem 1.3 1.3 1.1 1.0 0.1 UbuntuToolkit::UCStyledItemBase: Item | 1203 | Ubuntu.Components.StyledItem 1.3 1.3 1.1 1.0 0.1 UCStyledItemBase: Item |
| 569 | 1196 | property bool activeFocusOnPress 1.3 | 1204 | property bool activeFocusOnPress 1.3 |
| 570 | 1197 | readonly property bool keyNavigationFocus 1.3 | 1205 | readonly property bool keyNavigationFocus 1.3 |
| 571 | 1198 | signal activeFocusOnTabChanged2() 1.3 | 1206 | signal activeFocusOnTabChanged2() 1.3 |
| 572 | @@ -1232,10 +1240,6 @@ | |||
| 573 | 1232 | readonly property QPointF from | 1240 | readonly property QPointF from |
| 574 | 1233 | readonly property Status status | 1241 | readonly property Status status |
| 575 | 1234 | readonly property QPointF to | 1242 | readonly property QPointF to |
| 576 | 1235 | Ubuntu.Components.SwipeEvent.Status: Enum | ||
| 577 | 1236 | Finished | ||
| 578 | 1237 | Started | ||
| 579 | 1238 | Updated | ||
| 580 | 1239 | Ubuntu.Components.Switch 1.0 0.1: AbstractButton | 1243 | Ubuntu.Components.Switch 1.0 0.1: AbstractButton |
| 581 | 1240 | property bool checked | 1244 | property bool checked |
| 582 | 1241 | Ubuntu.Components.Switch 1.3: AbstractButton | 1245 | Ubuntu.Components.Switch 1.3: AbstractButton |
| 583 | @@ -1540,9 +1544,16 @@ | |||
| 584 | 1540 | readonly property int selectionStart | 1544 | readonly property int selectionStart |
| 585 | 1541 | property QValidator validator | 1545 | property QValidator validator |
| 586 | 1542 | property int verticalAlignment | 1546 | property int verticalAlignment |
| 587 | 1547 | Ubuntu.Components.TextSize: Enum | ||
| 588 | 1548 | Large | ||
| 589 | 1549 | Medium | ||
| 590 | 1550 | Small | ||
| 591 | 1551 | XLarge | ||
| 592 | 1552 | XSmall | ||
| 593 | 1553 | XxSmall | ||
| 594 | 1543 | Ubuntu.PerformanceMetrics.TextureFromImage 1.0 0.1 UPMTextureFromImage: Item | 1554 | Ubuntu.PerformanceMetrics.TextureFromImage 1.0 0.1 UPMTextureFromImage: Item |
| 595 | 1544 | property QImage image | 1555 | property QImage image |
| 597 | 1545 | Ubuntu.Components.ThemeSettings 1.3 UbuntuToolkit::UCTheme: QtObject | 1556 | Ubuntu.Components.ThemeSettings 1.3 UCTheme: QtObject |
| 598 | 1546 | property string name | 1557 | property string name |
| 599 | 1547 | property QtObject palette | 1558 | property QtObject palette |
| 600 | 1548 | readonly property ThemeSettings parentTheme | 1559 | readonly property ThemeSettings parentTheme |
| 601 | @@ -1583,6 +1594,13 @@ | |||
| 602 | 1583 | property Item pageStack | 1594 | property Item pageStack |
| 603 | 1584 | Ubuntu.Components.Styles.ToolbarStyle 1.3: Item | 1595 | Ubuntu.Components.Styles.ToolbarStyle 1.3: Item |
| 604 | 1585 | property Component defaultDelegate | 1596 | property Component defaultDelegate |
| 605 | 1597 | Ubuntu.Components.Type: Enum | ||
| 606 | 1598 | Bool | ||
| 607 | 1599 | Integer | ||
| 608 | 1600 | None | ||
| 609 | 1601 | Object | ||
| 610 | 1602 | Real | ||
| 611 | 1603 | String | ||
| 612 | 1586 | UCActionContextAttached: QtObject | 1604 | UCActionContextAttached: QtObject |
| 613 | 1587 | Ubuntu.Components.UCApplication 1.0 0.1: QtObject | 1605 | Ubuntu.Components.UCApplication 1.0 0.1: QtObject |
| 614 | 1588 | property string applicationName | 1606 | property string applicationName |
| 615 | @@ -1602,6 +1620,11 @@ | |||
| 616 | 1602 | property double left | 1620 | property double left |
| 617 | 1603 | property double right | 1621 | property double right |
| 618 | 1604 | property double top | 1622 | property double top |
| 619 | 1623 | Ubuntu.Components.UCSlotPosition: Enum | ||
| 620 | 1624 | First | ||
| 621 | 1625 | Last | ||
| 622 | 1626 | Leading | ||
| 623 | 1627 | Trailing | ||
| 624 | 1605 | UCStateSaverAttached: QtObject | 1628 | UCStateSaverAttached: QtObject |
| 625 | 1606 | property bool enabled | 1629 | property bool enabled |
| 626 | 1607 | property string properties | 1630 | property string properties |
| 627 | @@ -1622,9 +1645,6 @@ | |||
| 628 | 1622 | readonly property ushort toolkitVersion | 1645 | readonly property ushort toolkitVersion |
| 629 | 1623 | readonly property ushort toolkitVersionMajor | 1646 | readonly property ushort toolkitVersionMajor |
| 630 | 1624 | readonly property ushort toolkitVersionMinor | 1647 | readonly property ushort toolkitVersionMinor |
| 631 | 1625 | Ubuntu.Components.Ubuntu.CaptionsStyle: Enum | ||
| 632 | 1626 | SummaryCaptionStyle | ||
| 633 | 1627 | TitleCaptionStyle | ||
| 634 | 1628 | Ubuntu.Components.UbuntuAnimation 1.0 0.1: QtObject singleton | 1648 | Ubuntu.Components.UbuntuAnimation 1.0 0.1: QtObject singleton |
| 635 | 1629 | readonly property int BriskDuration | 1649 | readonly property int BriskDuration |
| 636 | 1630 | readonly property int FastDuration | 1650 | readonly property int FastDuration |
| 637 | @@ -1688,7 +1708,7 @@ | |||
| 638 | 1688 | readonly property PullToRefresh pullToRefresh | 1708 | readonly property PullToRefresh pullToRefresh |
| 639 | 1689 | Ubuntu.Components.UbuntuNumberAnimation 1.0 0.1: PropertyAnimation | 1709 | Ubuntu.Components.UbuntuNumberAnimation 1.0 0.1: PropertyAnimation |
| 640 | 1690 | Ubuntu.Components.UbuntuNumberAnimation 1.3: PropertyAnimation | 1710 | Ubuntu.Components.UbuntuNumberAnimation 1.3: PropertyAnimation |
| 642 | 1691 | Ubuntu.Components.UbuntuShape 1.3 1.2 1.0 0.1 Shape 1.0 0.1 UbuntuToolkit::UCUbuntuShape: Item | 1711 | Ubuntu.Components.UbuntuShape 1.3 1.2 1.0 0.1 Shape 1.0 0.1 UCUbuntuShape: Item |
| 643 | 1692 | property Aspect aspect 1.3 | 1712 | property Aspect aspect 1.3 |
| 644 | 1693 | property color backgroundColor 1.3 | 1713 | property color backgroundColor 1.3 |
| 645 | 1694 | property BackgroundMode backgroundMode 1.3 | 1714 | property BackgroundMode backgroundMode 1.3 |
| 646 | @@ -1711,30 +1731,7 @@ | |||
| 647 | 1711 | property WrapMode sourceVerticalWrapMode 1.3 | 1731 | property WrapMode sourceVerticalWrapMode 1.3 |
| 648 | 1712 | property bool stretched | 1732 | property bool stretched |
| 649 | 1713 | property VAlignment verticalAlignment | 1733 | property VAlignment verticalAlignment |
| 674 | 1714 | Ubuntu.Components.UbuntuShape.Aspect: Enum | 1734 | Ubuntu.Components.UbuntuShapeOverlay 1.2 UCUbuntuShapeOverlay: UbuntuShape |
| 651 | 1715 | DropShadow | ||
| 652 | 1716 | Flat | ||
| 653 | 1717 | Inset | ||
| 654 | 1718 | Ubuntu.Components.UbuntuShape.BackgroundMode: Enum | ||
| 655 | 1719 | SolidColor | ||
| 656 | 1720 | VerticalGradient | ||
| 657 | 1721 | Ubuntu.Components.UbuntuShape.FillMode: Enum | ||
| 658 | 1722 | Pad | ||
| 659 | 1723 | PreserveAspectCrop | ||
| 660 | 1724 | PreserveAspectFit | ||
| 661 | 1725 | Stretch | ||
| 662 | 1726 | Ubuntu.Components.UbuntuShape.HAlignment: Enum | ||
| 663 | 1727 | AlignHCenter | ||
| 664 | 1728 | AlignLeft | ||
| 665 | 1729 | AlignRight | ||
| 666 | 1730 | Ubuntu.Components.UbuntuShape.VAlignment: Enum | ||
| 667 | 1731 | AlignBottom | ||
| 668 | 1732 | AlignTop | ||
| 669 | 1733 | AlignVCenter | ||
| 670 | 1734 | Ubuntu.Components.UbuntuShape.WrapMode: Enum | ||
| 671 | 1735 | Repeat | ||
| 672 | 1736 | Transparent | ||
| 673 | 1737 | Ubuntu.Components.UbuntuShapeOverlay 1.2 UbuntuToolkit::UCUbuntuShapeOverlay: UbuntuShape | ||
| 675 | 1738 | property color overlayColor | 1735 | property color overlayColor |
| 676 | 1739 | property QRectF overlayRect | 1736 | property QRectF overlayRect |
| 677 | 1740 | Ubuntu.Test.UbuntuTestCase 1.0 0.1: TestCase | 1737 | Ubuntu.Test.UbuntuTestCase 1.0 0.1: TestCase |
| 678 | @@ -1765,6 +1762,10 @@ | |||
| 679 | 1765 | readonly property QuickTestUtil testUtil | 1762 | readonly property QuickTestUtil testUtil |
| 680 | 1766 | Ubuntu.Components.UriHandler 1.0 0.1: QtObject singleton | 1763 | Ubuntu.Components.UriHandler 1.0 0.1: QtObject singleton |
| 681 | 1767 | signal opened(QStringList uris) | 1764 | signal opened(QStringList uris) |
| 682 | 1765 | Ubuntu.Components.VAlignment: Enum | ||
| 683 | 1766 | AlignBottom | ||
| 684 | 1767 | AlignTop | ||
| 685 | 1768 | AlignVCenter | ||
| 686 | 1768 | Ubuntu.Components.ListItems.ValueSelector 1.0 0.1: Empty | 1769 | Ubuntu.Components.ListItems.ValueSelector 1.0 0.1: Empty |
| 687 | 1769 | property bool expanded | 1770 | property bool expanded |
| 688 | 1770 | property string fallbackIconName | 1771 | property string fallbackIconName |
| 689 | @@ -1790,10 +1791,9 @@ | |||
| 690 | 1790 | signal expandedIndicesChanged(list<int> indices) | 1791 | signal expandedIndicesChanged(list<int> indices) |
| 691 | 1791 | property bool selectMode | 1792 | property bool selectMode |
| 692 | 1792 | property list<int> selectedIndices | 1793 | property list<int> selectedIndices |
| 697 | 1793 | Ubuntu.Components.ViewItems.ExpansionFlag: Enum | 1794 | Ubuntu.Components.WrapMode: Enum |
| 698 | 1794 | CollapseOnOutsidePress | 1795 | Repeat |
| 699 | 1795 | Exclusive | 1796 | Transparent |
| 696 | 1796 | UnlockExpanded | ||
| 700 | 1797 | Ubuntu.Components.i18n 1.0 0.1: QtObject | 1797 | Ubuntu.Components.i18n 1.0 0.1: QtObject |
| 701 | 1798 | property string domain | 1798 | property string domain |
| 702 | 1799 | property string language | 1799 | property string language |
| 703 | 1800 | 1800 | ||
| 704 | === modified file 'src/Ubuntu/Components/plugin/plugin.cpp' | |||
| 705 | --- src/Ubuntu/Components/plugin/plugin.cpp 2016-06-21 14:21:46 +0000 | |||
| 706 | +++ src/Ubuntu/Components/plugin/plugin.cpp 2016-07-25 23:21:11 +0000 | |||
| 707 | @@ -32,8 +32,8 @@ | |||
| 708 | 32 | Q_ASSERT(uri == QLatin1String("Ubuntu.Components")); | 32 | Q_ASSERT(uri == QLatin1String("Ubuntu.Components")); |
| 709 | 33 | Q_UNUSED(uri); | 33 | Q_UNUSED(uri); |
| 710 | 34 | 34 | ||
| 713 | 35 | qmlRegisterSimpleSingletonType<UbuntuToolkit::UCNamespace>(uri, 1, 2, "Ubuntu"); | 35 | qmlRegisterSimpleSingletonType<UT_PREPEND_NAMESPACE(UCNamespace)>(uri, 1, 2, "Ubuntu"); |
| 714 | 36 | qmlRegisterSimpleSingletonType<UbuntuToolkit::UCNamespaceV13>(uri, 1, 3, "Ubuntu"); | 36 | qmlRegisterSimpleSingletonType<UT_PREPEND_NAMESPACE(UCNamespaceV13)>(uri, 1, 3, "Ubuntu"); |
| 715 | 37 | 37 | ||
| 716 | 38 | UG_PREPEND_NAMESPACE(UbuntuGesturesModule)::defineModule(uri); | 38 | UG_PREPEND_NAMESPACE(UbuntuGesturesModule)::defineModule(uri); |
| 717 | 39 | UT_PREPEND_NAMESPACE(UbuntuToolkitModule)::defineModule(); | 39 | UT_PREPEND_NAMESPACE(UbuntuToolkitModule)::defineModule(); |
| 718 | 40 | 40 | ||
| 719 | === modified file 'src/Ubuntu/UbuntuGestures/timer.cpp' | |||
| 720 | --- src/Ubuntu/UbuntuGestures/timer.cpp 2016-07-06 11:27:11 +0000 | |||
| 721 | +++ src/Ubuntu/UbuntuGestures/timer.cpp 2016-07-25 23:21:11 +0000 | |||
| 722 | @@ -59,7 +59,7 @@ | |||
| 723 | 59 | /////////////////////////////////// FakeTimer ////////////////////////////////// | 59 | /////////////////////////////////// FakeTimer ////////////////////////////////// |
| 724 | 60 | 60 | ||
| 725 | 61 | FakeTimer::FakeTimer(const SharedTimeSource &timeSource, QObject *parent) | 61 | FakeTimer::FakeTimer(const SharedTimeSource &timeSource, QObject *parent) |
| 727 | 62 | : UbuntuGestures::AbstractTimer(parent) | 62 | : UG_PREPEND_NAMESPACE(AbstractTimer(parent)) |
| 728 | 63 | , m_interval(0) | 63 | , m_interval(0) |
| 729 | 64 | , m_singleShot(false) | 64 | , m_singleShot(false) |
| 730 | 65 | , m_timeSource(timeSource) | 65 | , m_timeSource(timeSource) |
| 731 | 66 | 66 | ||
| 732 | === modified file 'src/Ubuntu/UbuntuGestures/timesource.cpp' | |||
| 733 | --- src/Ubuntu/UbuntuGestures/timesource.cpp 2016-07-06 11:27:11 +0000 | |||
| 734 | +++ src/Ubuntu/UbuntuGestures/timesource.cpp 2016-07-25 23:21:11 +0000 | |||
| 735 | @@ -28,7 +28,7 @@ | |||
| 736 | 28 | }; | 28 | }; |
| 737 | 29 | 29 | ||
| 738 | 30 | RealTimeSource::RealTimeSource() | 30 | RealTimeSource::RealTimeSource() |
| 740 | 31 | : UbuntuGestures::TimeSource() | 31 | : UG_PREPEND_NAMESPACE(TimeSource()) |
| 741 | 32 | , d(new RealTimeSourcePrivate) | 32 | , d(new RealTimeSourcePrivate) |
| 742 | 33 | { | 33 | { |
| 743 | 34 | d->timer.start(); | 34 | d->timer.start(); |
| 744 | 35 | 35 | ||
| 745 | === modified file 'src/Ubuntu/UbuntuGestures/ucswipearea.cpp' | |||
| 746 | --- src/Ubuntu/UbuntuGestures/ucswipearea.cpp 2016-07-06 11:27:11 +0000 | |||
| 747 | +++ src/Ubuntu/UbuntuGestures/ucswipearea.cpp 2016-07-25 23:21:11 +0000 | |||
| 748 | @@ -253,7 +253,7 @@ | |||
| 749 | 253 | } | 253 | } |
| 750 | 254 | } | 254 | } |
| 751 | 255 | 255 | ||
| 753 | 256 | void UCSwipeAreaPrivate::setRecognitionTimer(UbuntuGestures::AbstractTimer *timer) | 256 | void UCSwipeAreaPrivate::setRecognitionTimer(UG_PREPEND_NAMESPACE(AbstractTimer) *timer) |
| 754 | 257 | { | 257 | { |
| 755 | 258 | int interval = 0; | 258 | int interval = 0; |
| 756 | 259 | bool timerWasRunning = false; | 259 | bool timerWasRunning = false; |
| 757 | @@ -273,7 +273,7 @@ | |||
| 758 | 273 | recognitionTimer = timer; | 273 | recognitionTimer = timer; |
| 759 | 274 | timer->setInterval(interval); | 274 | timer->setInterval(interval); |
| 760 | 275 | timer->setSingleShot(wasSingleShot); | 275 | timer->setSingleShot(wasSingleShot); |
| 762 | 276 | QObject::connect(timer, &UbuntuGestures::AbstractTimer::timeout, | 276 | QObject::connect(timer, &UG_PREPEND_NAMESPACE(AbstractTimer)::timeout, |
| 763 | 277 | q, &UCSwipeArea::rejectGesture); | 277 | q, &UCSwipeArea::rejectGesture); |
| 764 | 278 | if (timerWasRunning) { | 278 | if (timerWasRunning) { |
| 765 | 279 | recognitionTimer->start(); | 279 | recognitionTimer->start(); |
| 766 | 280 | 280 | ||
| 767 | === modified file 'src/Ubuntu/UbuntuGestures/ucswipearea_p_p.h' | |||
| 768 | --- src/Ubuntu/UbuntuGestures/ucswipearea_p_p.h 2016-07-06 09:51:06 +0000 | |||
| 769 | +++ src/Ubuntu/UbuntuGestures/ucswipearea_p_p.h 2016-07-25 23:21:11 +0000 | |||
| 770 | @@ -35,12 +35,12 @@ | |||
| 771 | 35 | }; | 35 | }; |
| 772 | 36 | class UBUNTUGESTURES_EXPORT ActiveTouchesInfo { | 36 | class UBUNTUGESTURES_EXPORT ActiveTouchesInfo { |
| 773 | 37 | public: | 37 | public: |
| 775 | 38 | ActiveTouchesInfo(const UbuntuGestures::SharedTimeSource &timeSource); | 38 | ActiveTouchesInfo(const UG_PREPEND_NAMESPACE(SharedTimeSource) &timeSource); |
| 776 | 39 | void update(QTouchEvent *event); | 39 | void update(QTouchEvent *event); |
| 777 | 40 | qint64 touchStartTime(int id); | 40 | qint64 touchStartTime(int id); |
| 778 | 41 | bool isEmpty() const { return m_touchInfoPool.isEmpty(); } | 41 | bool isEmpty() const { return m_touchInfoPool.isEmpty(); } |
| 779 | 42 | qint64 mostRecentStartTime(); | 42 | qint64 mostRecentStartTime(); |
| 781 | 43 | UbuntuGestures::SharedTimeSource m_timeSource; | 43 | UG_PREPEND_NAMESPACE(SharedTimeSource) m_timeSource; |
| 782 | 44 | private: | 44 | private: |
| 783 | 45 | void addTouchPoint(int touchId); | 45 | void addTouchPoint(int touchId); |
| 784 | 46 | void removeTouchPoint(int touchId); | 46 | void removeTouchPoint(int touchId); |
| 785 | @@ -70,10 +70,10 @@ | |||
| 786 | 70 | // Replaces the existing Timer with the given one. | 70 | // Replaces the existing Timer with the given one. |
| 787 | 71 | // | 71 | // |
| 788 | 72 | // Useful for providing a fake timer when testing. | 72 | // Useful for providing a fake timer when testing. |
| 790 | 73 | void setRecognitionTimer(UbuntuGestures::AbstractTimer *timer); | 73 | void setRecognitionTimer(UG_PREPEND_NAMESPACE(AbstractTimer) *timer); |
| 791 | 74 | 74 | ||
| 792 | 75 | // Useful for testing, where a fake time source can be supplied | 75 | // Useful for testing, where a fake time source can be supplied |
| 794 | 76 | void setTimeSource(const UbuntuGestures::SharedTimeSource &timeSource); | 76 | void setTimeSource(const UG_PREPEND_NAMESPACE(SharedTimeSource) &timeSource); |
| 795 | 77 | 77 | ||
| 796 | 78 | // Describes the state of the directional drag gesture. | 78 | // Describes the state of the directional drag gesture. |
| 797 | 79 | enum Status { | 79 | enum Status { |
| 798 | @@ -135,13 +135,13 @@ | |||
| 799 | 135 | QPointF previousDampedScenePos; | 135 | QPointF previousDampedScenePos; |
| 800 | 136 | // Unit vector in scene coordinates describing the direction of the gesture recognition | 136 | // Unit vector in scene coordinates describing the direction of the gesture recognition |
| 801 | 137 | QPointF sceneDirectionVector; | 137 | QPointF sceneDirectionVector; |
| 803 | 138 | UbuntuGestures::SharedTimeSource timeSource; | 138 | UG_PREPEND_NAMESPACE(SharedTimeSource) timeSource; |
| 804 | 139 | ActiveTouchesInfo activeTouches; | 139 | ActiveTouchesInfo activeTouches; |
| 805 | 140 | 140 | ||
| 806 | 141 | // status change listeners | 141 | // status change listeners |
| 807 | 142 | QList<UCSwipeAreaStatusListener*> statusChangeListeners; | 142 | QList<UCSwipeAreaStatusListener*> statusChangeListeners; |
| 808 | 143 | 143 | ||
| 810 | 144 | UbuntuGestures::AbstractTimer *recognitionTimer; | 144 | UG_PREPEND_NAMESPACE(AbstractTimer) *recognitionTimer; |
| 811 | 145 | 145 | ||
| 812 | 146 | // How far a touch point has to move from its initial position along the gesture axis in order | 146 | // How far a touch point has to move from its initial position along the gesture axis in order |
| 813 | 147 | // for it to be recognized as a directional drag. | 147 | // for it to be recognized as a directional drag. |
| 814 | 148 | 148 | ||
| 815 | === modified file 'tests/unit/bottomedge/tst_bottomedge.cpp' | |||
| 816 | --- tests/unit/bottomedge/tst_bottomedge.cpp 2016-07-19 18:12:33 +0000 | |||
| 817 | +++ tests/unit/bottomedge/tst_bottomedge.cpp 2016-07-25 23:21:11 +0000 | |||
| 818 | @@ -242,7 +242,7 @@ | |||
| 819 | 242 | QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("BottomEdgeInItem.qml")); | 242 | QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("BottomEdgeInItem.qml")); |
| 820 | 243 | UCBottomEdge *bottomEdge = test->testItem(); | 243 | UCBottomEdge *bottomEdge = test->testItem(); |
| 821 | 244 | UCBottomEdgeStyle *style = UCBottomEdgePrivate::get(bottomEdge)->bottomPanel; | 244 | UCBottomEdgeStyle *style = UCBottomEdgePrivate::get(bottomEdge)->bottomPanel; |
| 823 | 245 | QSignalSpy spy(bottomEdge, SIGNAL(statusChanged(UbuntuToolkit::UCBottomEdge::Status))); | 245 | QSignalSpy spy(bottomEdge, SIGNAL(statusChanged(UCBottomEdge::Status))); |
| 824 | 246 | 246 | ||
| 825 | 247 | // swipe till we reveal it | 247 | // swipe till we reveal it |
| 826 | 248 | QPoint from(bottomEdge->width() / 2.0f, bottomEdge->height() - 1); | 248 | QPoint from(bottomEdge->width() / 2.0f, bottomEdge->height() - 1); |
| 827 | @@ -568,7 +568,7 @@ | |||
| 828 | 568 | 568 | ||
| 829 | 569 | QPoint from(bottomEdge->width() / 2.0f, bottomEdge->height() - 5); | 569 | QPoint from(bottomEdge->width() / 2.0f, bottomEdge->height() - 5); |
| 830 | 570 | QPoint to = from + QPoint(0, -(bottomEdge->parentItem()->height() - 1)); | 570 | QPoint to = from + QPoint(0, -(bottomEdge->parentItem()->height() - 1)); |
| 832 | 571 | QSignalSpy spy(bottomEdge, SIGNAL(activeRegionChanged(UbuntuToolkit::UCBottomEdgeRegion*))); | 571 | QSignalSpy spy(bottomEdge, SIGNAL(activeRegionChanged(UCBottomEdgeRegion*))); |
| 833 | 572 | 572 | ||
| 834 | 573 | UCTestExtras::touchPress(0, bottomEdge, from); | 573 | UCTestExtras::touchPress(0, bottomEdge, from); |
| 835 | 574 | QPoint movePos(from); | 574 | QPoint movePos(from); |
| 836 | @@ -831,7 +831,7 @@ | |||
| 837 | 831 | UCBottomEdgeRegionPrivate::get(region)->to = 0.2; | 831 | UCBottomEdgeRegionPrivate::get(region)->to = 0.2; |
| 838 | 832 | QPoint from(bottomEdge->width() / 2.0f, bottomEdge->height() - 5); | 832 | QPoint from(bottomEdge->width() / 2.0f, bottomEdge->height() - 5); |
| 839 | 833 | QPoint delta(0, -(bottomEdge->height() / 2.0f)); | 833 | QPoint delta(0, -(bottomEdge->height() / 2.0f)); |
| 841 | 834 | QSignalSpy activeRegion(bottomEdge, SIGNAL(activeRegionChanged(UbuntuToolkit::UCBottomEdgeRegion*))); | 834 | QSignalSpy activeRegion(bottomEdge, SIGNAL(activeRegionChanged(UCBottomEdgeRegion*))); |
| 842 | 835 | if (withMouse) { | 835 | if (withMouse) { |
| 843 | 836 | bottomEdge->hint()->setStatus(UCBottomEdgeHint::Locked); | 836 | bottomEdge->hint()->setStatus(UCBottomEdgeHint::Locked); |
| 844 | 837 | UCTestExtras::mouseDrag(bottomEdge, from, delta, Qt::LeftButton, 0, 10); | 837 | UCTestExtras::mouseDrag(bottomEdge, from, delta, Qt::LeftButton, 0, 10); |
| 845 | @@ -910,7 +910,7 @@ | |||
| 846 | 910 | 910 | ||
| 847 | 911 | QPoint from(bottomEdge->width() / 2.0f, bottomEdge->height() - 5); | 911 | QPoint from(bottomEdge->width() / 2.0f, bottomEdge->height() - 5); |
| 848 | 912 | QPoint to = from + QPoint(0, -(bottomEdge->parentItem()->height() - 1)); | 912 | QPoint to = from + QPoint(0, -(bottomEdge->parentItem()->height() - 1)); |
| 850 | 913 | QSignalSpy spy(bottomEdge, SIGNAL(activeRegionChanged(UbuntuToolkit::UCBottomEdgeRegion*))); | 913 | QSignalSpy spy(bottomEdge, SIGNAL(activeRegionChanged(UCBottomEdgeRegion*))); |
| 851 | 914 | 914 | ||
| 852 | 915 | connect(bottomEdge, &UCBottomEdge::contentItemChanged, [=]() { | 915 | connect(bottomEdge, &UCBottomEdge::contentItemChanged, [=]() { |
| 853 | 916 | regionObjects.append(bottomEdge->contentItem() | 916 | regionObjects.append(bottomEdge->contentItem() |
| 854 | 917 | 917 | ||
| 855 | === modified file 'tests/unit/subtheming/tst_subtheming.cpp' | |||
| 856 | --- tests/unit/subtheming/tst_subtheming.cpp 2016-07-13 20:39:15 +0000 | |||
| 857 | +++ tests/unit/subtheming/tst_subtheming.cpp 2016-07-25 23:21:11 +0000 | |||
| 858 | @@ -140,7 +140,11 @@ | |||
| 859 | 140 | 140 | ||
| 860 | 141 | void test_create_without_engine() | 141 | void test_create_without_engine() |
| 861 | 142 | { | 142 | { |
| 862 | 143 | #if !defined(UBUNTUTOOLKIT_NO_NAMESPACE) | ||
| 863 | 143 | QTest::ignoreMessage(QtCriticalMsg, "The item UbuntuToolkit::UCLabel was created without a valid QML Engine. Styling will not be possible."); | 144 | QTest::ignoreMessage(QtCriticalMsg, "The item UbuntuToolkit::UCLabel was created without a valid QML Engine. Styling will not be possible."); |
| 864 | 145 | #else | ||
| 865 | 146 | QTest::ignoreMessage(QtCriticalMsg, "The item UCLabel was created without a valid QML Engine. Styling will not be possible."); | ||
| 866 | 147 | #endif | ||
| 867 | 144 | QScopedPointer<UCLabel> item(new UCLabel); | 148 | QScopedPointer<UCLabel> item(new UCLabel); |
| 868 | 145 | QVERIFY(!item->getTheme()); | 149 | QVERIFY(!item->getTheme()); |
| 869 | 146 | } | 150 | } |
| 870 | 147 | 151 | ||
| 871 | === modified file 'tests/unit/swipearea/GestureTest.h' | |||
| 872 | --- tests/unit/swipearea/GestureTest.h 2016-06-21 14:21:46 +0000 | |||
| 873 | +++ tests/unit/swipearea/GestureTest.h 2016-07-25 23:21:11 +0000 | |||
| 874 | @@ -84,7 +84,7 @@ | |||
| 875 | 84 | QTouchDevice *m_device; | 84 | QTouchDevice *m_device; |
| 876 | 85 | UbuntuTestCase *m_view; | 85 | UbuntuTestCase *m_view; |
| 877 | 86 | TouchRegistry *m_touchRegistry; | 86 | TouchRegistry *m_touchRegistry; |
| 879 | 87 | UbuntuGestures::FakeTimerFactory *m_fakeTimerFactory; | 87 | UG_PREPEND_NAMESPACE(FakeTimerFactory) *m_fakeTimerFactory; |
| 880 | 88 | QString m_qmlFilename; | 88 | QString m_qmlFilename; |
| 881 | 89 | }; | 89 | }; |
| 882 | 90 | 90 | ||
| 883 | 91 | 91 | ||
| 884 | === modified file 'tests/unit/swipearea/tst_swipearea.cpp' | |||
| 885 | --- tests/unit/swipearea/tst_swipearea.cpp 2016-07-06 11:27:11 +0000 | |||
| 886 | +++ tests/unit/swipearea/tst_swipearea.cpp 2016-07-25 23:21:11 +0000 | |||
| 887 | @@ -34,7 +34,7 @@ | |||
| 888 | 34 | #include "GestureTest.h" | 34 | #include "GestureTest.h" |
| 889 | 35 | #include "uctestcase.h" | 35 | #include "uctestcase.h" |
| 890 | 36 | 36 | ||
| 892 | 37 | using namespace UbuntuGestures; | 37 | UG_USE_NAMESPACE |
| 893 | 38 | 38 | ||
| 894 | 39 | // Because QSignalSpy(UCSwipeArea, SIGNAL(UCSwipeArea::Status)) simply | 39 | // Because QSignalSpy(UCSwipeArea, SIGNAL(UCSwipeArea::Status)) simply |
| 895 | 40 | // doesn't work | 40 | // doesn't work |
FAILED: Continuous integration, rev:2044
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/