From 0cb70c8d363f8c9608e9c84f2e5b4699b963b8b9 Mon Sep 17 00:00:00 2001 From: Christoph Wolk Date: Wed, 28 Aug 2024 22:13:49 +0200 Subject: [PATCH] kcms/decoration: use sentence case for combobox The HIG recommend sentence case for combobox entries. The window border combobox in the decoration kcm currently uses title case, except for the option following the theme default, which uses mixed title and sentence case. This change converts the labels to sentence case. The "Theme's default" option is also renamed to "Theme default", as this is a shorter and more common construction in UI strings. --- src/kcms/decoration/kcm.cpp | 2 +- src/kcms/decoration/utils.cpp | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/kcms/decoration/kcm.cpp b/src/kcms/decoration/kcm.cpp index 12be3a17ea..9c8b4f6a96 100644 --- a/src/kcms/decoration/kcm.cpp +++ b/src/kcms/decoration/kcm.cpp @@ -174,7 +174,7 @@ QStringList KCMKWinDecoration::borderSizesModel() const // Use index 0 for borderSizeAuto == true // The rest of indexes get offset by 1 QStringList model = Utils::getBorderSizeNames().values(); - model.insert(0, i18nc("%1 is the name of a border size", "Theme's default (%1)", model.at(recommendedBorderSize()))); + model.insert(0, i18nc("%1 is the name of a border size", "Theme default (%1)", model.at(recommendedBorderSize()))); return model; } diff --git a/src/kcms/decoration/utils.cpp b/src/kcms/decoration/utils.cpp index 7d6b213388..e63416f6a9 100644 --- a/src/kcms/decoration/utils.cpp +++ b/src/kcms/decoration/utils.cpp @@ -22,15 +22,15 @@ const QMap s_borderSizes{ {QStringLiteral("VeryHuge"), KDecoration2::BorderSize::VeryHuge}, {QStringLiteral("Oversized"), KDecoration2::BorderSize::Oversized}}; const QMap s_borderSizeNames{ - {KDecoration2::BorderSize::None, i18n("No Window Borders")}, - {KDecoration2::BorderSize::NoSides, i18n("No Side Window Borders")}, - {KDecoration2::BorderSize::Tiny, i18n("Tiny Window Borders")}, - {KDecoration2::BorderSize::Normal, i18n("Normal Window Borders")}, - {KDecoration2::BorderSize::Large, i18n("Large Window Borders")}, - {KDecoration2::BorderSize::VeryLarge, i18n("Very Large Window Borders")}, - {KDecoration2::BorderSize::Huge, i18n("Huge Window Borders")}, - {KDecoration2::BorderSize::VeryHuge, i18n("Very Huge Window Borders")}, - {KDecoration2::BorderSize::Oversized, i18n("Oversized Window Borders")}}; + {KDecoration2::BorderSize::None, i18n("No window borders")}, + {KDecoration2::BorderSize::NoSides, i18n("No side window borders")}, + {KDecoration2::BorderSize::Tiny, i18n("Tiny window borders")}, + {KDecoration2::BorderSize::Normal, i18n("Normal window borders")}, + {KDecoration2::BorderSize::Large, i18n("Large window borders")}, + {KDecoration2::BorderSize::VeryLarge, i18n("Very large window borders")}, + {KDecoration2::BorderSize::Huge, i18n("Huge window borders")}, + {KDecoration2::BorderSize::VeryHuge, i18n("Very huge window borders")}, + {KDecoration2::BorderSize::Oversized, i18n("Oversized window borders")}}; const QHash s_buttonNames{ {KDecoration2::DecorationButtonType::Menu, QChar('M')},