drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-20 05:13:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[qt] Remove defunct Traffic layer button"

Browse Source 
This reverts commit df2541e1bf12abca329becdac8de7c92f0893b03.
This commit is contained in:
mvglasow
2025-04-29 23:44:02 +03:00
parent e3e4a1985a
commit 6f2f61b30a
5 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
3party/CMake-MetalShaderSupport

Submodule 3party/CMake-MetalShaderSupport updated: 989857d2e5...84209c32e5

2
3party/gflags

Submodule 3party/gflags updated: a738fdf933...52e94563eb

2
3party/jansson/jansson

Submodule 3party/jansson/jansson updated: 61fc3d0e28...96d160df90

13
qt/mainwindow.cpp
View File

@@ -282,10 +282,9 @@ void MainWindow::CreateNavigationBar()
m_layers = new PopupMenuHolder(this); m_layers = new PopupMenuHolder(this);
/// @todo Uncomment when we will integrate a traffic provider. m_layers->addAction(QIcon(":/navig64/traffic.png"), tr("Traffic"),
// m_layers->addAction(QIcon(":/navig64/traffic.png"), tr("Traffic"), std::bind(&MainWindow::OnLayerEnabled, this, LayerType::TRAFFIC), true);
// std::bind(&MainWindow::OnLayerEnabled, this, LayerType::TRAFFIC), true); m_layers->setChecked(LayerType::TRAFFIC, m_pDrawWidget->GetFramework().LoadTrafficEnabled());
// m_layers->setChecked(LayerType::TRAFFIC, m_pDrawWidget->GetFramework().LoadTrafficEnabled());
m_layers->addAction(QIcon(":/navig64/subway.png"), tr("Public transport"), m_layers->addAction(QIcon(":/navig64/subway.png"), tr("Public transport"),
std::bind(&MainWindow::OnLayerEnabled, this, LayerType::TRANSIT), true); std::bind(&MainWindow::OnLayerEnabled, this, LayerType::TRANSIT), true);
@@ -876,11 +875,11 @@ void MainWindow::SetLayerEnabled(LayerType type, bool enable)
auto & frm = m_pDrawWidget->GetFramework(); auto & frm = m_pDrawWidget->GetFramework();
switch (type) switch (type)
{ {
// @todo Uncomment when we will integrate a traffic provider. case LayerType::TRAFFIC:
// case LayerType::TRAFFIC: /// @todo Uncomment when we will integrate a traffic provider.
// frm.GetTrafficManager().SetEnabled(enable); // frm.GetTrafficManager().SetEnabled(enable);
// frm.SaveTrafficEnabled(enable); // frm.SaveTrafficEnabled(enable);
// break; break;
case LayerType::TRANSIT: case LayerType::TRANSIT:
frm.GetTransitManager().EnableTransitSchemeMode(enable); frm.GetTransitManager().EnableTransitSchemeMode(enable);
frm.SaveTransitSchemeEnabled(enable); frm.SaveTransitSchemeEnabled(enable);

5
qt/mainwindow.hpp
View File

@@ -50,9 +50,8 @@ class MainWindow : public QMainWindow, location::LocationObserver
enum LayerType : uint8_t enum LayerType : uint8_t
{ {
/// @todo Uncomment when we will integrate a traffic provider. TRAFFIC = 0,
// TRAFFIC = 0, TRANSIT, // Metro scheme
TRANSIT = 0, // Metro scheme
ISOLINES, ISOLINES,
OUTDOORS, OUTDOORS,
}; };