From 45bf53adab9d998126037134b10492437d42e53e Mon Sep 17 00:00:00 2001
From: Nate Graham <nate@kde.org>
Date: Wed, 13 May 2020 12:11:44 -0600
Subject: [PATCH] Improve partial maximization strings

Summary:
e.g. "Vertically maximize" is more natural and expressive than "Maximize (vertical only)"

See D29671#inline-169882.

Test Plan: New strings appear in the KCM

Reviewers: zzag, #vdg, #kwin, davidedmundson

Reviewed By: #kwin, davidedmundson

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D29729
---
 kcmkwin/kwinoptions/kwinoptions_settings.kcfg | 16 ++++++++--------
 kcmkwin/kwinoptions/mouse.ui                  | 16 ++++++++--------
 kwin.kcfg                                     |  4 ++--
 options.cpp                                   |  6 +++---
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/kcmkwin/kwinoptions/kwinoptions_settings.kcfg b/kcmkwin/kwinoptions/kwinoptions_settings.kcfg
index 3ee260af01..d0b2e68bf3 100644
--- a/kcmkwin/kwinoptions/kwinoptions_settings.kcfg
+++ b/kcmkwin/kwinoptions/kwinoptions_settings.kcfg
@@ -62,8 +62,8 @@
         <default>Maximize</default>
         <choices>
             <choice name="Maximize"></choice>
-            <choice name="MaximizeVerticalOnly" value="Maximize (vertical only)"></choice>
-            <choice name="MaximizeHorizontalOnly" value="Maximize (horizontal only)"></choice>
+            <choice name="MaximizeVerticalOnly" value="Vertically maximize"></choice>
+            <choice name="MaximizeHorizontalOnly" value="Horizontally maximize"></choice>
             <choice name="Minimize"></choice>
             <choice name="Shade"></choice>
             <choice name="Lower"></choice>
@@ -77,8 +77,8 @@
         <default>Maximize</default>
         <choices>
             <choice name="Maximize"></choice>
-            <choice name="MaximizeVerticalOnly" value="Maximize (vertical only)"></choice>
-            <choice name="MaximizeHorizontalOnly" value="Maximize (horizontal only)"></choice>
+            <choice name="MaximizeVerticalOnly" value="Vertically maximize"></choice>
+            <choice name="MaximizeHorizontalOnly" value="Horizontally maximize"></choice>
         </choices>
     </entry>
 
@@ -86,8 +86,8 @@
         <default>MaximizeVerticalOnly</default>
         <choices>
             <choice name="Maximize"></choice>
-            <choice name="MaximizeVerticalOnly" value="Maximize (vertical only)"></choice>
-            <choice name="MaximizeHorizontalOnly" value="Maximize (horizontal only)"></choice>
+            <choice name="MaximizeVerticalOnly" value="Vertically maximize"></choice>
+            <choice name="MaximizeHorizontalOnly" value="Horizontally maximize"></choice>
         </choices>
     </entry>
 
@@ -95,8 +95,8 @@
         <default>MaximizeHorizontalOnly</default>
         <choices>
             <choice name="Maximize"></choice>
-            <choice name="MaximizeVerticalOnly" value="Maximize (vertical only)"></choice>
-            <choice name="MaximizeHorizontalOnly" value="Maximize (horizontal only)"></choice>
+            <choice name="MaximizeVerticalOnly" value="Vertically maximize"></choice>
+            <choice name="MaximizeHorizontalOnly" value="Horizontally maximize"></choice>
         </choices>
     </entry>
 
diff --git a/kcmkwin/kwinoptions/mouse.ui b/kcmkwin/kwinoptions/mouse.ui
index da8ffcff52..6fed1c1a28 100644
--- a/kcmkwin/kwinoptions/mouse.ui
+++ b/kcmkwin/kwinoptions/mouse.ui
@@ -42,12 +42,12 @@
         </item>
         <item>
          <property name="text">
-          <string extracomment="@item:inlistbox behavior on double click">Maximize (vertical only)</string>
+          <string extracomment="@item:inlistbox behavior on double click">Vertically maximize</string>
          </property>
         </item>
         <item>
          <property name="text">
-          <string extracomment="@item:inlistbox behavior on double click">Maximize (horizontal only)</string>
+          <string extracomment="@item:inlistbox behavior on double click">Horizontally maximize</string>
          </property>
         </item>
         <item>
@@ -617,12 +617,12 @@
         </item>
         <item>
          <property name="text">
-          <string>Maximize (vertical only)</string>
+          <string>Vertically maximize</string>
          </property>
         </item>
         <item>
          <property name="text">
-          <string>Maximize (horizontal only)</string>
+          <string>Horizontally maximize</string>
          </property>
         </item>
        </widget>
@@ -652,12 +652,12 @@
         </item>
         <item>
          <property name="text">
-          <string>Maximize (vertical only)</string>
+          <string>Vertically maximize</string>
          </property>
         </item>
         <item>
          <property name="text">
-          <string>Maximize (horizontal only)</string>
+          <string>Horizontally maximize</string>
          </property>
         </item>
        </widget>
@@ -687,12 +687,12 @@
         </item>
         <item>
          <property name="text">
-          <string>Maximize (vertical only)</string>
+          <string>Vertically maximize</string>
          </property>
         </item>
         <item>
          <property name="text">
-          <string>Maximize (horizontal only)</string>
+          <string>Horizontally maximize</string>
          </property>
         </item>
        </widget>
diff --git a/kwin.kcfg b/kwin.kcfg
index 861b6c9943..15c5689b09 100644
--- a/kwin.kcfg
+++ b/kwin.kcfg
@@ -189,10 +189,10 @@
             <default>Maximize</default>
         </entry>
         <entry name="MaximizeButtonMiddleClickCommand" type="String">
-            <default>Maximize (vertical only)</default>
+            <default>Vertically maximize</default>
         </entry>
         <entry name="MaximizeButtonRightClickCommand" type="String">
-            <default>Maximize (horizontal only)</default>
+            <default>Horizontally maximize</default>
         </entry>
         <entry name="KillPingTimeout" type="Int">
             <default>5000</default>
diff --git a/options.cpp b/options.cpp
index 63f922cf6d..16a82792bf 100644
--- a/options.cpp
+++ b/options.cpp
@@ -758,7 +758,7 @@ void Options::loadConfig()
     KConfigGroup config(m_settings->config(), "Windows");
     OpTitlebarDblClick = windowOperation(config.readEntry("TitlebarDoubleClickCommand", "Maximize"), true);
     setOperationMaxButtonLeftClick(windowOperation(config.readEntry("MaximizeButtonLeftClickCommand", "Maximize"), true));
-    setOperationMaxButtonMiddleClick(windowOperation(config.readEntry("MaximizeButtonMiddleClickCommand", "Maximize (vertical only)"), true));
+    setOperationMaxButtonMiddleClick(windowOperation(config.readEntry("MaximizeButtonMiddleClickCommand", "Vertically Maximize"), true));
     setOperationMaxButtonRightClick(windowOperation(config.readEntry("MaximizeButtonRightClickCommand", "Maximize (horizontal only)"), true));
 
     // Mouse bindings
@@ -982,9 +982,9 @@ Options::WindowOperation Options::windowOperation(const QString &name, bool rest
         return ShadeOp;
     else if (name == QStringLiteral("Operations"))
         return OperationsOp;
-    else if (name == QStringLiteral("Maximize (vertical only)"))
+    else if (name == QStringLiteral("Vertically maximize"))
         return VMaximizeOp;
-    else if (name == QStringLiteral("Maximize (horizontal only)"))
+    else if (name == QStringLiteral("Horizontally maximize"))
         return HMaximizeOp;
     else if (name == QStringLiteral("Lower"))
         return LowerOp;