Commit 1d0973cb authored by Marcel Wiesweg's avatar Marcel Wiesweg
Browse files

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

BUG: 309558
FIXED-IN: 3.0.0
parent b1629096
...@@ -144,5 +144,6 @@ BUGFIXES FROM KDE BUGZILLA (alias B.K.O | http://bugs.kde.org): ...@@ -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. 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. 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. 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 ==>
...@@ -196,8 +196,9 @@ TagEditDlg::TagEditDlg(QWidget* parent, TAlbum* album, bool create) ...@@ -196,8 +196,9 @@ TagEditDlg::TagEditDlg(QWidget* parent, TAlbum* album, bool create)
d->keySeqWidget = new KKeySequenceWidget(page); d->keySeqWidget = new KKeySequenceWidget(page);
kscTextLabel->setBuddy(d->keySeqWidget); kscTextLabel->setBuddy(d->keySeqWidget);
KShortcut ksc(album->property(TagPropertyName::tagKeyboardShortcut())); // Do not inherit tag shortcut, only creates a conflict shortcut, see bug 309558.
d->keySeqWidget->setKeySequence(ksc.primary(), KKeySequenceWidget::NoValidate); //KShortcut ksc(album->property(TagPropertyName::tagKeyboardShortcut()));
//d->keySeqWidget->setKeySequence(ksc.primary(), KKeySequenceWidget::NoValidate);
d->keySeqWidget->setCheckActionCollections(TagsActionMngr::defaultManager()->actionCollections()); d->keySeqWidget->setCheckActionCollections(TagsActionMngr::defaultManager()->actionCollections());
QLabel* tipLabel2 = new QLabel(page); QLabel* tipLabel2 = new QLabel(page);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment