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

Removed m_fake_search, resorted functions to be in a more logical order,

Browse Source 
added comments.
This commit is contained in:
hiker 2014-03-04 08:15:46 +11:00
parent 7592200a44
commit 46304e7f28
2 changed files with 65 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
src/states_screens/online_user_search.cpp
View File

@ -51,7 +51,41 @@ OnlineUserSearch::~OnlineUserSearch()
} // OnlineUserSearch
// ----------------------------------------------------------------------------
/** Callback when the xml file was loaded.
*/
void OnlineUserSearch::loadedFromFile()
{
m_back_widget = getWidget<GUIEngine::IconButtonWidget>("back");
assert(m_back_widget != NULL);
m_search_button_widget = getWidget<GUIEngine::ButtonWidget>("search_button");
assert(m_search_button_widget != NULL);
m_search_box_widget = getWidget<GUIEngine::TextBoxWidget>("search_box");
assert(m_search_box_widget != NULL);
m_user_list_widget = getWidget<GUIEngine::ListWidget>("user_list");
assert(m_user_list_widget != NULL);
} // loadedFromFile
// ----------------------------------------------------------------------------
/** Callback before widgets are added. Clears all widgets.
*/
void OnlineUserSearch::beforeAddingWidget()
{
m_user_list_widget->clearColumns();
m_user_list_widget->addColumn(_("Username"), 3);
}
// ----------------------------------------------------------------------------
/** Called when entering this menu (before widgets are added).
*/
void OnlineUserSearch::init()
{
Screen::init();
search();
m_search_box_widget->setText(m_search_string);
} // init
// ----------------------------------------------------------------------------
/** Callback before the screen is removed.
*/
void OnlineUserSearch::tearDown()
{
delete m_search_request;
@ -89,6 +123,8 @@ void OnlineUserSearch::parseResult(const XMLNode * input)
} // parseResult
// ----------------------------------------------------------------------------
/** Takes the list of user ids from a query and shows it in the list gui.
*/
void OnlineUserSearch::showList()
{
m_user_list_widget->clear();
@ -115,52 +151,25 @@ void OnlineUserSearch::showList()
*/
void OnlineUserSearch::search()
{
if ( m_search_string != "" && m_last_search_string != m_search_string )
if (m_search_string != "" && m_last_search_string != m_search_string)
{
m_search_request = CurrentUser::get()->requestUserSearch(m_search_string);
else
m_fake_refresh = true;
m_user_list_widget->clear();
m_user_list_widget->addItem("spacer", L"");
m_user_list_widget->addItem("loading", Messages::searching());
m_back_widget->setDeactivated();
m_search_box_widget->setDeactivated();
m_search_button_widget->setDeactivated();
m_user_list_widget->clear();
m_user_list_widget->addItem("spacer", L"");
m_user_list_widget->addItem("loading", Messages::searching());
m_back_widget->setDeactivated();
m_search_box_widget->setDeactivated();
m_search_button_widget->setDeactivated();
}
} // sarch
// ----------------------------------------------------------------------------
void OnlineUserSearch::loadedFromFile()
{
m_back_widget = getWidget<GUIEngine::IconButtonWidget>("back");
assert(m_back_widget != NULL);
m_search_button_widget = getWidget<GUIEngine::ButtonWidget>("search_button");
assert(m_search_button_widget != NULL);
m_search_box_widget = getWidget<GUIEngine::TextBoxWidget>("search_box");
assert(m_search_box_widget != NULL);
m_user_list_widget = getWidget<GUIEngine::ListWidget>("user_list");
assert(m_user_list_widget != NULL);
} // loadedFromFile
// ----------------------------------------------------------------------------
void OnlineUserSearch::beforeAddingWidget()
{
m_user_list_widget->clearColumns();
m_user_list_widget->addColumn( _("Username"), 3 );
}
// ----------------------------------------------------------------------------
void OnlineUserSearch::init()
{
Screen::init();
search();
m_fake_refresh = false;
m_search_box_widget->setText(m_search_string);
} // init
// ----------------------------------------------------------------------------
void OnlineUserSearch::eventCallback( GUIEngine::Widget* widget, const std::string& name, const int playerID)
/** Called when an event occurs (i.e. user clicks on something).
*/
void OnlineUserSearch::eventCallback(GUIEngine::Widget* widget,
const std::string& name,
const int player_id)
{
if (name == m_back_widget->m_properties[GUIEngine::PROP_ID])
{
@ -197,7 +206,9 @@ void OnlineUserSearch::setLastSelected() //FIXME actually use this here and in s
} // setLastSelected
// ----------------------------------------------------------------------------
/** Called every frame. It queries the search request for results and
* displays them if necessary.
*/
void OnlineUserSearch::onUpdate(float dt)
{
if(m_search_request != NULL)
@ -225,12 +236,4 @@ void OnlineUserSearch::onUpdate(float dt)
m_user_list_widget->renameItem("loading", Messages::searching());
}
}
else if(m_fake_refresh)
{
showList();
m_fake_refresh = false;
m_back_widget->setActivated();
m_search_box_widget->setActivated();
m_search_button_widget->setActivated();
}
} // onUpdate

14
src/states_screens/online_user_search.hpp
View File

@ -39,22 +39,28 @@ private:
OnlineUserSearch();
~OnlineUserSearch();
/** Pointer to the back widget. */
GUIEngine::IconButtonWidget * m_back_widget;
/** Pointer to the search button. */
GUIEngine::ButtonWidget * m_search_button_widget;
/** Pointer to the search box. */
GUIEngine::TextBoxWidget * m_search_box_widget;
/** Pointer to the result list. */
GUIEngine::ListWidget * m_user_list_widget;
/** The currently selected index, used to re-select this item after
* addons_loading is being displayed. */
int m_selected_index;
/** Seach string entered in the search widget. */
irr::core::stringw m_search_string;
/** Last search string, used to avoid doing the same search again. */
irr::core::stringw m_last_search_string;
/** The list of all IDs found. */
Online::Profile::IDList m_users;
/** The online request to search for users. */
const Online::XMLRequest * m_search_request;
bool m_fake_refresh;
void parseResult(const XMLNode * input);
void showList();
@ -81,7 +87,11 @@ public:
virtual void onUpdate(float dt) OVERRIDE;
void setLastSelected();
void setSearchString(const irr::core::stringw & search_string) {m_search_string = search_string;}
/** Sets the search string to an initial value. */
void setSearchString(const irr::core::stringw & search_string)
{
m_search_string = search_string;
}
};