map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[drape] rebase fix

Browse source
This commit is contained in:
ExMix 2015-08-10 13:14:51 +03:00 • committed by r.kuznetsov
parent 6bb2c18493
commit cc2b1903e9
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drape_frontend/gui/country_status_helper.cpp
View file

@ -54,8 +54,8 @@ void FormatMapSize(uint64_t sizeInBytes, string & units, size_t & sizeToDownload
}
}
char const * DownloadMapButtonID = "country_status_download";
char const * DownloadMapRoutingButtonID = "country_status_download_routing";
char const * DownloadMapButtonID = "country_status_download_without_routing";
char const * DownloadMapRoutingButtonID = "country_status_download";
char const * TryAgainButtonID = "try_again";
char const * DownloadingLabelID = "country_status_downloading";
char const * DownloadingFailedID = "country_status_download_failed";
@ -175,8 +175,8 @@ void CountryStatusHelper::FillControlsForEmpty()
{
ASSERT(m_controls.empty(), ());
m_controls.push_back(MakeLabel(m_countryInfo.m_currentCountryName));
m_controls.push_back(MakeButton(FormatDownloadMap(), BUTTON_TYPE_MAP));
m_controls.push_back(MakeButton(FormatDownloadMapRouting(), BUTTON_TYPE_MAP_ROUTING));
m_controls.push_back(MakeButton(FormatDownloadMap(), BUTTON_TYPE_MAP));
}
void CountryStatusHelper::FillControlsForLoading()

6
map/framework.cpp
View file

@ -210,7 +210,7 @@ Framework::Framework()
// It's better to use strings form strings.txt intead of hardcoding them here.
m_stringsBundle.SetDefaultString("country_status_added_to_queue", "^\nis added to the downloading queue");
m_stringsBundle.SetDefaultString("country_status_downloading", "Downloading\n^\n^");
m_stringsBundle.SetDefaultString("country_status_download", "Download map\n^ ^");
m_stringsBundle.SetDefaultString("country_status_download", "Download map\n(^ ^)");
m_stringsBundle.SetDefaultString("country_status_download_failed", "Downloading\n^\nhas failed");
m_stringsBundle.SetDefaultString("country_status_download_without_routing", "Download map\nwithout routing (^ ^)");
m_stringsBundle.SetDefaultString("try_again", "Try Again");
@ -1242,7 +1242,7 @@ void Framework::CreateDrapeEngine(ref_ptr<dp::OGLContextFactory> contextFactory,
GetPlatform().RunOnGuiThread(bind(&Framework::OnDownloadMapCallback, this, countryIndex));
};
TDownloadFn downloadMapRoutingFn = [this](storage::TIndex const & countryIndex)
TDownloadFn downloadMapWithoutRoutingFn = [this](storage::TIndex const & countryIndex)
{
GetPlatform().RunOnGuiThread(bind(&Framework::OnDownloadMapRoutingCallback, this, countryIndex));
};
@ -1256,7 +1256,7 @@ void Framework::CreateDrapeEngine(ref_ptr<dp::OGLContextFactory> contextFactory,
make_ref(&m_stringsBundle),
df::Viewport(0, 0, params.m_surfaceWidth, params.m_surfaceHeight),
df::MapDataProvider(idReadFn, featureReadFn, updateCountryIndex, isCountryLoadedFn,
downloadMapFn, downloadMapRoutingFn, downloadRetryFn),
downloadMapFn, downloadMapWithoutRoutingFn, downloadRetryFn),
params.m_visualScale,
move(params.m_widgetsInitInfo));