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

Added an instructions message when connecting wiimotes

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12390 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
funto66 2013-01-19 14:52:40 +00:00
parent 4dc3589086
commit 6e20eac366
2 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/states_screens/dialogs/add_device_dialog.cpp
View File

@ -24,9 +24,11 @@
#include "guiengine/widgets/button_widget.hpp" #include "guiengine/widgets/button_widget.hpp"
#include "input/device_manager.hpp" #include "input/device_manager.hpp"
#include "input/input_manager.hpp" #include "input/input_manager.hpp"
#include "states_screens/dialogs/message_dialog.hpp"
#include "states_screens/options_screen_players.hpp" #include "states_screens/options_screen_players.hpp"
#include "states_screens/options_screen_input.hpp" #include "states_screens/options_screen_input.hpp"
#include "states_screens/state_manager.hpp" #include "states_screens/state_manager.hpp"
#include "utils/cpp2011.h"
#include "utils/string_utils.hpp" #include "utils/string_utils.hpp"
#include "utils/translation.hpp" #include "utils/translation.hpp"
#include "input/wiimote_manager.hpp" #include "input/wiimote_manager.hpp"
@ -150,7 +152,36 @@ void AddDeviceDialog::onEnterPressedInternal()
} // onEnterPressedInternal } // onEnterPressedInternal
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#ifdef ENABLE_WIIUSE
class WiimoteDialogListener : public MessageDialog::IConfirmDialogListener
{
public:
virtual void onConfirm() OVERRIDE
{
ModalDialog::dismiss();
wiimote_manager->launchDetection(5);
int nb_wiimotes = wiimote_manager->getNbWiimotes();
if(nb_wiimotes > 0)
{
core::stringw msg = StringUtils::insertValues(
_("Found %d wiimote(s)"),
core::stringw(nb_wiimotes));
new MessageDialog( msg );
((OptionsScreenInput*)GUIEngine::getCurrentScreen())->rebuildDeviceList();
}
else
{
new MessageDialog( _("Could not detect any wiimote :/") );
}
}
};
#endif
// ----------------------------------------------------------------------------
GUIEngine::EventPropagation AddDeviceDialog::processEvent GUIEngine::EventPropagation AddDeviceDialog::processEvent
(const std::string& eventSource) (const std::string& eventSource)
{ {
@ -173,38 +204,12 @@ GUIEngine::EventPropagation AddDeviceDialog::processEvent
#ifdef ENABLE_WIIUSE #ifdef ENABLE_WIIUSE
else if (eventSource == "addwiimote") else if (eventSource == "addwiimote")
{ {
//new MessageDialog( _("Press the buttons 1+2 of your wiimote..."), MessageDialog::MESSAGE_DIALOG_OK, this, false); new MessageDialog( _("Press the buttons 1+2 simultaneously on your wiimote to put "
//new MessageDialog( _("Press the buttons 1+2 of your wiimote...")); "it in discovery mode, then click on OK."),
MessageDialog::MESSAGE_DIALOG_CONFIRM, new WiimoteDialogListener(), true);
wiimote_manager->launchDetection(5);
int nb_wiimotes = wiimote_manager->getNbWiimotes();
if(nb_wiimotes > 0)
{
core::stringw msg = StringUtils::insertValues(
_("Found %d wiimote(s)"),
core::stringw(nb_wiimotes));
new MessageDialog( msg );
((OptionsScreenInput*)GUIEngine::getCurrentScreen())->rebuildDeviceList();
}
else
{
new MessageDialog( _("Could not detect any wiimote :/") );
}
return GUIEngine::EVENT_BLOCK; return GUIEngine::EVENT_BLOCK;
} }
#endif #endif
return GUIEngine::EVENT_LET; return GUIEngine::EVENT_LET;
} // processEvent } // processEvent
// ----------------------------------------------------------------------------
void AddDeviceDialog::onConfirm()
{
ModalDialog::dismiss();
printf("TEST\n");
}

7
src/states_screens/dialogs/add_device_dialog.hpp
View File

@ -21,16 +21,13 @@
#include "config/player.hpp" #include "config/player.hpp"
#include "guiengine/modaldialog.hpp" #include "guiengine/modaldialog.hpp"
#include "states_screens/dialogs/message_dialog.hpp"
#include "utils/cpp2011.h"
/** /**
* \brief Dialog that warns the user about the potential problems of * \brief Dialog that warns the user about the potential problems of
* creating multiple keyboard configs. * creating multiple keyboard configs.
* \ingroup states_screens * \ingroup states_screens
*/ */
class AddDeviceDialog : public GUIEngine::ModalDialog, class AddDeviceDialog : public GUIEngine::ModalDialog
public MessageDialog::IConfirmDialogListener
{ {
public: public:
@ -38,8 +35,6 @@ public:
void onEnterPressedInternal(); void onEnterPressedInternal();
GUIEngine::EventPropagation processEvent(const std::string& eventSource); GUIEngine::EventPropagation processEvent(const std::string& eventSource);
virtual void onConfirm() OVERRIDE;
}; };