1 | diff -U 2 -x '*.o' -x '*.so' -x '*22.so.0*' -x Makefile -x 'moc_*.cpp' -x '*.a' -r mythtv-0.22.org/mythtv-0.22/libs/libmythui/mythuiwebbrowser.cpp mythtv-0.22/mythtv-0.22/libs/libmythui/mythuiwebbrowser.cpp |
---|
2 | --- mythtv-0.22.org/mythtv-0.22/libs/libmythui/mythuiwebbrowser.cpp 2010-03-07 14:25:17.000000000 +0100 |
---|
3 | +++ mythtv-0.22/mythtv-0.22/libs/libmythui/mythuiwebbrowser.cpp 2010-03-07 15:10:03.000000000 +0100 |
---|
4 | @@ -53,4 +53,11 @@ |
---|
5 | } |
---|
6 | |
---|
7 | +void MythWebView::followLink(void) |
---|
8 | +{ |
---|
9 | + QKeyEvent returnKey(QEvent::KeyPress, Qt::Key_Return, |
---|
10 | + Qt::NoModifier, "\n", false, 1); |
---|
11 | + QWebView::keyPressEvent( &returnKey); |
---|
12 | +} |
---|
13 | + |
---|
14 | void MythWebView::handleUnsupportedContent(QNetworkReply *reply) |
---|
15 | { |
---|
16 | @@ -596,6 +603,4 @@ |
---|
17 | UpdateBuffer(); |
---|
18 | } |
---|
19 | - else |
---|
20 | - handled = false; |
---|
21 | } |
---|
22 | else if (action == "DOWN") |
---|
23 | @@ -610,6 +615,4 @@ |
---|
24 | UpdateBuffer(); |
---|
25 | } |
---|
26 | - else |
---|
27 | - handled = false; |
---|
28 | } |
---|
29 | else if (action == "LEFT") |
---|
30 | @@ -623,6 +626,4 @@ |
---|
31 | UpdateBuffer(); |
---|
32 | } |
---|
33 | - else |
---|
34 | - handled = false; |
---|
35 | } |
---|
36 | else if (action == "RIGHT") |
---|
37 | @@ -637,6 +638,4 @@ |
---|
38 | UpdateBuffer(); |
---|
39 | } |
---|
40 | - else |
---|
41 | - handled = false; |
---|
42 | } |
---|
43 | else if (action == "PAGEUP") |
---|
44 | @@ -691,9 +690,5 @@ |
---|
45 | event->modifiers(), QString(), |
---|
46 | event->isAutoRepeat(), event->count()); |
---|
47 | - |
---|
48 | - *event = tabKey; |
---|
49 | - |
---|
50 | - return false; |
---|
51 | - |
---|
52 | + m_browser->event( &tabKey); |
---|
53 | } |
---|
54 | else if (action == "PREVIOUSLINK") |
---|
55 | @@ -702,17 +697,9 @@ |
---|
56 | event->modifiers() | Qt::ShiftModifier,QString(), |
---|
57 | event->isAutoRepeat(), event->count()); |
---|
58 | - |
---|
59 | - *event = shiftTabKey; |
---|
60 | - |
---|
61 | - return false; |
---|
62 | + m_browser->event( &shiftTabKey); |
---|
63 | } |
---|
64 | else if (action == "FOLLOWLINK") |
---|
65 | { |
---|
66 | - QKeyEvent returnKey(event->type(), Qt::Key_Return, |
---|
67 | - event->modifiers(), QString(), |
---|
68 | - event->isAutoRepeat(), event->count()); |
---|
69 | - *event = returnKey; |
---|
70 | - |
---|
71 | - return false; |
---|
72 | + m_browser->followLink(); |
---|
73 | } |
---|
74 | else if (action == "HISTORYBACK") |
---|
75 | @@ -724,4 +711,8 @@ |
---|
76 | Forward(); |
---|
77 | } |
---|
78 | + else if (action == "NEXT") |
---|
79 | + { |
---|
80 | + handled = true; |
---|
81 | + } |
---|
82 | else |
---|
83 | handled = false; |
---|
84 | diff -U 2 -x '*.o' -x '*.so' -x '*22.so.0*' -x Makefile -x 'moc_*.cpp' -x '*.a' -r mythtv-0.22.org/mythtv-0.22/libs/libmythui/mythuiwebbrowser.h mythtv-0.22/mythtv-0.22/libs/libmythui/mythuiwebbrowser.h |
---|
85 | --- mythtv-0.22.org/mythtv-0.22/libs/libmythui/mythuiwebbrowser.h 2010-03-07 14:25:21.000000000 +0100 |
---|
86 | +++ mythtv-0.22/mythtv-0.22/libs/libmythui/mythuiwebbrowser.h 2010-03-07 15:10:07.000000000 +0100 |
---|
87 | @@ -27,4 +27,7 @@ |
---|
88 | virtual void keyPressEvent(QKeyEvent *event); |
---|
89 | |
---|
90 | + /** Open link in focus (keyboard navigation support). */ |
---|
91 | + virtual void followLink(void); |
---|
92 | + |
---|
93 | protected slots: |
---|
94 | void handleUnsupportedContent(QNetworkReply *reply); |
---|