From ec063ef163233d7efdc25fb06fc4cf16dc8ac704 Mon Sep 17 00:00:00 2001
From: xapantu <xapantu@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Wed, 8 Sep 2010 18:19:05 +0000
Subject: [PATCH] Adding a package-update.png image Show 'update' instead of
 uninstall or install for addons which can be updated (maybe we need a third
 button) Add a special icon in the addons lists if the addon can be updated

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5926 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 data/gui/package-update.png                   | Bin 0 -> 2878 bytes
 src/states_screens/addons_screen.cpp          |   8 +++++++-
 src/states_screens/addons_update_screen.cpp   |  10 +++++++++-
 src/states_screens/dialogs/addons_loading.cpp |   7 ++++++-
 4 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 data/gui/package-update.png

diff --git a/data/gui/package-update.png b/data/gui/package-update.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e83c0f456d1d224f106ee79655d61472a026c39
GIT binary patch
literal 2878
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

literal 0
HcmV?d00001

diff --git a/src/states_screens/addons_screen.cpp b/src/states_screens/addons_screen.cpp
index 4af906356..c64e70006 100644
--- a/src/states_screens/addons_screen.cpp
+++ b/src/states_screens/addons_screen.cpp
@@ -52,10 +52,13 @@ void AddonsScreen::loadedFromFile()
             + "/package.png" );
     video::ITexture* icon2 = irr_driver->getTexture( file_manager->getGUIDir()
             + "/no-package.png" );
+    video::ITexture* icon3 = irr_driver->getTexture( file_manager->getGUIDir()
+            + "/package-update.png" );
 
     m_icon_bank = new irr::gui::STKModifiedSpriteBank( GUIEngine::getGUIEnv() );
     m_icon_bank->addTextureAsSprite(icon1);
     m_icon_bank->addTextureAsSprite(icon2);
+    m_icon_bank->addTextureAsSprite(icon3);
 }
 // ------------------------------------------------------------------------------------------------------
 void AddonsScreen::loadList()
@@ -68,7 +71,10 @@ void AddonsScreen::loadList()
     while(addons_manager->NextType(this->type))
     {
         std::cout << addons_manager->GetName() << std::endl;
-	    if(addons_manager->IsInstalledAsBool())
+        if(addons_manager->IsInstalledAsBool() && addons_manager->GetInstalledVersion() < addons_manager->GetVersion())
+        	w_list->addItem(addons_manager->GetIdAsStr().c_str(),
+        	        addons_manager->GetName().c_str(), 2 /* icon installed */);
+	    else if(addons_manager->IsInstalledAsBool())
         	w_list->addItem(addons_manager->GetIdAsStr().c_str(),
         	        addons_manager->GetName().c_str(), 0 /* icon installed */);
 
diff --git a/src/states_screens/addons_update_screen.cpp b/src/states_screens/addons_update_screen.cpp
index 878e78835..ccecfcce8 100644
--- a/src/states_screens/addons_update_screen.cpp
+++ b/src/states_screens/addons_update_screen.cpp
@@ -56,6 +56,14 @@ void AddonsUpdateScreen::eventCallback(GUIEngine::Widget* widget, const std::str
     {
         StateManager::get()->escapePressed();
     }
+    else if (name == "list_addons")
+    {
+        GUIEngine::ListWidget* list = this->getWidget<GUIEngine::ListWidget>("list_addons");
+        std::string addons = list->getSelectionInternalName();
+
+        addons_manager->SelectId(addons);
+        this->load = new AddonsLoading(addons_manager, 0.8f, 0.8f);
+    }
     else if (name == "category")
     {
         std::string selection = ((GUIEngine::RibbonWidget*)widget)->getSelectionIDString(PLAYER_ID_GAME_MASTER).c_str();
@@ -88,7 +96,7 @@ void AddonsUpdateScreen::init()
 	//w_list->addItem("kart", _("Karts:"), -1 /* no icon */);
     while(addons_manager->Next())
     {
-		if(addons_manager->IsInstalledAsBool() && addons_manager->GetInstalledVersion() < addons_manager->GetVersion() )
+		if(addons_manager->IsInstalledAsBool() && addons_manager->GetInstalledVersion() < addons_manager->GetVersion())
 		{
 			std::cout << addons_manager->GetName() << std::endl;
 			w_list->addItem(addons_manager->GetIdAsStr().c_str(),
diff --git a/src/states_screens/dialogs/addons_loading.cpp b/src/states_screens/dialogs/addons_loading.cpp
index 997ae2618..929e9cbd4 100644
--- a/src/states_screens/dialogs/addons_loading.cpp
+++ b/src/states_screens/dialogs/addons_loading.cpp
@@ -56,7 +56,12 @@ AddonsLoading::AddonsLoading(Addons * id, const float w, const float h) :
     version = this->getWidget<LabelWidget>("version");
     
     if(this->addons->IsInstalledAsBool())
-        this->getWidget<ButtonWidget>("install")->setLabel(_("Uninstall"));
+    {
+        if(addons_manager->GetInstalledVersion() < addons_manager->GetVersion())
+            this->getWidget<ButtonWidget>("install")->setLabel(_("Update"));
+        else
+            this->getWidget<ButtonWidget>("install")->setLabel(_("Uninstall"));
+    }
     
     this->loadInfo();
 }