From 5cc244de6b5d8b5d8e9aea6ed9e918b51010b690 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Fri, 23 May 2025 14:06:39 +0700 Subject: [PATCH] [desktop] Rebrand desktop apps Signed-off-by: Konstantin Pastbin --- dev_sandbox/main.cpp | 4 ++-- map/map_tests/mwm_url_tests.cpp | 8 ++++---- platform/platform_win.cpp | 2 +- qt/main.cpp | 10 +++++----- qt/mainwindow.cpp | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dev_sandbox/main.cpp b/dev_sandbox/main.cpp index 99492586c..5c68d4ab1 100644 --- a/dev_sandbox/main.cpp +++ b/dev_sandbox/main.cpp @@ -205,7 +205,7 @@ int main(int argc, char * argv[]) Platform & platform = GetPlatform(); - LOG(LINFO, ("Organic Maps: Developer Sandbox", platform.Version(), "detected CPU cores:", platform.CpuCores())); + LOG(LINFO, ("Developer Render Sandbox", platform.Version(), "detected CPU cores:", platform.CpuCores())); gflags::SetUsageMessage("Developer Sandbox."); gflags::SetVersionString(platform.Version()); @@ -240,7 +240,7 @@ int main(int argc, char * argv[]) auto monitor = glfwGetPrimaryMonitor(); auto mode = glfwGetVideoMode(monitor); GLFWwindow * window = - glfwCreateWindow(mode->width, mode->height, "Organic Maps: Developer Sandbox", nullptr, nullptr); + glfwCreateWindow(mode->width, mode->height, "Developer Render Sandbox", nullptr, nullptr); int fbWidth = 0, fbHeight = 0; glfwGetFramebufferSize(window, &fbWidth, &fbHeight); float xs = 1.0f, ys = 1.0f; diff --git a/map/map_tests/mwm_url_tests.cpp b/map/map_tests/mwm_url_tests.cpp index 401fcf592..67c90daee 100644 --- a/map/map_tests/mwm_url_tests.cpp +++ b/map/map_tests/mwm_url_tests.cpp @@ -23,7 +23,7 @@ double const kEps = 1e-10; UNIT_TEST(MapApiSmoke) { - string urlString = "mapswithme://map?ll=38.970559,-9.419289&ignoreThisParam=Yes&z=17&n=Point%20Name&s=black&backurl=https%3A%2F%2Forganicmaps.app"; + string urlString = "mapswithme://map?ll=38.970559,-9.419289&ignoreThisParam=Yes&z=17&n=Point%20Name&s=black&backurl=https%3A%2F%2Fcomaps.app"; TEST(url::Url(urlString).IsValid(), ()); ParsedMapApi test(urlString); @@ -36,7 +36,7 @@ UNIT_TEST(MapApiSmoke) TEST_EQUAL(p0.m_id, "", ()); TEST_EQUAL(p0.m_style, "black", ()); TEST_ALMOST_EQUAL_ABS(test.GetZoomLevel(), 17.0, kEps, ()); - TEST_EQUAL(test.GetGlobalBackUrl(), "https://organicmaps.app", ()); + TEST_EQUAL(test.GetGlobalBackUrl(), "https://comaps.app", ()); } UNIT_TEST(RouteApiSmoke) @@ -59,7 +59,7 @@ UNIT_TEST(RouteApiSmoke) UNIT_TEST(SearchApiSmoke) { - string const urlString = "mapsme://search?query=Saint%20Hilarion&cll=35.3166654,33.2833322&locale=ru&map&appname=Organic%20Maps"; + string const urlString = "mapsme://search?query=Saint%20Hilarion&cll=35.3166654,33.2833322&locale=ru&map&appname=CoMaps"; TEST(url::Url(urlString).IsValid(), ()); ParsedMapApi test(urlString); @@ -70,7 +70,7 @@ UNIT_TEST(SearchApiSmoke) TEST_ALMOST_EQUAL_ABS(latlon.m_lat, 35.3166654, kEps, ()); TEST_ALMOST_EQUAL_ABS(latlon.m_lon, 33.2833322, kEps, ()); TEST_EQUAL(request.m_locale, "ru", ()); - TEST_EQUAL(test.GetAppName(), "Organic Maps", ()); + TEST_EQUAL(test.GetAppName(), "CoMaps", ()); TEST(request.m_isSearchOnMap, ()); } diff --git a/platform/platform_win.cpp b/platform/platform_win.cpp index 4f0816368..ee95d9109 100644 --- a/platform/platform_win.cpp +++ b/platform/platform_win.cpp @@ -26,7 +26,7 @@ static bool GetUserWritableDir(string & outDir) { outDir = pathBuf; ::CreateDirectoryA(outDir.c_str(), NULL); - outDir += "\\OrganicMaps\\"; + outDir += "\\CoMaps\\"; ::CreateDirectoryA(outDir.c_str(), NULL); return true; } diff --git a/qt/main.cpp b/qt/main.cpp index 2eab11deb..192e0c58b 100644 --- a/qt/main.cpp +++ b/qt/main.cpp @@ -110,7 +110,7 @@ int main(int argc, char * argv[]) Platform & platform = GetPlatform(); - LOG(LINFO, ("Organic Maps", platform.Version(), "built with QT:", QT_VERSION_STR, "runtime QT:", qVersion(), + LOG(LINFO, ("CoMaps", platform.Version(), "built with QT:", QT_VERSION_STR, "runtime QT:", qVersion(), "detected CPU cores:", platform.CpuCores())); gflags::SetUsageMessage("Desktop application."); @@ -133,14 +133,14 @@ int main(int argc, char * argv[]) UNUSED_VALUE(mainGuard); QApplication app(argc, argv); - app.setDesktopFileName("app.organicmaps.desktop"); + app.setDesktopFileName("app.comaps.desktop"); platform.SetupMeasurementSystem(); #ifdef BUILD_DESIGNER - QApplication::setApplicationName("Organic Maps Designer"); + QApplication::setApplicationName("CoMaps Designer"); #else - QApplication::setApplicationName("Organic Maps"); + QApplication::setApplicationName("CoMaps"); #endif @@ -263,6 +263,6 @@ int main(int argc, char * argv[]) } #endif // BUILD_DESIGNER - LOG_SHORT(LINFO, ("Organic Maps finished with code", returnCode)); + LOG_SHORT(LINFO, ("Finished with code", returnCode)); return returnCode; } diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp index 02e31905b..d4b17c3d9 100644 --- a/qt/mainwindow.cpp +++ b/qt/mainwindow.cpp @@ -649,7 +649,7 @@ void MainWindow::OnUploadEditsMenuItem() { auto & editor = osm::Editor::Instance(); if (editor.HaveMapEditsOrNotesToUpload()) - editor.UploadChanges(token, {{"created_by", "Organic Maps " OMIM_OS_NAME}}); + editor.UploadChanges(token, {{"created_by", "CoMaps " OMIM_OS_NAME}}); } }