Merge branch 'Plasma/5.14'

wilder-broken-krunner
Eike Hein 7 years ago
commit d06fc5333f
  1. 8
      package/contents/ui/main.qml
  2. 2
      translationsmodel.cpp

@ -221,10 +221,14 @@ ScrollViewKCM {
onTriggered: kcm.selectedTranslationsModel.move(index, 0)
},
Kirigami.Action {
enabled: !model.IsMissing
property bool removing: false
enabled: removing || !model.IsMissing && languagesList.count > 1
iconName: "list-remove"
tooltip: i18nc("@info:tooltip", "Remove")
onTriggered: kcm.selectedTranslationsModel.remove(model.LanguageCode)
onTriggered: {
removing = true; // Don't crash by re-evaluating `enabled` during destruction.
kcm.selectedTranslationsModel.remove(model.LanguageCode);
}
}]
}
}

@ -213,7 +213,7 @@ void SelectedTranslationsModel::remove(const QString &languageCode)
int index = m_selectedLanguages.indexOf(languageCode);
if (index < 1) {
if (index < 0 || m_selectedLanguages.count() < 2) {
return;
}

Loading…
Cancel
Save