From kmail-devel Sat Sep 30 16:10:50 2000 From: Frerich Raabe Date: Sat, 30 Sep 2000 16:10:50 +0000 To: kmail-devel Subject: Patch for KMail X-MARC-Message: https://marc.info/?l=kmail-devel&m=97035003532711 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--------------Boundary-00=_2MJPHQCU62O4NKV4PF8H" --------------Boundary-00=_2MJPHQCU62O4NKV4PF8H Content-Type: text/plain Content-Transfer-Encoding: 8bit Hi, I've attached a small patch for KMail which basically makes an ugly hack (by David, shame on him ;-) obsolete. It adds a --body commandline parameter which lets you pass a template body text to KMail without using an extra file. Besides that, it saves some copies of QString's. Please tell me whether this can be committed so that I can commit the patch to KApplication::invokeMailer(), too. :-) Another thing: I noticed, while testing that --body parameter, that KMail sets the focus to the to-address line edit. IMHO it's more convenient to give the focus to the body multiline edit if KMail is passed a body text. I browsed through the code a bit but couldn't find how to reach the composer's widgets so - any comments/ideas on this? :-) - Frerich P.S.: As I'm currently not subscribed to this list (at least from this account), I'd greatly appreciate a CC of postings on this thread. :-} --------------Boundary-00=_2MJPHQCU62O4NKV4PF8H Content-Type: text/x-c++; name="kmail.diff" Content-Transfer-Encoding: base64 Content-Description: Patch for KMail Content-Disposition: attachment; filename="kmail.diff" SW5kZXg6IGttYWlsSWZhY2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9rZGUva2RlbmV0 d29yay9rbWFpbC9rbWFpbElmYWNlLmgsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMgpkaWZmIC11 IC0zIC1wIC1yMS4yIGttYWlsSWZhY2UuaAotLS0ga21haWxJZmFjZS5oCTIwMDAvMDcvMzEgMTE6 MTg6MjYJMS4yCisrKyBrbWFpbElmYWNlLmgJMjAwMC8wOS8yMiAyMToyNzoyMgpAQCAtMjEsOCAr MjEsMTAgQEAgY2xhc3MgS01haWxJZmFjZSA6IHZpcnR1YWwgcHVibGljIERDT1BPYgoga19kY29w OgogICB2aXJ0dWFsIHZvaWQgY2hlY2tNYWlsKCkgPSAwOwogICB2aXJ0dWFsIHZvaWQgb3BlblJl YWRlcigpID0gMDsKLSAgdmlydHVhbCBpbnQgb3BlbkNvbXBvc2VyKFFTdHJpbmcgdG8sIFFTdHJp bmcgY2MsIFFTdHJpbmcgYmNjLCBRU3RyaW5nIHN1YmplY3QsCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICBpbnQgaGlkZGVuLCBLVVJMIG1lc3NhZ2VGaWxlKSA9IDA7CisgIHZpcnR1YWwgaW50 IG9wZW5Db21wb3Nlcihjb25zdCBRU3RyaW5nICZ0bywgY29uc3QgUVN0cmluZyAmY2MsCisgICAg ICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBRU3RyaW5nICZiY2MsIGNvbnN0IFFTdHJpbmcg JnN1YmplY3QsCisgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBRU3RyaW5nICZib2R5 LCBpbnQgaGlkZGVuLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgS1VSTCAmbWVz c2FnZUZpbGUpID0gMDsKICAgdmlydHVhbCBpbnQgc2VuZChpbnQgY29tcG9zZXJJZCwgaW50IGhv dykgPSAwOyAvLzA9ZGVmYXVsdCwxPW5vdywyPWxhdGVyCiAgIHZpcnR1YWwgaW50IGFkZEF0dGFj aG1lbnQoaW50IGNvbXBvc2VySWQsIEtVUkwgdXJsLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgIFFTdHJpbmcgY29tbWVudCkgPSAwOwpJbmRleDoga21rZXJuZWwuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K UkNTIGZpbGU6IC9ob21lL2tkZS9rZGVuZXR3b3JrL2ttYWlsL2tta2VybmVsLmNwcCx2CnJldHJp ZXZpbmcgcmV2aXNpb24gMS4yMgpkaWZmIC11IC0zIC1wIC1yMS4yMiBrbWtlcm5lbC5jcHAKLS0t IGtta2VybmVsLmNwcAkyMDAwLzA5LzAyIDE3OjM5OjA0CTEuMjIKKysrIGtta2VybmVsLmNwcAky MDAwLzA5LzIyIDIxOjI3OjIzCkBAIC05MCw5ICs5MCwxMCBAQCB2b2lkIEtNS2VybmVsOjpvcGVu UmVhZGVyKCkKICAgS1dpbjo6c2V0QWN0aXZlV2luZG93KG1XaW4tPndpbklkKCkpOwogfQogCi1p bnQgS01LZXJuZWw6Om9wZW5Db21wb3NlciAoUVN0cmluZyB0bywgUVN0cmluZyBjYywKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICBRU3RyaW5nIGJjYywgUVN0cmluZyBzdWJqZWN0LCBpbnQg aGlkZGVuLAotCQkJICAgIEtVUkwgbWVzc2FnZUZpbGUgKQoraW50IEtNS2VybmVsOjpvcGVuQ29t cG9zZXIgKGNvbnN0IFFTdHJpbmcgJnRvLCBjb25zdCBRU3RyaW5nICZjYywKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICBjb25zdCBRU3RyaW5nICZiY2MsIGNvbnN0IFFTdHJpbmcgJnN1Ympl Y3QsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgUVN0cmluZyAmYm9keSwgaW50 IGhpZGRlbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBLVVJMICZtZXNzYWdl RmlsZSkKIHsKICAga2REZWJ1ZygpIDw8ICJLTUtlcm5lbDo6b3BlbkNvbXBvc2VyIGNhbGxlZCIg PDwgZW5kbDsKIApAQCAtMTA2LDYgKzEwNyw4IEBAIGludCBLTUtlcm5lbDo6b3BlbkNvbXBvc2Vy IChRU3RyaW5nIHRvLCAKICAgaWYgKCFtZXNzYWdlRmlsZS5pc0VtcHR5KCkgJiYgbWVzc2FnZUZp bGUuaXNMb2NhbEZpbGUoKSkKICAgICBtc2ctPnNldEJvZHkoIGtGaWxlVG9TdHJpbmcoIG1lc3Nh Z2VGaWxlLnBhdGgoKSwgdHJ1ZSwgZmFsc2UgKSApOwogCisgIGlmICghYm9keS5pc0VtcHR5KCkp IG1zZy0+c2V0Qm9keShib2R5KTsKKwogICBLTUNvbXBvc2VXaW4gKmNXaW4gPSBuZXcgS01Db21w b3NlV2luKG1zZyk7CiAgIGlmIChoaWRkZW4gPT0gMCkKICAgICBjV2luLT5zaG93KCk7CkBAIC01 MDIsMTIgKzUwNSwxNCBAQCB2b2lkIEtNS2VybmVsOjpkdW1wRGVhZExldHRlcnMoKQogCiAKIAot dm9pZCBLTUtlcm5lbDo6YWN0aW9uKGJvb2wgbWFpbHRvLCBib29sIGNoZWNrLCBRU3RyaW5nIHRv LCBRU3RyaW5nIGNjLAotICAgICAgICAgICAgICAgICAgICAgIFFTdHJpbmcgYmNjLCBRU3RyaW5n IHN1YmosIEtVUkwgbWVzc2FnZUZpbGUpCit2b2lkIEtNS2VybmVsOjphY3Rpb24oYm9vbCBtYWls dG8sIGJvb2wgY2hlY2ssIGNvbnN0IFFTdHJpbmcgJnRvLAorICAgICAgICAgICAgICAgICAgICAg IGNvbnN0IFFTdHJpbmcgJmNjLCBjb25zdCBRU3RyaW5nICZiY2MsCisgICAgICAgICAgICAgICAg ICAgICAgY29uc3QgUVN0cmluZyAmc3ViaiwgY29uc3QgUVN0cmluZyAmYm9keSwKKyAgICAgICAg ICAgICAgICAgICAgICBjb25zdCBLVVJMICZtZXNzYWdlRmlsZSkKIHsKIAogICBpZiAobWFpbHRv KQotICAgIG9wZW5Db21wb3NlciAodG8sIGNjLCBiY2MsIHN1YmosIDAsIG1lc3NhZ2VGaWxlKTsK KyAgICBvcGVuQ29tcG9zZXIgKHRvLCBjYywgYmNjLCBzdWJqLCBib2R5LCAwLCBtZXNzYWdlRmls ZSk7CiAgIGVsc2UKICAgICBvcGVuUmVhZGVyKCk7CiAKSW5kZXg6IGtta2VybmVsLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQpSQ1MgZmlsZTogL2hvbWUva2RlL2tkZW5ldHdvcmsva21haWwva21rZXJuZWwuaCx2CnJl dHJpZXZpbmcgcmV2aXNpb24gMS45CmRpZmYgLXUgLTMgLXAgLXIxLjkga21rZXJuZWwuaAotLS0g a21rZXJuZWwuaAkyMDAwLzA3LzMxIDExOjE4OjI2CTEuOQorKysga21rZXJuZWwuaAkyMDAwLzA5 LzIyIDIxOjI3OjIzCkBAIC0zNiw4ICszNiw5IEBAIHB1YmxpYzoKICAgCiAgIHZvaWQgY2hlY2tN YWlsICgpOwogICAvL3JldHVybnMgaWQgb2YgY29tcG9zZXIgaWYgbW9yZSBhcmUgb3BlbmVkCi0g IGludCBvcGVuQ29tcG9zZXIgKFFTdHJpbmcgdG8sIFFTdHJpbmcgY2MsIFFTdHJpbmcgYmNjLCBR U3RyaW5nIHN1YmplY3QsCi0gICAgICAgICAgICAgICAgICAgIGludCBoaWRkZW4sIEtVUkwgbWVz c2FnZUZpbGUpOworICBpbnQgb3BlbkNvbXBvc2VyIChjb25zdCBRU3RyaW5nICZ0bywgY29uc3Qg UVN0cmluZyAmY2MsIGNvbnN0IFFTdHJpbmcgJmJjYywKKyAgICAgICAgICAgICAgICAgICAgY29u c3QgUVN0cmluZyAmc3ViamVjdCwgY29uc3QgUVN0cmluZyAmYm9keSwgaW50IGhpZGRlbiwKKyAg ICAgICAgICAgICAgICAgICAgY29uc3QgS1VSTCAmbWVzc2FnZUZpbGUpOwogICB2b2lkIG9wZW5S ZWFkZXIoKTsKICAgaW50IHJlYWR5KCk7CiAgIGludCBzZW5kKGludCBjb21wb3NlcklkLCBpbnQg aG93KTsgLy8wPW5vdywgMT1sYXRlcgpAQCAtNTgsOCArNTksOSBAQCBwdWJsaWM6CiAgIHZvaWQg a21haWxNc2dIYW5kbGVyKFF0TXNnVHlwZSBhVHlwZSwgY29uc3QgY2hhciogYU1zZyk7CiAgIHZv aWQgZHVtcERlYWRMZXR0ZXJzKCk7CiAgIGJvb2wgZG9TZXNzaW9uTWFuYWdlbWVudCAoKTsKLSAg dm9pZCBhY3Rpb24gKGJvb2wgbWFpbHRvLCBib29sIGNoZWNrLCBRU3RyaW5nIHRvLCBRU3RyaW5n IGNjLAotICAgICAgICAgICAgICAgUVN0cmluZyBiY2MsIFFTdHJpbmcgc3ViaiwgS1VSTCBtZXNz YWdlRmlsZSk7CisgIHZvaWQgYWN0aW9uIChib29sIG1haWx0bywgYm9vbCBjaGVjaywgY29uc3Qg UVN0cmluZyAmdG8sIGNvbnN0IFFTdHJpbmcgJmNjLAorICAgICAgICAgICAgICAgY29uc3QgUVN0 cmluZyAmYmNjLCBjb25zdCBRU3RyaW5nICZzdWJqLCBjb25zdCBRU3RyaW5nICZib2R5LAorICAg ICAgICAgICAgICAgY29uc3QgS1VSTCAmbWVzc2FnZUZpbGUpOwogICAKICAgaW5saW5lIEtNRm9s ZGVyICppbmJveEZvbGRlcigpIHsgcmV0dXJuIHRoZV9pbmJveEZvbGRlcjsgfQogICBpbmxpbmUg S01Gb2xkZXIgKm91dGJveEZvbGRlcigpIHsgcmV0dXJuIHRoZV9vdXRib3hGb2xkZXI7IH0KSW5k ZXg6IG1haW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL2tkZS9rZGVuZXR3b3JrL2tt YWlsL21haW4uY3BwLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjEwNwpkaWZmIC11IC0zIC1wIC1y MS4xMDcgbWFpbi5jcHAKLS0tIG1haW4uY3BwCTIwMDAvMDkvMTMgMTQ6MzQ6MzUJMS4xMDcKKysr IG1haW4uY3BwCTIwMDAvMDkvMjIgMjE6Mjc6MjMKQEAgLTcxLDYgKzcxLDcgQEAgc3RhdGljIEtD bWRMaW5lT3B0aW9ucyBrbW9wdGlvbnNbXSA9CiAgIHsgImgiLCAwICwgMCB9LAogICB7ICJoZWFk ZXIgPGhlYWRlcj4iLAkJSTE4Tl9OT09QKCJBZGQgJ2hlYWRlcicgdG8gbXNnLiIpLCAwIH0sCiAg IHsgIm1zZyA8ZmlsZT4iLAkJSTE4Tl9OT09QKCJSZWFkIG1zZy1ib2R5IGZyb20gJ2ZpbGUnLiIp LCAwIH0sCisgIHsgImJvZHkgPHRleHQ+IiwgICAgICAgICAgICAgIEkxOE5fTk9PUCgiU2V0IGJv ZHkgb2YgbXNnLiIpLCAwIH0sCiAgIHsgImNoZWNrIiwJCQlJMThOX05PT1AoIkNoZWNrIGZvciBu ZXcgbWFpbCBvbmx5LiIpLCAwIH0sCiAgIHsgImNvbXBvc2VyIiwJCQlJMThOX05PT1AoIk9wZW4g b25seSBjb21wb3NlciB3aW5kb3cuIiksIDAgfSwKICAgeyAiK1thZGRyZXNzXSIsCQlJMThOX05P T1AoIlNlbmQgbXNnIHRvICdhZGRyZXNzJy4iKSwgMCB9LApAQCAtMTI2LDcgKzEyNyw3IEBAIHB1 YmxpYzoKIAogaW50IEtNYWlsQXBwbGljYXRpb246Om5ld0luc3RhbmNlKCkKIHsKLSAgUVN0cmlu ZyB0bywgY2MsIGJjYywgc3ViajsKKyAgUVN0cmluZyB0bywgY2MsIGJjYywgc3ViaiwgYm9keTsK ICAgS1VSTCBtZXNzYWdlRmlsZSA9IFFTdHJpbmc6Om51bGw7CiAgIGJvb2wgbWFpbHRvID0gZmFs c2U7CiAgIGJvb2wgY2hlY2tNYWlsID0gZmFsc2U7CkBAIC0xNTgsNiArMTU5LDEyIEBAIGludCBL TWFpbEFwcGxpY2F0aW9uOjpuZXdJbnN0YW5jZSgpCiAgICAgIG1lc3NhZ2VGaWxlID0gUVN0cmlu Zzo6ZnJvbUxvY2FsOEJpdChhcmdzLT5nZXRPcHRpb24oIm1zZyIpKTsKICAgfQogCisgIGlmIChh cmdzLT5nZXRPcHRpb24oImJvZHkiKSkKKyAgeworICAgICBtYWlsdG8gPSB0cnVlOworICAgICBi b2R5ID0gYXJncy0+Z2V0T3B0aW9uKCJib2R5Iik7CisgIH0KKwogICBpZiAoYXJncy0+aXNTZXQo ImNvbXBvc2VyIikpCiAgICAgbWFpbHRvID0gdHJ1ZTsKIApAQCAtMTc3LDcgKzE4NCw3IEBAIGlu dCBLTWFpbEFwcGxpY2F0aW9uOjpuZXdJbnN0YW5jZSgpCiAKICAgYXJncy0+Y2xlYXIoKTsKIAot ICBrZXJuZWwtPmFjdGlvbiAobWFpbHRvLCBjaGVja01haWwsIHRvLCBjYywgYmNjLCBzdWJqLCBt ZXNzYWdlRmlsZSk7CisgIGtlcm5lbC0+YWN0aW9uIChtYWlsdG8sIGNoZWNrTWFpbCwgdG8sIGNj LCBiY2MsIHN1YmosIGJvZHksIG1lc3NhZ2VGaWxlKTsKICAgcmV0dXJuIDA7CiB9CiAK --------------Boundary-00=_2MJPHQCU62O4NKV4PF8H-- _______________________________________________ Kmail Developers mailing list Kmail@master.kde.org http://master.kde.org/mailman/listinfo/kmail