[mythtv] [mythtv-commits] mythtv commit: r18211 by nigel
Nigel Pearson
nigel at ind.tansu.com.au
Mon Sep 29 04:41:52 UTC 2008
On 28/08/2008, at 6:23 PM, Stuart Morgan wrote:
> On Thursday 28 August 2008 01:57:34 mythtv at cvs.mythtv.org wrote:
>> Author: nigel
>> Date: 2008-08-28 00:57:34 +0000 (Thu, 28 Aug 2008)
>> New Revision: 18211
>> Changeset: http://cvs.mythtv.org/trac/changeset/18211
>>
>> Modified:
>>
>> trunk/mythtv/libs/libmythui/myththemedmenu.cpp
>>
>> Log:
>>
>> Tidy VERBOSE, saves a few hundred bytes in source and .o
>
> Could we leave myththemedmenu alone until I've committed the new
> version in a
> week or so? Even the smallest change creates conflicts.
Do you still have commits to do for this file?
If so, could you merge this in locally,
so I can commit globally :-)
% svn diff myththemedmenu.cpp
Index: myththemedmenu.cpp
===================================================================
--- myththemedmenu.cpp (revision 18438)
+++ myththemedmenu.cpp (working copy)
@@ -1424,12 +1424,9 @@
}
else
{
-#if 0
- parent->GetScreenStack()->PopScreen();
- MythPopupBox::showOkPopup(gContext->GetMainWindow(),
QObject::tr("No Menu File"),
- QObject::tr(QString("Myth
could not locate the menu file %1.\n\n"
- "We will now return to the
main menu.").arg(menuname)));
-#endif
+ ShowOkPopup(QObject::tr("Myth could not locate the menu
file %1\n\n"
+ "We will now return to the main
menu.")
+ .arg(menuname));
return false;
}
@@ -1452,16 +1449,9 @@
return false;
}
-#if 0
- parent->GetScreenStack()->PopScreen();
- MythPopupBox::showOkPopup(gContext->GetMainWindow(),
- QObject::tr("Bad Menu File"),
- QObject::tr(QString("The menu file
%1 is "
- "incomplete.\n\nWe
will now "
- "return to the main
menu.")
- .arg(menuname)));
-#endif
- return false;
+ ShowOkPopup(QObject::tr("The menu file %1 is incomplete.\n\n"
+ "We will now return to the main menu.")
+ .arg(menuname));
}
f.close();
--
Nigel Pearson, nigel at ind.tansu.com.au|
Telstra Net. Eng., Sydney, Australia |
Office: 9202 3900 Fax: 9212 6348 |
Mobile: 0408 664435 Home: 9792 6998 |
More information about the mythtv-dev
mailing list