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

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 :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/webbrowser/BookmarksFoldersView.qml'
2--- src/app/webbrowser/BookmarksFoldersView.qml 2016-04-15 11:27:13 +0000
3+++ src/app/webbrowser/BookmarksFoldersView.qml 2016-06-06 09:12:16 +0000
4@@ -229,8 +229,6 @@
5 event.accepted = false
6 }
7 }
8- Keys.onEnterPressed: currentItem.clicked()
9- Keys.onReturnPressed: currentItem.clicked()
10 Keys.onDeletePressed: currentItem.removed()
11 }
12 }
13
14=== modified file 'src/app/webbrowser/BookmarksFoldersViewWide.qml'
15--- src/app/webbrowser/BookmarksFoldersViewWide.qml 2016-04-15 11:27:13 +0000
16+++ src/app/webbrowser/BookmarksFoldersViewWide.qml 2016-06-06 09:12:16 +0000
17@@ -194,7 +194,6 @@
18 }
19 }
20
21- Keys.onReturnPressed: bookmarksFoldersViewWideItem.bookmarkClicked(currentItem.url)
22 Keys.onDeletePressed: {
23 if (currentItem.removable) {
24 bookmarksFoldersViewWideItem.bookmarkRemoved(currentItem.url)
25
26=== modified file 'src/app/webbrowser/DownloadsPage.qml'
27--- src/app/webbrowser/DownloadsPage.qml 2016-05-05 11:11:01 +0000
28+++ src/app/webbrowser/DownloadsPage.qml 2016-06-06 09:12:16 +0000
29@@ -228,8 +228,6 @@
30 }
31 }
32
33- Keys.onEnterPressed: currentItem.clicked()
34- Keys.onReturnPressed: currentItem.clicked()
35 Keys.onEscapePressed: {
36 if (selectMode) {
37 selectMode = false
38@@ -237,11 +235,6 @@
39 event.accepted = false
40 }
41 }
42- Keys.onSpacePressed: {
43- if (selectMode || pickingMode) {
44- currentItem.clicked()
45- }
46- }
47 Keys.onDeletePressed: {
48 if (!selectMode && !pickingMode) {
49 currentItem.removed()
50
51=== modified file 'src/app/webbrowser/ExpandedHistoryView.qml'
52--- src/app/webbrowser/ExpandedHistoryView.qml 2016-04-15 11:27:13 +0000
53+++ src/app/webbrowser/ExpandedHistoryView.qml 2016-06-06 09:12:16 +0000
54@@ -79,8 +79,6 @@
55 onRemoved: expandedHistoryView.historyEntryRemoved(model.url)
56 }
57
58- Keys.onEnterPressed: currentItem.clicked()
59- Keys.onReturnPressed: currentItem.clicked()
60 Keys.onDeletePressed: currentItem.removed()
61 Keys.onEscapePressed: done()
62 }
63
64=== modified file 'src/app/webbrowser/HistoryView.qml'
65--- src/app/webbrowser/HistoryView.qml 2016-05-04 09:27:00 +0000
66+++ src/app/webbrowser/HistoryView.qml 2016-06-06 09:12:16 +0000
67@@ -100,8 +100,6 @@
68 }
69 }
70
71- Keys.onEnterPressed: currentItem.clicked()
72- Keys.onReturnPressed: currentItem.clicked()
73 Keys.onDeletePressed: currentItem.removed()
74 }
75
76
77=== modified file 'src/app/webbrowser/HistoryViewWide.qml'
78--- src/app/webbrowser/HistoryViewWide.qml 2016-05-05 11:11:01 +0000
79+++ src/app/webbrowser/HistoryViewWide.qml 2016-06-06 09:12:16 +0000
80@@ -301,9 +301,6 @@
81
82 anchors.fill: parent
83
84- Keys.onReturnPressed: historyEntrySelected()
85- Keys.onEnterPressed: historyEntrySelected()
86-
87 model: SortFilterModel {
88 id: historyLastVisitDateModel
89 readonly property date lastVisitDate: lastVisitDateListView.currentItem ? lastVisitDateListView.currentItem.lastVisitDate : ""
90@@ -330,14 +327,6 @@
91 }
92 }
93
94- function historyEntrySelected() {
95- if (urlsListView.ViewItems.selectMode) {
96- currentItem.selected = !currentItem.selected
97- } else {
98- historyViewWide.historyEntryClicked(currentItem.siteUrl)
99- }
100- }
101-
102 // Only use sections for "All History" history list
103 section.property: historyLastVisitDateModel.lastVisitDate.isValid() ? "" : "lastVisitDate"
104 section.delegate: HistorySectionDelegate {
105
106=== modified file 'src/app/webbrowser/NewTabView.qml'
107--- src/app/webbrowser/NewTabView.qml 2016-04-15 11:38:07 +0000
108+++ src/app/webbrowser/NewTabView.qml 2016-06-06 09:12:16 +0000
109@@ -261,8 +261,6 @@
110 }
111 }
112
113- Keys.onEnterPressed: currentItem.clicked()
114- Keys.onReturnPressed: currentItem.clicked()
115 Keys.onDeletePressed: currentItem.removed()
116
117 // Setting 'interactive' to false to prevent flicks also disables

Subscribers

People subscribed via source and target branches

to status/vote changes: