From c5f80213962b8a79a0e4060ad248bf31fff274f6 Mon Sep 17 00:00:00 2001
From: Ales Erjavec <ales.erjavec@fri.uni-lj.si>
Date: Thu, 20 Aug 2020 11:49:09 +0200
Subject: [PATCH] oweditdomain: Rename the 'merge selected' to 'rename
 selected'

---
 Orange/widgets/data/oweditdomain.py | 48 +++++++++++++++++++----------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/Orange/widgets/data/oweditdomain.py b/Orange/widgets/data/oweditdomain.py
index 32bf474c628..1c0604a482c 100644
--- a/Orange/widgets/data/oweditdomain.py
+++ b/Orange/widgets/data/oweditdomain.py
@@ -24,12 +24,12 @@
     QStyledItemDelegate, QStyleOptionViewItem, QStyle, QSizePolicy, QToolTip,
     QDialogButtonBox, QPushButton, QCheckBox, QComboBox, QStackedLayout,
     QDialog, QRadioButton, QGridLayout, QLabel, QSpinBox, QDoubleSpinBox,
-    QShortcut, QAbstractItemView
+    QAbstractItemView, QMenu
 )
 from AnyQt.QtGui import QStandardItemModel, QStandardItem, QKeySequence, QIcon
 from AnyQt.QtCore import (
     Qt, QEvent, QSize, QModelIndex, QAbstractItemModel, QPersistentModelIndex,
-    QRect
+    QRect, QPoint
 )
 from AnyQt.QtCore import pyqtSignal as Signal, pyqtSlot as Slot
 
@@ -1170,7 +1170,8 @@ def __init__(self, *args, **kwargs):
             self, objectName="action-group-categories", enabled=False
         )
         self.move_value_up = QAction(
-            "\N{UPWARDS ARROW}", group,
+            "Move up", group,
+            iconText="\N{UPWARDS ARROW}",
             toolTip="Move the selected item up.",
             shortcut=QKeySequence(Qt.ControlModifier | Qt.AltModifier |
                                   Qt.Key_BracketLeft),
@@ -1179,7 +1180,8 @@ def __init__(self, *args, **kwargs):
         self.move_value_up.triggered.connect(self.move_up)
 
         self.move_value_down = QAction(
-            "\N{DOWNWARDS ARROW}", group,
+            "Move down", group,
+            iconText="\N{DOWNWARDS ARROW}",
             toolTip="Move the selected item down.",
             shortcut=QKeySequence(Qt.ControlModifier | Qt.AltModifier |
                                   Qt.Key_BracketRight),
@@ -1188,28 +1190,32 @@ def __init__(self, *args, **kwargs):
         self.move_value_down.triggered.connect(self.move_down)
 
         self.add_new_item = QAction(
-            "+", group,
+            "Add", group,
+            iconText="+",
             objectName="action-add-item",
             toolTip="Append a new item.",
             shortcut=QKeySequence(QKeySequence.New),
             shortcutContext=Qt.WidgetShortcut,
         )
         self.remove_item = QAction(
-            "\N{MINUS SIGN}", group,
+            "Remove item", group,
+            iconText="\N{MINUS SIGN}",
             objectName="action-remove-item",
             toolTip="Delete the selected item.",
             shortcut=QKeySequence(QKeySequence.Delete),
             shortcutContext=Qt.WidgetShortcut,
         )
-        self.merge_selected_items = QAction(
-            "=", group,
-            objectName="action-merge-selected-items",
-            toolTip="Merge selected items.",
+        self.rename_selected_items = QAction(
+            "Rename selected items", group,
+            iconText="=",
+            objectName="action-rename-selected-items",
+            toolTip="Rename selected items.",
             shortcut=QKeySequence(Qt.ControlModifier | Qt.Key_Equal),
             shortcutContext=Qt.WidgetShortcut,
         )
         self.merge_items = QAction(
-            "ƒM", group,
+            "Merge", group,
+            iconText="M",
             objectName="action-activate-merge-dialog",
             toolTip="Merge infrequent items.",
             shortcut=QKeySequence(Qt.ControlModifier | Qt.MetaModifier | Qt.Key_Equal),
@@ -1218,7 +1224,7 @@ def __init__(self, *args, **kwargs):
 
         self.add_new_item.triggered.connect(self._add_category)
         self.remove_item.triggered.connect(self._remove_category)
-        self.merge_selected_items.triggered.connect(self._merge_selected_categories)
+        self.rename_selected_items.triggered.connect(self._rename_selected_categories)
         self.merge_items.triggered.connect(self._merge_categories)
 
         button1 = FixedSizeButton(
@@ -1238,7 +1244,7 @@ def __init__(self, *args, **kwargs):
             accessibleName="Remove"
         )
         button5 = FixedSizeButton(
-            self, defaultAction=self.merge_selected_items,
+            self, defaultAction=self.rename_selected_items,
             accessibleName="Merge selected items"
         )
         button6 = FixedSizeButton(
@@ -1248,8 +1254,18 @@ def __init__(self, *args, **kwargs):
 
         self.values_edit.addActions([
             self.move_value_up, self.move_value_down,
-            self.add_new_item, self.remove_item, self.merge_selected_items
+            self.add_new_item, self.remove_item, self.rename_selected_items
         ])
+        self.values_edit.setContextMenuPolicy(Qt.CustomContextMenu)
+
+        @self.values_edit.customContextMenuRequested.connect
+        def context_menu(pos: QPoint):
+            viewport = self.values_edit.viewport()
+            menu = QMenu(self.values_edit)
+            menu.setAttribute(Qt.WA_DeleteOnClose)
+            menu.addActions([self.rename_selected_items, self.remove_item])
+            menu.popup(viewport.mapToGlobal(pos))
+
         hlayout.addWidget(button1)
         hlayout.addWidget(button2)
         hlayout.addSpacing(3)
@@ -1535,9 +1551,9 @@ def complete_merge(text, merge_attributes):
                 dlg.get_merged_value_name(), dlg.get_merge_attributes()
             )
 
-    def _merge_selected_categories(self):
+    def _rename_selected_categories(self):
         """
-        Merge selected categories into one.
+        Rename selected categories and merging them.
 
         Popup an editable combo box for selection/edit of a new value.
         """