From 7af56c6972bb6b788e83f14582e99116d7460a09 Mon Sep 17 00:00:00 2001
From: Matthias Kuehlewein <github@kuehlewein.de>
Date: Wed, 2 Jul 2025 17:29:18 +0200
Subject: [PATCH 1/2] Templates: Add custom names

Add the possibility to enter a custom name for a template that is shown
instead of the filename. Allow to select whether the filename or custom
name is shown.
Save and load custom file names and selection preferences.

Closes GH-1060 (Templates should be able to be named independently of file name).
---
 src/gui/widgets/template_list_widget.cpp | 44 +++++++++++++++++++++++-
 src/gui/widgets/template_list_widget.h   |  7 ++--
 src/templates/template.cpp               | 10 ++++++
 src/templates/template.h                 | 16 +++++++--
 src/templates/template_table_model.cpp   |  6 ++--
 5 files changed, 75 insertions(+), 8 deletions(-)

diff --git a/src/gui/widgets/template_list_widget.cpp b/src/gui/widgets/template_list_widget.cpp
index 5b562c46bd..c17764f5e9 100644
--- a/src/gui/widgets/template_list_widget.cpp
+++ b/src/gui/widgets/template_list_widget.cpp
@@ -1,6 +1,6 @@
 /*
  *    Copyright 2012, 2013 Thomas Schöps
- *    Copyright 2012-2020 Kai Pastor
+ *    Copyright 2012-2020, 2025 Kai Pastor
  *
  *    This file is part of OpenOrienteering.
  *
@@ -49,6 +49,7 @@
 #include <QLabel>
 #include <QLatin1Char>
 #include <QLatin1String>
+#include <QLineEdit>
 #include <QList>
 #include <QLocale>
 #include <QMenu>
@@ -56,6 +57,7 @@
 #include <QModelIndex>
 #include <QPainter>
 #include <QPixmap>
+#include <QPoint>
 #include <QRect>
 #include <QScroller>
 #include <QSettings>
@@ -227,6 +229,9 @@ TemplateListWidget::TemplateListWidget(Map& map, MapView& main_view, MapEditorCo
 		auto header_check_size = geometry.size();
 		if (header_check_size.isValid())
 			template_model->setCheckBoxDecorator(makeCheckBoxDecorator(style(), header_check_size));
+		
+		template_table->setContextMenuPolicy(Qt::CustomContextMenu);
+		connect(template_table, &QTableView::customContextMenuRequested, this, &TemplateListWidget::showContextMenu);
 	}
 	
 	all_templates_layout = new QVBoxLayout();
@@ -1042,5 +1047,42 @@ void TemplateListWidget::showOpacitySlider(int row)
 	dialog.exec();
 }
 
+void TemplateListWidget::showContextMenu(const QPoint& clicked_pos)
+{
+	const auto index = template_table->indexAt(clicked_pos);
+	const auto row = index.row();
+	const auto pos = posFromRow(qMax(0, row));
+	if (row >= 0 && pos >= 0 && index.column() == TemplateTableModel::nameColumn())
+	{
+		auto* templ = map.getTemplate(pos);
+		if (!templ)
+			return;
+		auto* enter_customname_action = new QAction(tr("Enter custom name"), template_table);
+		connect(enter_customname_action, &QAction::triggered, this, [this, templ]() {
+			bool ok;
+			const auto previous_customname = templ->getTemplateCustomname();
+			const auto text = QInputDialog::getText(this, tr("Enter custom name"), tr("Custom name:"), QLineEdit::Normal, previous_customname, &ok);
+			if (ok)
+			{
+				templ->setTemplateCustomname(text);
+				templ->setCustomnamePreference(!text.isEmpty());
+				if (previous_customname != text)
+					map.setTemplatesDirty();	// only mark as dirty if custom name has changed
+			}
+		});
+		QMenu context_menu(this);
+		context_menu.addAction(enter_customname_action);
+		if (!templ->getTemplateCustomname().isEmpty())
+		{
+			auto* toggle_show_name_action = new QAction(templ->getCustomnamePreference() ? tr("Show filename") : tr("Show custom name"), template_table);
+			connect(toggle_show_name_action, &QAction::triggered, this, [templ]() {
+				templ->setCustomnamePreference(!templ->getCustomnamePreference());	// don't mark as dirty
+			});
+			context_menu.addAction(toggle_show_name_action);
+		}
+		context_menu.exec(mapToGlobal(clicked_pos));
+	}
+}
+
 
 }  // namespace OpenOrienteering
diff --git a/src/gui/widgets/template_list_widget.h b/src/gui/widgets/template_list_widget.h
index 85505d44d6..6501995cc9 100644
--- a/src/gui/widgets/template_list_widget.h
+++ b/src/gui/widgets/template_list_widget.h
@@ -1,6 +1,6 @@
 /*
  *    Copyright 2012, 2013 Thomas Schöps
- *    Copyright 2020 Kai Pastor
+ *    Copyright 2020, 2025 Kai Pastor
  *
  *    This file is part of OpenOrienteering.
  *
@@ -36,6 +36,7 @@ class QBoxLayout;
 class QCheckBox;
 class QEvent;
 class QModelIndex;
+class QPoint;
 class QTableView;
 class QToolButton;
 class QVariant;
@@ -142,6 +143,8 @@ class TemplateListWidget : public QWidget
 	
 	void showOpacitySlider(int row);
 	
+	void showContextMenu(const QPoint &pos);
+	
 private:
 	Map& map;
 	MapView& main_view;
@@ -179,4 +182,4 @@ class TemplateListWidget : public QWidget
 
 }  // namespace OpenOrienteering
 
-#endif
+#endif // OPENORIENTEERING_TEMPLATE_LIST_WIDGET_H
diff --git a/src/templates/template.cpp b/src/templates/template.cpp
index cbb74f7766..69d910fc70 100644
--- a/src/templates/template.cpp
+++ b/src/templates/template.cpp
@@ -290,6 +290,11 @@ void Template::saveTemplateConfiguration(QXmlStreamWriter& xml, bool open, const
 		primary_path = relative_path;
 	xml.writeAttribute(QString::fromLatin1("path"), primary_path);
 	xml.writeAttribute(QString::fromLatin1("relpath"), relative_path);
+	if (!template_custom_name.isEmpty())
+	{
+		xml.writeAttribute(QString::fromLatin1("customname"), getTemplateCustomname());
+		xml.writeAttribute(QString::fromLatin1("custompref"), QString::fromLatin1(getCustomnamePreference() ? "true" : "false"));
+	}
 	
 	if (template_group)
 	{
@@ -349,6 +354,11 @@ std::unique_ptr<Template> Template::loadTemplateConfiguration(QXmlStreamReader&
 	temp->setTemplateRelativePath(attributes.value(QLatin1String("relpath")).toString());
 	if (attributes.hasAttribute(QLatin1String("name")))
 		temp->template_file = attributes.value(QLatin1String("name")).toString();
+	if (attributes.hasAttribute(QLatin1String("customname")))
+	{
+		temp->template_custom_name = attributes.value(QLatin1String("customname")).toString();
+		temp->custom_name_preference = (attributes.value(QLatin1String("custompref")) == QLatin1String("true"));
+	}
 	temp->is_georeferenced = (attributes.value(QLatin1String("georef")) == QLatin1String("true"));
 	if (attributes.hasAttribute(QLatin1String("group")))
 		temp->template_group = attributes.value(QLatin1String("group")).toInt();
diff --git a/src/templates/template.h b/src/templates/template.h
index 1c06733f99..03dfefa53b 100644
--- a/src/templates/template.h
+++ b/src/templates/template.h
@@ -1,6 +1,6 @@
 /*
  *    Copyright 2012, 2013 Thomas Schöps
- *    Copyright 2012-2020 Kai Pastor
+ *    Copyright 2012-2020, 2025 Kai Pastor
  *
  *    This file is part of OpenOrienteering.
  *
@@ -530,6 +530,12 @@ Q_OBJECT
 	
 	inline const QString& getTemplateFilename() const {return template_file;}
 	
+	inline const QString& getTemplateCustomname() const {return template_custom_name;}
+	inline void setTemplateCustomname(const QString& template_custom_name) {this->template_custom_name = template_custom_name;}
+	
+	inline bool getCustomnamePreference() const {return custom_name_preference;}
+	inline void setCustomnamePreference(bool custom_name_preference) {this->custom_name_preference = custom_name_preference;}
+	
 	/// Changes the path and filename only. Does not do any reloading etc.
 	void setTemplateFileInfo(const QFileInfo& file_info);
 	
@@ -753,6 +759,12 @@ Q_OBJECT
 	/// Can be empty as long as the map file has not been saved yet.
 	QString template_relative_path;
 	
+	/// The custom name of the template set by the user
+	QString template_custom_name;
+	
+	/// User preference to show custom name instead of filename
+	bool custom_name_preference = false;
+	
 	/// The template lifetime state
 	State template_state = Configuring;
 	
@@ -811,4 +823,4 @@ Q_OBJECT
 Q_DECLARE_OPERATORS_FOR_FLAGS(OpenOrienteering::Template::ScribbleOptions)
 
 
-#endif
+#endif // OPENORIENTEERING_TEMPLATE_H
diff --git a/src/templates/template_table_model.cpp b/src/templates/template_table_model.cpp
index 793b825c4e..dc7d8c7fc3 100644
--- a/src/templates/template_table_model.cpp
+++ b/src/templates/template_table_model.cpp
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2020 Kai Pastor
+ *    Copyright 2020, 2025 Kai Pastor
  *
  *    This file is part of OpenOrienteering.
  *
@@ -176,7 +176,7 @@ QVariant TemplateTableModel::headerData(int section, Qt::Orientation orientation
 			break;
 		case nameColumn():
 			if (role == Qt::DisplayRole)
-				return QCoreApplication::translate("OpenOrienteering::TemplateListWidget", "Filename");
+				return QCoreApplication::translate("OpenOrienteering::TemplateListWidget", "Filename / Custom name");
 			break;
 		}
 	}
@@ -309,7 +309,7 @@ QVariant TemplateTableModel::templateData(Template* temp, const QModelIndex &ind
 			break;
 		Q_FALLTHROUGH();
 	case combined(nameColumn(), Qt::DisplayRole):
-		return temp->getTemplateFilename();
+		return temp->getCustomnamePreference() ? temp->getTemplateCustomname() : temp->getTemplateFilename();
 		
 	case combined(visibilityColumn(), Qt::ToolTipRole):
 		if (!touchMode())

From 912364138511c34f42cee95a5343b0bde57a31e0 Mon Sep 17 00:00:00 2001
From: Matthias Kuehlewein <github@kuehlewein.de>
Date: Sat, 12 Jul 2025 20:46:28 +0200
Subject: [PATCH 2/2] Custom template names: Move actions to Edit menu

Remove context menu on right-click and add actions to the menu
invoked by the Edit button.
Change tool tip to show custom name if filename is actively shown.
---
 src/gui/widgets/template_list_widget.cpp | 62 +++++++++++-------------
 src/gui/widgets/template_list_widget.h   |  6 ++-
 src/templates/template_table_model.cpp   |  2 +-
 3 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/src/gui/widgets/template_list_widget.cpp b/src/gui/widgets/template_list_widget.cpp
index c17764f5e9..92aebaeccc 100644
--- a/src/gui/widgets/template_list_widget.cpp
+++ b/src/gui/widgets/template_list_widget.cpp
@@ -57,7 +57,6 @@
 #include <QModelIndex>
 #include <QPainter>
 #include <QPixmap>
-#include <QPoint>
 #include <QRect>
 #include <QScroller>
 #include <QSettings>
@@ -229,9 +228,6 @@ TemplateListWidget::TemplateListWidget(Map& map, MapView& main_view, MapEditorCo
 		auto header_check_size = geometry.size();
 		if (header_check_size.isValid())
 			template_model->setCheckBoxDecorator(makeCheckBoxDecorator(style(), header_check_size));
-		
-		template_table->setContextMenuPolicy(Qt::CustomContextMenu);
-		connect(template_table, &QTableView::customContextMenuRequested, this, &TemplateListWidget::showContextMenu);
 	}
 	
 	all_templates_layout = new QVBoxLayout();
@@ -287,6 +283,9 @@ TemplateListWidget::TemplateListWidget(Map& map, MapView& main_view, MapEditorCo
 	position_action = edit_menu->addAction(tr("Positioning..."));
 	position_action->setCheckable(true);
 	edit_menu->addSeparator();
+	custom_name_action = edit_menu->addAction(tr("Enter custom name..."), this, &TemplateListWidget::enterCustomname);
+	show_name_action = edit_menu->addAction(tr("Show filename"), this, &TemplateListWidget::showCustomOrFilename);
+	edit_menu->addSeparator();
 	import_action =  edit_menu->addAction(tr("Import and remove"), this, &TemplateListWidget::importClicked);
 	
 #if WITH_COVE
@@ -495,6 +494,9 @@ void TemplateListWidget::updateButtons()
 				vectorize_enabled = qobject_cast<TemplateImage*>(temp)
 									&& temp->getTemplateState() == Template::Loaded;
 			}
+			show_name_action->setText(temp->getCustomnamePreference() ? tr("Show filename") : tr("Show custom name"));
+			show_name_action->setVisible(!temp->getTemplateCustomname().isEmpty());
+			
 		}
 		else if (current_row >= 0)
 		{
@@ -1047,40 +1049,34 @@ void TemplateListWidget::showOpacitySlider(int row)
 	dialog.exec();
 }
 
-void TemplateListWidget::showContextMenu(const QPoint& clicked_pos)
+void TemplateListWidget::enterCustomname()
 {
-	const auto index = template_table->indexAt(clicked_pos);
-	const auto row = index.row();
-	const auto pos = posFromRow(qMax(0, row));
-	if (row >= 0 && pos >= 0 && index.column() == TemplateTableModel::nameColumn())
+	auto* templ = currentTemplate();
+	if (templ)
 	{
-		auto* templ = map.getTemplate(pos);
-		if (!templ)
-			return;
-		auto* enter_customname_action = new QAction(tr("Enter custom name"), template_table);
-		connect(enter_customname_action, &QAction::triggered, this, [this, templ]() {
-			bool ok;
-			const auto previous_customname = templ->getTemplateCustomname();
-			const auto text = QInputDialog::getText(this, tr("Enter custom name"), tr("Custom name:"), QLineEdit::Normal, previous_customname, &ok);
-			if (ok)
+		bool ok;
+		const auto previous_customname = templ->getTemplateCustomname();
+		const auto text = QInputDialog::getText(this, tr("Enter custom name"), tr("Custom name:"), QLineEdit::Normal, previous_customname, &ok);
+		if (ok)
+		{
+			templ->setTemplateCustomname(text);
+			templ->setCustomnamePreference(!text.isEmpty());
+			if (previous_customname != text)
 			{
-				templ->setTemplateCustomname(text);
-				templ->setCustomnamePreference(!text.isEmpty());
-				if (previous_customname != text)
-					map.setTemplatesDirty();	// only mark as dirty if custom name has changed
+				map.setTemplatesDirty();	// only mark as dirty if custom name has changed
+				updateButtons();
 			}
-		});
-		QMenu context_menu(this);
-		context_menu.addAction(enter_customname_action);
-		if (!templ->getTemplateCustomname().isEmpty())
-		{
-			auto* toggle_show_name_action = new QAction(templ->getCustomnamePreference() ? tr("Show filename") : tr("Show custom name"), template_table);
-			connect(toggle_show_name_action, &QAction::triggered, this, [templ]() {
-				templ->setCustomnamePreference(!templ->getCustomnamePreference());	// don't mark as dirty
-			});
-			context_menu.addAction(toggle_show_name_action);
 		}
-		context_menu.exec(mapToGlobal(clicked_pos));
+	}
+}
+
+void TemplateListWidget::showCustomOrFilename()
+{
+	auto* templ = currentTemplate();
+	if (templ)
+	{
+		templ->setCustomnamePreference(!templ->getCustomnamePreference());	// don't mark as dirty
+		updateButtons();
 	}
 }
 
diff --git a/src/gui/widgets/template_list_widget.h b/src/gui/widgets/template_list_widget.h
index 6501995cc9..009ec8d94e 100644
--- a/src/gui/widgets/template_list_widget.h
+++ b/src/gui/widgets/template_list_widget.h
@@ -36,7 +36,6 @@ class QBoxLayout;
 class QCheckBox;
 class QEvent;
 class QModelIndex;
-class QPoint;
 class QTableView;
 class QToolButton;
 class QVariant;
@@ -143,7 +142,8 @@ class TemplateListWidget : public QWidget
 	
 	void showOpacitySlider(int row);
 	
-	void showContextMenu(const QPoint &pos);
+	void enterCustomname();
+	void showCustomOrFilename();
 	
 private:
 	Map& map;
@@ -162,6 +162,8 @@ class TemplateListWidget : public QWidget
 	QAction* duplicate_action;
 	QAction* move_by_hand_action;
 	QAction* position_action;
+	QAction* custom_name_action;
+	QAction* show_name_action;
 	QAction* import_action;
 	QAction* georef_action;
 	QAction* vectorize_action;
diff --git a/src/templates/template_table_model.cpp b/src/templates/template_table_model.cpp
index dc7d8c7fc3..432230b830 100644
--- a/src/templates/template_table_model.cpp
+++ b/src/templates/template_table_model.cpp
@@ -316,7 +316,7 @@ QVariant TemplateTableModel::templateData(Template* temp, const QModelIndex &ind
 			break;
 		Q_FALLTHROUGH();
 	case combined(nameColumn(), Qt::ToolTipRole):
-		return temp->getTemplatePath();
+		return temp->getCustomnamePreference() ? temp->getTemplatePath() : temp->getTemplateCustomname();
 	}
 	
 	if (role == Qt::UserRole)