webbrowser-app

Merge lp:~osomon/webbrowser-app/listitems-now-handle-keyboard-activation into lp:webbrowser-app

  1. listitems-now-handle-keyboard-activation
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 1474
Merged at revision: 1476
Proposed branch: lp:~osomon/webbrowser-app/listitems-now-handle-keyboard-activation
Merge into: lp:webbrowser-app
Diff against target: 117 lines (+0/-27)
7 files modified
src/app/webbrowser/BookmarksFoldersView.qml (+0/-2)
src/app/webbrowser/BookmarksFoldersViewWide.qml (+0/-1)
src/app/webbrowser/DownloadsPage.qml (+0/-7)
src/app/webbrowser/ExpandedHistoryView.qml (+0/-2)
src/app/webbrowser/HistoryView.qml (+0/-2)
src/app/webbrowser/HistoryViewWide.qml (+0/-11)
src/app/webbrowser/NewTabView.qml (+0/-2)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/listitems-now-handle-keyboard-activation
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+296527@code.launchpad.net

Commit message

The UITK now handles Enter/Return/Space key presses to activate list items,
remove custom implementation.

To post a comment you must log in.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1474
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/513/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/515/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/515
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/508
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/508
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/503/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/503/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/503/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/503/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/503/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/503/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/513/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/app/webbrowser/BookmarksFoldersView.qml'
--- src/app/webbrowser/BookmarksFoldersView.qml 2016-04-15 11:27:13 +0000
+++ src/app/webbrowser/BookmarksFoldersView.qml 2016-06-06 09:12:16 +0000
@@ -229,8 +229,6 @@
229 event.accepted = false229 event.accepted = false
230 }230 }
231 }231 }
232 Keys.onEnterPressed: currentItem.clicked()
233 Keys.onReturnPressed: currentItem.clicked()
234 Keys.onDeletePressed: currentItem.removed()232 Keys.onDeletePressed: currentItem.removed()
235 }233 }
236 }234 }
237235
=== modified file 'src/app/webbrowser/BookmarksFoldersViewWide.qml'
--- src/app/webbrowser/BookmarksFoldersViewWide.qml 2016-04-15 11:27:13 +0000
+++ src/app/webbrowser/BookmarksFoldersViewWide.qml 2016-06-06 09:12:16 +0000
@@ -194,7 +194,6 @@
194 }194 }
195 }195 }
196196
197 Keys.onReturnPressed: bookmarksFoldersViewWideItem.bookmarkClicked(currentItem.url)
198 Keys.onDeletePressed: {197 Keys.onDeletePressed: {
199 if (currentItem.removable) {198 if (currentItem.removable) {
200 bookmarksFoldersViewWideItem.bookmarkRemoved(currentItem.url)199 bookmarksFoldersViewWideItem.bookmarkRemoved(currentItem.url)
201200
=== modified file 'src/app/webbrowser/DownloadsPage.qml'
--- src/app/webbrowser/DownloadsPage.qml 2016-05-05 11:11:01 +0000
+++ src/app/webbrowser/DownloadsPage.qml 2016-06-06 09:12:16 +0000
@@ -228,8 +228,6 @@
228 }228 }
229 }229 }
230230
231 Keys.onEnterPressed: currentItem.clicked()
232 Keys.onReturnPressed: currentItem.clicked()
233 Keys.onEscapePressed: {231 Keys.onEscapePressed: {
234 if (selectMode) {232 if (selectMode) {
235 selectMode = false233 selectMode = false
@@ -237,11 +235,6 @@
237 event.accepted = false235 event.accepted = false
238 }236 }
239 }237 }
240 Keys.onSpacePressed: {
241 if (selectMode || pickingMode) {
242 currentItem.clicked()
243 }
244 }
245 Keys.onDeletePressed: {238 Keys.onDeletePressed: {
246 if (!selectMode && !pickingMode) {239 if (!selectMode && !pickingMode) {
247 currentItem.removed()240 currentItem.removed()
248241
=== modified file 'src/app/webbrowser/ExpandedHistoryView.qml'
--- src/app/webbrowser/ExpandedHistoryView.qml 2016-04-15 11:27:13 +0000
+++ src/app/webbrowser/ExpandedHistoryView.qml 2016-06-06 09:12:16 +0000
@@ -79,8 +79,6 @@
79 onRemoved: expandedHistoryView.historyEntryRemoved(model.url)79 onRemoved: expandedHistoryView.historyEntryRemoved(model.url)
80 }80 }
8181
82 Keys.onEnterPressed: currentItem.clicked()
83 Keys.onReturnPressed: currentItem.clicked()
84 Keys.onDeletePressed: currentItem.removed()82 Keys.onDeletePressed: currentItem.removed()
85 Keys.onEscapePressed: done()83 Keys.onEscapePressed: done()
86 }84 }
8785
=== modified file 'src/app/webbrowser/HistoryView.qml'
--- src/app/webbrowser/HistoryView.qml 2016-05-04 09:27:00 +0000
+++ src/app/webbrowser/HistoryView.qml 2016-06-06 09:12:16 +0000
@@ -100,8 +100,6 @@
100 }100 }
101 }101 }
102102
103 Keys.onEnterPressed: currentItem.clicked()
104 Keys.onReturnPressed: currentItem.clicked()
105 Keys.onDeletePressed: currentItem.removed()103 Keys.onDeletePressed: currentItem.removed()
106 }104 }
107105
108106
=== modified file 'src/app/webbrowser/HistoryViewWide.qml'
--- src/app/webbrowser/HistoryViewWide.qml 2016-05-05 11:11:01 +0000
+++ src/app/webbrowser/HistoryViewWide.qml 2016-06-06 09:12:16 +0000
@@ -301,9 +301,6 @@
301301
302 anchors.fill: parent302 anchors.fill: parent
303303
304 Keys.onReturnPressed: historyEntrySelected()
305 Keys.onEnterPressed: historyEntrySelected()
306
307 model: SortFilterModel {304 model: SortFilterModel {
308 id: historyLastVisitDateModel305 id: historyLastVisitDateModel
309 readonly property date lastVisitDate: lastVisitDateListView.currentItem ? lastVisitDateListView.currentItem.lastVisitDate : ""306 readonly property date lastVisitDate: lastVisitDateListView.currentItem ? lastVisitDateListView.currentItem.lastVisitDate : ""
@@ -330,14 +327,6 @@
330 }327 }
331 }328 }
332329
333 function historyEntrySelected() {
334 if (urlsListView.ViewItems.selectMode) {
335 currentItem.selected = !currentItem.selected
336 } else {
337 historyViewWide.historyEntryClicked(currentItem.siteUrl)
338 }
339 }
340
341 // Only use sections for "All History" history list330 // Only use sections for "All History" history list
342 section.property: historyLastVisitDateModel.lastVisitDate.isValid() ? "" : "lastVisitDate"331 section.property: historyLastVisitDateModel.lastVisitDate.isValid() ? "" : "lastVisitDate"
343 section.delegate: HistorySectionDelegate {332 section.delegate: HistorySectionDelegate {
344333
=== modified file 'src/app/webbrowser/NewTabView.qml'
--- src/app/webbrowser/NewTabView.qml 2016-04-15 11:38:07 +0000
+++ src/app/webbrowser/NewTabView.qml 2016-06-06 09:12:16 +0000
@@ -261,8 +261,6 @@
261 }261 }
262 }262 }
263263
264 Keys.onEnterPressed: currentItem.clicked()
265 Keys.onReturnPressed: currentItem.clicked()
266 Keys.onDeletePressed: currentItem.removed()264 Keys.onDeletePressed: currentItem.removed()
267265
268 // Setting 'interactive' to false to prevent flicks also disables266 // Setting 'interactive' to false to prevent flicks also disables

Subscribers

People subscribed via source and target branches

to status/vote changes: