summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-07-09 16:18:14 +0300
committerAndrei Karas <akaras@inbox.ru>2016-07-09 16:18:14 +0300
commitdf092799e9bb64035db76a7b0eda8a9f5a7d5ba9 (patch)
tree462bbf919c05cf7c6861df32d454ad3c70525a69
parent12ebce86d17596542edf094c179ee2e75bb9308e (diff)
downloadmanaverse-df092799e9bb64035db76a7b0eda8a9f5a7d5ba9.tar.gz
manaverse-df092799e9bb64035db76a7b0eda8a9f5a7d5ba9.tar.bz2
manaverse-df092799e9bb64035db76a7b0eda8a9f5a7d5ba9.tar.xz
manaverse-df092799e9bb64035db76a7b0eda8a9f5a7d5ba9.zip
Show map name in debug window in map tab.s20160709
-rw-r--r--src/gui/widgets/tabs/debugwindowtabs.cpp21
-rw-r--r--src/gui/widgets/tabs/debugwindowtabs.h1
2 files changed, 15 insertions, 7 deletions
diff --git a/src/gui/widgets/tabs/debugwindowtabs.cpp b/src/gui/widgets/tabs/debugwindowtabs.cpp
index bda8af76e..2757d591c 100644
--- a/src/gui/widgets/tabs/debugwindowtabs.cpp
+++ b/src/gui/widgets/tabs/debugwindowtabs.cpp
@@ -55,6 +55,8 @@ MapDebugTab::MapDebugTab(const Widget2 *const widget) :
// TRANSLATORS: debug window label
mMapLabel(new Label(this, _("Map:"))),
// TRANSLATORS: debug window label
+ mMapNameLabel(new Label(this, _("Map name:"))),
+ // TRANSLATORS: debug window label
mMinimapLabel(new Label(this, _("Minimap:"))),
mTileMouseLabel(new Label(this, strprintf("%s (%d, %d)",
// TRANSLATORS: debug window label
@@ -132,15 +134,16 @@ MapDebugTab::MapDebugTab(const Widget2 *const widget) :
place(0, 1, mLPSLabel, 2);
place(0, 2, mMusicFileLabel, 2);
place(0, 3, mMapLabel, 2);
- place(0, 4, mMinimapLabel, 2);
- place(0, 5, mXYLabel, 2);
- place(0, 6, mTileMouseLabel, 2);
- place(0, 7, mParticleCountLabel, 2);
- place(0, 8, mMapActorCountLabel, 2);
+ place(0, 4, mMapNameLabel, 2);
+ place(0, 5, mMinimapLabel, 2);
+ place(0, 6, mXYLabel, 2);
+ place(0, 7, mTileMouseLabel, 2);
+ place(0, 8, mParticleCountLabel, 2);
+ place(0, 9, mMapActorCountLabel, 2);
#ifdef USE_OPENGL
#if defined (DEBUG_OPENGL_LEAKS) || defined(DEBUG_DRAW_CALLS) \
|| defined(DEBUG_BIND_TEXTURE)
- int n = 9;
+ int n = 10;
#endif
#ifdef DEBUG_OPENGL_LEAKS
mTexturesLabel = new Label(this, strprintf("%s %s",
@@ -198,7 +201,9 @@ void MapDebugTab::logic()
// TRANSLATORS: debug window label
mMapLabel->setCaption(strprintf("%s %s", _("Map:"),
map->getProperty("_realfilename").c_str()));
-
+ // TRANSLATORS: debug window label
+ mMapNameLabel->setCaption(strprintf("%s %s", _("Map name:"),
+ map->getProperty("name").c_str()));
if (mUpdateTime != cur_time)
{
@@ -246,6 +251,8 @@ void MapDebugTab::logic()
mMinimapLabel->setCaption(strprintf("%s ?", _("Minimap:")));
// TRANSLATORS: debug window label
mMapLabel->setCaption(strprintf("%s ?", _("Map:")));
+ // TRANSLATORS: debug window label
+ mMapNameLabel->setCaption(strprintf("%s ?", _("Map name:")));
mMapActorCountLabel->setCaption(
// TRANSLATORS: debug window label
diff --git a/src/gui/widgets/tabs/debugwindowtabs.h b/src/gui/widgets/tabs/debugwindowtabs.h
index 1dd92b39d..ca1527fa6 100644
--- a/src/gui/widgets/tabs/debugwindowtabs.h
+++ b/src/gui/widgets/tabs/debugwindowtabs.h
@@ -61,6 +61,7 @@ class MapDebugTab final : public DebugTab
private:
Label *mMusicFileLabel A_NONNULLPOINTER;
Label *mMapLabel A_NONNULLPOINTER;
+ Label *mMapNameLabel A_NONNULLPOINTER;
Label *mMinimapLabel A_NONNULLPOINTER;
Label *mTileMouseLabel A_NONNULLPOINTER;
Label *mParticleCountLabel A_NONNULLPOINTER;