Ticket #2503: playbackbox_storage_popup_11349.diff

programs/mythfrontend/playbackbox.cpp

@@ -206 +206 @@
       recGroupLineEdit(NULL),           recGroupLineEdit1(NULL),
       recGroupOldPassword(NULL),        recGroupNewPassword(NULL),
       recGroupOkButton(NULL),
+      // Storage popup support
+      storageAutoExpireButton(NULL),    storagePreserveEpisodeButton(NULL),
       // Main Recording List support
       fillListTimer(new QTimer(this)),  connected(false),
       titleIndex(0),                    progIndex(0),
@@ -2780 +2782 @@
     popup->addButton(tr("Change Playback Group"), this,
                      SLOT(showPlayGroupChanger()));
 
+    QString buttonLabel;
     if (delitem && delitem->GetAutoExpireFromRecorded())
-        popup->addButton(tr("Disable Auto Expire"), this, SLOT(noAutoExpire()));
+        buttonLabel = "Disable Auto Expire";
     else
-        popup->addButton(tr("Enable Auto Expire"), this, SLOT(doAutoExpire()));
+        buttonLabel = "Enable Auto Expire";
+    storageAutoExpireButton = new MythPushButton(tr(buttonLabel), popup);
+    connect(storageAutoExpireButton, SIGNAL(pressed()), this, SLOT(autoExpireToggle()));
+    popup->addWidget(storageAutoExpireButton, false);
 
     if (delitem && delitem->UsesMaxEpisodes())
     {
-        if (delitem && delitem->GetPreserveEpisodeFromRecorded())
-            popup->addButton(tr("Do not preserve this episode"), this, SLOT(noPreserveEpisode()));
+        if (delitem->GetPreserveEpisodeFromRecorded())
+            buttonLabel = "Do not preserve this episode";
         else
-            popup->addButton(tr("Preserve this episode"), this, SLOT(doPreserveEpisode()));
+            buttonLabel = "Preserve this episode";
+
+        storagePreserveEpisodeButton = new MythPushButton(tr(buttonLabel), popup);
+        connect(storagePreserveEpisodeButton, SIGNAL(pressed()), this, SLOT(preserveEpisodeToggle()));
+        popup->addWidget(storagePreserveEpisodeButton, false);
     }
 
-    popup->ShowPopup(this, SLOT(doCancel()));
+    popup->ShowPopup(this, SLOT(storageDoCancel()));
     storageButton->setFocus();
 
     expectingPopup = true;
@@ -3128 +3138 @@
     playSelectedPlaylist(true);
 }
 
-void PlaybackBox::doPreserveEpisode(void)
-{
-    if (!expectingPopup)
-        return;
-
-    cancelPopup();
-
-    if (delitem->availableStatus != asAvailable)
-        showAvailablePopup(delitem);
-    else
-        delitem->SetPreserveEpisode(true);
-}
-
-void PlaybackBox::noPreserveEpisode(void)
-{
-    if (!expectingPopup)
-        return;
-
-    cancelPopup();
-
-    if (delitem->availableStatus != asAvailable)
-        showAvailablePopup(delitem);
-    else
-        delitem->SetPreserveEpisode(false);
-}
-
 void PlaybackBox::askStop(void)
 {
     if (!expectingPopup)
@@ -3548 +3532 @@
     update(drawListBounds);
 }
 
-void PlaybackBox::noAutoExpire(void)
+
+void PlaybackBox::autoExpireToggle()
 {
     if (!expectingPopup && delitem)
         return;
 
-    cancelPopup();
+    ProgramInfo *tmpItem = findMatchingProg(delitem);
+    if (delitem->GetAutoExpireFromRecorded())
+    {
+        delitem->SetAutoExpire(0);
 
-    delitem->SetAutoExpire(0);
+        if (tmpItem)
+            tmpItem->programflags &= ~FL_AUTOEXP;
 
-    ProgramInfo *tmpItem = findMatchingProg(delitem);
-    if (tmpItem)
-        tmpItem->programflags &= ~FL_AUTOEXP;
+        storageAutoExpireButton->setText(tr("Enable Auto Expire"));
+    }
+    else
+    {
+        delitem->SetAutoExpire(1);
 
-    delete delitem;
-    delitem = NULL;
+        if (tmpItem)
+            tmpItem->programflags |= FL_AUTOEXP;
 
-    previewVideoState = kChanging;
+        storageAutoExpireButton->setText(tr("Disable Auto Expire"));
+    }
+}
 
-    update(drawListBounds);
+void PlaybackBox::preserveEpisodeToggle()
+{    
+    if (!expectingPopup)
+        return;
+
+    if (delitem->availableStatus != asAvailable)
+        showAvailablePopup(delitem);
+    else
+    {
+        if (delitem->GetPreserveEpisodeFromRecorded())
+        {
+            delitem->SetPreserveEpisode(false);
+            storagePreserveEpisodeButton->setText(tr("Preserve this episode"));
+        }
+        else
+        {
+            delitem->SetPreserveEpisode(true);
+            storagePreserveEpisodeButton->setText(tr("Do not preserve this episode"));
+        }
+    }
 }
 
-void PlaybackBox::doAutoExpire(void)
+void PlaybackBox::doCancel(void)
 {
     if (!expectingPopup)
         return;
 
     cancelPopup();
 
-    delitem->SetAutoExpire(1);
-
-    ProgramInfo *tmpItem = findMatchingProg(delitem);
-    if (tmpItem)
-        tmpItem->programflags |= FL_AUTOEXP;
-
-    delete delitem;
-    delitem = NULL;
-
     previewVideoState = kChanging;
-
-    update(drawListBounds);
 }
 
-void PlaybackBox::doCancel(void)
+void PlaybackBox::storageDoCancel(void)
 {
     if (!expectingPopup)
         return;
 
-    cancelPopup();
-
-    previewVideoState = kChanging;
+    storageAutoExpireButton = NULL;
+    storagePreserveEpisodeButton = NULL;
+    doCancel();
 }
 
 void PlaybackBox::toggleTitleView(void)

programs/mythfrontend/playbackbox.h

@@ -163 +163 @@
     void setWatched();
     void setUnwatched();
 
-    void doAutoExpire();
-    void noAutoExpire();
-    void doPreserveEpisode();
-    void noPreserveEpisode();
-
+    void autoExpireToggle();
+    void preserveEpisodeToggle();
+    
     void doCancel();
+    void storageDoCancel();
     void toggleTitleView();
 
     void exitWin();
@@ -372 +371 @@
     MythLineEdit       *recGroupNewPassword;
     MythPushButton     *recGroupOkButton;
 
+    // Storage popup support
+    MythPushButton     *storageAutoExpireButton;
+    MythPushButton     *storagePreserveEpisodeButton;
+
     // State Variables ////////////////////////////////////////////////////////
     // Main Recording List support
     QTimer             *fillListTimer;