vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Improve partial maximization strings" 

Summary:
This reverts commit 45bf53adab.

We cannot change config values for existing users since it will break
their installations.

Reviewers: #kwin, davidedmundson

Reviewed By: #kwin, davidedmundson

Subscribers: davidedmundson, bshah, broulik, kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D29736
master
Vlad Zahorodnii 2020-05-14 08:28:37 +03:00
parent 45bf53adab
commit a68c0959a6
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kcmkwin/kwinoptions/kwinoptions_settings.kcfg
View File

@ -62,8 +62,8 @@
<default>Maximize</default>
<choices>
<choice name="Maximize"></choice>
<choice name="MaximizeVerticalOnly" value="Vertically maximize"></choice>
<choice name="MaximizeHorizontalOnly" value="Horizontally maximize"></choice>
<choice name="MaximizeVerticalOnly" value="Maximize (vertical only)"></choice>
<choice name="MaximizeHorizontalOnly" value="Maximize (horizontal only)"></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="Vertically maximize"></choice>
<choice name="MaximizeHorizontalOnly" value="Horizontally maximize"></choice>
<choice name="MaximizeVerticalOnly" value="Maximize (vertical only)"></choice>
<choice name="MaximizeHorizontalOnly" value="Maximize (horizontal only)"></choice>
</choices>
</entry>
@ -86,8 +86,8 @@
<default>MaximizeVerticalOnly</default>
<choices>
<choice name="Maximize"></choice>
<choice name="MaximizeVerticalOnly" value="Vertically maximize"></choice>
<choice name="MaximizeHorizontalOnly" value="Horizontally maximize"></choice>
<choice name="MaximizeVerticalOnly" value="Maximize (vertical only)"></choice>
<choice name="MaximizeHorizontalOnly" value="Maximize (horizontal only)"></choice>
</choices>
</entry>
@ -95,8 +95,8 @@
<default>MaximizeHorizontalOnly</default>
<choices>
<choice name="Maximize"></choice>
<choice name="MaximizeVerticalOnly" value="Vertically maximize"></choice>
<choice name="MaximizeHorizontalOnly" value="Horizontally maximize"></choice>
<choice name="MaximizeVerticalOnly" value="Maximize (vertical only)"></choice>
<choice name="MaximizeHorizontalOnly" value="Maximize (horizontal only)"></choice>
</choices>
</entry>

16
kcmkwin/kwinoptions/mouse.ui
View File

@ -42,12 +42,12 @@
</item>
<item>
<property name="text">
<string extracomment="@item:inlistbox behavior on double click">Vertically maximize</string>
<string extracomment="@item:inlistbox behavior on double click">Maximize (vertical only)</string>
</property>
</item>
<item>
<property name="text">
<string extracomment="@item:inlistbox behavior on double click">Horizontally maximize</string>
<string extracomment="@item:inlistbox behavior on double click">Maximize (horizontal only)</string>
</property>
</item>
<item>
@ -617,12 +617,12 @@
</item>
<item>
<property name="text">
<string>Vertically maximize</string>
<string>Maximize (vertical only)</string>
</property>
</item>
<item>
<property name="text">
<string>Horizontally maximize</string>
<string>Maximize (horizontal only)</string>
</property>
</item>
</widget>
@ -652,12 +652,12 @@
</item>
<item>
<property name="text">
<string>Vertically maximize</string>
<string>Maximize (vertical only)</string>
</property>
</item>
<item>
<property name="text">
<string>Horizontally maximize</string>
<string>Maximize (horizontal only)</string>
</property>
</item>
</widget>
@ -687,12 +687,12 @@
</item>
<item>
<property name="text">
<string>Vertically maximize</string>
<string>Maximize (vertical only)</string>
</property>
</item>
<item>
<property name="text">
<string>Horizontally maximize</string>
<string>Maximize (horizontal only)</string>
</property>
</item>
</widget>

4
kwin.kcfg
View File

@ -189,10 +189,10 @@
<default>Maximize</default>
</entry>
<entry name="MaximizeButtonMiddleClickCommand" type="String">
<default>Vertically maximize</default>
<default>Maximize (vertical only)</default>
</entry>
<entry name="MaximizeButtonRightClickCommand" type="String">
<default>Horizontally maximize</default>
<default>Maximize (horizontal only)</default>
</entry>
<entry name="KillPingTimeout" type="Int">
<default>5000</default>

6
options.cpp
View File

@ -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", "Vertically Maximize"), true));
setOperationMaxButtonMiddleClick(windowOperation(config.readEntry("MaximizeButtonMiddleClickCommand", "Maximize (vertical only)"), 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("Vertically maximize"))
else if (name == QStringLiteral("Maximize (vertical only)"))
return VMaximizeOp;
else if (name == QStringLiteral("Horizontally maximize"))
else if (name == QStringLiteral("Maximize (horizontal only)"))
return HMaximizeOp;
else if (name == QStringLiteral("Lower"))
return LowerOp;