ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better error message in case of uninstalling an addon.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7469 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2011-01-17 06:07:49 +00:00
parent 6278343553
commit 43af75f8da
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/states_screens/dialogs/addons_loading.cpp
View File

@ -96,10 +96,6 @@ GUIEngine::EventPropagation
m_progress->setVisible(true); m_progress->setVisible(true);
// Change the 'back' button into a 'cancel' button. // Change the 'back' button into a 'cancel' button.
m_back_button->setText(_("Cancel")); m_back_button->setText(_("Cancel"));
//m_progress->m_h = m_install_button->m_h;
//m_progress->m_x = m_install_button->m_x;
//m_progress->m_y = m_install_button->m_y;
//m_progress->m_w = m_install_button->m_w;
m_install_button->setVisible(false); m_install_button->setVisible(false);
startDownload(); startDownload();
} }
@ -133,7 +129,7 @@ void AddonsLoading::onUpdate(float delta)
doInstall(); doInstall();
return; return;
} }
} } // if(m_progress->isVisible())
// See if the icon is loaded (but not yet displayed) // See if the icon is loaded (but not yet displayed)
if(!m_icon_shown && m_addon.iconReady()) if(!m_icon_shown && m_addon.iconReady())
@ -166,19 +162,31 @@ void AddonsLoading::doInstall()
if(!m_addon.isInstalled() || m_addon.needsUpdate()) if(!m_addon.isInstalled() || m_addon.needsUpdate())
{ {
error = !addons_manager->install(m_addon); error = !addons_manager->install(m_addon);
if(error)
{
core::stringw msg = StringUtils::insertValues(
_("Problems installing the addon '%s'."),
core::stringw(m_addon.getName().c_str()));
m_state->setText(msg.c_str());
}
} }
else else
{ {
error = !addons_manager->uninstall(m_addon); error = !addons_manager->uninstall(m_addon);
if(error)
{
core::stringw msg = StringUtils::insertValues(
_("Problems removing the addon '%s'."),
core::stringw(m_addon.getName().c_str()));
m_state->setText(msg.c_str());
}
} }
if(error) if(error)
{ {
core::stringw msg = StringUtils::insertValues(
_("Problems installing the addon '%s', it might not work."),
core::stringw(m_addon.getName().c_str()));
m_state->setText(msg.c_str());
m_progress->setVisible(false); m_progress->setVisible(false);
m_install_button->setVisible(true); m_install_button->setVisible(true);
m_install_button->setText(_("Try again"));
} }
else else
{ {