Skip to content

Commit c15c9ad

Browse files
committed
Revert "Map information tool: Information about map properties"
This reverts commit 606b40f.
1 parent 6e5a41b commit c15c9ad

File tree

8 files changed

+1
-568
lines changed

8 files changed

+1
-568
lines changed

code-check-wrapper.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ for I in \
5858
map_coord.cpp \
5959
map_editor.cpp \
6060
map_find_feature.cpp \
61-
map_information_dialog.cpp \
6261
map_notes.cpp \
6362
map_printer \
6463
map_widget.cpp \

images/map-information.png

-3.14 KB
Binary file not shown.

resources.qrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,5 @@
117117
<file>images/view-zoom-out.png</file>
118118
<file>images/window-new.png</file>
119119
<file>images/mapper-icon/Mapper-128.png</file>
120-
<file>images/map-information.png</file>
121120
</qresource>
122121
</RCC>

src/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ set(Mapper_Common_SRCS
124124
gui/map/map_editor.cpp
125125
gui/map/map_editor_activity.cpp
126126
gui/map/map_find_feature.cpp
127-
gui/map/map_information_dialog.cpp
128127
gui/map/map_notes.cpp
129128
gui/map/map_widget.cpp
130129
gui/map/rotate_map_dialog.cpp

src/gui/map/map_editor.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@
111111
#include "gui/map/map_dialog_scale.h"
112112
#include "gui/map/map_editor_activity.h"
113113
#include "gui/map/map_find_feature.h"
114-
#include "gui/map/map_information_dialog.h"
115114
#include "gui/map/map_notes.h"
116115
#include "gui/map/map_widget.h"
117116
#include "gui/map/rotate_map_dialog.h"
@@ -452,7 +451,6 @@ void MapEditorController::setEditingInProgress(bool value)
452451
scale_map_act->setEnabled(!editing_in_progress);
453452
rotate_map_act->setEnabled(!editing_in_progress);
454453
map_notes_act->setEnabled(!editing_in_progress);
455-
map_info_act->setEnabled(!editing_in_progress);
456454

457455
// Map menu, continued
458456
const int num_parts = map->getNumParts();
@@ -1018,7 +1016,6 @@ void MapEditorController::createActions()
10181016
scale_map_act = newAction("scalemap", tr("Change map scale..."), this, SLOT(scaleMapClicked()), "tool-scale.png", tr("Change the map scale and adjust map objects and symbol sizes"), "map_menu.html");
10191017
rotate_map_act = newAction("rotatemap", tr("Rotate map..."), this, SLOT(rotateMapClicked()), "tool-rotate.png", tr("Rotate the whole map"), "map_menu.html");
10201018
map_notes_act = newAction("mapnotes", tr("Map notes..."), this, SLOT(mapNotesClicked()), nullptr, QString{}, "map_menu.html");
1021-
map_info_act = newAction("mapinfo", tr("Map information..."), this, SLOT(mapInfoClicked()), "map-information.png", QString{}, "map_menu.html");
10221019

10231020
template_window_act = newCheckAction("templatewindow", tr("Template setup window"), this, SLOT(showTemplateWindow(bool)), "templates.png", tr("Show/Hide the template window"), "templates_menu.html");
10241021
//QAction* template_config_window_act = newCheckAction("templateconfigwindow", tr("Template configurations window"), this, SLOT(showTemplateConfigurationsWindow(bool)), "window-new", tr("Show/Hide the template configurations window"));
@@ -1246,7 +1243,6 @@ void MapEditorController::createMenuAndToolbars()
12461243
map_menu->addAction(scale_map_act);
12471244
map_menu->addAction(rotate_map_act);
12481245
map_menu->addAction(map_notes_act);
1249-
map_menu->addAction(map_info_act);
12501246
map_menu->addSeparator();
12511247
updateMapPartsUI();
12521248
map_menu->addAction(mappart_add_act);
@@ -2252,13 +2248,6 @@ void MapEditorController::mapNotesClicked()
22522248
}
22532249
}
22542250

2255-
void MapEditorController::mapInfoClicked()
2256-
{
2257-
MapInformationDialog dialog(window, map);
2258-
dialog.setWindowModality(Qt::WindowModal);
2259-
dialog.exec();
2260-
}
2261-
22622251
void MapEditorController::createTemplateWindow()
22632252
{
22642253
Q_ASSERT(!template_dock_widget);

src/gui/map/map_editor.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* SPDX-License-Identifier: GPL-3.0-or-later
22
*
33
* Copyright 2012, 2013, 2014 Thomas Schöps (OpenOrienteering)
4-
* Copyright 2013-2024 Kai Pastor (OpenOrienteering)
4+
* Copyright 2013-2021 Kai Pastor (OpenOrienteering)
55
*
66
* This file is part of LibreMapper.
77
*/
@@ -336,8 +336,6 @@ public slots:
336336
void rotateMapClicked();
337337
/** Shows the dialog to enter map notes. */
338338
void mapNotesClicked();
339-
/** Shows the map information. */
340-
void mapInfoClicked();
341339

342340
/** Shows or hides the template setup dock widget. */
343341
void showTemplateWindow(bool show);
@@ -737,7 +735,6 @@ protected slots:
737735
QAction* scale_map_act = {};
738736
QAction* rotate_map_act = {};
739737
QAction* map_notes_act = {};
740-
QAction* map_info_act = {};
741738
QAction* symbol_set_id_act = {};
742739
std::unique_ptr<SymbolReportFeature> symbol_report_feature;
743740

0 commit comments

Comments
 (0)