From kde-mac Sun Jan 24 15:57:14 2016 From: Yichao Yu Date: Sun, 24 Jan 2016 15:57:14 +0000 To: kde-mac Subject: Re: [KDE/Mac] Review Request 126624: respect "ShowIconsOnButtons" in the Qt5/KF5 style Message-Id: <20160124155714.17778.13354 () mimi ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-mac&m=145365105503235 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--===============4498736701762608238==" --===============4498736701762608238== Content-Type: multipart/alternative; boundary="===============3714475365477133064==" --===============3714475365477133064== MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/126624/#review91526 ----------------------------------------------------------- Ship it! - Yichao Yu On 一月 18, 2016, 11:48 a.m., René J.V. Bertin wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/126624/ > ----------------------------------------------------------- > > (Updated 一月 18, 2016, 11:48 a.m.) > > > Review request for KDE Software on Mac OS X, KDE Frameworks and Yichao Yu. > > > Repository: qtcurve > > > Description > ------- > > Implementation details have changed in Qt5 that affect when icons were being shown in pushbuttons; as a result, many buttons were drawn with icons visible regardless the `ShowIconsInButtons` preference. > > This patch implements a solution in the Qt5 style itself, which appears to be the only way to respect the preference both robustly (= on all buttons) and reversibly (i.e. icons will appear or disappear when toggling the setting without need to restart running applications). > Buttons that have only an icon but no text will continue to show the icon. > > Note that `KGlobalSettings::showIconsOnPushButtons()` is deprecated and will have to be replaced with something that is not... > > > Diffs > ----- > > qt5/style/qtcurve_api.cpp 44b2068 > > Diff: https://git.reviewboard.kde.org/r/126624/diff/ > > > Testing > ------- > > On OS X 10.9.5 and Linux, both with Qt 5.5.1 and KF5 5.17.0 installed into /opt/local > > > Thanks, > > René J.V. Bertin > > --===============3714475365477133064== MIME-Version: 1.0 Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: 8bit
This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/126624/

Ship it!

- Yichao Yu


On 一月 18th, 2016, 11:48 a.m. EST, René J.V. Bertin wrote:

Review request for KDE Software on Mac OS X, KDE Frameworks and Yichao Yu.
By René J.V. Bertin.

Updated 一月 18, 2016, 11:48 a.m.

Repository: qtcurve

Description 

Implementation details have changed in Qt5 that affect when icons were being shown in pushbuttons; as a result, many buttons were drawn with icons visible regardless the ShowIconsInButtons preference.


This patch implements a solution in the Qt5 style itself, which appears to be the only way to respect the preference both robustly (= on all buttons) and reversibly (i.e. icons will appear or disappear when toggling the setting without need to restart running applications).
Buttons that have only an icon but no text will continue to show the icon.


Note that KGlobalSettings::showIconsOnPushButtons() is deprecated and will have to be replaced with something that is not...

Testing 

On OS X 10.9.5 and Linux, both with Qt 5.5.1 and KF5 5.17.0 installed into /opt/local

Diffs

  • qt5/style/qtcurve_api.cpp (44b2068)

View Diff
--===============3714475365477133064==-- --===============4498736701762608238== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18Ka2RlLW1hY0Br ZGUub3JnCkxpc3QgSW5mb3JtYXRpb246IGh0dHBzOi8vbWFpbC5rZGUub3JnL21haWxtYW4vbGlz dGluZm8va2RlLW1hYwpLREUvTWFjIEluZm9ybWF0aW9uOiBodHRwOi8vY29tbXVuaXR5LmtkZS5v cmcvTWFj --===============4498736701762608238==--