# HG changeset patch # User Wuzzy # Date 1462542348 -7200 # Node ID f9a4f4d11c3a1d725a65f35b88b4f63e030eb360 # Parent 09079c1b8ad559eaa33a9f975651a07958a9ecd2 Fix problems with dynamic whats this texts diff -r 09079c1b8ad5 -r f9a4f4d11c3a QTfrontend/hwconsts.cpp.in --- a/QTfrontend/hwconsts.cpp.in Wed May 04 22:56:22 2016 +0200 +++ b/QTfrontend/hwconsts.cpp.in Fri May 06 15:45:48 2016 +0200 @@ -38,8 +38,6 @@ int cMaxTeams = 8; int cMinServerVersion = 3; -int cFortDistanceUnit = 20; -int cBaseFortDistance = 60; QString * cDefaultAmmoStore = new QString( AMMOLINE_DEFAULT_QT AMMOLINE_DEFAULT_PROB AMMOLINE_DEFAULT_DELAY AMMOLINE_DEFAULT_CRATE ); diff -r 09079c1b8ad5 -r f9a4f4d11c3a QTfrontend/hwconsts.h --- a/QTfrontend/hwconsts.h Wed May 04 22:56:22 2016 +0200 +++ b/QTfrontend/hwconsts.h Fri May 06 15:45:48 2016 +0200 @@ -38,8 +38,6 @@ extern int cMaxTeams; extern int cMinServerVersion; -extern int cBaseFortDistance; -extern int cFortDistanceUnit; class QStandardItemModel; diff -r 09079c1b8ad5 -r f9a4f4d11c3a QTfrontend/ui/page/pagenetgame.cpp --- a/QTfrontend/ui/page/pagenetgame.cpp Wed May 04 22:56:22 2016 +0200 +++ b/QTfrontend/ui/page/pagenetgame.cpp Fri May 06 15:45:48 2016 +0200 @@ -126,6 +126,7 @@ BtnGo = new QPushButton(this); BtnGo->setIconSize(QSize(25, 34)); + BtnGo->setWhatsThis(tr("Turn on the lightbulb to show the other players when you're ready to fight.")); setReadyStatus(false); BtnGo->setMinimumWidth(50); BtnGo->setMinimumHeight(50); @@ -219,12 +220,10 @@ if(isReady) { BtnGo->setIcon(QIcon(":/res/lightbulb_on.png")); - BtnGo->setWhatsThis(tr("You are ready for action! Click on the lightbulb if you are not ready.")); } else { BtnGo->setIcon(QIcon(":/res/lightbulb_off.png")); - BtnGo->setWhatsThis(tr("You're not ready for action yet. Turn on the lightbulb when you're ready so other players will know this.")); } } diff -r 09079c1b8ad5 -r f9a4f4d11c3a QTfrontend/ui/widget/mapContainer.cpp --- a/QTfrontend/ui/widget/mapContainer.cpp Wed May 04 22:56:22 2016 +0200 +++ b/QTfrontend/ui/widget/mapContainer.cpp Fri May 06 15:45:48 2016 +0200 @@ -804,9 +804,8 @@ QString randomSeed = tr("Randomize the seed"); QString randomAllPrev = tr("Click to randomize the map, theme and seed"); QString randomNoMapPrev = tr("Click to randomize the theme and seed"); - QString mfsComplex = QString(tr("Complexity of the generated map (current: %1)")).arg(mapFeatureSize->value()); - int fortDistance = cBaseFortDistance + mapFeatureSize->value() * cFortDistanceUnit; - QString mfsFortsDistance = QString(tr("Distance between forts (current: %1)")).arg(fortDistance); + QString mfsComplex = QString(tr("Adjust the complexity of the generated map")); + QString mfsFortsDistance = QString(tr("Adjust the distance between forts")); switch (type) { case MapModel::GeneratedMap: