Ticket #9227: osd-delete-dialog.patch

mythtv/libs/libmythtv/tv_play.cpp

@@ -4512 +4512 @@
         if (ctx->player)
             ctx->player->SetBookmark();
         ctx->UnlockDeletePlayer(__FILE__, __LINE__);
-        ShowOSDPromptDeleteRecording(ctx, tr("Delete this recording?"));
+        ShowOSDPromptDeleteRecording(ctx, tr("Are you sure you want to delete:"));
     }
     else if (has_action("JUMPTODVDROOTMENU", actions) && isDVD)
     {
@@ -11652 +11652 @@
 
     InfoMap infoMap;
     ctx->GetPlayingInfoMap(infoMap);
-    QString message = QString("%1\n%2\n%3")
-        .arg(title).arg(infoMap["title"]).arg(infoMap["timedate"]);
 
+    QString extra;
+
+    if (!infoMap["subtitle"].isEmpty())
+    {
+        extra = QString('\n') + infoMap["subtitle"];
+        int maxll = max(infoMap["title"].length(), 20);
+        if (extra.length() > maxll)
+            extra = extra.left(maxll - 3) + "...";
+    }
+
+    QString message = QString("%1\n%2%3\n%4")
+        .arg(title).arg(infoMap["title"]).arg(extra).arg(infoMap["timedate"]);
+
     OSD *osd = GetOSDLock(ctx);
     if (osd && (!osd->DialogVisible() || force))
     {
@@ -11674 +11685 @@
                                  "DIALOG_VIDEOEXIT_DELETEANDRERECORD_0");
             osd->DialogAddButton(tr("Yes, delete it"),
                                  "DIALOG_VIDEOEXIT_JUSTDELETE_0");
-            osd->DialogAddButton(tr("No, keep it, I changed my mind"),
+            osd->DialogAddButton(tr("No, keep it"),
                                  "DIALOG_VIDEOEXIT_JUSTEXIT_0", false, true);
         }
 
@@ -11713 +11724 @@
     else if (action == "CONFIRMDELETE")
     {
         hide = false;
-        ShowOSDPromptDeleteRecording(ctx, tr("Delete this recording?"),
+        ShowOSDPromptDeleteRecording(ctx, tr("Are you sure you want to delete:"),
                                      true);
     }
     else if (action == "SAVEPOSITIONANDEXIT" && bookmark_ok)