Index: programs/mythwelcome/welcomesettings.cpp
===================================================================
--- programs/mythwelcome/welcomesettings.cpp	(revision 12345)
+++ programs/mythwelcome/welcomesettings.cpp	(working copy)
@@ -110,16 +110,29 @@
 //  mythshutdown script settings
 ///////////////////////////////////////////////////////////////////
 
-static HostLineEdit *MythShutdownNvramCmd()
+static HostComboBox *MythShutdownNvramCmd()
 {
-    HostLineEdit *gc = new HostLineEdit("MythShutdownNvramCmd");
-    gc->setLabel(QObject::tr("nvram-wakeup Command"));
-    gc->setValue("/usr/bin/nvram-wakeup");
+    HostComboBox *gc = new HostComboBox("MythShutdownNvramCmd", true);
+    gc->setLabel(QObject::tr("Command to Set Wakeup Time"));
+    gc->addSelection("/usr/bin/nvram-wakeup --settime $time");
     gc->setHelpText(QObject::tr("Command to set the wakeup time in the BIOS. "
                     "See the README file for more examples."));
     return gc;
 };
 
+static HostComboBox *WakeupTimeFormat()
+{
+    HostComboBox *gc = new HostComboBox("WakeupTimeFormat", true);
+    gc->setLabel(QObject::tr("Wakeup time format"));
+    gc->addSelection("time_t");
+    gc->addSelection("yyyy-MM-dd hh:mm:ss");
+    gc->setHelpText(QObject::tr("The format of the time string passed to the "
+                    "\'Set Wakeup Time Command\' as $time. See "
+                    "QT::QDateTime.toString() for details. Set to 'time_t' for "
+                    "seconds since epoch (use time_t for nvram_wakeup)."));
+    return gc;
+};
+
 static HostLineEdit *MythShutdownNvramRestartCmd()
 {
     HostLineEdit *gc = new HostLineEdit("MythShutdownNvramRestartCmd");
@@ -178,6 +191,7 @@
     
     vcg->setLabel(QObject::tr("MythShutdown/MythWelcome Settings"));
     vcg->addChild(MythShutdownNvramCmd());
+    vcg->addChild(WakeupTimeFormat());
     vcg->addChild(MythShutdownNvramRestartCmd());
     vcg->addChild(MythShutdownReboot());
     vcg->addChild(MythShutdownPowerOff());