X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftitle.cpp;h=2a34b101e56bc8a3d5cdc2d3b0c3a0c099ff3015;hb=dd9fdb809ad6effa216e4483f099a48ab2814352;hp=e04859afd98b1b85d423d50e29d643d4da1355b8;hpb=82895aabbae07b59a19e09a61ca94cd7b1603702;p=supertux.git

diff --git a/src/title.cpp b/src/title.cpp
index e04859afd..2a34b101e 100644
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -214,18 +214,31 @@ namespace {
   {
     return a1.title < a2.title;
   }
+
+  const int ADDON_LIST_START_ID = 10;
 }
 
 void
 TitleScreen::generate_addons_menu()
 {
   AddonManager& adm = AddonManager::get_instance();
-  addons = adm.get_addons();
 
-  // sort addons
+  // refresh list of installed addons
+  installed_addons = adm.get_installed_addons();
+  
+  // build new Add-on list
+  addons.clear();
+
+  // add installed addons to list
+  addons.insert(addons.end(), installed_addons.begin(), installed_addons.end());
+
+  // add available addons to list
+  addons.insert(addons.end(), available_addons.begin(), available_addons.end());
+
+  // sort list
   std::sort(addons.begin(), addons.end(), generate_addons_menu_sorter);
 
-  // hide installed addons from installation menu
+  // remove available addons that are already installed
   std::vector<Addon>::iterator it2 = addons.begin();
   while (it2 != addons.end()) {
     Addon addon = *it2;
@@ -233,7 +246,7 @@ TitleScreen::generate_addons_menu()
       bool restart = false;
       for (std::vector<Addon>::iterator it = addons.begin(); it != addons.end(); ++it) {
         Addon addon2 = *it;
-        if ((addon2.title == addon.title) && (!addon2.isInstalled)) {
+        if ((addon2.equals(addon)) && (!addon2.isInstalled)) {
           addons.erase(it);
           restart = true;
           break;
@@ -247,20 +260,28 @@ TitleScreen::generate_addons_menu()
     it2++;
   }
 
+  // (re)generate menu
   free_addons_menu();
   addons_menu.reset(new Menu());
 
   addons_menu->add_label(_("Add-ons"));
   addons_menu->add_hl();
+  
+#ifdef HAVE_LIBCURL
+  addons_menu->add_entry(0, std::string(_("Check Online")));
+#else
+  addons_menu->add_deactive(0, std::string(_("Check Online (disabled)")));
+#endif
 
-  int i = 0;
-  for (std::vector<Addon>::iterator it = addons.begin(); it != addons.end(); ++it) {
-    Addon addon = *it;
-    if (addon.isInstalled) {
-      addons_menu->add_entry(i++, std::string(_("Remove")) + " \"" + addon.title + "\"");
-    } else {
-      addons_menu->add_entry(i++, std::string(_("Install")) + " \"" + addon.title + "\"");
-    }
+  //addons_menu->add_hl();
+
+  for (unsigned int i = 0; i < addons.size(); i++) {
+    Addon addon = addons[i];
+    std::string text = "";
+    if (addon.kind != "") text += addon.kind + " ";
+    text += std::string("\"") + addon.title + "\"";
+    if (addon.author != "") text += " by \"" + addon.author + "\"";
+    addons_menu->add_toggle(ADDON_LIST_START_ID + i, text, addon.isInstalled);
   }
 
   addons_menu->add_hl();
@@ -273,17 +294,46 @@ TitleScreen::check_addons_menu()
   int index = addons_menu->check();
   if (index == -1) return;
 
-  //AddonManager& adm = AddonManager::get_instance();
-  Addon addon = addons[index];
-  if (!addon.isInstalled) {
-    addon.install();
-    generate_addons_menu();
-    Menu::set_current(addons_menu.get());
-  } else {
-    addon.remove();
-    generate_addons_menu();
-    Menu::set_current(addons_menu.get());
+  // check if "Check Online" was chosen
+  if (index == 0) {
+    try {
+      available_addons = AddonManager::get_instance().get_available_addons();
+      generate_addons_menu();
+      Menu::set_current(addons_menu.get());
+      addons_menu->set_active_item(index);
+    } 
+    catch (std::runtime_error e) {
+      log_warning << "Check for available Add-ons failed: " << e.what() << std::endl;
+    }
+    return;
+  }
+
+  // if one of the Addons listed was chosen, take appropriate action
+  if ((index >= ADDON_LIST_START_ID) && (index < ADDON_LIST_START_ID) + addons.size()) {
+    Addon addon = addons[index - ADDON_LIST_START_ID];
+    if (!addon.isInstalled) {
+      try {
+        addon.install();
+        generate_addons_menu();
+        Menu::set_current(addons_menu.get());
+        addons_menu->set_active_item(index);
+      } 
+      catch (std::runtime_error e) {
+        log_warning << "Installation of Add-on failed: " << e.what() << std::endl;
+      }
+    } else {
+      try {
+        addon.remove();
+        generate_addons_menu();
+        Menu::set_current(addons_menu.get());
+        addons_menu->set_active_item(index);
+      } 
+      catch (std::runtime_error e) {
+        log_warning << "Removal of Add-on failed: " << e.what() << std::endl;
+      }
+    }
   }
+
 }
 
 void
@@ -423,6 +473,7 @@ TitleScreen::update(float elapsed_time)
           break;
         case MNID_QUITMAINMENU:
           main_loop->quit(new FadeOut(0.25));
+		  sound_manager->stop_music(0.25);
           break;
       }
     } else if(menu == load_game_menu.get()) {