From 49840f4ab9764d6a1f4423c83ddecc3f6370be39 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Sun, 25 Jan 2015 01:54:34 +0300 Subject: [PATCH] MapsWithMe => MAPS.ME --- platform/platform_unix_impl.cpp | 2 +- qt/about.cpp | 2 +- qt/main.cpp | 4 ++-- qt/mainwindow.cpp | 6 +++--- qt/qt.pro | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/platform/platform_unix_impl.cpp b/platform/platform_unix_impl.cpp index f344b2612b..4ca1c81c47 100644 --- a/platform/platform_unix_impl.cpp +++ b/platform/platform_unix_impl.cpp @@ -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 }; diff --git a/qt/about.cpp b/qt/about.cpp index ec25d9b5c4..db0723a11f 100644 --- a/qt/about.cpp +++ b/qt/about.cpp @@ -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); diff --git a/qt/main.cpp b/qt/main.cpp index 401a44500e..51ed6e6eda 100644 --- a/qt/main.cpp +++ b/qt/main.cpp @@ -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 = 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); } diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp index 8be32a661f..8b6f72a66e 100644 --- a/qt/mainwindow.cpp +++ b/qt/mainwindow.cpp @@ -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(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; diff --git a/qt/qt.pro b/qt/qt.pro index 19d97f7d1d..c009297f19 100644 --- a/qt/qt.pro +++ b/qt/qt.pro @@ -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/