Port the Backend Selection dialog to mythui. Theme needs a little work and there is no default-wide yet.

Author: stuartm

mythtv/libs/libmyth/backendselect.cpp

@@ -1,76 +1,85 @@
 #ifndef __BACKENDSELECT_H__
 #define __BACKENDSELECT_H__
 
-#include <QListWidget>
+// libmythui
+#include "mythscreentype.h"
+#include "mythuibuttonlist.h"
 
-#include "mythdialogs.h"
 #include "upnpdevice.h"
 
-// define this to add a search button. In Nigel's testing, an extra ssdp
-// doesn't get any extra responses, so it is disabled by default.
-//#define SEARCH_BUTTON
+class MythUIButtonList;
+class MythUIButton;
 
+class XmlConfiguration;
 struct DatabaseParams;
 
-class ListBoxDevice : public QListWidgetItem
-{
-  public:
+// TODO: The following do not belong here, but I cannot think of a better
+//       location at this moment in time
+// Some common UPnP search and XML value strings
+const QString gBackendURI = "urn:schemas-mythtv-org:device:MasterMediaServer:1";
+const QString kDefaultBE  = "UPnP/MythFrontend/DefaultBackend/";
+const QString kDefaultPIN = kDefaultBE + "SecurityPin";
+const QString kDefaultUSN = kDefaultBE + "USN";
 
-    ListBoxDevice(QListWidget *parent, const QString &name, DeviceLocation *dev)
-        : QListWidgetItem(name, parent), m_dev(dev)
-    {
-        if (m_dev)
-            m_dev->AddRef();
-    }
+typedef QMap <QString, DeviceLocation*> ItemMap;
 
-    virtual ~ListBoxDevice()
-    {
-        if (m_dev)
-            m_dev->Release();
-    }
-
-    DeviceLocation *m_dev;
-};
+/**
+ * \class BackendSelection
+ * \brief Classes to Prompt user for a master backend.
+ *
+ * \author Originally based on masterselection.cpp/h by David Blain.
+ */
 
-typedef QMap <QString, ListBoxDevice *> ItemMap;
-
-
-class BackendSelect : public MythDialog 
+class BackendSelection : public MythScreenType
 {
     Q_OBJECT
 
   public:
-             BackendSelect(MythMainWindow *parent, DatabaseParams *params);
-    virtual ~BackendSelect();
+    BackendSelection(MythScreenStack *parent, DatabaseParams *params,
+                     XmlConfiguration *xmlConfig, bool exitOnFinish = false);
+    virtual ~BackendSelection();
 
-    void     customEvent(QEvent *e);
+    bool Create(void);
+    void customEvent(QEvent *event);
 
-    QString  m_PIN;
-    QString  m_USN;
+    static bool prompt(DatabaseParams *dbParams, XmlConfiguration *xmlConfig);
 
+  signals:
+//    void
 
   public slots:
-    void Accept(QListWidgetItem *);  ///< Invoked by mouse click
-    void Accept(void);   ///< Linked to the OK button
+    void Accept(void);
+    void Accept(MythUIButtonListItem *);
     void Manual(void);   ///< Linked to 'Configure Manually' button
-#ifdef SEARCH_BUTTON
-    void Search(void);
-#endif
-
-
-  protected:
-    void AddItem    (DeviceLocation *dev);
-    bool Connect    (DeviceLocation *dev);
-    void CreateUI   (void);
-    void FillListBox(void);
-    void RemoveItem (QString URN);
-    bool eventFilter(QObject *obj, QEvent *event);
+    void Cancel(void);  ///< Linked to 'Cancel' button
+    void Close(void);
+
+  private:
+    void Load(void);
+    void Init(void);
+    bool ConnectBackend(DeviceLocation *dev);
+    void AddItem(DeviceLocation *dev);
+    void RemoveItem(QString URN);
     bool TryDBfromURL(const QString &error, QString URL);
+    void PromptForPassword(void);
 
     DatabaseParams *m_DBparams;
-    ItemMap         m_devices;
-    MythMainWindow *m_parent;
-    QListWidget    *m_backends;
+    XmlConfiguration *m_XML;
+    bool m_exitOnFinish;
+    ItemMap m_devices;
+
+    MythUIButtonList *m_backendList;
+    MythUIButton *m_manualButton;
+    MythUIButton *m_saveButton;
+    MythUIButton *m_cancelButton;
+    //MythUIButton *m_searchButton;
+
+    QString m_pinCode;
+    QString m_USN;
+
+    static bool m_backendChanged;
 };
 
+Q_DECLARE_METATYPE(DeviceLocation*)
+
 #endif

mythtv/libs/libmyth/backendselect.h

@@ -48,12 +48,6 @@ using namespace std;
 
 MythContext *gContext = NULL;
 
-// Some common UPnP search and XML value strings
-const QString gBackendURI = "urn:schemas-mythtv-org:device:MasterMediaServer:1";
-const QString kDefaultBE  = "UPnP/MythFrontend/DefaultBackend/";
-const QString kDefaultPIN = kDefaultBE + "SecurityPin";
-const QString kDefaultUSN = kDefaultBE + "USN";
-
 class MythContextPrivate : public QObject
 {
     friend class MythContextSlotHandler;
@@ -941,58 +935,12 @@ int MythContextPrivate::ChooseBackend(const QString &error)
 
     // Tell the user what went wrong:
     if (error.length())
-        MythPopupBox::showOkPopup(GetMythMainWindow(), "DB connect failure",
-                                  error);
+        ShowOkPopup(error);
 
     VERBOSE(VB_GENERAL, "Putting up the UPnP backend chooser");
 
-    BackendSelect *BEsel = new BackendSelect(GetMythMainWindow(), &m_DBparams);
-    switch (BEsel->exec())
-    {
-        case kDialogCodeRejected:
-            VERBOSE(VB_IMPORTANT, "User canceled database configuration");
-            delete BEsel;
-            return 0;
-
-        case kDialogCodeButton0:
-            VERBOSE(VB_IMPORTANT, "User requested Manual Config");
-            delete BEsel;
-            return -1;
-    }
-
-    QStringList buttons;
-    QString     message;
-
-    buttons += QObject::tr("Save database details");
-    buttons += QObject::tr("Save backend details");
-    buttons += QObject::tr("Don't Save");
-
-    message = QObject::tr("Save that backend or database as the default?");
-
-    DialogCode selected = MythPopupBox::ShowButtonPopup(
-        GetMythMainWindow(), "Save default", message, buttons,
-        kDialogCodeButton2);
-    switch (selected)
-    {
-        case kDialogCodeButton0:
-            if (!WriteSettingsFile(m_DBparams, true))
-            {
-                VERBOSE(VB_IMPORTANT, "WriteSettingsFile failed.");
-                return -1;
-            }
-            // User prefers mysql.txt, so throw away default UPnP backend:
-            m_XML->SetValue(kDefaultUSN, "");
-            m_XML->Save();
-            break;
-        case kDialogCodeButton1:
-            if (BEsel->m_PIN.length())
-                m_XML->SetValue(kDefaultPIN, BEsel->m_PIN);
-            m_XML->SetValue(kDefaultUSN, BEsel->m_USN);
-            m_XML->Save();
-            break;
-    }
+    BackendSelection::prompt(&m_DBparams, m_XML);
 
-    delete BEsel;
     EndTempWindow();
 
     return 1;

mythtv/libs/libmyth/mythcontext.cpp

@@ -3,10 +3,10 @@
 // Created     : Oct. 24, 2005
 //
 // Purpose     : UPnp Main Class
-//                                                                            
+//
 // Copyright (c) 2005 David Blain <mythtv@theblains.net>
-//                                          
-// This library is free software; you can redistribute it and/or 
+//
+// This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
 // version 2.1 of the License, or at your option any later version of the LGPL.
@@ -132,7 +132,7 @@ bool UPnp::Initialize( QStringList &sIPAddrList, int nServicePort, HttpServer *p
             new SSDPExtension( m_nServicePort, m_pHttpServer->m_sSharePath));
 
     // ----------------------------------------------------------------------
-    // Add Task to keep SSDPCache purged of stale entries.  
+    // Add Task to keep SSDPCache purged of stale entries.
     // ----------------------------------------------------------------------
 
     UPnp::g_pTaskQueue->AddTask( new SSDPCacheTask() );
@@ -214,7 +214,7 @@ void UPnp::CleanUp()
         g_pConfig = NULL;
     }
 
-} 
+}
 
 //////////////////////////////////////////////////////////////////////////////
 //
@@ -251,23 +251,23 @@ QString UPnp::GetResultDesc( UPnPResultCode eCode )
     switch( eCode )
     {
         case UPnPResult_Success                     : return "Success";
-        case UPnPResult_InvalidAction               : return "Invalid Action"; 
-        case UPnPResult_InvalidArgs                 : return "Invalid Args"; 
-        case UPnPResult_ActionFailed                : return "Action Failed"; 
-        case UPnPResult_ArgumentValueInvalid        : return "Argument Value Invalid"; 
-        case UPnPResult_ArgumentValueOutOfRange     : return "Argument Value Out Of Range"; 
-        case UPnPResult_OptionalActionNotImplemented: return "Optional Action Not Implemented"; 
-        case UPnPResult_OutOfMemory                 : return "Out Of Memory"; 
-        case UPnPResult_HumanInterventionRequired   : return "Human Intervention Required"; 
-        case UPnPResult_StringArgumentTooLong       : return "String Argument Too Long"; 
-        case UPnPResult_ActionNotAuthorized         : return "Action Not Authorized"; 
-        case UPnPResult_SignatureFailure            : return "Signature Failure"; 
-        case UPnPResult_SignatureMissing            : return "Signature Missing"; 
-        case UPnPResult_NotEncrypted                : return "Not Encrypted"; 
-        case UPnPResult_InvalidSequence             : return "Invalid Sequence"; 
-        case UPnPResult_InvalidControlURL           : return "Invalid Control URL"; 
-        case UPnPResult_NoSuchSession               : return "No Such Session"; 
-        case UPnPResult_MS_AccessDenied             : return "Access Denied"; 
+        case UPnPResult_InvalidAction               : return "Invalid Action";
+        case UPnPResult_InvalidArgs                 : return "Invalid Args";
+        case UPnPResult_ActionFailed                : return "Action Failed";
+        case UPnPResult_ArgumentValueInvalid        : return "Argument Value Invalid";
+        case UPnPResult_ArgumentValueOutOfRange     : return "Argument Value Out Of Range";
+        case UPnPResult_OptionalActionNotImplemented: return "Optional Action Not Implemented";
+        case UPnPResult_OutOfMemory                 : return "Out Of Memory";
+        case UPnPResult_HumanInterventionRequired   : return "Human Intervention Required";
+        case UPnPResult_StringArgumentTooLong       : return "String Argument Too Long";
+        case UPnPResult_ActionNotAuthorized         : return "Action Not Authorized";
+        case UPnPResult_SignatureFailure            : return "Signature Failure";
+        case UPnPResult_SignatureMissing            : return "Signature Missing";
+        case UPnPResult_NotEncrypted                : return "Not Encrypted";
+        case UPnPResult_InvalidSequence             : return "Invalid Sequence";
+        case UPnPResult_InvalidControlURL           : return "Invalid Control URL";
+        case UPnPResult_NoSuchSession               : return "No Such Session";
+        case UPnPResult_MS_AccessDenied             : return "Access Denied";
 
         case UPnPResult_CDS_NoSuchObject            : return "No Such Object";
         case UPnPResult_CDS_InvalidCurrentTagValue  : return "Invalid CurrentTagValue";
@@ -303,18 +303,18 @@ QString UPnp::GetResultDesc( UPnPResultCode eCode )
 }
 
 //////////////////////////////////////////////////////////////////////////////
-// 
+//
 //////////////////////////////////////////////////////////////////////////////
 
-void UPnp::FormatErrorResponse( HTTPRequest   *pRequest, 
+void UPnp::FormatErrorResponse( HTTPRequest   *pRequest,
                                 UPnPResultCode  eCode,
                                 const QString &msg )
 {
     QString sMsg( msg );
 
     if (pRequest != NULL)
     {
-        QString sDetails = ""; 
+        QString sDetails = "";
 
         if (pRequest->m_bSOAPRequest)
             sDetails = "<UPnPResult xmlns=\"urn:schemas-upnp-org:control-1-0\">";
@@ -327,12 +327,12 @@ void UPnp::FormatErrorResponse( HTTPRequest   *pRequest,
                        .arg( eCode )
                        .arg( HTTPRequest::Encode( sMsg ) );
 
-        if (pRequest->m_bSOAPRequest)     
+        if (pRequest->m_bSOAPRequest)
             sDetails += "</UPnPResult>";
 
 
         pRequest->FormatErrorResponse ( true,   // -=>TODO: Should make this dynamic
-                                        "UPnPResult", 
+                                        "UPnPResult",
                                         sDetails );
     }
     else

mythtv/libs/libmythupnp/upnp.cpp

@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Program Name: mediarenderer.cpp
-//                                                                           
+//
 // Purpose - uPnp Media Renderer main Class
-//                                                                           
+//
 // Created By  : David Blain                    Created On : Jan. 15, 2007
-// Modified By :                                Modified On:                 
-//                                                                           
+// Modified By :                                Modified On:
+//
 /////////////////////////////////////////////////////////////////////////////
 
 #include "mediarenderer.h"
@@ -24,7 +24,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-MediaRenderer::MediaRenderer() 
+MediaRenderer::MediaRenderer()
 {
     VERBOSE(VB_UPNP, "MediaRenderer::Begin" );
 
@@ -51,6 +51,7 @@ MediaRenderer::MediaRenderer()
         // exit(BACKEND_BUGGY_EXIT_NO_BIND_STATUS);
         delete m_pHttpServer;
         m_pHttpServer = NULL;
+        InitializeSSDPOnly();
         return;
     }
 
@@ -92,7 +93,7 @@ MediaRenderer::MediaRenderer()
                                  "http-get:*:video/nupplevideo:*,"
                                  "http-get:*:video/x-ms-wmv:*";
         // ------------------------------------------------------------------
-        // Register the MythFEXML protocol... 
+        // Register the MythFEXML protocol...
         // ------------------------------------------------------------------
         VERBOSE(VB_UPNP, "MediaRenderer::Registering MythFEXML Service." );
         m_pHttpServer->RegisterExtension( new MythFEXML( RootDevice(),