mirror of
https://codeberg.org/comaps/comaps
synced 2025-12-19 04:53:36 +00:00
[desktop] Rebrand desktop apps
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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, ());
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
10
qt/main.cpp
10
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;
|
||||
}
|
||||
|
||||
@@ -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}});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user