From: <hik...@us...> - 2010-12-30 05:40:39
|
Revision: 7190 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=7190&view=rev Author: hikerstk Date: 2010-12-30 05:40:33 +0000 (Thu, 30 Dec 2010) Log Message: ----------- Some code cleanups, mostly for addons_loading. Modified Paths: -------------- main/trunk/src/addons/addon.hpp main/trunk/src/addons/addons_manager.hpp main/trunk/src/states_screens/addons_screen.cpp main/trunk/src/states_screens/dialogs/addons_loading.cpp main/trunk/src/states_screens/dialogs/addons_loading.hpp Modified: main/trunk/src/addons/addon.hpp =================================================================== --- main/trunk/src/addons/addon.hpp 2010-12-30 05:23:04 UTC (rev 7189) +++ main/trunk/src/addons/addon.hpp 2010-12-30 05:40:33 UTC (rev 7190) @@ -22,7 +22,7 @@ #ifndef HEADER_ADDON_HPP #define HEADER_ADDON_HPP -#include <sstream> +#include <string> class XMLNode; @@ -68,14 +68,6 @@ * online. */ int getVersion() const {return m_version; } // ------------------------------------------------------------------------ - /** Returns the version as string. */ - std::string getVersionAsStr() const - { - std::ostringstream os; - os << m_version; - return os.str(); - } // getVersionAsStr - // ------------------------------------------------------------------------ /** Returns the ID of this addon. */ const std::string& getId() const {return m_id; } // ------------------------------------------------------------------------ Modified: main/trunk/src/addons/addons_manager.hpp =================================================================== --- main/trunk/src/addons/addons_manager.hpp 2010-12-30 05:23:04 UTC (rev 7189) +++ main/trunk/src/addons/addons_manager.hpp 2010-12-30 05:40:33 UTC (rev 7190) @@ -61,9 +61,6 @@ const Addon* getAddon(const std::string &id) const; int getAddonIndex(const std::string &id) const; - /** Get all the selected addon parameters. */ - const Addon &getAddons() const; - /** Install or upgrade the selected addon. */ void install(const Addon &addon); Modified: main/trunk/src/states_screens/addons_screen.cpp =================================================================== --- main/trunk/src/states_screens/addons_screen.cpp 2010-12-30 05:23:04 UTC (rev 7189) +++ main/trunk/src/states_screens/addons_screen.cpp 2010-12-30 05:40:33 UTC (rev 7190) @@ -133,9 +133,9 @@ { GUIEngine::ListWidget* list = getWidget<GUIEngine::ListWidget>("list_addons"); - std::string addons = list->getSelectionInternalName(); + std::string id = list->getSelectionInternalName(); - new AddonsLoading(0.8f, 0.8f, addons); + new AddonsLoading(0.8f, 0.8f, id); } if (name == "category") { Modified: main/trunk/src/states_screens/dialogs/addons_loading.cpp =================================================================== --- main/trunk/src/states_screens/dialogs/addons_loading.cpp 2010-12-30 05:23:04 UTC (rev 7189) +++ main/trunk/src/states_screens/dialogs/addons_loading.cpp 2010-12-30 05:40:33 UTC (rev 7190) @@ -37,10 +37,10 @@ // ---------------------------------------------------------------------------- AddonsLoading::AddonsLoading(const float w, const float h, - const std::string &addon_name) + const std::string &id) : ModalDialog(w, h) { - m_addon = *(addons_manager->getAddon(addon_name)); + m_addon = *(addons_manager->getAddon(id)); loadFromFile("addons_view_dialog.stkgui"); m_can_install = false; @@ -50,9 +50,6 @@ /*Init the icon here to be able to load a single image*/ m_icon = getWidget<IconButtonWidget>("icon"); - m_name = getWidget<LabelWidget>("name"); - m_description = getWidget<LabelWidget>("description"); - m_version = getWidget<LabelWidget>("version"); if(m_addon.isInstalled()) { @@ -68,12 +65,18 @@ // ---------------------------------------------------------------------------- void AddonsLoading::loadInfo() { - m_name->setText(StringUtils::insertValues(_("Name: %i"), - m_addon.getName().c_str())); - m_description->setText(StringUtils::insertValues(_("Description: %i"), - m_addon.getDescription().c_str())); - m_version->setText(StringUtils::insertValues(_("Version: %i"), - m_addon.getVersionAsStr().c_str())); + core::stringw name = StringUtils::insertValues(_("Name: %i"), + m_addon.getName().c_str() ); + getWidget<LabelWidget>("name")->setText(name); + + core::stringw desc = StringUtils::insertValues(_("Description: %i"), + m_addon.getDescription().c_str()); + getWidget<LabelWidget>("description")->setText(desc); + + core::stringw version = StringUtils::insertValues(_("Version: %d"), + m_addon.getVersion()); + getWidget<LabelWidget>("version")->setText(version); + pthread_t thread; pthread_create(&thread, NULL, &AddonsLoading::downloadIcon, this); } Modified: main/trunk/src/states_screens/dialogs/addons_loading.hpp =================================================================== --- main/trunk/src/states_screens/dialogs/addons_loading.hpp 2010-12-30 05:23:04 UTC (rev 7189) +++ main/trunk/src/states_screens/dialogs/addons_loading.hpp 2010-12-30 05:40:33 UTC (rev 7190) @@ -31,9 +31,6 @@ { //virtual void escapePressed() {}; private: - GUIEngine::LabelWidget *m_name; - GUIEngine::LabelWidget *m_description; - GUIEngine::LabelWidget *m_version; GUIEngine::LabelWidget *m_author; GUIEngine::LabelWidget *m_state; GUIEngine::ProgressBarWidget *m_progress; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |