Add error and visibility option to mythutil

MythTV · Jul 18, 2013 · 6594304 · 6594304
1 parent fc6ec79
commit 6594304
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/mythtv/programs/mythutil/commandlineparser.cpp b/mythtv/programs/mythutil/commandlineparser.cpp
@@ -176,6 +176,10 @@ void MythUtilCommandLineParser::LoadArguments(void)
         ->SetChildOf("notification");
     add("--fullscreen", "fullscreen", false, "(optional) display notification in full screen mode", "")
         ->SetChildOf("notification");
+    add("--error", "error", false, "(optional) set notification to be displayed as an error", "")
+    ->SetChildOf("notification");
+    add("--visibility", "visibility", 0, "(optional) bitmask indicating where to show the notification", "")
+    ->SetChildOf("notification");
 
     // Generic Options used by more than one utility
     addRecording();

diff --git a/mythtv/programs/mythutil/messageutils.cpp b/mythtv/programs/mythutil/messageutils.cpp
@@ -24,14 +24,16 @@ const QString kMessage =
 const QString kNotification =
 "<mythnotification version=\"1\">\n"
 "  <text>%message_text%</text>\n"
-"  <timeout>%timeout%</timeout>\n"
-"  <image>%image%</image>\n"
 "  <origin>%origin%</origin>\n"
 "  <description>%description%</description>\n"
+"  <error>%error%</error>\n"
+"  <timeout>%timeout%</timeout>\n"
+"  <image>%image%</image>\n"
 "  <extra>%extra%</extra>\n"
 "  <progress_text>%progress_text%</progress_text>\n"
 "  <progress>%progress%</progress>\n"
 "  <fullscreen>%fullscreen%</fullscreen>\n"
+"  <visibility>%visibility%</visibility>\n"
 "</mythnotification>";
 
 static int PrintMTemplate(const MythUtilCommandLineParser &cmdline)
@@ -61,6 +63,8 @@ static int SendMessage(const MythUtilCommandLineParser &cmdline)
     QString progress_text = "";
     QString progress = "-1";
     QString fullscreen = "false";
+    QString error = "false";
+    QString visibility = "0";
 
     QString message = notification ? kNotification : kMessage;
 
@@ -97,6 +101,12 @@ static int SendMessage(const MythUtilCommandLineParser &cmdline)
         if (cmdline.toBool("fullscreen"))
             fullscreen = cmdline.toString("fullscreen");
         message.replace("%fullscreen%", fullscreen);
+        if (cmdline.toBool("error"))
+            error = cmdline.toString("error");
+        message.replace("%error%", error);
+        if (cmdline.toBool("visibility"))
+            visibility = cmdline.toString("visibility");
+        message.replace("%visibility%", visibility);
     }
 
     // extra optional argument