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

obvious stuff

Browse Source
This commit is contained in:
konstin
2014-05-11 17:47:09 +02:00
parent 3a8bba6cad
commit 57db9cf858
2 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/states_screens/tracks_screen.cpp
View File

@@ -46,19 +46,8 @@ DEFINE_SCREEN_SINGLETON( TracksScreen );
// -----------------------------------------------------------------------------
TracksScreen::TracksScreen() : Screen("tracks.stkgui")
{
}
// -----------------------------------------------------------------------------
void TracksScreen::loadedFromFile()
{
}
// -----------------------------------------------------------------------------
void TracksScreen::eventCallback(Widget* widget, const std::string& name, const int playerID)
void TracksScreen::eventCallback(Widget* widget, const std::string& name,
const int playerID)
{
// -- track selection screen
if (name == "tracks")
@@ -87,7 +76,7 @@ void TracksScreen::eventCallback(Widget* widget, const std::string& name, const
ITexture* screenshot =
irr_driver->getTexture(clickedTrack->getScreenshotFile(),
"While loading screenshot for track '%s':",
clickedTrack->getFilename() );
clickedTrack->getFilename());
new TrackInfoDialog(selection, clickedTrack->getIdent(),
translations->fribidize(clickedTrack->getName()),
@@ -108,9 +97,9 @@ void TracksScreen::eventCallback(Widget* widget, const std::string& name, const
if (clickedTrack != NULL)
{
ITexture* screenshot =
irr_driver->getTexture( clickedTrack->getScreenshotFile(),
"While loading screenshot for track '%s'",
clickedTrack->getFilename());
irr_driver->getTexture(clickedTrack->getScreenshotFile(),
"While loading screenshot for track '%s'",
clickedTrack->getFilename());
new TrackInfoDialog(selection, clickedTrack->getIdent(),
translations->fribidize(clickedTrack->getName()),
@@ -164,12 +153,9 @@ void TracksScreen::beforeAddingWidget()
//I18N: track group name
FOR_GETTEXT_ONLY( _("Add-Ons") )
// add others after
// add behind the other categories
for (int n=0; n<group_amount; n++)
{
// try to translate the group name
tabs->addTextChild( _(groups[n].c_str()), groups[n] );
}
DynamicRibbonWidget* tracks_widget = this->getWidget<DynamicRibbonWidget>("tracks");
tracks_widget->setItemCountHint( track_manager->getNumberOfTracks()+1 );
@@ -179,7 +165,7 @@ void TracksScreen::beforeAddingWidget()
void TracksScreen::init()
{
DynamicRibbonWidget* gps_widget = this->getWidget<DynamicRibbonWidget>("gps");
DynamicRibbonWidget* gps_widget = this->getWidget<DynamicRibbonWidget>("gps");
DynamicRibbonWidget* tracks_widget = this->getWidget<DynamicRibbonWidget>("tracks");
assert(tracks_widget != NULL);

10
src/states_screens/tracks_screen.hpp
View File

@@ -27,11 +27,12 @@ namespace GUIEngine { class Widget; }
* \brief screen where the user can select a track
* \ingroup states_screens
*/
class TracksScreen : public GUIEngine::Screen, public GUIEngine::ScreenSingleton<TracksScreen>
class TracksScreen : public GUIEngine::Screen,
public GUIEngine::ScreenSingleton<TracksScreen>
{
friend class GUIEngine::ScreenSingleton<TracksScreen>;
TracksScreen();
TracksScreen() : Screen("tracks.stkgui") {}
/** adds the tracks from the current track group into the tracks ribbon */
void buildTrackList();
@@ -41,10 +42,11 @@ class TracksScreen : public GUIEngine::Screen, public GUIEngine::ScreenSingleton
public:
/** \brief implement callback from parent class GUIEngine::Screen */
virtual void loadedFromFile() OVERRIDE;
virtual void loadedFromFile() {} OVERRIDE;
/** \brief implement callback from parent class GUIEngine::Screen */
virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name,
virtual void eventCallback(GUIEngine::Widget* widget,
const std::string& name,
const int playerID) OVERRIDE;
/** \brief implement callback from parent class GUIEngine::Screen */