Make 'Copy of' on duplicated layer name optional

Freya Lupen · dimula73 · commit bc235cecd6f7 · 2025-01-13T08:25:28.000Z
in line with the options for merged and pasted layer names.
diff --git a/libs/image/kis_image_config.cpp b/libs/image/kis_image_config.cpp
@@ -714,6 +714,16 @@ void KisImageConfig::setRenameMergedLayers(bool value)
     m_config.writeEntry("renameMergedLayers", value);
 }
 
+bool KisImageConfig::renameDuplicatedLayers(bool defaultValue) const
+{
+    return defaultValue ? true : m_config.readEntry("renameDuplicatedLayers", true);
+}
+
+void KisImageConfig::setRenameDuplicatedLayers(bool value)
+{
+    m_config.writeEntry("renameDuplicatedLayers", value);
+}
+
 QString KisImageConfig::exportConfigurationXML(const QString &exportConfigId, bool defaultValue) const
 {
     return (defaultValue ? QString() : m_config.readEntry("ExportConfiguration-" + exportConfigId, QString()));
diff --git a/libs/image/kis_image_config.h b/libs/image/kis_image_config.h
@@ -145,6 +145,8 @@ class KRITAIMAGE_EXPORT KisImageConfig
 
     bool renameMergedLayers(bool defaultValue = false) const;
     void setRenameMergedLayers(bool value);
+    bool renameDuplicatedLayers(bool defaultValue = false) const;
+    void setRenameDuplicatedLayers(bool value);
 
     template<class T>
     void writeEntry(const QString& name, const T& value) {
diff --git a/libs/image/kis_layer_utils.cpp b/libs/image/kis_layer_utils.cpp
@@ -1686,6 +1686,8 @@ namespace Private {
 
     void addCopyOfNameTag(KisNodeSP node)
     {
+        if (!KisImageConfig(true).renameDuplicatedLayers()) { return; }
+
         const QString prefix = i18n("Copy of");
         QString newName = node->name();
         if (!newName.startsWith(prefix)) {
diff --git a/libs/ui/dialogs/kis_dlg_preferences.cc b/libs/ui/dialogs/kis_dlg_preferences.cc
@@ -427,6 +427,7 @@ GeneralTab::GeneralTab(QWidget *_parent, const char *_name)
 
     chkRenameMergedLayers->setChecked(KisImageConfig(true).renameMergedLayers());
     chkRenamePastedLayers->setChecked(cfg.renamePastedLayers());
+    chkRenameDuplicatedLayers->setChecked(KisImageConfig(true).renameDuplicatedLayers());
 
     KConfigGroup group = KSharedConfig::openConfig()->group("File Dialogs");
     bool dontUseNative = true;
@@ -761,6 +762,7 @@ void GeneralTab::setDefault()
 
     chkRenameMergedLayers->setChecked(KisImageConfig(true).renameMergedLayers(true));
     chkRenamePastedLayers->setChecked(cfg.renamePastedLayers(true));
+    chkRenameDuplicatedLayers->setChecked(KisImageConfig(true).renameDuplicatedLayers(true));
 
     QAbstractButton *button = m_pasteFormatGroup.button(cfg.pasteFormat(true));
     Q_ASSERT(button);
@@ -939,6 +941,11 @@ bool GeneralTab::renamePastedLayers()
     return chkRenamePastedLayers->isChecked();
 }
 
+bool GeneralTab::renameDuplicatedLayers()
+{
+    return chkRenameDuplicatedLayers->isChecked();
+}
+
 void GeneralTab::getBackgroundImage()
 {
     KoFileDialog dialog(this, KoFileDialog::OpenFile, "BackgroundImages");
@@ -2460,6 +2467,7 @@ bool KisDlgPreferences::editPreferences()
 
         KisImageConfig(true).setRenameMergedLayers(m_general->renameMergedLayers());
         cfg.setRenamePastedLayers(m_general->renamePastedLayers());
+        KisImageConfig(true).setRenameDuplicatedLayers(m_general->renameDuplicatedLayers());
 
         // Color settings
         cfg.setUseSystemMonitorProfile(m_colorSettings->m_page->chkUseSystemMonitorProfile->isChecked());
diff --git a/libs/ui/dialogs/kis_dlg_preferences.h b/libs/ui/dialogs/kis_dlg_preferences.h
@@ -94,6 +94,7 @@ class GeneralTab : public WdgGeneralSettings
     bool adaptivePlaybackRange();
     bool renameMergedLayers();
     bool renamePastedLayers();
+    bool renameDuplicatedLayers();
     QString exportMimeType();
     int forcedFontDpi();
 
diff --git a/libs/ui/forms/wdggeneralsettings.ui b/libs/ui/forms/wdggeneralsettings.ui
@@ -1470,20 +1470,27 @@ To restore the old behavior you can force Krita to use Display DPI for fonts by
            <item row="11" column="0" colspan="2">
             <widget class="QGroupBox" name="groupBox_51">
              <property name="title">
-              <string>Automatic layer suffixes</string>
+              <string>Automatic layer naming</string>
              </property>
              <layout class="QVBoxLayout" name="verticalLayout_7">
               <item>
                <widget class="QCheckBox" name="chkRenameMergedLayers">
                 <property name="text">
-                 <string>Add &quot;Merged&quot; to merged group layers</string>
+                 <string>Append &quot;Merged&quot; to merged group layers</string>
                 </property>
                </widget>
               </item>
               <item>
                <widget class="QCheckBox" name="chkRenamePastedLayers">
                 <property name="text">
-                 <string>Add &quot;(pasted)&quot; to pasted layers</string>
+                 <string>Append &quot;(pasted)&quot; to pasted layers</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="chkRenameDuplicatedLayers">
+                <property name="text">
+                 <string>Prepend &quot;Copy of&quot; to duplicated layers</string>
                 </property>
                </widget>
               </item>

Original file line number	Diff line number	Diff line change
`@@ -1686,6 +1686,8 @@ namespace Private {`
`1686`	`1686`
`1687`	`1687`	`void addCopyOfNameTag(KisNodeSP node)`
`1688`	`1688`	`{`
	`1689`	`+ if (!KisImageConfig(true).renameDuplicatedLayers()) { return; }`
	`1690`	`+`
`1689`	`1691`	`const QString prefix = i18n("Copy of");`
`1690`	`1692`	`QString newName = node->name();`
`1691`	`1693`	`if (!newName.startsWith(prefix)) {`