[mythtv] [PATCH] allow use of media key codes
Joseph Caputo
jcaputo1 at comcast.net
Sat Dec 4 04:48:56 UTC 2004
So, I was fiddling around with my keybindings and lircrc the other day,
when I noticed that Qt defines key codes that correspond to media keys
you might find on a fancy keyboard or a remote control. I figured I'd
bind some of my remote buttons to these key codes, seeing as it's more
intuitive to bind the "Play" button to the Key_MediaPlay than to some
arbitrary letter. Unfortunately, when I did so, I encountered the
following behavior:
Watch Recordings -> Select Show -> press Enter
playback as normal
press Esc -> exit to "watch recordings"
Watch Recordings -> Select Show -> press "Play" button on remote
playback as normal
press Esc -> flash "watch recordings", then start playing the
program again, ad infinitum...
What I discovered (from reading the comment in qnamespace.h) is that
although the normal default for a generated QKeyEvent is QEvent::accept,
Qt automatically does QEvent::ignore on any QKeyEvent generated by one
of the 'multimedia' keys, which means (I think) that the event queue
never realizes it's been processed and keeps sending it back to the
window. If I put a QKeyEvent::accept() call in the appropriate place,
all seems to be fine.
So, this patch puts an explicit QKeyEvent::accept() everywhere in every
::keyEventHandler() function when a key is handled via a translated
keybinding (no need to do it for plain old dialogs that just use the Qt
bindings). It should be rather benign; at least I haven't seen any ill
effects from it, and it lets me use the following key codes in my lircrc
and keybindings table:
(from qkeysequence.cpp)
// Multimedia keys
"Back"
"Forward"
"Stop"
"Refresh"
"Volume Down"
"Volume Mute"
"Volume Up"
"Bass Boost"
"Bass Up"
"Bass Down"
"Treble Up"
"Treble Down"
"Media Play"
"Media Stop"
"Media Previous"
"Media Next"
"Media Record"
"Home"
"Favorites"
"Search"
"Standby"
"Open URL"
"Launch Mail"
"Launch Media"
"Launch (0)"
"Launch (1)"
"Launch (2)"
"Launch (3)"
"Launch (4)"
"Launch (5)"
"Launch (6)"
"Launch (7)"
"Launch (8)"
"Launch (9)"
"Launch (A)"
"Launch (B)"
"Launch (C)"
"Launch (D)"
"Launch (E)"
"Launch (F)"
-JAC
-------------- next part --------------
? mythbrowser/i18n/Makefile
? mythbrowser/i18n/i18n
? mythtv/config.log
? mythtv/contrib/iconmap.xml
? mythtv/programs/mythuitest/moc_test1.cpp
? mythtv/programs/mythuitest/mythuitest
? mythtv/themes/isthmus
? mythtv/themes/blue/konsole.png
Index: mfd/settings.pro
===================================================================
RCS file: /var/lib/mythcvs/mfd/settings.pro,v
retrieving revision 1.8
diff -u -r1.8 settings.pro
--- mfd/settings.pro 7 Sep 2004 21:21:33 -0000 1.8
+++ mfd/settings.pro 3 Dec 2004 14:02:01 -0000
@@ -1,7 +1,7 @@
CONFIG += debug
#CONFIG += release
-PREFIX = /usr/local
+PREFIX = /usr/local/stow/mythtv-2004-11-30
LIBVERSION = 0.16
Index: mfd/mfdlib/httpinrequest.cpp
===================================================================
RCS file: /var/lib/mythcvs/mfd/mfdlib/httpinrequest.cpp,v
retrieving revision 1.4
diff -u -r1.4 httpinrequest.cpp
--- mfd/mfdlib/httpinrequest.cpp 2 Sep 2004 07:01:14 -0000 1.4
+++ mfd/mfdlib/httpinrequest.cpp 3 Dec 2004 14:02:02 -0000
@@ -132,7 +132,8 @@
all_is_well = false;
return;
}
- if(protocol_and_version[1] != "1.1")
+ if(protocol_and_version[1] != "1.1" &&
+ protocol_and_version[1] != "1.0")
{
parent->warning(QString("httprequest got bad http version "
"should be \"1.1\" but got \"%1\"")
Index: mfe/settings.pro
===================================================================
RCS file: /var/lib/mythcvs/mfe/settings.pro,v
retrieving revision 1.2
diff -u -r1.2 settings.pro
--- mfe/settings.pro 26 Aug 2004 19:42:37 -0000 1.2
+++ mfe/settings.pro 3 Dec 2004 14:02:02 -0000
@@ -1,7 +1,7 @@
CONFIG += debug
#CONFIG += release
-PREFIX = /usr/local
+PREFIX = /usr/local/stow/mythtv-2004-11-30
INCLUDEPATH += $${PREFIX}/include
INCLUDEPATH *= /usr/local/include
Index: mfe/mfe/mfedialog.cpp
===================================================================
RCS file: /var/lib/mythcvs/mfe/mfe/mfedialog.cpp,v
retrieving revision 1.19
diff -u -r1.19 mfedialog.cpp
--- mfe/mfe/mfedialog.cpp 2 Sep 2004 07:01:46 -0000 1.19
+++ mfe/mfe/mfedialog.cpp 3 Dec 2004 14:02:03 -0000
@@ -195,6 +195,8 @@
if (!handled)
MythThemedDialog::keyPressEvent(e);
+ else
+ e->accept();
}
void MfeDialog::handleTreeSignals(UIListGenericTree *node)
Index: mfe/mfe/playlistdialog.cpp
===================================================================
RCS file: /var/lib/mythcvs/mfe/mfe/playlistdialog.cpp,v
retrieving revision 1.5
diff -u -r1.5 playlistdialog.cpp
--- mfe/mfe/playlistdialog.cpp 2 Sep 2004 07:01:46 -0000 1.5
+++ mfe/mfe/playlistdialog.cpp 3 Dec 2004 14:02:04 -0000
@@ -280,6 +280,8 @@
if (!handled)
MythThemedDialog::keyPressEvent(e);
+ else
+ e->accept();
}
void PlaylistDialog::playlistCheckDone()
Index: mythbrowser/settings.pro
===================================================================
RCS file: /var/lib/mythcvs/mythbrowser/settings.pro,v
retrieving revision 1.5
diff -u -r1.5 settings.pro
--- mythbrowser/settings.pro 7 Sep 2004 21:23:06 -0000 1.5
+++ mythbrowser/settings.pro 3 Dec 2004 14:02:04 -0000
@@ -1,7 +1,7 @@
-#CONFIG += debug
-CONFIG += release
+CONFIG += debug
+#CONFIG += release
-PREFIX = /usr/local
+PREFIX = /usr/local/stow/mythtv-2004-11-30
LIBVERSION = 0.16
Index: mythdvd/settings.pro
===================================================================
RCS file: /var/lib/mythcvs/mythdvd/settings.pro,v
retrieving revision 1.10
diff -u -r1.10 settings.pro
--- mythdvd/settings.pro 7 Sep 2004 21:23:26 -0000 1.10
+++ mythdvd/settings.pro 3 Dec 2004 14:02:04 -0000
@@ -1,7 +1,7 @@
#CONFIG += debug
-CONFIG += release
+CONFIG += debug
-PREFIX = /usr/local
+PREFIX = /usr/local/stow/mythtv-2004-11-30
LIBVERSION = 0.16
Index: mythdvd/mythdvd/config.h
===================================================================
RCS file: /var/lib/mythcvs/mythdvd/mythdvd/config.h,v
retrieving revision 1.11
diff -u -r1.11 config.h
--- mythdvd/mythdvd/config.h 9 Sep 2004 18:40:07 -0000 1.11
+++ mythdvd/mythdvd/config.h 3 Dec 2004 14:02:04 -0000
@@ -1,4 +1,5 @@
/*
Automatically generated by configure - do not modify
*/
+#define VCD_SUPPORT 1
#define TRANSCODE_SUPPORT 1
Index: mythdvd/mythdvd/dvdmenu.xml
===================================================================
RCS file: /var/lib/mythcvs/mythdvd/mythdvd/dvdmenu.xml,v
retrieving revision 1.19
diff -u -r1.19 dvdmenu.xml
--- mythdvd/mythdvd/dvdmenu.xml 9 Sep 2004 18:40:07 -0000 1.19
+++ mythdvd/mythdvd/dvdmenu.xml 3 Dec 2004 14:02:04 -0000
@@ -15,6 +15,19 @@
<action>DVD_PLAY</action>
</button>
+ <button>
+ <type>VCD_PLAY</type>
+ <text>Play VCD</text>
+ <text lang="DK">Afspil VCD</text>
+ <text lang="FR">Lecture VCD</text>
+ <text lang="PT">Tocar VCD</text>
+ <text lang="DE">VCD spielen</text>
+ <text lang="NL">VCD Afspelen</text>
+ <text lang="JA">VCD再生</text>
+ <action>VCD_PLAY</action>
+ </button>
+
+
<button>
<type>DVD_RIP</type>
Index: mythdvd/mythdvd/dvdripbox.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythdvd/mythdvd/dvdripbox.cpp,v
retrieving revision 1.18
diff -u -r1.18 dvdripbox.cpp
--- mythdvd/mythdvd/dvdripbox.cpp 9 Sep 2004 18:40:07 -0000 1.18
+++ mythdvd/mythdvd/dvdripbox.cpp 3 Dec 2004 14:02:05 -0000
@@ -346,6 +346,8 @@
if (!handled)
MythThemedDialog::keyPressEvent(e);
+ else
+ e->accept();
}
void DVDRipBox::nextJob()
Index: mythdvd/mythdvd/titledialog.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythdvd/mythdvd/titledialog.cpp,v
retrieving revision 1.16
diff -u -r1.16 titledialog.cpp
--- mythdvd/mythdvd/titledialog.cpp 20 Jan 2004 20:15:42 -0000 1.16
+++ mythdvd/mythdvd/titledialog.cpp 3 Dec 2004 14:02:07 -0000
@@ -210,6 +210,8 @@
if (!handled)
MythThemedDialog::keyPressEvent(e);
+ else
+ e->accept();
}
void TitleDialog::nextTitle()
Index: mythgallery/settings.pro
===================================================================
RCS file: /var/lib/mythcvs/mythgallery/settings.pro,v
retrieving revision 1.9
diff -u -r1.9 settings.pro
--- mythgallery/settings.pro 4 Aug 2003 01:03:41 -0000 1.9
+++ mythgallery/settings.pro 3 Dec 2004 14:02:07 -0000
@@ -1,7 +1,7 @@
#CONFIG += debug
-CONFIG += release
+CONFIG += debug
-PREFIX = /usr/local
+PREFIX = /usr/local/stow/mythtv-2004-11-30
INCLUDEPATH += $${PREFIX}/include
INCLUDEPATH *= /usr/local/include
Index: mythgallery/mythgallery/iconview.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythgallery/mythgallery/iconview.cpp,v
retrieving revision 1.32
diff -u -r1.32 iconview.cpp
--- mythgallery/mythgallery/iconview.cpp 13 Nov 2004 23:00:10 -0000 1.32
+++ mythgallery/mythgallery/iconview.cpp 3 Dec 2004 14:02:07 -0000
@@ -375,6 +375,7 @@
}
if (handled || menuHandled) {
+ e->accept();
update();
}
else
Index: mythgallery/mythgallery/singleview.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythgallery/mythgallery/singleview.cpp,v
retrieving revision 1.28
diff -u -r1.28 singleview.cpp
--- mythgallery/mythgallery/singleview.cpp 18 Apr 2004 19:24:19 -0000 1.28
+++ mythgallery/mythgallery/singleview.cpp 3 Dec 2004 14:02:08 -0000
@@ -384,6 +384,7 @@
}
if (handled) {
+ e->accept();
update();
}
else {
Index: mythgame/settings.pro
===================================================================
RCS file: /var/lib/mythcvs/mythgame/settings.pro,v
retrieving revision 1.10
diff -u -r1.10 settings.pro
--- mythgame/settings.pro 4 Aug 2003 01:04:39 -0000 1.10
+++ mythgame/settings.pro 3 Dec 2004 14:02:08 -0000
@@ -1,7 +1,7 @@
#CONFIG += debug
-CONFIG += release
+CONFIG += debug
-PREFIX = /usr/local
+PREFIX = /usr/local/stow/mythtv-2004-11-30
INCLUDEPATH += $${PREFIX}/include
INCLUDEPATH *= /usr/local/include
Index: mythgame/mythgame/gametree.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythgame/mythgame/gametree.cpp,v
retrieving revision 1.8
diff -u -r1.8 gametree.cpp
--- mythgame/mythgame/gametree.cpp 5 Dec 2003 20:09:41 -0000 1.8
+++ mythgame/mythgame/gametree.cpp 3 Dec 2004 14:02:09 -0000
@@ -72,6 +72,8 @@
if (!handled)
MythThemedDialog::keyPressEvent(e);
+ else
+ e->accept();
}
void GameTree::buildGameList(void)
Index: mythmusic/settings.pro
===================================================================
RCS file: /var/lib/mythcvs/mythmusic/settings.pro,v
retrieving revision 1.14
diff -u -r1.14 settings.pro
--- mythmusic/settings.pro 9 Aug 2003 20:57:10 -0000 1.14
+++ mythmusic/settings.pro 3 Dec 2004 14:02:09 -0000
@@ -1,7 +1,7 @@
#CONFIG += debug
-CONFIG += release
+CONFIG += debug
-PREFIX = /usr/local
+PREFIX = /usr/local/stow/mythtv-2004-11-30
INCLUDEPATH += $${PREFIX}/include
INCLUDEPATH *= /usr/local/include
Index: mythmusic/mythmusic/databasebox.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythmusic/mythmusic/databasebox.cpp,v
retrieving revision 1.40
diff -u -r1.40 databasebox.cpp
--- mythmusic/mythmusic/databasebox.cpp 25 Nov 2004 06:56:40 -0000 1.40
+++ mythmusic/mythmusic/databasebox.cpp 3 Dec 2004 14:02:10 -0000
@@ -1147,7 +1147,10 @@
}
if (handled)
+ {
+ e->accept();
return;
+ }
updateLCDMenu(e);
Index: mythmusic/mythmusic/playbackbox.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythmusic/mythmusic/playbackbox.cpp,v
retrieving revision 1.74
diff -u -r1.74 playbackbox.cpp
--- mythmusic/mythmusic/playbackbox.cpp 23 Oct 2004 20:15:06 -0000 1.74
+++ mythmusic/mythmusic/playbackbox.cpp 3 Dec 2004 14:02:12 -0000
@@ -405,6 +405,8 @@
if (!handled)
MythThemedDialog::keyPressEvent(e);
+ else
+ e->accept();
}
void PlaybackBox::checkForPlaylists()
Index: mythnews/settings.pro
===================================================================
RCS file: /var/lib/mythcvs/mythnews/settings.pro,v
retrieving revision 1.2
diff -u -r1.2 settings.pro
--- mythnews/settings.pro 29 Dec 2003 04:27:43 -0000 1.2
+++ mythnews/settings.pro 3 Dec 2004 14:02:12 -0000
@@ -1,7 +1,7 @@
-#CONFIG += debug
-CONFIG += release
+CONFIG += debug
+#CONFIG += release
-PREFIX = /usr/local
+PREFIX = /usr/local/stow/mythtv-2004-11-30
# FOR Debian
#PREFIX = /usr
Index: mythnews/mythnews/mythnews.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythnews/mythnews/mythnews.cpp,v
retrieving revision 1.14
diff -u -r1.14 mythnews.cpp
--- mythnews/mythnews/mythnews.cpp 24 Jul 2004 23:11:23 -0000 1.14
+++ mythnews/mythnews/mythnews.cpp 3 Dec 2004 14:02:13 -0000
@@ -373,6 +373,8 @@
if (!handled)
MythDialog::keyPressEvent(e);
+ else
+ e->accept();
}
void MythNews::cursorUp(bool page)
Index: mythnews/mythnews/mythnewsconfig.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythnews/mythnews/mythnewsconfig.cpp,v
retrieving revision 1.9
diff -u -r1.9 mythnewsconfig.cpp
--- mythnews/mythnews/mythnewsconfig.cpp 8 May 2004 20:16:51 -0000 1.9
+++ mythnews/mythnews/mythnewsconfig.cpp 3 Dec 2004 14:02:13 -0000
@@ -576,7 +576,10 @@
if (!handled)
MythDialog::keyPressEvent(e);
else
+ {
+ e->accept();
update();
+ }
}
void MythNewsConfig::cursorUp(bool page)
Index: mythtv/settings.pro
===================================================================
RCS file: /var/lib/mythcvs/mythtv/settings.pro,v
retrieving revision 1.77
diff -u -r1.77 settings.pro
--- mythtv/settings.pro 20 Nov 2004 05:56:00 -0000 1.77
+++ mythtv/settings.pro 3 Dec 2004 14:02:13 -0000
@@ -1,8 +1,8 @@
#CONFIG += debug
-CONFIG += release
+CONFIG += debug
isEmpty( PREFIX ) {
- PREFIX = /usr/local
+PREFIX = /usr/local/stow/mythtv-2004-11-30
}
LIBVERSION = 0.16
@@ -83,13 +83,13 @@
CONFIG += using_joystick_menu
# Native lirc support
-#CONFIG += using_lirc
-#LIRC_LIBS = -llirc_client
+CONFIG += using_lirc
+LIRC_LIBS = -llirc_client
# XvMC support, modify as necessary.
-#CONFIG += using_xvmc
-#DEFINES += USING_XVMC
-#EXTRA_LIBS += -lXvMCNVIDIA -lXvMC
+CONFIG += using_xvmc
+DEFINES += USING_XVMC
+EXTRA_LIBS += -L /usr/X11R6/lib/nvidia-graphics-1.0-6111 -lXvMCNVIDIA -lXvMC
# XvMC_VLD support, modify as necessary. Incompatible with normal XvMC support.
#CONFIG += using_xvmc using_xvmc_vld
Index: mythtv/libs/libmyth/mythdialogs.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmyth/mythdialogs.cpp,v
retrieving revision 1.97
diff -u -r1.97 mythdialogs.cpp
--- mythtv/libs/libmyth/mythdialogs.cpp 26 Nov 2004 21:49:22 -0000 1.97
+++ mythtv/libs/libmyth/mythdialogs.cpp 3 Dec 2004 14:02:17 -0000
@@ -1009,6 +1009,9 @@
handled = false;
}
}
+
+ if (handled)
+ e->accept();
}
MythPopupBox::MythPopupBox(MythMainWindow *parent, const char *name)
@@ -1263,6 +1266,8 @@
if (!handled)
MythDialog::keyPressEvent(e);
+ else
+ e->accept();
}
int MythPopupBox::ExecPopup(QObject *target, const char *slot)
@@ -1490,6 +1495,8 @@
if (!handled)
MythDialog::keyPressEvent(e);
+ else
+ e->accept();
}
MythThemedDialog::MythThemedDialog(MythMainWindow *parent, QString window_name,
@@ -2370,6 +2377,9 @@
}
}
}
+
+ if (handled)
+ e->accept();
}
@@ -2523,6 +2533,8 @@
if (!handled)
MythThemedDialog::keyPressEvent(e);
+ else
+ e->accept();
}
void MythImageFileDialog::buildTree(QString starting_where)
@@ -2899,6 +2911,9 @@
handled = false;
}
}
+
+ if (handled)
+ e->accept();
}
void MythScrollDialog::viewportPaintEvent(QPaintEvent *pe)
Index: mythtv/libs/libmyth/mythwidgets.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmyth/mythwidgets.cpp,v
retrieving revision 1.84
diff -u -r1.84 mythwidgets.cpp
--- mythtv/libs/libmyth/mythwidgets.cpp 7 Aug 2004 13:08:32 -0000 1.84
+++ mythtv/libs/libmyth/mythwidgets.cpp 3 Dec 2004 14:02:18 -0000
@@ -55,6 +55,8 @@
else
e->ignore();
}
+ else
+ e->accept();
}
void MythComboBox::focusInEvent(QFocusEvent *e)
@@ -123,6 +125,8 @@
if (!handled)
e->ignore();
+ else
+ e->accept();
}
void MythCheckBox::focusInEvent(QFocusEvent *e)
@@ -245,6 +249,8 @@
if (!handled)
QSlider::keyPressEvent(e);
+ else
+ e->accept();
}
void MythSlider::focusInEvent(QFocusEvent *e)
@@ -286,8 +292,12 @@
}
if (!handled)
+ {
if (rw || e->key() == Key_Escape)
QLineEdit::keyPressEvent(e);
+ }
+ else
+ e->accept();
}
void MythLineEdit::setText(const QString& text)
@@ -614,7 +624,10 @@
}
if (handled)
+ {
+ e->accept();
return;
+ }
switch (e->key())
{
@@ -840,6 +853,8 @@
if (!handled)
QTable::keyPressEvent(e);
+ else
+ e->accept();
}
void MythButtonGroup::moveFocus(int key)
@@ -894,6 +909,8 @@
if (!handled)
QPushButton::keyPressEvent(e);
+ else
+ e->accept();
}
void MythPushButton::keyReleaseEvent(QKeyEvent *e)
@@ -986,7 +1003,7 @@
if (action == "UP" && currentItem() == firstChild())
{
- // Key_Up at top of list allows focus to move to other widgets
+ // UP at top of list allows focus to move to other widgets
clearSelection();
if (!focusNextPrevChild(false))
{
@@ -996,7 +1013,7 @@
}
else if (action == "DOWN" && currentItem() == lastItem())
{
- // Key_Down at bottom of list allows focus to move to other widgets
+ // DOWN at bottom of list allows focus to move to other widgets
clearSelection();
if (!focusNextPrevChild(true))
setSelected(currentItem(), true);
@@ -1009,6 +1026,9 @@
else
handled = false;
}
+
+ if (handled)
+ e->accept();
QListView::keyPressEvent(e);
}
@@ -1075,6 +1095,8 @@
if (!handled)
e->ignore();
+ else
+ e->accept();
}
void MythListBox::focusInEvent(QFocusEvent *e)
Index: mythtv/libs/libmyth/mythwizard.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmyth/mythwizard.cpp,v
retrieving revision 1.8
diff -u -r1.8 mythwizard.cpp
--- mythtv/libs/libmyth/mythwizard.cpp 7 Aug 2004 13:08:32 -0000 1.8
+++ mythtv/libs/libmyth/mythwizard.cpp 3 Dec 2004 14:02:18 -0000
@@ -570,6 +570,8 @@
if (!handled)
MythDialog::keyPressEvent(e);
+ else
+ e->accept();
}
void MythWizard::removePage( QWidget * page )
Index: mythtv/libs/libmyth/settings.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmyth/settings.cpp,v
retrieving revision 1.84
diff -u -r1.84 settings.cpp
--- mythtv/libs/libmyth/settings.cpp 29 May 2004 18:30:43 -0000 1.84
+++ mythtv/libs/libmyth/settings.cpp 3 Dec 2004 14:02:19 -0000
@@ -637,6 +637,8 @@
if (!handled)
MythDialog::keyPressEvent(e);
+ else
+ e->accept();
}
MythDialog* ConfigurationDialog::dialogWidget(MythMainWindow *parent,
Index: mythtv/libs/libmyth/themedmenu.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmyth/themedmenu.cpp,v
retrieving revision 1.98
diff -u -r1.98 themedmenu.cpp
--- mythtv/libs/libmyth/themedmenu.cpp 26 Nov 2004 14:07:43 -0000 1.98
+++ mythtv/libs/libmyth/themedmenu.cpp 3 Dec 2004 14:02:22 -0000
@@ -2592,6 +2592,8 @@
if (!d->keyPressHandler(e))
MythDialog::keyPressEvent(e);
+ else
+ e->accept();
d->ignorekeys = false;
}
Index: mythtv/libs/libmythtv/guidegrid.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmythtv/guidegrid.cpp,v
retrieving revision 1.167
diff -u -r1.167 guidegrid.cpp
--- mythtv/libs/libmythtv/guidegrid.cpp 9 Sep 2004 21:52:35 -0000 1.167
+++ mythtv/libs/libmythtv/guidegrid.cpp 3 Dec 2004 14:02:23 -0000
@@ -391,6 +391,8 @@
if (!handled)
MythDialog::keyPressEvent(e);
+ else
+ e->accept();
}
void GuideGrid::keyReleaseEvent(QKeyEvent *e)
Index: mythtv/libs/libmythtv/progfind.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmythtv/progfind.cpp,v
retrieving revision 1.58
diff -u -r1.58 progfind.cpp
--- mythtv/libs/libmythtv/progfind.cpp 6 Sep 2004 19:43:59 -0000 1.58
+++ mythtv/libs/libmythtv/progfind.cpp 3 Dec 2004 14:02:24 -0000
@@ -201,6 +201,8 @@
if (!handled)
MythDialog::keyPressEvent(e);
+ else
+ e->accept();
if (needFill && inSearch == 2)
{
Index: mythtv/libs/libmythtv/proglist.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmythtv/proglist.cpp,v
retrieving revision 1.52
diff -u -r1.52 proglist.cpp
--- mythtv/libs/libmythtv/proglist.cpp 25 Nov 2004 21:23:52 -0000 1.52
+++ mythtv/libs/libmythtv/proglist.cpp 3 Dec 2004 14:02:26 -0000
@@ -172,6 +172,8 @@
if (!handled)
MythDialog::keyPressEvent(e);
+ else
+ e->accept();
if (refillAll)
{
Index: mythtv/libs/libmythtv/sr_dialog.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmythtv/sr_dialog.cpp,v
retrieving revision 1.7
diff -u -r1.7 sr_dialog.cpp
--- mythtv/libs/libmythtv/sr_dialog.cpp 6 Sep 2004 22:58:05 -0000 1.7
+++ mythtv/libs/libmythtv/sr_dialog.cpp 3 Dec 2004 14:02:26 -0000
@@ -150,6 +150,8 @@
if (!handled)
MythDialog::keyPressEvent(e);
+ else
+ e->accept();
allowEvents = true;
}
Index: mythtv/libs/libmythui/dialogbox.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmythui/dialogbox.cpp,v
retrieving revision 1.4
diff -u -r1.4 dialogbox.cpp
--- mythtv/libs/libmythui/dialogbox.cpp 13 Sep 2004 20:57:49 -0000 1.4
+++ mythtv/libs/libmythui/dialogbox.cpp 3 Dec 2004 14:02:26 -0000
@@ -85,6 +85,9 @@
}
}
+ if (handled)
+ e->accept();
+
return handled;
}
Index: mythtv/libs/libmythui/myththemeddialog.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmythui/myththemeddialog.cpp,v
retrieving revision 1.2
diff -u -r1.2 myththemeddialog.cpp
--- mythtv/libs/libmythui/myththemeddialog.cpp 22 Nov 2004 15:38:22 -0000 1.2
+++ mythtv/libs/libmythui/myththemeddialog.cpp 3 Dec 2004 14:02:27 -0000
@@ -62,6 +62,9 @@
}
}
+ if (handled)
+ e->accept();
+
return handled;
}
Index: mythtv/programs/mythfrontend/channelrecpriority.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/programs/mythfrontend/channelrecpriority.cpp,v
retrieving revision 1.18
diff -u -r1.18 channelrecpriority.cpp
--- mythtv/programs/mythfrontend/channelrecpriority.cpp 26 Oct 2004 23:56:06 -0000 1.18
+++ mythtv/programs/mythfrontend/channelrecpriority.cpp 3 Dec 2004 14:02:27 -0000
@@ -168,6 +168,8 @@
if (!handled)
MythDialog::keyPressEvent(e);
+ else
+ e->accept();
}
void ChannelRecPriority::LoadWindow(QDomElement &element)
Index: mythtv/programs/mythfrontend/playbackbox.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/programs/mythfrontend/playbackbox.cpp,v
retrieving revision 1.178
diff -u -r1.178 playbackbox.cpp
--- mythtv/programs/mythfrontend/playbackbox.cpp 28 Nov 2004 19:04:15 -0000 1.178
+++ mythtv/programs/mythfrontend/playbackbox.cpp 3 Dec 2004 14:02:30 -0000
@@ -2089,6 +2089,8 @@
if (!handled)
MythDialog::keyPressEvent(e);
+ else
+ e->accept();
}
void PlaybackBox::customEvent(QCustomEvent *e)
Index: mythtv/programs/mythfrontend/previousbox.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/programs/mythfrontend/previousbox.cpp,v
retrieving revision 1.5
diff -u -r1.5 previousbox.cpp
--- mythtv/programs/mythfrontend/previousbox.cpp 23 Nov 2004 09:01:47 -0000 1.5
+++ mythtv/programs/mythfrontend/previousbox.cpp 3 Dec 2004 14:02:30 -0000
@@ -152,6 +152,8 @@
if (!handled)
MythDialog::keyPressEvent(e);
+ else
+ e->accept();
if (refillAll)
{
Index: mythtv/programs/mythfrontend/programrecpriority.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/programs/mythfrontend/programrecpriority.cpp,v
retrieving revision 1.40
diff -u -r1.40 programrecpriority.cpp
--- mythtv/programs/mythfrontend/programrecpriority.cpp 25 Nov 2004 23:28:45 -0000 1.40
+++ mythtv/programs/mythfrontend/programrecpriority.cpp 3 Dec 2004 14:02:32 -0000
@@ -267,6 +267,8 @@
if (!handled)
MythDialog::keyPressEvent(e);
+ else
+ e->accept();
}
void ProgramRecPriority::LoadWindow(QDomElement &element)
Index: mythtv/programs/mythfrontend/statusbox.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/programs/mythfrontend/statusbox.cpp,v
retrieving revision 1.14
diff -u -r1.14 statusbox.cpp
--- mythtv/programs/mythfrontend/statusbox.cpp 1 Dec 2004 04:47:37 -0000 1.14
+++ mythtv/programs/mythfrontend/statusbox.cpp 3 Dec 2004 14:02:33 -0000
@@ -426,6 +426,8 @@
if (!handled)
MythDialog::keyPressEvent(e);
+ else
+ e->accept();
}
void StatusBox::setHelpText()
Index: mythtv/programs/mythfrontend/viewscheduled.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/programs/mythfrontend/viewscheduled.cpp,v
retrieving revision 1.90
diff -u -r1.90 viewscheduled.cpp
--- mythtv/programs/mythfrontend/viewscheduled.cpp 30 Oct 2004 01:26:08 -0000 1.90
+++ mythtv/programs/mythfrontend/viewscheduled.cpp 3 Dec 2004 14:02:33 -0000
@@ -127,6 +127,8 @@
if (!handled)
MythDialog::keyPressEvent(e);
+ else
+ e->accept();
if (needFill)
{
Index: mythtv/programs/mythuitest/test1.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/programs/mythuitest/test1.cpp,v
retrieving revision 1.3
diff -u -r1.3 test1.cpp
--- mythtv/programs/mythuitest/test1.cpp 4 Sep 2004 16:16:49 -0000 1.3
+++ mythtv/programs/mythuitest/test1.cpp 3 Dec 2004 14:02:34 -0000
@@ -65,6 +65,9 @@
}
}
+ if (handled)
+ e->accept();
+
return true;
}
Index: mythtv/themes/blue/theme.xml
===================================================================
RCS file: /var/lib/mythcvs/mythtv/themes/blue/theme.xml,v
retrieving revision 1.36
diff -u -r1.36 theme.xml
--- mythtv/themes/blue/theme.xml 26 Nov 2004 19:53:57 -0000 1.36
+++ mythtv/themes/blue/theme.xml 3 Dec 2004 14:02:35 -0000
@@ -722,5 +722,9 @@
<offset>22,10</offset>
</buttondef>
-</myththeme>
+ <buttondef name="TERMINAL">
+ <image>konsole.png</image>
+ <offset>20,10</offset>
+ </buttondef>
+</myththeme>
Index: mythvideo/settings.pro
===================================================================
RCS file: /var/lib/mythcvs/mythvideo/settings.pro,v
retrieving revision 1.8
diff -u -r1.8 settings.pro
--- mythvideo/settings.pro 19 Aug 2004 20:41:56 -0000 1.8
+++ mythvideo/settings.pro 3 Dec 2004 14:02:36 -0000
@@ -1,7 +1,7 @@
#CONFIG += debug
-CONFIG += release
+CONFIG += debug
-PREFIX = /usr/local
+PREFIX = /usr/local/stow/mythtv-2004-11-30
INCLUDEPATH += $${PREFIX}/include
INCLUDEPATH *= /usr/local/include
Index: mythvideo/mythvideo/editmetadata.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythvideo/mythvideo/editmetadata.cpp,v
retrieving revision 1.12
diff -u -r1.12 editmetadata.cpp
--- mythvideo/mythvideo/editmetadata.cpp 19 Aug 2004 21:50:12 -0000 1.12
+++ mythvideo/mythvideo/editmetadata.cpp 3 Dec 2004 14:02:36 -0000
@@ -318,6 +318,8 @@
if (!handled)
MythThemedDialog::keyPressEvent(e);
+ else
+ e->accept();
}
@@ -587,6 +589,9 @@
}
}
}
+
+ if (handled)
+ e->accept();
}
Index: mythvideo/mythvideo/fileassoc.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythvideo/mythvideo/fileassoc.cpp,v
retrieving revision 1.5
diff -u -r1.5 fileassoc.cpp
--- mythvideo/mythvideo/fileassoc.cpp 5 Dec 2003 19:40:23 -0000 1.5
+++ mythvideo/mythvideo/fileassoc.cpp 3 Dec 2004 14:02:37 -0000
@@ -225,6 +225,8 @@
if (!handled)
MythThemedDialog::keyPressEvent(e);
+ else
+ e->accept();
}
void FileAssocDialog::takeFocusAwayFromEditor(bool up_or_down)
Index: mythvideo/mythvideo/videobrowser.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythvideo/mythvideo/videobrowser.cpp,v
retrieving revision 1.40
diff -u -r1.40 videobrowser.cpp
--- mythvideo/mythvideo/videobrowser.cpp 31 Oct 2004 12:06:51 -0000 1.40
+++ mythvideo/mythvideo/videobrowser.cpp 3 Dec 2004 14:02:37 -0000
@@ -126,6 +126,8 @@
if (!handled)
MythDialog::keyPressEvent(e);
+ else
+ e->accept();
}
void VideoBrowser::doMenu(bool info)
Index: mythvideo/mythvideo/videofilter.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythvideo/mythvideo/videofilter.cpp,v
retrieving revision 1.8
diff -u -r1.8 videofilter.cpp
--- mythvideo/mythvideo/videofilter.cpp 5 Oct 2004 10:33:32 -0000 1.8
+++ mythvideo/mythvideo/videofilter.cpp 3 Dec 2004 14:02:38 -0000
@@ -465,6 +465,8 @@
if (!handled)
MythThemedDialog::keyPressEvent(e);
+ else
+ e->accept();
}
Index: mythvideo/mythvideo/videogallery.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythvideo/mythvideo/videogallery.cpp,v
retrieving revision 1.14
diff -u -r1.14 videogallery.cpp
--- mythvideo/mythvideo/videogallery.cpp 21 Nov 2004 14:58:32 -0000 1.14
+++ mythvideo/mythvideo/videogallery.cpp 3 Dec 2004 14:02:39 -0000
@@ -162,6 +162,8 @@
if (!handled)
MythDialog::keyPressEvent(e);
+ else
+ e->accept();
}
bool VideoGallery::goBack()
Index: mythvideo/mythvideo/videomanager.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythvideo/mythvideo/videomanager.cpp,v
retrieving revision 1.41
diff -u -r1.41 videomanager.cpp
--- mythvideo/mythvideo/videomanager.cpp 25 Nov 2004 11:29:10 -0000 1.41
+++ mythvideo/mythvideo/videomanager.cpp 3 Dec 2004 14:02:40 -0000
@@ -173,6 +173,8 @@
if (!handled)
MythDialog::keyPressEvent(e);
+ else
+ e->accept();
}
void VideoManager::num(const QString &text)
Index: mythvideo/mythvideo/videoselected.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythvideo/mythvideo/videoselected.cpp,v
retrieving revision 1.6
diff -u -r1.6 videoselected.cpp
--- mythvideo/mythvideo/videoselected.cpp 12 Nov 2004 10:17:20 -0000 1.6
+++ mythvideo/mythvideo/videoselected.cpp 3 Dec 2004 14:02:41 -0000
@@ -108,6 +108,8 @@
if (!handled)
MythDialog::keyPressEvent(e);
+ else
+ e->accept();
}
void VideoSelected::updateBackground(void)
Index: mythvideo/mythvideo/videotree.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythvideo/mythvideo/videotree.cpp,v
retrieving revision 1.35
diff -u -r1.35 videotree.cpp
--- mythvideo/mythvideo/videotree.cpp 31 Oct 2004 12:06:51 -0000 1.35
+++ mythvideo/mythvideo/videotree.cpp 3 Dec 2004 14:02:41 -0000
@@ -129,6 +129,8 @@
if (!handled)
MythThemedDialog::keyPressEvent(e);
+ else
+ e->accept();
}
bool VideoTree::checkParentPassword()
Index: mythweather/settings.pro
===================================================================
RCS file: /var/lib/mythcvs/mythweather/settings.pro,v
retrieving revision 1.6
diff -u -r1.6 settings.pro
--- mythweather/settings.pro 29 Dec 2003 04:27:01 -0000 1.6
+++ mythweather/settings.pro 3 Dec 2004 14:02:42 -0000
@@ -1,7 +1,7 @@
#CONFIG += debug
-CONFIG += release
+CONFIG += debug
-PREFIX = /usr/local
+PREFIX = /usr/local/stow/mythtv-2004-11-30
INCLUDEPATH += $${PREFIX}/include
INCLUDEPATH *= /usr/local/include
Index: mythweather/mythweather/weather.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythweather/mythweather/weather.cpp,v
retrieving revision 1.46
diff -u -r1.46 weather.cpp
--- mythweather/mythweather/weather.cpp 6 Nov 2004 15:15:19 -0000 1.46
+++ mythweather/mythweather/weather.cpp 3 Dec 2004 14:02:44 -0000
@@ -264,6 +264,8 @@
if (!handled)
MythDialog::keyPressEvent(e);
+ else
+ e->accept();
}
void Weather::updateBackground(void)
Index: nuvexport/Makefile
===================================================================
RCS file: /var/lib/mythcvs/nuvexport/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- nuvexport/Makefile 22 Nov 2004 22:28:26 -0000 1.5
+++ nuvexport/Makefile 3 Dec 2004 14:02:44 -0000
@@ -32,9 +32,11 @@
INSTALL = /usr/bin/install
-BINDIR = /usr/local/bin
-MANDIR = /usr/local/man/man1
-MODDIR = /usr/local/share/nuvexport
+PREFIX = /usr/local/stow/nuvexport-2004-10-04
+
+BINDIR = ${PREFIX}/bin
+MANDIR = ${PREFIX}/man/man1
+MODDIR = ${PREFIX}/share/nuvexport
default:
More information about the mythtv-dev
mailing list