← Back to branch summary

~ubuntu-branches/ubuntu/wily/dialer-app/wily-proposed

« back to all changes in this revision

Viewing changes to src/qml/HistoryPage/HistoryPage.qml

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release, CI bot, Gustavo Pichorim Boiko, Renato Araujo Oliveira Filho, Ubuntu daily release
  • Date: 2014-09-24 17:55:40 UTC
  • mfrom: (1.1.60)
  • Revision ID: package-import@ubuntu.com-20140924175540-a7rml8jwq54cz3jd
Tags: 0.1+14.10.20140924-0ubuntu1
https://launchpad.net/bugs/1362404
https://launchpad.net/bugs/1368337
[ CI bot ]
* Resync trunk

[ Gustavo Pichorim Boiko ]
* Go back to greeter when pressing back on the live call if running on
  top of the lock screen. (LP: #1362404)

[ Renato Araujo Oliveira Filho ]
* Changed swipe list item to not activate on mouse release. Changed
  actions order on history page. (LP: #1368337)

[ Ubuntu daily release ]
* New rebuild forced

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/qml/HistoryPage/HistoryPage.qml
318
318
                        }
319
319
                    },
320
320
                    Action {
 
321
                        iconName: "message"
 
322
                        text: i18n.tr("Send message")
 
323
                        onTriggered: {
 
324
                            mainView.sendMessage(phoneNumber)
 
325
                        }
 
326
                        visible: knownNumber
 
327
                        enabled: knownNumber
 
328
                    },
 
329
                    Action {
321
330
                        iconName: unknownContact ? "contact-new" : "stock_contact"
322
331
                        text: i18n.tr("Contact Details")
323
332
                        onTriggered: {
329
338
                        }
330
339
                        visible: knownNumber
331
340
                        enabled: knownNumber
332
 
                    },
333
 
                    Action {
334
 
                        iconName: "message"
335
 
                        text: i18n.tr("Send message")
336
 
                        onTriggered: {
337
 
                            mainView.sendMessage(phoneNumber)
338
 
                        }
339
 
                        visible: knownNumber
340
 
                        enabled: knownNumber
341
341
                    }
342
342
                ]
343
343
            }