From kde-core-devel  Wed May 30 15:48:05 2001
From: Martijn Klingens <mklingens () yahoo ! com>
Date: Wed, 30 May 2001 15:48:05 +0000
To: kde-core-devel
Subject: [PATCH] kaction.cpp
X-MARC-Message: https://marc.info/?l=kde-core-devel&m=99123751431906
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--------------Boundary-00=_5WN5HK7FEN0JOP0279RD"


--------------Boundary-00=_5WN5HK7FEN0JOP0279RD
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 8bit

Attached is a patch for KAction to support iconsets/pixmaps when plugged into 
popup menus. A few styles (KDE SGI, Marble, Risc OS and MegaGradient) break 
with checkable menu items that have icons. IMO those styles need to be fixed 
and KAction should not hide the pixmaps instead. Besides, some parts of KDE 
already use checkable menu entries with icons outside of KAction, so the 
problems are there already anyway.

Please review, I can commit myself.

Martijn

--------------Boundary-00=_5WN5HK7FEN0JOP0279RD
Content-Type: text/plain;
  charset="iso-8859-1";
  name="kaction.cpp.patch"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="kaction.cpp.patch"

SW5kZXg6IGthY3Rpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL2tkZS9rZGVsaWJz
L2tkZXVpL2thY3Rpb24uY3BwLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjE4MgpkaWZmIC1iIC11
IC1wIC1yMS4xODIga2FjdGlvbi5jcHAKLS0tIGthY3Rpb24uY3BwCTIwMDEvMDUvMjUgMjI6MzI6
MTAJMS4xODIKKysrIGthY3Rpb24uY3BwCTIwMDEvMDUvMzAgMTU6Mzg6MzgKQEAgLTQyOCwxMiAr
NDI4LDEwIEBAIGludCBLQWN0aW9uOjpwbHVnKCBRV2lkZ2V0ICp3LCBpbnQgaW5kZXgKICAgICBR
UG9wdXBNZW51KiBtZW51ID0gc3RhdGljX2Nhc3Q8UVBvcHVwTWVudSo+KCB3ICk7CiAgICAgaW50
IGlkOwogCi0gICAgaWYgKCFpbmhlcml0cygiS1RvZ2dsZUFjdGlvbiIpKSB7Ci0gICAgICAgIGlm
ICggIWQtPm1fcGl4bWFwLmlzTnVsbCgpICkgeworICAgIGlmICggIWQtPm1fcGl4bWFwLmlzTnVs
bCgpICkKICAgICAgICAgICAgIGlkID0gbWVudS0+aW5zZXJ0SXRlbSggZC0+bV9waXhtYXAsIHRo
aXMsIFNMT1QoIHNsb3RBY3RpdmF0ZWQoKSApLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICBkLT5tX2FjY2VsLCAtMSwgaW5kZXggKTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAg
ICAgICAgIGlmICggZC0+bV9iSWNvblNldCApCisJCWVsc2UgaWYgKCBkLT5tX2JJY29uU2V0ICkK
ICAgICAgICAgICAgICAgICBpZCA9IG1lbnUtPmluc2VydEl0ZW0oIGljb25TZXQoKSwgZC0+bV90
ZXh0LCB0aGlzLC8vZHN3ZWV0CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICBTTE9UKCBzbG90QWN0aXZhdGVkKCkgKSwgZC0+bV9hY2NlbCwKICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgIC0xLCBpbmRleCApOwpAQCAtNDQxLDE0ICs0MzksNiBAQCBp
bnQgS0FjdGlvbjo6cGx1ZyggUVdpZGdldCAqdywgaW50IGluZGV4CiAgICAgICAgICAgICAgICAg
aWQgPSBtZW51LT5pbnNlcnRJdGVtKCBkLT5tX3RleHQsIHRoaXMsCiAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICBTTE9UKCBzbG90QWN0aXZhdGVkKCkgKSwgIC8vZHN3ZWV0
CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkLT5tX2FjY2VsLCAtMSwg
aW5kZXggKTsKLSAgICAgICAgfQotICAgIH0gZWxzZSB7Ci0gICAgICAgIC8vIHRvZ2dsZSBhY3Rp
b25zIGRvIG5vdCBoYXZlIGEgcGl4bWFwIG9yIGljb24gaW4gdGhlIG1lbnUKLSAgICAgICAgLy8g
TG90emkgQi4KLSAgICAgICAgaWQgPSBtZW51LT5pbnNlcnRJdGVtKCBkLT5tX3RleHQsIHRoaXMs
Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgU0xPVCggc2xvdEFjdGl2YXRlZCgpICks
Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZC0+bV9hY2NlbCwgLTEsIGluZGV4ICk7
Ci0gICAgfQogCiAgICAgLy8gY2FsbCBzZXRJdGVtRW5hYmxlZCBvbmx5IGlmIHRoZSBpdGVtIHJl
YWxseSBzaG91bGQgYmUgZGlzYWJsZWQsCiAgICAgLy8gYmVjYXVzZSB0aGF0IG1ldGhvZCBpcyBz
bG93IGFuZCB0aGUgaXRlbSBpcyBwZXIgZGVmYXVsdCBlbmFibGVkCg==

--------------Boundary-00=_5WN5HK7FEN0JOP0279RD--