yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kcms/rules: use sentence case in comboboxes/names

Browse source 
The HIG recommend sentence case for combobox entries. The comboboxes in
the rules kcm currently mostly use title case for their entries. The
property names mostly use sentence case, although there are few
exceptions using title case. The HIG are not explicit here (although
sentence case seems to be in the spirit of the guidance); in any case it
should be consistent.

This change converts the labels and property names to sentence case. It
also includes some minor phrasing touch-ups, in particular regarding on-
screen displays which are now spelled correctly and consistently.
This commit is contained in:
Christoph Wolk 2024-08-29 00:58:26 +02:00 committed by Nate Graham
parent fc1f53895f
commit e4e5fa3b08
2 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/kcms/rules/optionsmodel.cpp
View file

@ -196,17 +196,17 @@ QList<RulePolicy::Data> RulePolicy::policyOptions(RulePolicy::Type type)
{ {
static const auto stringMatchOptions = QList<RulePolicy::Data>{ static const auto stringMatchOptions = QList<RulePolicy::Data>{
{Rules::UnimportantMatch, i18n("Unimportant")}, {Rules::UnimportantMatch, i18n("Unimportant")},
{Rules::ExactMatch, i18n("Exact Match")}, {Rules::ExactMatch, i18n("Exact match")},
{Rules::SubstringMatch, i18n("Substring Match")}, {Rules::SubstringMatch, i18n("Substring match")},
{Rules::RegExpMatch, i18n("Regular Expression")}}; {Rules::RegExpMatch, i18n("Regular expression")}};
static const auto setRuleOptions = QList<RulePolicy::Data>{ static const auto setRuleOptions = QList<RulePolicy::Data>{
{Rules::Apply, {Rules::Apply,
i18n("Apply Initially"), i18n("Apply initially"),
i18n("The window property will be only set to the given value after the window is created." i18n("The window property will be only set to the given value after the window is created."
"\nNo further changes will be affected.")}, "\nNo further changes will be affected.")},
{Rules::ApplyNow, {Rules::ApplyNow,
i18n("Apply Now"), i18n("Apply now"),
i18n("The window property will be set to the given value immediately and will not be affected later" i18n("The window property will be set to the given value immediately and will not be affected later"
"\n(this action will be deleted afterwards).")}, "\n(this action will be deleted afterwards).")},
{Rules::Remember, {Rules::Remember,
@ -214,14 +214,14 @@ QList<RulePolicy::Data> RulePolicy::policyOptions(RulePolicy::Type type)
i18n("The value of the window property will be remembered and, every time the window" i18n("The value of the window property will be remembered and, every time the window"
" is created, the last remembered value will be applied.")}, " is created, the last remembered value will be applied.")},
{Rules::DontAffect, {Rules::DontAffect,
i18n("Do Not Affect"), i18n("Do not affect"),
i18n("The window property will not be affected and therefore the default handling for it will be used." i18n("The window property will not be affected and therefore the default handling for it will be used."
"\nSpecifying this will block more generic window settings from taking effect.")}, "\nSpecifying this will block more generic window settings from taking effect.")},
{Rules::Force, {Rules::Force,
i18n("Force"), i18n("Force"),
i18n("The window property will be always forced to the given value.")}, i18n("The window property will be always forced to the given value.")},
{Rules::ForceTemporarily, {Rules::ForceTemporarily,
i18n("Force Temporarily"), i18n("Force temporarily"),
i18n("The window property will be forced to the given value until it is hidden" i18n("The window property will be forced to the given value until it is hidden"
"\n(this action will be deleted after the window is hidden).")}}; "\n(this action will be deleted after the window is hidden).")}};

42
src/kcms/rules/rulesmodel.cpp
View file

@ -464,13 +464,13 @@ void RulesModel::populateRuleList()
// Single selection of Virtual Desktop on X11 // Single selection of Virtual Desktop on X11
desktops = new RuleItem(QLatin1String("desktops"), desktops = new RuleItem(QLatin1String("desktops"),
RulePolicy::SetRule, RuleItem::Option, RulePolicy::SetRule, RuleItem::Option,
i18n("Virtual Desktop"), i18n("Size & Position"), i18n("Virtual desktop"), i18n("Size & Position"),
QIcon::fromTheme("virtual-desktops")); QIcon::fromTheme("virtual-desktops"));
} else { } else {
// Multiple selection on Wayland // Multiple selection on Wayland
desktops = new RuleItem(QLatin1String("desktops"), desktops = new RuleItem(QLatin1String("desktops"),
RulePolicy::SetRule, RuleItem::OptionList, RulePolicy::SetRule, RuleItem::OptionList,
i18n("Virtual Desktops"), i18n("Size & Position"), i18n("Virtual desktops"), i18n("Size & Position"),
QIcon::fromTheme("virtual-desktops")); QIcon::fromTheme("virtual-desktops"));
} }
addRule(desktops); addRule(desktops);
@ -722,12 +722,12 @@ void RulesModel::populateRuleList()
addRule(new RuleItem(QLatin1String("adaptivesync"), addRule(new RuleItem(QLatin1String("adaptivesync"),
RulePolicy::ForceRule, RuleItem::Boolean, RulePolicy::ForceRule, RuleItem::Boolean,
i18n("Adaptive Sync"), i18n("Appearance & Fixes"), i18n("Adaptive sync"), i18n("Appearance & Fixes"),
QIcon::fromTheme("monitor-symbolic"))); QIcon::fromTheme("monitor-symbolic")));
addRule(new RuleItem(QLatin1String("tearing"), addRule(new RuleItem(QLatin1String("tearing"),
RulePolicy::ForceRule, RuleItem::Boolean, RulePolicy::ForceRule, RuleItem::Boolean,
i18n("Allow Tearing"), i18n("Appearance & Fixes"), i18n("Allow tearing"), i18n("Appearance & Fixes"),
QIcon::fromTheme("monitor-symbolic"))); QIcon::fromTheme("monitor-symbolic")));
} }
@ -814,18 +814,18 @@ QList<OptionsModel::Data> RulesModel::windowTypesModelData() const
{ {
static const auto modelData = QList<OptionsModel::Data>{ static const auto modelData = QList<OptionsModel::Data>{
// TODO: Find/create better icons // TODO: Find/create better icons
{0, i18n("All Window Types"), {}, {}, OptionsModel::SelectAllOption}, {0, i18n("All window types"), {}, {}, OptionsModel::SelectAllOption},
{1 << NET::Normal, i18n("Normal Window"), QIcon::fromTheme("window")}, {1 << NET::Normal, i18n("Normal window"), QIcon::fromTheme("window")},
{1 << NET::Dialog, i18n("Dialog Window"), QIcon::fromTheme("window-duplicate")}, {1 << NET::Dialog, i18n("Dialog window"), QIcon::fromTheme("window-duplicate")},
{1 << NET::Utility, i18n("Utility Window"), QIcon::fromTheme("dialog-object-properties")}, {1 << NET::Utility, i18n("Utility window"), QIcon::fromTheme("dialog-object-properties")},
{1 << NET::Dock, i18n("Dock (panel)"), QIcon::fromTheme("list-remove")}, {1 << NET::Dock, i18n("Dock (panel)"), QIcon::fromTheme("list-remove")},
{1 << NET::Toolbar, i18n("Toolbar"), QIcon::fromTheme("tools")}, {1 << NET::Toolbar, i18n("Toolbar"), QIcon::fromTheme("tools")},
{1 << NET::Menu, i18n("Torn-Off Menu"), QIcon::fromTheme("overflow-menu-left")}, {1 << NET::Menu, i18n("Torn-off menu"), QIcon::fromTheme("overflow-menu-left")},
{1 << NET::Splash, i18n("Splash Screen"), QIcon::fromTheme("embosstool")}, {1 << NET::Splash, i18n("Splash screen"), QIcon::fromTheme("embosstool")},
{1 << NET::Desktop, i18n("Desktop"), QIcon::fromTheme("desktop")}, {1 << NET::Desktop, i18n("Desktop"), QIcon::fromTheme("desktop")},
// {1 << NET::Override, i18n("Unmanaged Window")}, deprecated // {1 << NET::Override, i18n("Unmanaged Window")}, deprecated
{1 << NET::TopMenu, i18n("Standalone Menubar"), QIcon::fromTheme("application-menu")}, {1 << NET::TopMenu, i18n("Standalone menubar"), QIcon::fromTheme("application-menu")},
{1 << NET::OnScreenDisplay, i18n("On Screen Display"), QIcon::fromTheme("osd-duplicate")}}; {1 << NET::OnScreenDisplay, i18n("On-screen display"), QIcon::fromTheme("osd-duplicate")}};
return modelData; return modelData;
} }
@ -835,7 +835,7 @@ QList<OptionsModel::Data> RulesModel::virtualDesktopsModelData() const
QList<OptionsModel::Data> modelData; QList<OptionsModel::Data> modelData;
modelData << OptionsModel::Data{ modelData << OptionsModel::Data{
QString(), QString(),
i18n("All Desktops"), i18n("All desktops"),
QIcon::fromTheme("window-pin"), QIcon::fromTheme("window-pin"),
i18nc("@info:tooltip in the virtual desktop list", "Make the window available on all desktops"), i18nc("@info:tooltip in the virtual desktop list", "Make the window available on all desktops"),
OptionsModel::ExclusiveOption, OptionsModel::ExclusiveOption,
@ -856,7 +856,7 @@ QList<OptionsModel::Data> RulesModel::activitiesModelData() const
modelData << OptionsModel::Data{ modelData << OptionsModel::Data{
Activities::nullUuid(), Activities::nullUuid(),
i18n("All Activities"), i18n("All activities"),
QIcon::fromTheme("activities"), QIcon::fromTheme("activities"),
i18nc("@info:tooltip in the activity list", "Make the window available on all activities"), i18nc("@info:tooltip in the activity list", "Make the window available on all activities"),
OptionsModel::ExclusiveOption, OptionsModel::ExclusiveOption,
@ -880,14 +880,14 @@ QList<OptionsModel::Data> RulesModel::placementModelData() const
{ {
static const auto modelData = QList<OptionsModel::Data>{ static const auto modelData = QList<OptionsModel::Data>{
{PlacementDefault, i18n("Default")}, {PlacementDefault, i18n("Default")},
{PlacementNone, i18n("No Placement")}, {PlacementNone, i18n("No placement")},
{PlacementSmart, i18n("Minimal Overlapping")}, {PlacementSmart, i18n("Minimal overlapping")},
{PlacementMaximizing, i18n("Maximized")}, {PlacementMaximizing, i18n("Maximized")},
{PlacementCentered, i18n("Centered")}, {PlacementCentered, i18n("Centered")},
{PlacementRandom, i18n("Random")}, {PlacementRandom, i18n("Random")},
{PlacementZeroCornered, i18n("In Top-Left Corner")}, {PlacementZeroCornered, i18n("In top-left corner")},
{PlacementUnderMouse, i18n("Under Mouse")}, {PlacementUnderMouse, i18n("Under mouse")},
{PlacementOnMainWindow, i18n("On Main Window")}}; {PlacementOnMainWindow, i18n("On main window")}};
return modelData; return modelData;
} }
@ -931,8 +931,8 @@ QList<OptionsModel::Data> RulesModel::layerModelData() const
{NotificationLayer, i18n("Notification")}, {NotificationLayer, i18n("Notification")},
{ActiveLayer, i18n("Fullscreen")}, {ActiveLayer, i18n("Fullscreen")},
{PopupLayer, i18n("Popup")}, {PopupLayer, i18n("Popup")},
{CriticalNotificationLayer, i18n("Critical Notification")}, {CriticalNotificationLayer, i18n("Critical notification")},
{OnScreenDisplayLayer, i18n("OSD")}, {OnScreenDisplayLayer, i18n("On-screen display")},
{OverlayLayer, i18n("Overlay")}, {OverlayLayer, i18n("Overlay")},
}; };
return modelData; return modelData;