Add-ons are now reloaded in the background

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9716 178a84e3-b1eb-0310-8ba1-8eac791a3b58

src/states_screens/addons_screen.cpp

@@ -22,6 +22,7 @@
 #include "addons/addons_manager.hpp"
 #include "addons/network_http.hpp"
 #include "guiengine/CGUISpriteBank.h"
+#include "guiengine/modaldialog.hpp"
 #include "guiengine/scalable_font.hpp"
 #include "guiengine/widget.hpp"
 #include "guiengine/widgets/ribbon_widget.hpp"
@@ -272,7 +273,7 @@ void AddonsScreen::eventCallback(GUIEngine::Widget* widget,
     else if (name == "reload")
     {
         network_http->insertReInit();
-        new MessageDialog(_("You will be taken back to the Main Menu while an updated list of Addons are downloaded."),
+        new MessageDialog(_("Please wait while addons are updated, or click the button below to reload in the background."),
             MessageDialog::MESSAGE_DIALOG_OK, this, false);
     }
 
@@ -343,3 +344,28 @@ void AddonsScreen::setLastSelected()
 }   // setLastSelected
 
 // ----------------------------------------------------------------------------
+
+void AddonsScreen::onDialogUpdate(float delta)
+{
+    if (GUIEngine::ModalDialog::isADialogActive())
+    {
+        if(UserConfigParams::m_internet_status!=NetworkHttp::IPERM_ALLOWED)
+        {
+            // not allowed to access the net. how did you get to this menu in the first place??
+            GUIEngine::ModalDialog::dismiss();
+        }
+        else if (addons_manager->wasError())
+        {
+            GUIEngine::ModalDialog::dismiss();
+            new MessageDialog( _("Sorry, an error occurred while contacting the add-ons website. Make sure you are connected to the Internet and that SuperTuxKart is not blocked by a firewall") );
+        }
+        else if (addons_manager->onlineReady())
+        {
+            GUIEngine::ModalDialog::dismiss();
+        }
+        else 
+        {
+            // Addons manager is still initialising/downloading.
+        }
+    }
+}

src/states_screens/addons_screen.hpp

@@ -83,6 +83,9 @@ public:
     virtual void tearDown();
 
     virtual void onCancel();
+    
+    /** \brief callback from IConfirmDialogListener */
+    virtual void onDialogUpdate(float dt);
 
     void    setLastSelected();
 

src/states_screens/dialogs/message_dialog.cpp

@@ -108,3 +108,8 @@ GUIEngine::EventPropagation MessageDialog::processEvent(const std::string& event
 }
 
 // ------------------------------------------------------------------------------------------------------
+
+void MessageDialog::onUpdate(float dt)
+{
+    if (m_listener != NULL) m_listener->onDialogUpdate(dt);
+}

src/states_screens/dialogs/message_dialog.hpp

@@ -51,6 +51,11 @@ public:
           *        this method to change the behavior.
           */
         virtual void onCancel() { ModalDialog::dismiss(); };
+        
+        /**
+          * \brief Optional callback
+          */
+        virtual void onDialogUpdate(float dt) {}
     };
 
     enum MessageDialogType { MESSAGE_DIALOG_OK, MESSAGE_DIALOG_CONFIRM };
@@ -81,7 +86,8 @@ public:
     ~MessageDialog() { if (m_own_listener) delete m_listener; m_listener = NULL; }
     
     virtual void onEnterPressedInternal();
-    
+    virtual void onUpdate(float dt);
+
     GUIEngine::EventPropagation processEvent(const std::string& eventSource);
 };