Wait for an explicit "Close" by the user instead of closing the Downl…

…oadDialog automatically

Downloads are most of the time rather fast, having the window just pop
up and go away feels a bit irritating.

src/gui/dialog.cpp

@@ -48,6 +48,13 @@ Dialog::set_text(const std::string& text)
 
 }
 
+void
+Dialog::clear_buttons()
+{
+  m_buttons.clear();
+  m_selected_button = 0;
+}
+
 void
 Dialog::add_button(const std::string& text, const std::function<void ()>& callback, bool focus)
 {

src/gui/dialog.hpp

@@ -47,6 +47,7 @@ class Dialog
   virtual ~Dialog();
 
   void set_text(const std::string& text);
+  void clear_buttons();
   void add_button(const std::string& text, const std::function<void ()>& callback = {},
                   bool focus = false);
 

src/supertux/menu/addon_menu.cpp

@@ -186,7 +186,6 @@ AddonMenu::menu_action(MenuItem* item)
     {
       TransferStatusPtr status = m_addon_manager.request_check_online();
       status->then([this]{
-          MenuManager::instance().set_dialog({});
           refresh();
         });
       std::unique_ptr<DownloadDialog> dialog(new DownloadDialog(status));
@@ -236,7 +235,6 @@ AddonMenu::menu_action(MenuItem* item)
             {
               log_warning << "Enabling addon failed: " << err.what() << std::endl;
             }
-            MenuManager::instance().set_dialog({});
             refresh();
           });
 

src/supertux/menu/download_dialog.cpp

@@ -30,6 +30,10 @@ DownloadDialog::DownloadDialog(TransferStatusPtr status) :
     });
 
   update_text();
+
+  status->then([this]{
+      on_download_complete();
+    });
 }
 
 void
@@ -70,4 +74,13 @@ DownloadDialog::on_abort()
   AddonManager::current()->abort_install();
 }
 
+void
+DownloadDialog::on_download_complete()
+{
+  clear_buttons();
+  add_button(_("Close"), [this]{
+      MenuManager::instance().set_dialog({});
+    });
+}
+
 /* EOF */

src/supertux/menu/download_dialog.hpp

@@ -38,6 +38,7 @@ class DownloadDialog : public Dialog
 
 private:
   void on_abort();
+  void on_download_complete();
 
   void update_text();