Do not keep shortcut of parent tag in New-Tag-Dialog: Would only create a conflict.

BUG: 309558
FIXED-IN: 3.0.0

NEWS

@@ -144,5 +144,6 @@ BUGFIXES FROM KDE BUGZILLA (alias B.K.O | http://bugs.kde.org):
 103 ==> 308948 - Pictures belonging to a group can't be displayed in the light table window.
 104 ==> 307223 - Group selected by time not grouping one pair per album.
 105 ==> 309254 - Contact informations from template aren't written to xmp-tags of jpg-files.
-106 ==> 
+106 ==> 309558 - Bad inheritance of keyboard shortcut when creating sub-tag.
+107 ==> 
 

digikam/tags/tageditdlg.cpp

@@ -196,8 +196,9 @@ TagEditDlg::TagEditDlg(QWidget* parent, TAlbum* album, bool create)
 
     d->keySeqWidget      = new KKeySequenceWidget(page);
     kscTextLabel->setBuddy(d->keySeqWidget);
-    KShortcut ksc(album->property(TagPropertyName::tagKeyboardShortcut()));
-    d->keySeqWidget->setKeySequence(ksc.primary(), KKeySequenceWidget::NoValidate);
+    // Do not inherit tag shortcut, only creates a conflict shortcut, see bug 309558.
+    //KShortcut ksc(album->property(TagPropertyName::tagKeyboardShortcut()));
+    //d->keySeqWidget->setKeySequence(ksc.primary(), KKeySequenceWidget::NoValidate);
     d->keySeqWidget->setCheckActionCollections(TagsActionMngr::defaultManager()->actionCollections());
 
     QLabel* tipLabel2 = new QLabel(page);