diff -r c0ad9cf7db65 -r bf7899e6359a QTfrontend/ui/page/pagescheme.cpp --- a/QTfrontend/ui/page/pagescheme.cpp Sun Apr 24 16:34:01 2016 +0200 +++ b/QTfrontend/ui/page/pagescheme.cpp Sun Apr 24 16:51:31 2016 +0200 @@ -71,102 +71,101 @@ TBW_mode_Forts->setWhatsThis(tr("Defend your fort and destroy the opponents, two team colours max!")); glGMLayout->addWidget(TBW_mode_Forts,0,0,1,1); - TBW_teamsDivide = new ToggleButtonWidget(gbGameModes, ":/res/btnTeamsDivide@2x.png"); - TBW_teamsDivide->setWhatsThis(tr("Teams will start on opposite sides of the terrain, two team colours max!")); - glGMLayout->addWidget(TBW_teamsDivide,0,1,1,1); + TBW_disablegirders = new ToggleButtonWidget(gbGameModes, ":/res/btnDisableGirders@2x.png"); + TBW_disablegirders->setWhatsThis(tr("Disable girders when generating random maps.")); + glGMLayout->addWidget(TBW_disablegirders,0,1,1,1); - TBW_solid = new ToggleButtonWidget(gbGameModes, ":/res/btnSolid@2x.png"); - TBW_solid->setWhatsThis(tr("Land can not be destroyed!")); - glGMLayout->addWidget(TBW_solid,0,2,1,1); + TBW_disablelandobjects = new ToggleButtonWidget(gbGameModes, ":/res/btnDisableLandObjects@2x.png"); + TBW_disablelandobjects->setWhatsThis(tr("Disable land objects when generating random maps.")); + glGMLayout->addWidget(TBW_disablelandobjects,0,2,1,1); TBW_border = new ToggleButtonWidget(gbGameModes, ":/res/btnBorder@2x.png"); TBW_border->setWhatsThis(tr("Add an indestructible border around the terrain")); glGMLayout->addWidget(TBW_border,0,3,1,1); + TBW_bottomborder = new ToggleButtonWidget(gbGameModes, ":/res/btnBottomBorder@2x.png"); + TBW_bottomborder->setWhatsThis(tr("Add an indestructible border along the bottom")); + glGMLayout->addWidget(TBW_bottomborder,0,4,1,1); + + TBW_solid = new ToggleButtonWidget(gbGameModes, ":/res/btnSolid@2x.png"); + TBW_solid->setWhatsThis(tr("Land can not be destroyed!")); + glGMLayout->addWidget(TBW_solid,1,0,1,1); + TBW_lowGravity = new ToggleButtonWidget(gbGameModes, ":/res/btnLowGravity@2x.png"); TBW_lowGravity->setWhatsThis(tr("Lower gravity")); - glGMLayout->addWidget(TBW_lowGravity,0,4,1,1); - - TBW_laserSight = new ToggleButtonWidget(gbGameModes, ":/res/btnLaserSight@2x.png"); - TBW_laserSight->setWhatsThis(tr("Assisted aiming with laser sight")); - glGMLayout->addWidget(TBW_laserSight,1,0,1,1); - - TBW_invulnerable = new ToggleButtonWidget(gbGameModes, ":/res/btnInvulnerable@2x.png"); - TBW_invulnerable->setWhatsThis(tr("All hogs have a personal forcefield")); - glGMLayout->addWidget(TBW_invulnerable,1,1,1,1); + glGMLayout->addWidget(TBW_lowGravity,1,1,1,1); - TBW_resethealth = new ToggleButtonWidget(gbGameModes, ":/res/btnResetHealth@2x.png"); - TBW_resethealth->setWhatsThis(tr("All (living) hedgehogs are fully restored at the end of turn")); - glGMLayout->addWidget(TBW_resethealth,1,2,1,1); + TBW_nowind = new ToggleButtonWidget(gbGameModes, ":/res/btnNoWind@2x.png"); + TBW_nowind->setWhatsThis(tr("You will not have to worry about wind anymore.")); + glGMLayout->addWidget(TBW_nowind,1,2,1,1); - TBW_vampiric = new ToggleButtonWidget(gbGameModes, ":/res/btnVampiric@2x.png"); - TBW_vampiric->setWhatsThis(tr("Gain 80% of the damage you do back in health")); - glGMLayout->addWidget(TBW_vampiric,1,3,1,1); - - TBW_karma = new ToggleButtonWidget(gbGameModes, ":/res/btnKarma@2x.png"); - TBW_karma->setWhatsThis(tr("Share your opponents pain, share their damage")); - glGMLayout->addWidget(TBW_karma,1,4,1,1); + TBW_morewind = new ToggleButtonWidget(gbGameModes, ":/res/btnMoreWind@2x.png"); + TBW_morewind->setWhatsThis(tr("Wind will affect almost everything.")); + glGMLayout->addWidget(TBW_morewind,1,3,1,1); TBW_artillery = new ToggleButtonWidget(gbGameModes, ":/res/btnArtillery@2x.png"); TBW_artillery->setWhatsThis(tr("Your hogs are unable to move, put your artillery skills to the test")); - glGMLayout->addWidget(TBW_artillery,2,0,1,1); + glGMLayout->addWidget(TBW_artillery,1,4,1,1); - TBW_randomorder = new ToggleButtonWidget(gbGameModes, ":/res/btnRandomOrder@2x.png"); - TBW_randomorder->setWhatsThis(tr("Order of play is random instead of in room order.")); - glGMLayout->addWidget(TBW_randomorder,2,1,1,1); + TBW_vampiric = new ToggleButtonWidget(gbGameModes, ":/res/btnVampiric@2x.png"); + TBW_vampiric->setWhatsThis(tr("Gain 80% of the damage you do back in health")); + glGMLayout->addWidget(TBW_vampiric,2,0,1,1); + + TBW_karma = new ToggleButtonWidget(gbGameModes, ":/res/btnKarma@2x.png"); + TBW_karma->setWhatsThis(tr("Share your opponents pain, share their damage")); + glGMLayout->addWidget(TBW_karma,2,1,1,1); - TBW_king = new ToggleButtonWidget(gbGameModes, ":/res/btnKing@2x.png"); - TBW_king->setWhatsThis(tr("Play with a King. If he dies, your side dies.")); - glGMLayout->addWidget(TBW_king,2,2,1,1); + TBW_resethealth = new ToggleButtonWidget(gbGameModes, ":/res/btnResetHealth@2x.png"); + TBW_resethealth->setWhatsThis(tr("All (living) hedgehogs are fully restored at the end of turn")); + glGMLayout->addWidget(TBW_resethealth,2,2,1,1); + + TBW_aisurvival = new ToggleButtonWidget(gbGameModes, ":/res/btnAISurvival@2x.png"); + TBW_aisurvival->setWhatsThis(tr("AI respawns on death.")); + glGMLayout->addWidget(TBW_aisurvival,2,3,1,1); - TBW_placehog = new ToggleButtonWidget(gbGameModes, ":/res/btnPlaceHog@2x.png"); - TBW_placehog->setWhatsThis(tr("Take turns placing your hedgehogs before the start of play.")); - glGMLayout->addWidget(TBW_placehog,2,3,1,1); + TBW_invulnerable = new ToggleButtonWidget(gbGameModes, ":/res/btnInvulnerable@2x.png"); + TBW_invulnerable->setWhatsThis(tr("All hogs have a personal forcefield")); + glGMLayout->addWidget(TBW_invulnerable,2,4,1,1); + + TBW_perhogammo = new ToggleButtonWidget(gbGameModes, ":/res/btnPerHogAmmo@2x.png"); + TBW_perhogammo->setWhatsThis(tr("Each hedgehog has its own ammo. It does not share with the team.")); + glGMLayout->addWidget(TBW_perhogammo,3,0,1,1); TBW_sharedammo = new ToggleButtonWidget(gbGameModes, ":/res/btnSharedAmmo@2x.png"); TBW_sharedammo->setWhatsThis(tr("Ammo is shared between all teams that share a colour.")); - glGMLayout->addWidget(TBW_sharedammo,2,4,1,1); - - TBW_disablegirders = new ToggleButtonWidget(gbGameModes, ":/res/btnDisableGirders@2x.png"); - TBW_disablegirders->setWhatsThis(tr("Disable girders when generating random maps.")); - glGMLayout->addWidget(TBW_disablegirders,3,0,1,1); + glGMLayout->addWidget(TBW_sharedammo,3,1,1,1); - TBW_disablelandobjects = new ToggleButtonWidget(gbGameModes, ":/res/btnDisableLandObjects@2x.png"); - TBW_disablelandobjects->setWhatsThis(tr("Disable land objects when generating random maps.")); - glGMLayout->addWidget(TBW_disablelandobjects,3,1,1,1); - - TBW_aisurvival = new ToggleButtonWidget(gbGameModes, ":/res/btnAISurvival@2x.png"); - TBW_aisurvival->setWhatsThis(tr("AI respawns on death.")); - glGMLayout->addWidget(TBW_aisurvival,3,2,1,1); + TBW_resetweps = new ToggleButtonWidget(gbGameModes, ":/res/btnResetWeps@2x.png"); + TBW_resetweps->setWhatsThis(tr("Weapons are reset to starting values each turn.")); + glGMLayout->addWidget(TBW_resetweps,3,2,1,1); TBW_infattack = new ToggleButtonWidget(gbGameModes, ":/res/btnInfAttack@2x.png"); TBW_infattack->setWhatsThis(tr("Attacking does not end your turn.")); glGMLayout->addWidget(TBW_infattack,3,3,1,1); - TBW_resetweps = new ToggleButtonWidget(gbGameModes, ":/res/btnResetWeps@2x.png"); - TBW_resetweps->setWhatsThis(tr("Weapons are reset to starting values each turn.")); - glGMLayout->addWidget(TBW_resetweps,3,4,1,1); + TBW_laserSight = new ToggleButtonWidget(gbGameModes, ":/res/btnLaserSight@2x.png"); + TBW_laserSight->setWhatsThis(tr("Assisted aiming with laser sight")); + glGMLayout->addWidget(TBW_laserSight,3,4,1,1); - TBW_perhogammo = new ToggleButtonWidget(gbGameModes, ":/res/btnPerHogAmmo@2x.png"); - TBW_perhogammo->setWhatsThis(tr("Each hedgehog has its own ammo. It does not share with the team.")); - glGMLayout->addWidget(TBW_perhogammo,4,0,1,1); + TBW_randomorder = new ToggleButtonWidget(gbGameModes, ":/res/btnRandomOrder@2x.png"); + TBW_randomorder->setWhatsThis(tr("Order of play is random instead of in room order.")); + glGMLayout->addWidget(TBW_randomorder,4,0,1,1); - TBW_nowind = new ToggleButtonWidget(gbGameModes, ":/res/btnNoWind@2x.png"); - TBW_nowind->setWhatsThis(tr("You will not have to worry about wind anymore.")); - glGMLayout->addWidget(TBW_nowind,4,1,1,1); + TBW_placehog = new ToggleButtonWidget(gbGameModes, ":/res/btnPlaceHog@2x.png"); + TBW_placehog->setWhatsThis(tr("Take turns placing your hedgehogs before the start of play.")); + glGMLayout->addWidget(TBW_placehog,4,1,1,1); - TBW_morewind = new ToggleButtonWidget(gbGameModes, ":/res/btnMoreWind@2x.png"); - TBW_morewind->setWhatsThis(tr("Wind will affect almost everything.")); - glGMLayout->addWidget(TBW_morewind,4,2,1,1); + TBW_teamsDivide = new ToggleButtonWidget(gbGameModes, ":/res/btnTeamsDivide@2x.png"); + TBW_teamsDivide->setWhatsThis(tr("Teams will start on opposite sides of the terrain, two team colours max!")); + glGMLayout->addWidget(TBW_teamsDivide,4,2,1,1); TBW_tagteam = new ToggleButtonWidget(gbGameModes, ":/res/btnTagTeam@2x.png"); TBW_tagteam->setWhatsThis(tr("Teams in each clan take successive turns sharing their turn time.")); glGMLayout->addWidget(TBW_tagteam,4,3,1,1); - TBW_bottomborder = new ToggleButtonWidget(gbGameModes, ":/res/btnBottomBorder@2x.png"); - TBW_bottomborder->setWhatsThis(tr("Add an indestructible border along the bottom")); - glGMLayout->addWidget(TBW_bottomborder,4,4,1,1); - + TBW_king = new ToggleButtonWidget(gbGameModes, ":/res/btnKing@2x.png"); + TBW_king->setWhatsThis(tr("Play with a King. If he dies, your side dies.")); + glGMLayout->addWidget(TBW_king,4,4,1,1); // Right QLabel * l;