Renaming tabs updates configuration (clipboard_tab, tray_tab)

If the clipboard tab is renamed, clipboard will be still stored in the renamed tab.
hluk · Jul 10, 2021 · 1e60402 · 1e60402
1 parent d16c64f
commit 1e60402
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 1 deletion.
diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
@@ -3876,10 +3876,23 @@ void MainWindow::renameTab(const QString &name, int tabIndex)
 
     auto placeholder = getPlaceholder(tabIndex);
     if (placeholder) {
-        updateTabIcon(name, placeholder->tabName());
+        const QString oldName = placeholder->tabName();
         if ( placeholder->setTabName(name) ) {
+            updateTabIcon(name, oldName);
             ui->tabWidget->setTabName(tabIndex, name);
             saveTabPositions();
+
+            QStringList optionsAndValues;
+            if (oldName == m_options.clipboardTab) {
+                optionsAndValues.append(QStringLiteral("clipboard_tab"));
+                optionsAndValues.append(name);
+            }
+            if (oldName == m_options.trayTabName) {
+                optionsAndValues.append(QStringLiteral("tray_tab"));
+                optionsAndValues.append(name);
+            }
+            if ( !optionsAndValues.isEmpty() )
+                config(optionsAndValues);
         }
     }
 }

diff --git a/src/tests/tests.cpp b/src/tests/tests.cpp
@@ -2632,6 +2632,24 @@ void Tests::renameTab()
     QVERIFY( !hasTab(tab2) );
 }
 
+void Tests::renameClipboardTab()
+{
+    const QString newClipboardTabName = clipboardTabName + QStringLiteral("2");
+    RUN("config" << "tray_tab" << clipboardTabName, clipboardTabName + QStringLiteral("\n"));
+
+    RUN("renametab" << clipboardTabName << newClipboardTabName, "");
+    RUN("tab", newClipboardTabName + "\n");
+    RUN("config" << "clipboard_tab", newClipboardTabName + QStringLiteral("\n"));
+    RUN("config" << "tray_tab", newClipboardTabName + QStringLiteral("\n"));
+
+    TEST( m_test->setClipboard("test1") );
+    WAIT_ON_OUTPUT("tab" << newClipboardTabName << "read" << "0", "test1");
+    RUN("tab", newClipboardTabName + "\n");
+
+    WAIT_ON_OUTPUT("read" << "0", "test1");
+    RUN("tab", newClipboardTabName + "\n");
+}
+
 void Tests::importExportTab()
 {
     const QString tab = testTab(1);

diff --git a/src/tests/tests.h b/src/tests/tests.h
@@ -189,6 +189,7 @@ private slots:
     void action();
     void insertRemoveItems();
     void renameTab();
+    void renameClipboardTab();
     void importExportTab();
 
     void removeAllFoundItems();