pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

fixed displaying country name for composite country name like "Country, Province"

Browse source
This commit is contained in:
rachytski 2012-06-04 22:58:28 +04:00 • committed by Alex Zolotarev
parent 8ade6cd768
commit 6b472399e2
2 changed files with 49 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
map/country_status_display.cpp
View file

@ -24,7 +24,12 @@ void CountryStatusDisplay::cache()
m_statusMsg->setIsVisible(true);
ostringstream out;
out << m_countryName << " is added to the\ndownloading queue";
out << m_mapName;
if (!m_mapGroupName.empty())
out << "(" << m_mapGroupName << ")";
out << " is added to the\ndownloading queue";
m_statusMsg->setText(out.str());
}
@ -35,7 +40,13 @@ void CountryStatusDisplay::cache()
m_statusMsg->setIsVisible(true);
ostringstream out;
out << "Downloading " << m_countryName << "(" << m_countryProgress.first * 100 / m_countryProgress.second << "%)";
out << "Downloading " << m_mapName;
if (!m_mapGroupName.empty())
out << "(" << m_mapGroupName << ")";
out << "(" << m_countryProgress.first * 100 / m_countryProgress.second << "%)";
m_statusMsg->setText(out.str());
}
@ -43,7 +54,12 @@ void CountryStatusDisplay::cache()
case storage::ENotDownloaded:
{
m_downloadButton->setIsVisible(true);
m_downloadButton->setText("Download " + m_countryName);
string buttonText = "Download " + m_mapName;
if (!m_mapGroupName.empty())
buttonText += "(" + m_mapGroupName + ")";
m_downloadButton->setText(buttonText);
}
break;
case storage::EDownloadFailed:
@ -52,7 +68,13 @@ void CountryStatusDisplay::cache()
m_downloadButton->setText("Try again");
ostringstream out;
out << "Downloading " << m_countryName << "\nhas failed.";
out << "Downloading " << m_mapName;
if (!m_mapGroupName.empty())
out << "(" << m_mapGroupName << ")";
out << "\nhas failed.";
m_statusMsg->setIsVisible(true);
m_statusMsg->setText(out.str());
@ -144,12 +166,26 @@ void CountryStatusDisplay::setDownloadListener(gui::Button::TOnClickListener con
void CountryStatusDisplay::setCountryName(string const & name)
{
if (m_countryName != name)
if (m_fullName != name)
{
m_countryIdx = m_storage->FindIndexByName(name);
size_t pos = name.find(",");
if (pos == string::npos)
{
m_mapName = name;
m_mapGroupName.clear();
}
else
{
m_mapName = name.substr(pos + 2);
m_mapGroupName = name.substr(0, pos);
}
LOG(LINFO, (m_mapName, m_mapGroupName));
m_countryIdx = m_storage->FindIndexByName(m_mapName);
m_countryStatus = m_storage->CountryStatus(m_countryIdx);
m_countryProgress = m_storage->CountrySizeInBytes(m_countryIdx);
m_countryName = name;
m_fullName = name;
setIsDirtyDrawing(true);
invalidate();
}

8
map/country_status_display.hpp
View file

@ -29,8 +29,12 @@ private:
shared_ptr<gui::Button> m_downloadButton;
/// country status message
shared_ptr<gui::TextView> m_statusMsg;
/// current country name
string m_countryName;
/// full name, could be in the form "Country, Province"
string m_fullName;
/// current map name, "Province" part of the fullName
string m_mapName;
/// current map group name, "Country" part of the fullName
string m_mapGroupName;
/// current country status
storage::TStatus m_countryStatus;
/// index of the country in Storage