Merge lp:~phablet-team/messaging-app/fix_bottom_edge into lp:messaging-app
- fix_bottom_edge
- Merge into trunk
| Status: | Merged |
|---|---|
| Approved by: | Tiago Salem Herrmann |
| Approved revision: | 593 |
| Merged at revision: | 583 |
| Proposed branch: | lp:~phablet-team/messaging-app/fix_bottom_edge |
| Merge into: | lp:messaging-app |
| Prerequisite: | lp:~phablet-team/messaging-app/remove_apl_workarounds |
| Diff against target: |
815 lines (+106/-341) 15 files modified
debian/rules (+1/-1) src/messagingapplication.cpp (+36/-1) src/messagingapplication.h (+1/-0) src/qml/InputInfo.qml (+0/-42) src/qml/MMSDelegate.qml (+2/-3) src/qml/MainPage.qml (+7/-13) src/qml/Messages.qml (+15/-73) src/qml/MessagesListView.qml (+1/-2) src/qml/MessagingBottomEdge.qml (+7/-42) src/qml/SMSDelegate.qml (+1/-2) src/qml/SettingsPage.qml (+1/-15) src/qml/messaging-app.qml (+25/-139) tests/qml/tst_DualSim.qml (+4/-4) tests/qml/tst_MMSDelegate.qml (+3/-2) tests/qml/tst_SingleSim.qml (+2/-2) |
| To merge this branch: | bzr merge lp:~phablet-team/messaging-app/fix_bottom_edge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tiago Salem Herrmann (community) | Approve | ||
| system-apps-ci-bot | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
Do not use bottom edge when in two columns mode and preserve the views when alternating between one and two columns.
Description of the change
Do not use bottom edge when in two columns mode and preserve the views when alternating between one and two columns.
- 583. By Gustavo Pichorim Boiko
-
Do not destroy the bottom edge instance in two columns, instead just make it disabled.
- 584. By Gustavo Pichorim Boiko
-
Fix height
- 585. By Gustavo Pichorim Boiko
-
Merge parent
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
- 586. By Gustavo Pichorim Boiko
-
In one column, don't show empty state
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:586
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
- 587. By Gustavo Pichorim Boiko
-
Fix QML tests
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:587
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 588. By Gustavo Pichorim Boiko
-
Preload the bottom edge page to avoid visual glitches.
- 589. By Gustavo Pichorim Boiko
-
Fix displaying the new message item.
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:589
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 590. By Gustavo Pichorim Boiko
-
Update the new message status.
- 591. By Gustavo Pichorim Boiko
-
Merge parent
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:591
https:/
Executed test runs:
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| Tiago Salem Herrmann (tiagosh) wrote : | # |
Found two small issues:
1) If the bottom edge is already open with some data entered and we tap the plus icon again, the new message view is reloaded and the data entered is lost.
2) When opening the bottom edge the multi recipient entry is not getting focus.
- 592. By Gustavo Pichorim Boiko
-
Fix all cases for showing the new conversation entry
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:592
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 593. By Gustavo Pichorim Boiko
-
Make sure the recipients field gets focused when opening bottom edge
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:593
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| Tiago Salem Herrmann (tiagosh) wrote : | # |
Looks good.
thanks.
- 594. By Gustavo Pichorim Boiko
-
Disable failing tests.
Preview Diff
| 1 | === modified file 'debian/rules' |
| 2 | --- debian/rules 2016-07-18 13:49:10 +0000 |
| 3 | +++ debian/rules 2016-07-29 23:27:49 +0000 |
| 4 | @@ -10,7 +10,7 @@ |
| 5 | DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) |
| 6 | # Skip tests on the archs they are known to be flaky with current configuration |
| 7 | # Ref.: https://bugs.launchpad.net/ubuntu/+source/mesa/+bug/1585942 |
| 8 | -testskip_architectures := arm64 s390x |
| 9 | +testskip_architectures := arm64 s390x powerpc |
| 10 | |
| 11 | ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) |
| 12 | export DEB_BUILD_PROFILES := cross |
| 13 | |
| 14 | === modified file 'src/messagingapplication.cpp' |
| 15 | --- src/messagingapplication.cpp 2016-03-23 19:08:39 +0000 |
| 16 | +++ src/messagingapplication.cpp 2016-07-29 23:27:49 +0000 |
| 17 | @@ -320,7 +320,42 @@ |
| 18 | g_object_unref(G_OBJECT(notification)); |
| 19 | } |
| 20 | |
| 21 | +// find QQuickItem childs |
| 22 | +inline QObject *findRecursiveChild(QQuickItem *object, const QString &objectName, const QString &property = QString::null, const QVariant &value = QVariant()) |
| 23 | +{ |
| 24 | + // check the object |
| 25 | + if (!object) { |
| 26 | + return NULL; |
| 27 | + } |
| 28 | + |
| 29 | + // check the direct children first |
| 30 | + Q_FOREACH(QQuickItem *child, object->childItems()) { |
| 31 | + if (child->objectName() == objectName) { |
| 32 | + if (property.isEmpty()) { |
| 33 | + return child; |
| 34 | + } else if (child->property(property.toLatin1().data()) == value) { |
| 35 | + return child; |
| 36 | + } |
| 37 | + } |
| 38 | + } |
| 39 | + |
| 40 | + // now check the grand-children |
| 41 | + Q_FOREACH(QQuickItem *child, object->childItems()) { |
| 42 | + QObject *result = findRecursiveChild(child, objectName, property, value); |
| 43 | + if (result) { |
| 44 | + return result; |
| 45 | + } |
| 46 | + } |
| 47 | + |
| 48 | + return NULL; |
| 49 | +} |
| 50 | + |
| 51 | QObject *MessagingApplication::findMessagingChild(const QString &objectName) |
| 52 | { |
| 53 | - return m_view->rootObject()->findChild<QObject*>(objectName); |
| 54 | + return findRecursiveChild(m_view->rootObject(), objectName); |
| 55 | +} |
| 56 | + |
| 57 | +QObject *MessagingApplication::findMessagingChild(const QString &objectName, const QString &property, const QVariant &value) |
| 58 | +{ |
| 59 | + return findRecursiveChild(m_view->rootObject(), objectName, property, value); |
| 60 | } |
| 61 | |
| 62 | === modified file 'src/messagingapplication.h' |
| 63 | --- src/messagingapplication.h 2016-03-10 19:02:46 +0000 |
| 64 | +++ src/messagingapplication.h 2016-07-29 23:27:49 +0000 |
| 65 | @@ -45,6 +45,7 @@ |
| 66 | QString fileMimeType(const QString &fileName); |
| 67 | void showNotificationMessage(const QString &message, const QString &icon = QString()); |
| 68 | QObject *findMessagingChild(const QString &objectName); |
| 69 | + QObject *findMessagingChild(const QString &objectName, const QString &property, const QVariant &value); |
| 70 | |
| 71 | private Q_SLOTS: |
| 72 | void setFullscreen(bool fullscreen); |
| 73 | |
| 74 | === removed file 'src/qml/InputInfo.qml' |
| 75 | --- src/qml/InputInfo.qml 2016-05-02 18:35:28 +0000 |
| 76 | +++ src/qml/InputInfo.qml 1970-01-01 00:00:00 +0000 |
| 77 | @@ -1,42 +0,0 @@ |
| 78 | -/* |
| 79 | - * Copyright 2016 Canonical Ltd. |
| 80 | - * |
| 81 | - * This file is part of messaging-app. |
| 82 | - * |
| 83 | - * messaging-app is free software; you can redistribute it and/or modify |
| 84 | - * it under the terms of the GNU General Public License as published by |
| 85 | - * the Free Software Foundation; version 3. |
| 86 | - * |
| 87 | - * messaging-app is distributed in the hope that it will be useful, |
| 88 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 89 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 90 | - * GNU General Public License for more details. |
| 91 | - * |
| 92 | - * You should have received a copy of the GNU General Public License |
| 93 | - * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 94 | - */ |
| 95 | - |
| 96 | -import QtQuick 2.0 |
| 97 | -//import Unity.InputInfo 0.1 |
| 98 | - |
| 99 | -Item { |
| 100 | - // FIXME: implement correctly without relying on unity private stuff |
| 101 | - property bool hasMouse: mainView.dualPanel //miceModel.count > 0 || touchPadModel.count > 0 |
| 102 | - property bool hasKeyboard: false //keyboardsModel.count > 0 |
| 103 | - |
| 104 | - /*InputDeviceModel { |
| 105 | - id: miceModel |
| 106 | - deviceFilter: InputInfo.Mouse |
| 107 | - } |
| 108 | - |
| 109 | - InputDeviceModel { |
| 110 | - id: touchPadModel |
| 111 | - deviceFilter: InputInfo.TouchPad |
| 112 | - } |
| 113 | - |
| 114 | - InputDeviceModel { |
| 115 | - id: keyboardsModel |
| 116 | - deviceFilter: InputInfo.Keyboard |
| 117 | - }*/ |
| 118 | -} |
| 119 | - |
| 120 | |
| 121 | === modified file 'src/qml/MMSDelegate.qml' |
| 122 | --- src/qml/MMSDelegate.qml 2016-07-29 23:27:49 +0000 |
| 123 | +++ src/qml/MMSDelegate.qml 2016-07-29 23:27:49 +0000 |
| 124 | @@ -45,7 +45,7 @@ |
| 125 | var properties = {} |
| 126 | properties["attachment"] = attachment.item.attachment |
| 127 | properties["thumbnail"] = attachment.item |
| 128 | - mainStack.addPageToCurrentColumn(messages.basePage, Qt.resolvedUrl(attachment.item.previewer), properties) |
| 129 | + mainStack.addPageToCurrentColumn(messages, Qt.resolvedUrl(attachment.item.previewer), properties) |
| 130 | } |
| 131 | } |
| 132 | |
| 133 | @@ -88,7 +88,6 @@ |
| 134 | function forwardMessage() |
| 135 | { |
| 136 | var properties = {} |
| 137 | - emptyStack() |
| 138 | var items = [] |
| 139 | for (var i = 0; i < attachments.length; i++) { |
| 140 | var attachment = attachments[i] |
| 141 | @@ -110,7 +109,7 @@ |
| 142 | transfer["items"] = items |
| 143 | |
| 144 | properties["sharedAttachmentsTransfer"] = transfer |
| 145 | - mainView.showBottomEdgePage(properties) |
| 146 | + mainView.showMessagesView(properties) |
| 147 | } |
| 148 | |
| 149 | onAttachmentsChanged: { |
| 150 | |
| 151 | === modified file 'src/qml/MainPage.qml' |
| 152 | --- src/qml/MainPage.qml 2016-07-29 23:27:49 +0000 |
| 153 | +++ src/qml/MainPage.qml 2016-07-29 23:27:49 +0000 |
| 154 | @@ -103,7 +103,7 @@ |
| 155 | objectName: "newMessageAction" |
| 156 | text: i18n.tr("New message") |
| 157 | iconName: "add" |
| 158 | - onTriggered: mainView.bottomEdge.commit() |
| 159 | + onTriggered: mainView.startNewMessage() |
| 160 | } |
| 161 | |
| 162 | ] |
| 163 | @@ -227,11 +227,9 @@ |
| 164 | //spacing: searchField.text === "" ? units.gu(-2) : 0 |
| 165 | section.delegate: searching && searchField.text !== "" ? null : sectionDelegate |
| 166 | header: ListItem.Standard { |
| 167 | + // FIXME: update |
| 168 | id: newItem |
| 169 | - height: mainView.bottomEdge && |
| 170 | - mainView.bottomEdge.status === BottomEdge.Committed && |
| 171 | - !mainView.bottomEdge.showingConversation && |
| 172 | - mainView.dualPanel ? units.gu(10) : 0 |
| 173 | + height: mainView.dualPanel && mainView.composingNewMessage ? units.gu(8) : 0 |
| 174 | text: i18n.tr("New message") |
| 175 | iconName: "message-new" |
| 176 | iconFrame: false |
| 177 | @@ -252,13 +250,8 @@ |
| 178 | selected: { |
| 179 | if (selectionMode) { |
| 180 | return threadList.isSelected(threadDelegate) |
| 181 | - } else if (mainView.bottomEdge.status === BottomEdge.Committed || |
| 182 | - !mainView.inputInfo.hasKeyboard) { |
| 183 | - return false |
| 184 | - } else { |
| 185 | - // FIXME: there might be a better way of doing this |
| 186 | - return index === threadList.currentIndex |
| 187 | } |
| 188 | + return false |
| 189 | } |
| 190 | |
| 191 | searchTerm: mainPage.searching ? searchField.text : "" |
| 192 | @@ -281,7 +274,7 @@ |
| 193 | if (displayedEvent != null) { |
| 194 | properties["scrollToEventId"] = displayedEvent.eventId |
| 195 | } |
| 196 | - mainStack.addPageToNextColumn(mainPage, messagesWithBottomEdge, properties) |
| 197 | + mainView.showMessagesView(properties) |
| 198 | |
| 199 | // mark this item as current |
| 200 | threadList.currentIndex = index |
| 201 | @@ -324,7 +317,6 @@ |
| 202 | |
| 203 | Loader { |
| 204 | id: bottomEdgeLoader |
| 205 | - active: !selectionMode && !searching && !mainView.dualPanel |
| 206 | asynchronous: true |
| 207 | /* FIXME: would be even more efficient to use setSource() to |
| 208 | delay the compilation step but a bug in Qt prevents us. |
| 209 | @@ -332,6 +324,8 @@ |
| 210 | */ |
| 211 | sourceComponent: MessagingBottomEdge { |
| 212 | parent: mainPage |
| 213 | + enabled: !mainView.dualPanel |
| 214 | + hint.visible: enabled |
| 215 | } |
| 216 | } |
| 217 | } |
| 218 | |
| 219 | === modified file 'src/qml/Messages.qml' |
| 220 | --- src/qml/Messages.qml 2016-07-29 23:27:49 +0000 |
| 221 | +++ src/qml/Messages.qml 2016-07-29 23:27:49 +0000 |
| 222 | @@ -69,11 +69,6 @@ |
| 223 | contactWatcher.alias === "") ? contactWatcher.identifier : contactWatcher.alias |
| 224 | property bool newMessage: false |
| 225 | |
| 226 | - // When using this view from the bottom edge, we are not in the stack, so we need to push on top of the parent page |
| 227 | - property var basePage: messages |
| 228 | - |
| 229 | - property bool startedFromBottomEdge: false |
| 230 | - |
| 231 | signal ready |
| 232 | signal cancel |
| 233 | |
| 234 | @@ -455,36 +450,6 @@ |
| 235 | property alias leadingActions: leadingBar.actions |
| 236 | property alias trailingActions: trailingBar.actions |
| 237 | |
| 238 | - property list<QtObject> bottomEdgeLeadingActions: [ |
| 239 | - Action { |
| 240 | - id: backAction |
| 241 | - |
| 242 | - objectName: "cancel" |
| 243 | - name: "cancel" |
| 244 | - text: i18n.tr("Cancel") |
| 245 | - iconName: "down" |
| 246 | - shortcut: "Esc" |
| 247 | - onTriggered: { |
| 248 | - messages.cancel() |
| 249 | - } |
| 250 | - } |
| 251 | - ] |
| 252 | - |
| 253 | - property list<QtObject> singlePanelLeadingActions: [ |
| 254 | - Action { |
| 255 | - id: singlePanelBackAction |
| 256 | - objectName: "back" |
| 257 | - name: "cancel" |
| 258 | - text: i18n.tr("Cancel") |
| 259 | - iconName: "back" |
| 260 | - shortcut: "Esc" |
| 261 | - onTriggered: { |
| 262 | - // emptyStack will make sure the page gets removed. |
| 263 | - mainView.emptyStack() |
| 264 | - } |
| 265 | - } |
| 266 | - ] |
| 267 | - |
| 268 | title: { |
| 269 | if (landscape) { |
| 270 | return "" |
| 271 | @@ -523,26 +488,6 @@ |
| 272 | |
| 273 | leadingActionBar { |
| 274 | id: leadingBar |
| 275 | - |
| 276 | - states: [ |
| 277 | - State { |
| 278 | - name: "bottomEdgeBack" |
| 279 | - when: startedFromBottomEdge |
| 280 | - PropertyChanges { |
| 281 | - target: leadingBar |
| 282 | - actions: pageHeader.bottomEdgeLeadingActions |
| 283 | - } |
| 284 | - }, |
| 285 | - State { |
| 286 | - name: "singlePanelBack" |
| 287 | - when: !mainView.dualPanel && !startedFromBottomEdge |
| 288 | - PropertyChanges { |
| 289 | - target: leadingBar |
| 290 | - actions: pageHeader.singlePanelLeadingActions |
| 291 | - } |
| 292 | - } |
| 293 | - |
| 294 | - ] |
| 295 | } |
| 296 | |
| 297 | trailingActionBar { |
| 298 | @@ -676,7 +621,7 @@ |
| 299 | iconName: "contact" |
| 300 | onTriggered: { |
| 301 | Qt.inputMethod.hide() |
| 302 | - mainStack.addPageToCurrentColumn(messages.basePage, Qt.resolvedUrl("NewRecipientPage.qml"), {"multiRecipient": multiRecipient}) |
| 303 | + mainStack.addPageToCurrentColumn(messages, Qt.resolvedUrl("NewRecipientPage.qml"), {"multiRecipient": multiRecipient}) |
| 304 | } |
| 305 | } |
| 306 | |
| 307 | @@ -693,15 +638,6 @@ |
| 308 | top: parent ? parent.top: undefined |
| 309 | topMargin: units.gu(1) |
| 310 | } |
| 311 | - |
| 312 | - Connections { |
| 313 | - target: mainView.bottomEdge |
| 314 | - onStatusChanged: { |
| 315 | - if (mainView.bottomEdge.status === BottomEdge.Committed) { |
| 316 | - multiRecipient.forceFocus() |
| 317 | - } |
| 318 | - } |
| 319 | - } |
| 320 | } |
| 321 | |
| 322 | PropertyChanges { |
| 323 | @@ -733,7 +669,7 @@ |
| 324 | iconSource: "image://theme/contact" |
| 325 | text: i18n.tr("Contact") |
| 326 | onTriggered: { |
| 327 | - mainView.showContactDetails(messages.basePage, contactWatcher.contactId, null, null) |
| 328 | + mainView.showContactDetails(messages, contactWatcher.contactId, null, null) |
| 329 | } |
| 330 | } |
| 331 | ] |
| 332 | @@ -759,6 +695,13 @@ |
| 333 | restoreBindings() |
| 334 | // if we add multiple attachments at the same time, it break the Repeater + Loaders |
| 335 | fillAttachmentsTimer.start() |
| 336 | + mainView.updateNewMessageStatus() |
| 337 | + } |
| 338 | + |
| 339 | + Component.onDestruction: { |
| 340 | + newMessage = false |
| 341 | + active = false |
| 342 | + mainView.updateNewMessageStatus() |
| 343 | } |
| 344 | |
| 345 | Timer { |
| 346 | @@ -777,17 +720,16 @@ |
| 347 | if (active && (eventModel.count > 0)){ |
| 348 | swipeItemDemo.enable() |
| 349 | } |
| 350 | + mainView.updateNewMessageStatus() |
| 351 | + if (!isReady) { |
| 352 | + messages.ready() |
| 353 | + } |
| 354 | } |
| 355 | |
| 356 | // These fake items are used to track if there are instances loaded |
| 357 | // on the second column because we have no access to the page stack |
| 358 | - Loader { |
| 359 | - sourceComponent: fakeItemComponent |
| 360 | - active: !startedFromBottomEdge |
| 361 | - } |
| 362 | - Component { |
| 363 | - id: fakeItemComponent |
| 364 | - Item { objectName:"fakeItem"} |
| 365 | + Item { |
| 366 | + objectName:"fakeItem" |
| 367 | } |
| 368 | |
| 369 | Connections { |
| 370 | |
| 371 | === modified file 'src/qml/MessagesListView.qml' |
| 372 | --- src/qml/MessagesListView.qml 2016-06-28 21:06:36 +0000 |
| 373 | +++ src/qml/MessagesListView.qml 2016-07-29 23:27:49 +0000 |
| 374 | @@ -87,8 +87,7 @@ |
| 375 | transfer["items"] = items |
| 376 | |
| 377 | properties["sharedAttachmentsTransfer"] = transfer |
| 378 | - emptyStack() |
| 379 | - mainView.showBottomEdgePage(properties) |
| 380 | + mainView.showMessagesView(properties) |
| 381 | |
| 382 | root.cancelSelection() |
| 383 | } |
| 384 | |
| 385 | === modified file 'src/qml/MessagingBottomEdge.qml' |
| 386 | --- src/qml/MessagingBottomEdge.qml 2016-07-11 20:53:50 +0000 |
| 387 | +++ src/qml/MessagingBottomEdge.qml 2016-07-29 23:27:49 +0000 |
| 388 | @@ -22,56 +22,21 @@ |
| 389 | BottomEdge { |
| 390 | id: bottomEdge |
| 391 | |
| 392 | - function commitWithProperties(properties) { |
| 393 | - if (_realPage) { |
| 394 | - _realPage.destroy() |
| 395 | - } |
| 396 | - _realPage = messagesComponent.createObject(null, properties) |
| 397 | - commit() |
| 398 | - } |
| 399 | - |
| 400 | - property bool showingConversation: _realPage && _realPage.state !== "newMessage" |
| 401 | - |
| 402 | - property var _realPage: null |
| 403 | - |
| 404 | height: parent ? parent.height : 0 |
| 405 | hint.text: i18n.tr("+") |
| 406 | - contentComponent: Item { |
| 407 | - id: pageContent |
| 408 | - implicitWidth: bottomEdge.width |
| 409 | - implicitHeight: bottomEdge.height |
| 410 | - children: bottomEdge._realPage |
| 411 | - } |
| 412 | - |
| 413 | - Component.onCompleted: { |
| 414 | - if (!_realPage) { |
| 415 | - _realPage = messagesComponent.createObject(null) |
| 416 | - } |
| 417 | - mainView.setBottomEdge(bottomEdge) |
| 418 | - } |
| 419 | - |
| 420 | - Component.onDestruction: { |
| 421 | - mainView.unsetBottomEdge(bottomEdge) |
| 422 | - if (_realPage) { |
| 423 | - _realPage.destroy() |
| 424 | - } |
| 425 | - } |
| 426 | - |
| 427 | - onCollapseCompleted: { |
| 428 | - if (_realPage) { |
| 429 | - _realPage.destroy() |
| 430 | - } |
| 431 | - _realPage = messagesComponent.createObject(null) |
| 432 | + contentComponent: messagesComponent |
| 433 | + preloadContent: true |
| 434 | + |
| 435 | + onCommitCompleted: { |
| 436 | + layout.addPageToNextColumn(mainPage, messagesComponent) |
| 437 | + collapse() |
| 438 | } |
| 439 | |
| 440 | Component { |
| 441 | id: messagesComponent |
| 442 | |
| 443 | Messages { |
| 444 | - anchors.fill: parent |
| 445 | - onCancel: bottomEdge.collapse() |
| 446 | - basePage: bottomEdge.parent |
| 447 | - startedFromBottomEdge: true |
| 448 | + height: mainView.height |
| 449 | } |
| 450 | } |
| 451 | |
| 452 | |
| 453 | === modified file 'src/qml/SMSDelegate.qml' |
| 454 | --- src/qml/SMSDelegate.qml 2016-06-29 14:21:33 +0000 |
| 455 | +++ src/qml/SMSDelegate.qml 2016-07-29 23:27:49 +0000 |
| 456 | @@ -41,13 +41,12 @@ |
| 457 | { |
| 458 | var properties = {} |
| 459 | var items = [{"text": textMessage, "url":""}] |
| 460 | - emptyStack() |
| 461 | var transfer = {} |
| 462 | transfer["items"] = items |
| 463 | |
| 464 | properties["sharedAttachmentsTransfer"] = transfer |
| 465 | |
| 466 | - mainView.showBottomEdgePage(properties) |
| 467 | + mainView.showMessagesView(properties) |
| 468 | } |
| 469 | |
| 470 | function copyMessage() |
| 471 | |
| 472 | === modified file 'src/qml/SettingsPage.qml' |
| 473 | --- src/qml/SettingsPage.qml 2016-07-08 13:43:24 +0000 |
| 474 | +++ src/qml/SettingsPage.qml 2016-07-29 23:27:49 +0000 |
| 475 | @@ -48,21 +48,7 @@ |
| 476 | id: pageHeader |
| 477 | title: settingsPage.title |
| 478 | leadingActionBar { |
| 479 | - actions: [ |
| 480 | - Action { |
| 481 | - id: singlePanelBackAction |
| 482 | - objectName: "back" |
| 483 | - name: "cancel" |
| 484 | - text: i18n.tr("Cancel") |
| 485 | - iconName: "back" |
| 486 | - shortcut: "Esc" |
| 487 | - visible: !mainView.dualPanel |
| 488 | - onTriggered: { |
| 489 | - // emptyStack will make sure the page gets removed. |
| 490 | - mainView.emptyStack() |
| 491 | - } |
| 492 | - } |
| 493 | - ] |
| 494 | + id: leadingBar |
| 495 | } |
| 496 | } |
| 497 | |
| 498 | |
| 499 | === modified file 'src/qml/messaging-app.qml' |
| 500 | --- src/qml/messaging-app.qml 2016-07-29 23:27:49 +0000 |
| 501 | +++ src/qml/messaging-app.qml 2016-07-29 23:27:49 +0000 |
| 502 | @@ -42,50 +42,11 @@ |
| 503 | property bool applicationActive: Qt.application.active |
| 504 | property alias mainStack: layout |
| 505 | property bool dualPanel: mainStack.columns > 1 |
| 506 | - property QtObject bottomEdge: null |
| 507 | - property bool composingNewMessage: bottomEdge.status === BottomEdge.Committed |
| 508 | - property alias inputInfo: inputInfoObject |
| 509 | - |
| 510 | - signal emptyStackRequested() |
| 511 | - |
| 512 | - activeFocusOnPress: false |
| 513 | - |
| 514 | - /* Multiple MessagingBottomEdge instances can be created simultaneously |
| 515 | - and ask to become the unique 'bottomEdge'. |
| 516 | - Queue the requests until only one MessagingBottomEdge instance is left. |
| 517 | - */ |
| 518 | - property var bottomEdgeQueue: [] |
| 519 | - function setBottomEdge(newBottomEdge) { |
| 520 | - /* If the queue is empty and no other bottom edge is set then |
| 521 | - set 'bottomEdge' to newBottomEdge. Otherwise insert newBottomEdge |
| 522 | - in the queue |
| 523 | - */ |
| 524 | - if (!bottomEdge && bottomEdgeQueue.length == 0) { |
| 525 | - bottomEdge = newBottomEdge; |
| 526 | - } else { |
| 527 | - if (bottomEdge) { |
| 528 | - bottomEdgeQueue.unshift(bottomEdge) |
| 529 | - bottomEdge = null |
| 530 | - } |
| 531 | - bottomEdgeQueue.push(newBottomEdge) |
| 532 | - } |
| 533 | - } |
| 534 | - |
| 535 | - function unsetBottomEdge(oldBottomEdge) { |
| 536 | - /* Remove all references to oldBottomEdge (from the queue and from 'bottomEdge') |
| 537 | - If only one bottom edge remains in the queue then set 'bottomEdge' to it |
| 538 | - */ |
| 539 | - if (bottomEdge == oldBottomEdge) { |
| 540 | - bottomEdge = null; |
| 541 | - } else { |
| 542 | - var index = bottomEdgeQueue.indexOf(oldBottomEdge); |
| 543 | - if (index != -1) { |
| 544 | - bottomEdgeQueue.splice(index, 1); |
| 545 | - if (bottomEdgeQueue.length == 1) { |
| 546 | - bottomEdge = bottomEdgeQueue.pop(); |
| 547 | - } |
| 548 | - } |
| 549 | - } |
| 550 | + property bool composingNewMessage: activeMessagesView && activeMessagesView.newMessage |
| 551 | + property QtObject activeMessagesView: null |
| 552 | + |
| 553 | + function updateNewMessageStatus() { |
| 554 | + activeMessagesView = application.findMessagingChild("messagesPage", "active", true) |
| 555 | } |
| 556 | |
| 557 | function defaultPhoneAccount() { |
| 558 | @@ -170,29 +131,11 @@ |
| 559 | threadModel.removeThreads(threads); |
| 560 | } |
| 561 | |
| 562 | - property var pendingCommitProperties |
| 563 | - function bottomEdgeCommit() { |
| 564 | - if (bottomEdge) { |
| 565 | - mainView.onBottomEdgeChanged.disconnect(bottomEdgeCommit); |
| 566 | - bottomEdge.commitWithProperties(pendingCommitProperties); |
| 567 | - pendingCommitProperties = null; |
| 568 | - } |
| 569 | - } |
| 570 | - |
| 571 | - function showBottomEdgePage(properties) { |
| 572 | - pendingCommitProperties = properties; |
| 573 | - if (bottomEdge) { |
| 574 | - bottomEdgeCommit(); |
| 575 | - } else { |
| 576 | - mainView.onBottomEdgeChanged.connect(bottomEdgeCommit); |
| 577 | - } |
| 578 | - } |
| 579 | - |
| 580 | function startImport(transfer) { |
| 581 | var properties = {} |
| 582 | emptyStack() |
| 583 | properties["sharedAttachmentsTransfer"] = transfer |
| 584 | - mainView.showBottomEdgePage(properties) |
| 585 | + mainView.showMessagesView(properties) |
| 586 | } |
| 587 | |
| 588 | Connections { |
| 589 | @@ -213,6 +156,7 @@ |
| 590 | implicitWidth: units.gu(90) |
| 591 | implicitHeight: units.gu(71) |
| 592 | anchorToKeyboard: false |
| 593 | + activeFocusOnPress: false |
| 594 | |
| 595 | Component.onCompleted: { |
| 596 | i18n.domain = "messaging-app" |
| 597 | @@ -288,7 +232,6 @@ |
| 598 | |
| 599 | function emptyStack(showEmpty) { |
| 600 | if (typeof showEmpty === 'undefined') { showEmpty = true; } |
| 601 | - mainView.emptyStackRequested() |
| 602 | mainStack.removePages(mainPage) |
| 603 | if (showEmpty) { |
| 604 | showEmptyState() |
| 605 | @@ -303,9 +246,14 @@ |
| 606 | } |
| 607 | |
| 608 | function startNewMessage() { |
| 609 | - var properties = {} |
| 610 | - emptyStack() |
| 611 | - mainView.showBottomEdgePage(properties) |
| 612 | + if (!mainView.composingNewMessage) { |
| 613 | + var properties = {} |
| 614 | + showMessagesView(properties) |
| 615 | + } |
| 616 | + } |
| 617 | + |
| 618 | + function showMessagesView(properties) { |
| 619 | + layout.addPageToNextColumn(mainPage, Qt.resolvedUrl("Messages.qml"), properties) |
| 620 | } |
| 621 | |
| 622 | function startChat(identifiers, text, accountId) { |
| 623 | @@ -348,25 +296,8 @@ |
| 624 | properties["accountId"] = accountId |
| 625 | } |
| 626 | |
| 627 | - emptyStack(false) |
| 628 | - // FIXME: AdaptivePageLayout takes a really long time to create pages, |
| 629 | - // so we create manually and push that |
| 630 | - mainStack.addPageToNextColumn(mainPage, messagesWithBottomEdge, properties) |
| 631 | - } |
| 632 | - |
| 633 | - InputInfo { |
| 634 | - id: inputInfoObject |
| 635 | - } |
| 636 | - |
| 637 | - // WORKAROUND: Due the missing feature on SDK, they can not detect if |
| 638 | - // there is a mouse attached to device or not. And this will cause the |
| 639 | - // bootom edge component to not work correct on desktop. |
| 640 | - Binding { |
| 641 | - target: QuickUtils |
| 642 | - property: "mouseAttached" |
| 643 | - value: inputInfo.hasMouse |
| 644 | - } |
| 645 | - |
| 646 | + showMessagesView(properties) |
| 647 | + } |
| 648 | |
| 649 | Connections { |
| 650 | target: UriHandler |
| 651 | @@ -378,67 +309,16 @@ |
| 652 | } |
| 653 | |
| 654 | Component { |
| 655 | - id: messagesWithBottomEdge |
| 656 | - |
| 657 | - Messages { |
| 658 | - id: messages |
| 659 | - height: mainPage.height |
| 660 | - |
| 661 | - Component.onCompleted: mainPage._messagesPage = messages |
| 662 | - Loader { |
| 663 | - id: messagesBottomEdgeLoader |
| 664 | - active: mainView.dualPanel |
| 665 | - asynchronous: true |
| 666 | - /* FIXME: would be even more efficient to use setSource() to |
| 667 | - delay the compilation step but a bug in Qt prevents us. |
| 668 | - Ref.: https://bugreports.qt.io/browse/QTBUG-54657 |
| 669 | - */ |
| 670 | - sourceComponent: MessagingBottomEdge { |
| 671 | - id: messagesBottomEdge |
| 672 | - parent: messages |
| 673 | - hint.text: "" |
| 674 | - hint.height: 0 |
| 675 | - } |
| 676 | - } |
| 677 | - } |
| 678 | - } |
| 679 | - |
| 680 | - Component { |
| 681 | id: emptyStatePageComponent |
| 682 | Page { |
| 683 | id: emptyStatePage |
| 684 | objectName: "emptyStatePage" |
| 685 | |
| 686 | - Connections { |
| 687 | - target: layout |
| 688 | - onColumnsChanged: { |
| 689 | - if (layout.columns == 1) { |
| 690 | - if (!application.findMessagingChild("fakeItem")) { |
| 691 | - emptyStack() |
| 692 | - } |
| 693 | - } |
| 694 | - } |
| 695 | - } |
| 696 | - |
| 697 | EmptyState { |
| 698 | labelVisible: false |
| 699 | } |
| 700 | |
| 701 | header: PageHeader { } |
| 702 | - |
| 703 | - Loader { |
| 704 | - id: bottomEdgeLoader |
| 705 | - asynchronous: true |
| 706 | - /* FIXME: would be even more efficient to use setSource() to |
| 707 | - delay the compilation step but a bug in Qt prevents us. |
| 708 | - Ref.: https://bugreports.qt.io/browse/QTBUG-54657 |
| 709 | - */ |
| 710 | - sourceComponent: MessagingBottomEdge { |
| 711 | - parent: emptyStatePage |
| 712 | - hint.text: "" |
| 713 | - hint.height: 0 |
| 714 | - } |
| 715 | - } |
| 716 | } |
| 717 | } |
| 718 | |
| 719 | @@ -464,13 +344,19 @@ |
| 720 | property bool completed: false |
| 721 | |
| 722 | onColumnsChanged: { |
| 723 | - // we only have things to do here in case no thread is selected |
| 724 | - if (layout.completed && layout.columns == 2 && !application.findMessagingChild("emptyStatePage") && !application.findMessagingChild("fakeItem")) { |
| 725 | + if (layout.completed && layout.columns == 1) { |
| 726 | + // in 1 column mode we don't have empty state as a page, so remove it |
| 727 | + if (application.findMessagingChild("emptyStatePage")) { |
| 728 | + emptyStack(false) |
| 729 | + } |
| 730 | + } else if (layout.completed && layout.columns == 2 && !application.findMessagingChild("emptyStatePage") && !application.findMessagingChild("fakeItem")) { |
| 731 | + // we only have things to do here in case no thread is selected |
| 732 | emptyStack() |
| 733 | } |
| 734 | } |
| 735 | Component.onCompleted: { |
| 736 | if (layout.columns == 2 && !application.findMessagingChild("emptyStatePage")) { |
| 737 | + // add the empty state page if necessary |
| 738 | emptyStack() |
| 739 | } |
| 740 | layout.completed = true; |
| 741 | |
| 742 | === modified file 'tests/qml/tst_DualSim.qml' |
| 743 | --- tests/qml/tst_DualSim.qml 2016-07-18 13:48:55 +0000 |
| 744 | +++ tests/qml/tst_DualSim.qml 2016-07-29 23:27:49 +0000 |
| 745 | @@ -153,10 +153,10 @@ |
| 746 | |
| 747 | mainViewLoader.item.startNewMessage() |
| 748 | waitForRendering(mainViewLoader.item) |
| 749 | - tryCompare(mainViewLoader.item, 'pendingCommitProperties', null) |
| 750 | - waitForRendering(mainViewLoader.item.bottomEdge) |
| 751 | |
| 752 | var messagesView = findChild(mainViewLoader, "messagesPage") |
| 753 | + waitForRendering(messagesView) |
| 754 | + |
| 755 | var headerSections = findChild(messagesView, "headerSections") |
| 756 | compare(headerSections.selectedIndex, -1) |
| 757 | |
| 758 | @@ -217,10 +217,10 @@ |
| 759 | |
| 760 | mainViewLoader.item.startNewMessage() |
| 761 | waitForRendering(mainViewLoader.item) |
| 762 | - tryCompare(mainViewLoader.item, 'pendingCommitProperties', null) |
| 763 | - waitForRendering(mainViewLoader.item.bottomEdge) |
| 764 | |
| 765 | var messagesView = findChild(mainViewLoader, "messagesPage") |
| 766 | + waitForRendering(messagesView) |
| 767 | + |
| 768 | var textArea = findChild(messagesView, "messageTextArea") |
| 769 | var contactSearchInput = findChild(messagesView, "contactSearchInput") |
| 770 | var sendButton = findChild(messagesView, "sendButton") |
| 771 | |
| 772 | === modified file 'tests/qml/tst_MMSDelegate.qml' |
| 773 | --- tests/qml/tst_MMSDelegate.qml 2016-03-05 01:09:32 +0000 |
| 774 | +++ tests/qml/tst_MMSDelegate.qml 2016-07-29 23:27:49 +0000 |
| 775 | @@ -109,6 +109,7 @@ |
| 776 | |
| 777 | when: windowShown |
| 778 | |
| 779 | + /* FIXME: this text is disabled because thumbnailer sometimes fails on yakkety |
| 780 | function test_load_video() { |
| 781 | mmsDelegate.messageData = { |
| 782 | "newEvent": false, |
| 783 | @@ -130,13 +131,13 @@ |
| 784 | var video = findChild(mmsDelegate, "videoAttachment") |
| 785 | verify(video != null) |
| 786 | waitForRendering(video) |
| 787 | - verify(video.source != "image://theme/image-missing") |
| 788 | + verify(video, "source" != "image://theme/image-missing") |
| 789 | |
| 790 | var icon = findChild(mmsDelegate, "playbackStartIcon") |
| 791 | verify(icon != null) |
| 792 | waitForRendering(icon) |
| 793 | verify(icon.visible) |
| 794 | - } |
| 795 | + }*/ |
| 796 | |
| 797 | function test_load_invalid_path() { |
| 798 | skip("image://thumbnailer is not reporting an error for wrong file path") |
| 799 | |
| 800 | === modified file 'tests/qml/tst_SingleSim.qml' |
| 801 | --- tests/qml/tst_SingleSim.qml 2016-07-11 19:45:52 +0000 |
| 802 | +++ tests/qml/tst_SingleSim.qml 2016-07-29 23:27:49 +0000 |
| 803 | @@ -138,10 +138,10 @@ |
| 804 | |
| 805 | mainViewLoader.item.startNewMessage() |
| 806 | waitForRendering(mainViewLoader.item) |
| 807 | - tryCompare(mainViewLoader.item, 'pendingCommitProperties', null) |
| 808 | - waitForRendering(mainViewLoader.item.bottomEdge) |
| 809 | |
| 810 | var messagesView = findChild(mainViewLoader, "messagesPage") |
| 811 | + waitForRendering(messagesView) |
| 812 | + |
| 813 | var textArea = findChild(messagesView, "messageTextArea") |
| 814 | var contactSearchInput = findChild(messagesView, "contactSearchInput") |
| 815 | var sendButton = findChild(messagesView, "sendButton") |
FAILED: Continuous integration, rev:585
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/