From 6e51fa2fad902e1998982c2761a1f60c2a822198 Mon Sep 17 00:00:00 2001
From: Kurt Hindenburg <kurt.hindenburg@gmail.com>
Date: Fri, 19 Jun 2020 10:19:54 -0400
Subject: [PATCH] Change 'Rename Tab' menu items to 'Configure Tab Settings'

The 'Rename Tab' now also has the ability to change the current tab's
color.

GUI:

https://invent.kde.org/utilities/konsole/-/merge_requests/122
---
 doc/manual/index.docbook  | 14 +++++++-------
 src/RenameTabDialog.cpp   |  2 +-
 src/SessionController.cpp |  2 +-
 src/ViewContainer.cpp     |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/doc/manual/index.docbook b/doc/manual/index.docbook
index 67febfc2..56d5b714 100644
--- a/doc/manual/index.docbook
+++ b/doc/manual/index.docbook
@@ -576,10 +576,10 @@ signal</option></userinput>.</para></listitem>
 <term><menuchoice>
 <shortcut><keycombo
  action="simul">&Ctrl;&Alt;<keycap>S</keycap></keycombo></shortcut>
-<guimenu>Edit</guimenu><guimenuitem>Rename Tab...</guimenuitem></menuchoice></term>
+<guimenu>Edit</guimenu><guimenuitem>Configure Tab Settings...</guimenuitem></menuchoice></term>
 <listitem><para><action>Opens a dialog box allowing you to change
-the name of the current tab</action>
-(<link linkend="rename-tab-dialog">more info</link>)
+the name format, the remote tab title format and the color of the current tab</action>
+(<link linkend="configure-tab-settings-dialog">more info</link>)
 </para></listitem>
 </varlistentry>
 
@@ -1045,14 +1045,14 @@ of the &kde; Fundamentals.
 <sect1 id="console-dialogs">
 <title>&konsole; Dialogs</title>
 
-<sect2 id="rename-tab-dialog">
-<title>Rename Tab Dialog</title>
+<sect2 id="configure-tab-settings-dialog">
+<title>Configure Tab Settings Dialog</title>
 
-<para>The name of the current tab can be changed from this dialog.
+<para>The name format, the remote tab title format, and the color of the current tab can be changed from this dialog.
 The dialog can be displayed via the menu, the shortcut <keycombo
  action="simul">&Ctrl;&Alt;<keycap>S</keycap></keycombo> or by
 double-clicking on the tab in the tab bar.
-These changes can be made permanent by editing the current profile.
+These changes are temporary and can be made permanent by editing the current profile.
 </para>
 
 <para>
diff --git a/src/RenameTabDialog.cpp b/src/RenameTabDialog.cpp
index 7974ce65..10e57ae7 100644
--- a/src/RenameTabDialog.cpp
+++ b/src/RenameTabDialog.cpp
@@ -35,7 +35,7 @@ RenameTabDialog::RenameTabDialog(QWidget *parent) :
     QDialog(parent),
     _ui(nullptr)
 {
-    setWindowTitle(i18n("Rename Tab"));
+    setWindowTitle(i18n("Current Tab Settings"));
     auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
     auto mainWidget = new QWidget(this);
     auto mainLayout = new QVBoxLayout;
diff --git a/src/SessionController.cpp b/src/SessionController.cpp
index 6aab2f7b..4b8b3e4a 100644
--- a/src/SessionController.cpp
+++ b/src/SessionController.cpp
@@ -716,7 +716,7 @@ void SessionController::setupExtraActions()
 
     // Rename Session
     QAction* action = collection->addAction(QStringLiteral("rename-session"), this, SLOT(renameSession()));
-    action->setText(i18n("&Rename Tab..."));
+    action->setText(i18n("&Current Tab Settings..."));
     action->setIcon(QIcon::fromTheme(QStringLiteral("edit-rename")));
     collection->setDefaultShortcut(action, Konsole::ACCEL + Qt::ALT + Qt::Key_S);
 
diff --git a/src/ViewContainer.cpp b/src/ViewContainer.cpp
index 2b1d8369..06ac35be 100644
--- a/src/ViewContainer.cpp
+++ b/src/ViewContainer.cpp
@@ -119,7 +119,7 @@ TabbedViewContainer::TabbedViewContainer(ViewManager *connectedViewManager, QWid
 
     auto editAction = _contextPopupMenu->addAction(
         QIcon::fromTheme(QStringLiteral("edit-rename")),
-        i18nc("@action:inmenu", "&Rename Tab..."), this,
+        i18nc("@action:inmenu", "&Current Tab Settings..."), this,
         [this]{ renameTab(_contextMenuTabIndex); }
     );
     editAction->setObjectName(QStringLiteral("edit-rename"));