--------------Boundary-00=_QKDZWF4OCIV6FSL3BFOA Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 8bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi all! Well, my guests left early, so here is the first (incomplete) draft for mail templates. Summary: - - new flag "isTemplateFolder" in KMFolder - - new config-file option, same name - - checkbox in the folder properties dialog - - added special msgActivated handler for template folders: now open composer (with copy of original) instead of reader Still to do: - - disable showing the "isTemplateFolder" flag for system folders right now it is shown, but activating a msg will *always* open a composer - - find a way to edit the templates instead of spawning new ones. Probably with entries in context menu and "Message" main menu - - add menu option for instantiating the template - - disable reply (also forward?) buttons when in template folder - - make KMFolder emit a signal when template-status is changed (just for being thorough ...) - - dcop binding (is a new one needed at all? I have not checked yet) - - documentation: manual and announcement on "new version" splash RFC: Is it OK to copy all headers except Msg-ID from the template? Or should I remove/add other headers? (E.g. X-KMail-Template ... which, IMHO, would be a bad idea) MfG, Florian -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.4 (GNU/Linux) Comment: For info see http://www.gnupg.org iD8DBQE7dyB9IHY1JB8ZhlERAmjXAJ9qA3cWBV7qgecwzx1k2Z2mILYk7gCeN/LV BH64/y8Zr6HxCdb67XFKIQ4= =z59D -----END PGP SIGNATURE----- --------------Boundary-00=_QKDZWF4OCIV6FSL3BFOA Content-Type: text/x-diff; charset="iso-8859-1"; name="templates.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="templates.patch" SW5kZXg6IGttZm9sZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9rZGUva2RlbmV0 d29yay9rbWFpbC9rbWZvbGRlci5jcHAsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTg0CmRpZmYg LXUgLTMgLXAgLXIxLjE4NCBrbWZvbGRlci5jcHAKLS0tIGttZm9sZGVyLmNwcAkyMDAxLzA4LzA5 IDAwOjAzOjQxCTEuMTg0CisrKyBrbWZvbGRlci5jcHAJMjAwMS8wOC8xMiAyMzo1MDo1NwpAQCAt OTQ2LDYgKzk0Niw3IEBAIHZvaWQgS01Gb2xkZXI6OnJlYWRDb25maWcoKQogICBpZiAoIG1JZGVu dGl0eS5pc0VtcHR5KCkgKSAvLyBiYWNrd2FyZCBjb21wYXRpYmxpdHkKICAgICAgIG1JZGVudGl0 eSA9IGNvbmZpZy0+cmVhZEVudHJ5KCJNYWlsaW5nTGlzdElkZW50aXR5Iik7CiAgIG1Db21wYWN0 YWJsZSA9IGNvbmZpZy0+cmVhZEJvb2xFbnRyeSgiQ29tcGFjdGFibGUiLCBUUlVFKTsKKyAgbUlz VGVtcGxhdGVGb2xkZXIgPSBjb25maWctPnJlYWRCb29sRW50cnkoIklzVGVtcGxhdGVGb2xkZXIi LCBGQUxTRSk7CiB9CiAKIC8vLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KQEAgLTk1OSw2ICs5NjAsNyBA QCB2b2lkIEtNRm9sZGVyOjp3cml0ZUNvbmZpZygpCiAgIGNvbmZpZy0+d3JpdGVFbnRyeSgiTWFp bGluZ0xpc3RBZG1pbkFkZHJlc3MiLCBtTWFpbGluZ0xpc3RBZG1pbkFkZHJlc3MpOwogICBjb25m aWctPndyaXRlRW50cnkoIklkZW50aXR5IiwgbUlkZW50aXR5KTsKICAgY29uZmlnLT53cml0ZUVu dHJ5KCJDb21wYWN0YWJsZSIsIG1Db21wYWN0YWJsZSk7CisgIGNvbmZpZy0+d3JpdGVFbnRyeSgi SXNUZW1wbGF0ZUZvbGRlciIsIG1Jc1RlbXBsYXRlRm9sZGVyKTsKIH0KIAogLy8tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLQpJbmRleDoga21mb2xkZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9r ZGUva2RlbmV0d29yay9rbWFpbC9rbWZvbGRlci5oLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjYx CmRpZmYgLXUgLTMgLXAgLXIxLjYxIGttZm9sZGVyLmgKLS0tIGttZm9sZGVyLmgJMjAwMS8wOC8w OSAwMDowMzo0MQkxLjYxCisrKyBrbWZvbGRlci5oCTIwMDEvMDgvMTIgMjM6NTA6NTcKQEAgLTI4 NCw2ICsyODQsMTIgQEAgcHVibGljOgogCiAgICAgdWNoYXIgKmluZGV4U3RyZWFtQmFzZVB0cigp IHsgcmV0dXJuIG1JbmRleFN0cmVhbVB0cjsgfQogCisgIGJvb2wgaXNUZW1wbGF0ZUZvbGRlcigp CisgIHsgcmV0dXJuIG1Jc1RlbXBsYXRlRm9sZGVyOyB9CisKKyAgdm9pZCBzZXRJc1RlbXBsYXRl Rm9sZGVyKGJvb2wgbmV3SXNUZW1wbGF0ZSkKKyAgeyBtSXNUZW1wbGF0ZUZvbGRlcj1uZXdJc1Rl bXBsYXRlOyB3cml0ZUNvbmZpZygpOyB9CisKIHNpZ25hbHM6CiAgIC8qKiBFbWl0dGVkIHdoZW4g dGhlIHN0YXR1cywgbmFtZSwgb3IgYXNzb2NpYXRlZCBhY2NvdW50cyBvZiB0aGlzCiAgICAgZm9s ZGVyIGNoYW5nZWQuICovCkBAIC0zNTksNiArMzY1LDcgQEAgcHJvdGVjdGVkOgogICAvKiogbmFt ZSBvZiB0aGUgZmllbGQgdGhhdCBpcyB1c2VkIGZvciAiRnJvbSIgaW4gbGlzdGJveCAqLwogICBR U3RyaW5nIG1XaG9GaWVsZDsKICAgYm9vbCBtSXNTeXN0ZW1Gb2xkZXI7CisgIGJvb2wgbUlzVGVt cGxhdGVGb2xkZXI7CiAgIEtNQWNjdExpc3QqIG1BY2N0TGlzdDsKIAogICBib29sICAgIG1NYWls aW5nTGlzdEVuYWJsZWQ7CkluZGV4OiBrbWZvbGRlcmRpYS5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmls ZTogL2hvbWUva2RlL2tkZW5ldHdvcmsva21haWwva21mb2xkZXJkaWEuY3BwLHYKcmV0cmlldmlu ZyByZXZpc2lvbiAxLjQ0CmRpZmYgLXUgLTMgLXAgLXIxLjQ0IGttZm9sZGVyZGlhLmNwcAotLS0g a21mb2xkZXJkaWEuY3BwCTIwMDEvMDgvMDcgMTc6MzU6NDgJMS40NAorKysga21mb2xkZXJkaWEu Y3BwCTIwMDEvMDgvMTIgMjM6NTA6NTcKQEAgLTc4LDYgKzc4LDExIEBAIEtNRm9sZGVyRGlhbG9n OjpLTUZvbGRlckRpYWxvZyhLTUZvbGRlcioKIAogICB0b3BMYXlvdXQtPmFkZFdpZGdldCggbXRH cm91cCApOwogCisgIFFIQm94TGF5b3V0ICp0YiA9IG5ldyBRSEJveExheW91dCggbXRHcm91cC0+ bGF5b3V0KCkgKTsKKyAgaXNUZW1wbGF0ZUZvbGRlciA9IG5ldyBRQ2hlY2tCb3goIGkxOG4oIkZv bGRlciBob2xkcyBtYWlsIHRlbXBsYXRlcyIgKSwgbXRHcm91cCApOworICBpc1RlbXBsYXRlRm9s ZGVyLT5zZXRDaGVja2VkKG1Gb2xkZXItPmlzVGVtcGxhdGVGb2xkZXIoKSk7CisgIHRiLT5hZGRX aWRnZXQoIGlzVGVtcGxhdGVGb2xkZXIgKTsKKwogICBRSEJveExheW91dCAqbWwgPSBuZXcgUUhC b3hMYXlvdXQoIG10R3JvdXAtPmxheW91dCgpICk7CiAgIG1sLT5zZXRTcGFjaW5nKCA2ICk7CiAK QEAgLTIwMCw2ICsyMDUsMTEgQEAgS01Gb2xkZXJEaWFsb2c6OktNRm9sZGVyRGlhbG9nKEtNRm9s ZGVyKgogLy8tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogdm9pZCBLTUZvbGRlckRpYWxvZzo6c2xvdE9r KCkKIHsKKyAgLy9md2ViZXI6IGlzIHRoZSBjaGVja2luZyBuZWNjZXNzYXJ5PyBvciBjYW4gSSBy ZWx5IG9uIHRoZSBleGlzdGFuY2Ugb2YgbUZvbGRlcj8KKyAgLy9md2ViZXI6IHBsZWFzZSBmaXgg YXMgbmVlZGVkIGFuZCB0ZWxsIG1lCisgIGlmIChtRm9sZGVyKQorICAgIG1Gb2xkZXItPnNldElz VGVtcGxhdGVGb2xkZXIoIGlzVGVtcGxhdGVGb2xkZXItPmlzQ2hlY2tlZCgpICk7CisKICAgaWYg KCFtRm9sZGVyIHx8IChtRm9sZGVyLT5wcm90b2NvbCgpICE9ICJpbWFwIikpCiAgIHsKICAgICBR U3RyaW5nIGFjY3ROYW1lOwpJbmRleDoga21mb2xkZXJkaWEuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxl OiAvaG9tZS9rZGUva2RlbmV0d29yay9rbWFpbC9rbWZvbGRlcmRpYS5oLHYKcmV0cmlldmluZyBy ZXZpc2lvbiAxLjE0CmRpZmYgLXUgLTMgLXAgLXIxLjE0IGttZm9sZGVyZGlhLmgKLS0tIGttZm9s ZGVyZGlhLmgJMjAwMS8wOC8wNyAxNzozNTo0OAkxLjE0CisrKyBrbWZvbGRlcmRpYS5oCTIwMDEv MDgvMTIgMjM6NTA6NTcKQEAgLTM2LDYgKzM2LDcgQEAgcHJvdGVjdGVkOgogICBRVmFsdWVMaXN0 PFFHdWFyZGVkUHRyPEtNRm9sZGVyPiA+IG1Gb2xkZXJzOwogCiAgIFFDaGVja0JveCAqaG9sZHNN YWlsaW5nTGlzdCwgKm1hcmtBbnlNZXNzYWdlOworICBRQ2hlY2tCb3ggKmlzVGVtcGxhdGVGb2xk ZXI7CiAgIFFMaW5lRWRpdCAqbWFpbGluZ0xpc3RQb3N0QWRkcmVzczsKICAgUUNvbWJvQm94ICpp ZGVudGl0eTsKIC8vICAgUUxpbmVFZGl0ICptYWlsaW5nTGlzdEFkbWluQWRkcmVzczsKSW5kZXg6 IGttaGVhZGVycy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2hvbWUva2RlL2tkZW5ldHdvcmsv a21haWwva21oZWFkZXJzLmNwcCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4zMTIKZGlmZiAtdSAt MyAtcCAtcjEuMzEyIGttaGVhZGVycy5jcHAKLS0tIGttaGVhZGVycy5jcHAJMjAwMS8wOC8xMCAx Mzo1MTo1OAkxLjMxMgorKysga21oZWFkZXJzLmNwcAkyMDAxLzA4LzEyIDIzOjUxOjAwCkBAIC0x MTc3LDYgKzExNzcsMjkgQEAgdm9pZCBLTUhlYWRlcnM6OnJlc2VuZE1zZyAoKQogICBrZXJuZWwt PmticCgpLT5pZGxlKCk7CiB9CiAKKy8vLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKy8vdGhpcyBpcyBj dXJyZW50bHkgaWRlbnRpY2FsIHRvIHJlc2VuZE1zZygpLAorLy9idXQgaGF2aW5nIGEgc2VwZXJh dGUgZnVuY3Rpb24gaXMgYmV0dGVyIGRlc2lnbiwgSU1ITwordm9pZCBLTUhlYWRlcnM6Omluc3Rh bnRpYXRlTXNnVGVtcGxhdGUgKCkKK3sKKyAgS01Db21wb3NlV2luICp3aW47CisgIEtNTWVzc2Fn ZSAqbmV3TXNnLCAqbXNnID0gY3VycmVudE1zZygpOworICBpZiAoIW1zZykgcmV0dXJuOworCisg IGtlcm5lbC0+a2JwKCktPmJ1c3koKTsKKyAgbmV3TXNnID0gbmV3IEtNTWVzc2FnZTsKKyAgbmV3 TXNnLT5mcm9tU3RyaW5nKG1zZy0+YXNTdHJpbmcoKSk7CisgIG5ld01zZy0+cmVtb3ZlSGVhZGVy RmllbGQoIk1lc3NhZ2UtSWQiKTsKKyAgbmV3TXNnLT5pbml0SGVhZGVyKCk7CisgIG5ld01zZy0+ c2V0Q2hhcnNldChtc2ctPmNvZGVjKCktPm5hbWUoKSk7CisgIG5ld01zZy0+c2V0VG8obXNnLT50 bygpKTsKKyAgbmV3TXNnLT5zZXRTdWJqZWN0KG1zZy0+c3ViamVjdCgpKTsKKworICB3aW4gPSBu ZXcgS01Db21wb3NlV2luOworICB3aW4tPnNldE1zZyhuZXdNc2csIEZBTFNFKTsKKyAgd2luLT5z aG93KCk7CisgIGtlcm5lbC0+a2JwKCktPmlkbGUoKTsKK30KIAogLy8tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLQogdm9pZCBLTUhlYWRlcnM6OmJvdW5jZU1zZyAoKQpJbmRleDoga21oZWFkZXJzLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQpSQ1MgZmlsZTogL2hvbWUva2RlL2tkZW5ldHdvcmsva21haWwva21oZWFkZXJzLmgs dgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuODEKZGlmZiAtdSAtMyAtcCAtcjEuODEga21oZWFkZXJz LmgKLS0tIGttaGVhZGVycy5oCTIwMDEvMDcvMjUgMTI6MzE6NDYJMS44MQorKysga21oZWFkZXJz LmgJMjAwMS8wOC8xMiAyMzo1MTowMQpAQCAtMTA4LDYgKzEwOCw5IEBAIHB1YmxpYzoKICAgdmly dHVhbCB2b2lkIHJlcGx5TGlzdFRvTXNnKFFTdHJpbmcgc2VsZWN0aW9uPVFTdHJpbmc6Om51bGwp OwogICB2aXJ0dWFsIHZvaWQgcmVzZW5kTXNnKCk7CiAKKyAgLyoqIENyZWF0ZSBhIG5ldyBtZXNz YWdlIGZyb20gYSBnaXZlIHRlbXBsYXRlLiAqLworICB2aXJ0dWFsIHZvaWQgaW5zdGFudGlhdGVN c2dUZW1wbGF0ZSgpOworCiAgIC8qKiBJZiBkZXN0aW5hdGlvbj09TlVMTCB0aGUgbWVzc2FnZXMg YXJlIGRlbGV0ZWQsIG90aGVyd2lzZQogICAgIHRoZXkgYXJlIG1vdmVkIHRvIHRoaXMgZm9sZGVy LiAqLwogICB2aXJ0dWFsIHZvaWQgbW92ZU1zZ1RvRm9sZGVyKEtNRm9sZGVyKiBkZXN0aW5hdGlv biwgaW50IG1zZ0lkPS0xKTsKSW5kZXg6IGttbWFpbndpbi5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmls ZTogL2hvbWUva2RlL2tkZW5ldHdvcmsva21haWwva21tYWlud2luLmNwcCx2CnJldHJpZXZpbmcg cmV2aXNpb24gMS4zNTAKZGlmZiAtdSAtMyAtcCAtcjEuMzUwIGttbWFpbndpbi5jcHAKLS0tIGtt bWFpbndpbi5jcHAJMjAwMS8wOC8wNyAxNzozNTo0OAkxLjM1MAorKysga21tYWlud2luLmNwcAky MDAxLzA4LzEyIDIzOjUxOjA0CkBAIC05ODIsNiArOTgyLDExIEBAIHZvaWQgS01NYWluV2luOjpz bG90Qm91bmNlTXNnKCkKICAgbUhlYWRlcnMtPmJvdW5jZU1zZygpOwogfQogCisvLy0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tCit2b2lkIEtNTWFpbldpbjo6c2xvdEluc3RhbnRpYXRlTXNnVGVtcGxhdGUo KQoreworICBtSGVhZGVycy0+aW5zdGFudGlhdGVNc2dUZW1wbGF0ZSgpOworfQogCiAvLy0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tCiB2b2lkIEtNTWFpbldpbjo6c2xvdE1lc3NhZ2VRdWV1ZWRPckRyYWZ0 ZWQoKQpAQCAtMTMyNiwxMiArMTMzMSwxOCBAQCB2b2lkIEtNTWFpbldpbjo6c2xvdFByZXZNZXNz YWdlKCkgICAgICAgCiB2b2lkIEtNTWFpbldpbjo6c2xvdFByZXZVbnJlYWRNZXNzYWdlKCkgeyBt SGVhZGVycy0+cHJldlVucmVhZE1lc3NhZ2UoKTsgfQogCiAvLy0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t Ci0vL2NhbGxlZCBmcm9tIGhlZGVycy4gTWVzc2FnZSBtdXN0IG5vdCBiZSBkZWxldGVkIG9uIGNs b3NlCisvL2NhbGxlZCBmcm9tIGhlYWRlcnMuIE1lc3NhZ2UgbXVzdCBub3QgYmUgZGVsZXRlZCBv biBjbG9zZQogdm9pZCBLTU1haW5XaW46OnNsb3RNc2dBY3RpdmF0ZWQoS01NZXNzYWdlICptc2cp CiB7CiAgIGlmIChtRm9sZGVyID09IGtlcm5lbC0+b3V0Ym94Rm9sZGVyKCkgfHwgbUZvbGRlciA9 PSBrZXJuZWwtPmRyYWZ0c0ZvbGRlcigpKQogICB7CiAgICAgc2xvdEVkaXRNc2coKTsgcmV0dXJu OworICB9CisKKyAgaWYgKG1Gb2xkZXItPmlzVGVtcGxhdGVGb2xkZXIoKSkKKyAgeworICAgIHNs b3RJbnN0YW50aWF0ZU1zZ1RlbXBsYXRlKCk7CisgICAgcmV0dXJuOwogICB9CiAKICAgYXNzZXJ0 KG1zZyAhPSBOVUxMKTsKSW5kZXg6IGttbWFpbndpbi5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9o b21lL2tkZS9rZGVuZXR3b3JrL2ttYWlsL2ttbWFpbndpbi5oLHYKcmV0cmlldmluZyByZXZpc2lv biAxLjkzCmRpZmYgLXUgLTMgLXAgLXIxLjkzIGttbWFpbndpbi5oCi0tLSBrbW1haW53aW4uaAky MDAxLzA3LzI1IDEyOjMxOjQ2CTEuOTMKKysrIGttbWFpbndpbi5oCTIwMDEvMDgvMTIgMjM6NTE6 MDQKQEAgLTE0Myw2ICsxNDMsNyBAQCBwcm90ZWN0ZWQgc2xvdHM6CiAgIHZvaWQgc2xvdEZvcndh cmRBdHRhY2hlZE1zZygpOwogICB2b2lkIHNsb3RSZWRpcmVjdE1zZygpOwogICB2b2lkIHNsb3RC b3VuY2VNc2coKTsKKyAgdm9pZCBzbG90SW5zdGFudGlhdGVNc2dUZW1wbGF0ZSgpOwogICB2b2lk IHNsb3RNZXNzYWdlUXVldWVkT3JEcmFmdGVkKCk7CiAgIHZvaWQgc2xvdEVkaXRNc2coKTsKICAg dm9pZCBzbG90RGVsZXRlTXNnKCk7Cg== --------------Boundary-00=_QKDZWF4OCIV6FSL3BFOA-- _______________________________________________ Kmail Developers mailing list Kmail@master.kde.org http://master.kde.org/mailman/listinfo/kmail