Changeset 15776b172 in mythtv

Timestamp:

Nov 22, 2016, 9:18:55 PM (8 years ago)

Author:

Jonatan Lindblad <jlindblad@…>

Branches:

devel/2020-player, devel/ffmpeg-resync, fixes/29, fixes/30, fixes/31, github-templates, master

Children:

ec642bba15

Parents:

1925478899

git-author:

Jonatan Lindblad <jlindblad@…> (11/22/16 21:18:55)

git-committer:

Jonatan Lindblad <jlindblad@…> (02/13/17 21:23:50)

Message:

Settings: Allow individual video sources to be deleted through the menu

Refs #10092

Location:

mythtv

Files:

• libs/libmythtv/videosource.cpp (modified) (2 diffs)
• libs/libmythtv/videosource.h (modified) (2 diffs)
• programs/mythtv-setup/main.cpp (modified) (1 diff)

mythtv/libs/libmythtv/videosource.cpp

@@ -692 +692 @@
 }
 
+VideoSourceDialog::VideoSourceDialog(MythScreenStack *parent) :
+    StandardSettingDialog(parent, "videosourceeditor", new VideoSourceEditor())
+{
+}
+
+void VideoSourceDialog::ShowDeleteSourceDialog(void)
+{
+    MythUIButtonListItem *item = m_buttonList->GetItemCurrent();
+    if (!item)
+        return;
+
+    VideoSource *videosource = item->GetData().value<VideoSource*>();
+    if (!videosource)
+        return;
+
+    QString message = tr("Do you want to delete the '%1' video source?")
+        .arg(videosource->getSourceName());
+    ShowOkPopup(message, this,
+                [videosource, this](bool result)
+                {
+                    if (result)
+                        DeleteSource(videosource);
+                },
+                true);
+}
+
+void VideoSourceDialog::ShowMenu()
+{
+    MythUIButtonListItem *item = m_buttonList->GetItemCurrent();
+    if (!item)
+        return;
+
+    VideoSource *videosource = item->GetData().value<VideoSource*>();
+    if (!videosource)
+        return;
+
+    MythMenu *menu = new MythMenu(tr("Video Source Menu"), this, "mainmenu");
+    menu->AddItem(tr("Delete"), SLOT(ShowDeleteSourceDialog()));
+
+    MythScreenStack *popupStack = GetMythMainWindow()->GetStack("popup stack");
+
+    MythDialogBox *menuPopup = new MythDialogBox(menu, popupStack,
+                                                 "menudialog");
+    menuPopup->SetReturnEvent(this, "mainmenu");
+
+    if (menuPopup->Create())
+        popupStack->AddScreen(menuPopup);
+    else
+        delete menuPopup;
+}
+
 bool VideoSourceEditor::cardTypesInclude(const int &sourceID,
                                          const QString &thecardtype)
@@ -3835 +3886 @@
 }
 
-/* TODO
-void VideoSourceEditor::del()
-{
-    DialogCode val = MythPopupBox::Show2ButtonPopup(
-        GetMythMainWindow(), "",
-        tr("Are you sure you want to delete "
-           "this video source?"),
-        tr("Yes, delete video source"),
-        tr("No, don't"),
-        kDialogCodeButton1);
-
-    if (kDialogCodeButton0 == val)
-    {
-        SourceUtil::DeleteSource(listbox->getValue().toUInt());
-        Load();
-    }
-}
-*/
+void VideoSourceDialog::DeleteSource(VideoSource *videosource)
+{
+    SourceUtil::DeleteSource(videosource->getSourceID());
+    GetGroupSettings()->removeChild(videosource);
+}
 
 void VideoSourceEditor::NewSource(void)

mythtv/libs/libmythtv/videosource.h

@@ -224 +224 @@
 
 class VideoSource : public GroupSetting {
-public:
+    Q_OBJECT
+
+  public:
     VideoSource();
 
@@ -779 +781 @@
 };
 
+class MTV_PUBLIC VideoSourceDialog : public StandardSettingDialog
+{
+    Q_OBJECT
+
+    public:
+      VideoSourceDialog(MythScreenStack *parent);
+      void ShowMenu(void);
+
+    private slots:
+      void ShowDeleteSourceDialog(void);
+
+    private:
+      void DeleteSource(VideoSource *videosource);
+};
+
 class MTV_PUBLIC VideoSourceEditor : public GroupSetting
 {

mythtv/programs/mythtv-setup/main.cpp

@@ -101 +101 @@
     {
         MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
-        StandardSettingDialog *ssd =
-            new StandardSettingDialog(mainStack, "videosourceeditor",
-                                      new VideoSourceEditor());
+        StandardSettingDialog *ssd = new VideoSourceDialog(mainStack);
 
         if (ssd->Create())