summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Harrison <pharrison@mythtv.org>2011-06-22 12:38:19 (GMT)
committer Paul Harrison <pharrison@mythtv.org>2011-06-22 14:40:48 (GMT)
commit05e7a23e226d51ed4397ba6e8cce54b7c273d4ed (patch)
treede010c9b3f3d69b6e038736d34df2b4462bef0e2
parent7c2c249331e6abfd4dec17c48643f50c09d90653 (diff)
mythtv-setup: Fix scrolling in the xmltv config terminal screen.
This allows you to both scroll up or down in the terminal and to escape out of it. It also always makes sure the last line of the terminal output is visible. Fixes #7962. This is supposed to be fixed in the settings re-write but since it's been delayed to after 0.25 let's at least make it usable in the mean time. (cherry picked from commit 9861cf29b6fd5ca49ae573dfa7a5ff795f2bfdb5)
-rw-r--r--mythtv/libs/libmyth/mythterminal.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/mythtv/libs/libmyth/mythterminal.cpp b/mythtv/libs/libmyth/mythterminal.cpp
index eb09bfb..9987bfc 100644
--- a/mythtv/libs/libmyth/mythterminal.cpp
+++ b/mythtv/libs/libmyth/mythterminal.cpp
@@ -99,6 +99,7 @@ void MythTerminal::AddText(const QString &_str)
{
lbwidget->setEnabled(true);
lbwidget->setFocus();
+ lbwidget->setCurrentRow(lbwidget->count() - 1);
}
}
@@ -169,7 +170,9 @@ bool MythTerminalKeyFilter::eventFilter(QObject *obj, QEvent *event)
false);
if (!handled && !actions.isEmpty())
{
- if (actions.contains("LEFT") || actions.contains("RIGHT"))
+ if (actions.contains("LEFT") || actions.contains("RIGHT") ||
+ actions.contains("UP") || actions.contains("DOWN") ||
+ actions.contains("ESCAPE"))
{
return QObject::eventFilter(obj, event);
}