kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

MapsWithMe => MAPS.ME

Browse source
This commit is contained in:
Alex Zolotarev 2015-01-25 01:54:34 +03:00
parent 6ce1291d7e
commit 49840f4ab9
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
platform/platform_unix_impl.cpp
View file

@ -66,7 +66,7 @@ void Platform::GetSystemFontNames(FilesList & res) const
"/usr/share/fonts/truetype/tlwg/",
"/usr/share/fonts/truetype/abyssinica/",
"/usr/share/fonts/truetype/paktype/",
"/usr/share/fonts/truetype/mapswithme/",
"/usr/share/fonts/truetype/mapsme/",
#endif
};

2
qt/about.cpp
View file

@ -33,7 +33,7 @@ AboutDialog::AboutDialog(QWidget * parent)
labelIcon->setPixmap(icon.pixmap(128));
// @todo insert version to bundle.
QLabel * labelVersion = new QLabel(QString::fromLocal8Bit("MapsWithMe"));
QLabel * labelVersion = new QLabel(QString::fromLocal8Bit("MAPS.ME"));
QHBoxLayout * hBox = new QHBoxLayout();
hBox->addWidget(labelIcon);

4
qt/main.cpp
View file

@ -41,7 +41,7 @@ namespace
InitializeFinalize()
{
// App runs without error console under win32.
m_errFile = ::freopen(".\\mapswithme.log", "w", stderr);
m_errFile = ::freopen(".\\mapsme.log", "w", stderr);
my::g_LogLevel = my::LDEBUG;
//_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_DELAY_FREE_MEM_DF);
@ -94,7 +94,7 @@ int main(int argc, char * argv[])
ReaderPtr<Reader> reader = GetPlatform().GetReader("eula.html");
reader.ReadAsString(buffer);
}
qt::InfoDialog eulaDialog("MapsWithMe End User Licensing Agreement", buffer.c_str(), NULL, buttons);
qt::InfoDialog eulaDialog("MAPS.ME End User Licensing Agreement", buffer.c_str(), NULL, buttons);
eulaAccepted = (eulaDialog.exec() == 1);
Settings::Set(settingsEULA, eulaAccepted);
}

6
qt/mainwindow.cpp
View file

@ -76,7 +76,7 @@ MainWindow::MainWindow() : m_locationService(CreateDesktopLocationService(*this)
CreateNavigationBar();
CreateSearchBarAndPanel();
setWindowTitle(tr("MapsWithMe"));
setWindowTitle(tr("MAPS.ME"));
setWindowIcon(QIcon(":/ui/logo.png"));
#ifndef OMIM_OS_WINDOWS
@ -98,7 +98,7 @@ MainWindow::MainWindow() : m_locationService(CreateDesktopLocationService(*this)
item.cch = prefsStr.size();
::InsertMenuItemA(menu, ::GetMenuItemCount(menu) - 1, TRUE, &item);
item.wID = IDM_ABOUT_DIALOG;
QByteArray const aboutStr = tr("About MapsWithMe...").toLocal8Bit();
QByteArray const aboutStr = tr("About MAPS.ME...").toLocal8Bit();
item.dwTypeData = const_cast<char *>(aboutStr.data());
item.cch = aboutStr.size();
::InsertMenuItemA(menu, ::GetMenuItemCount(menu) - 1, TRUE, &item);
@ -129,7 +129,7 @@ MainWindow::MainWindow() : m_locationService(CreateDesktopLocationService(*this)
if (!text.empty())
{
InfoDialog welcomeDlg(tr("Welcome to MapsWithMe!"), text.c_str(),
InfoDialog welcomeDlg(tr("Welcome to MAPS.ME!"), text.c_str(),
this, QStringList(tr("Download Maps")));
if (welcomeDlg.exec() == QDialog::Rejected)
bShowUpdateDialog = false;

6
qt/qt.pro
View file

@ -9,7 +9,7 @@ drape {
include($$ROOT_DIR/common.pri)
TARGET = MapsWithMe
TARGET = MAPS.ME
TEMPLATE = app
CONFIG += warn_on
QT *= core widgets gui opengl
@ -30,10 +30,10 @@ linux* {
DEFINES += INSTALL_PREFIX=$$(PREFIX)
BINDIR = $$PREFIX/bin
DATADIR = $$PREFIX/share/MapsWithMe
DATADIR = $$PREFIX/share/mapsme
RESDIR = $$DATADIR
FONTSDIR = /usr/share/fonts/truetype/mapswithme/
FONTSDIR = /usr/share/fonts/truetype/mapsme/
target.path = $$BINDIR
desktop.path = /usr/share/applications/