205157 2009-08-26 00:08:15 +0000 two clicks on file to rename 2018-01-19 09:36:06 +0000 1 1 2 Applications dolphin general 16.12.2 unspecified Linux RESOLVED FIXED NOR wishlist --- 1 edwin dolphin-bugs-null ach alpeterson andreas.krutzler aspotashev bugseforuns ejbiow emdeck finex fraan funkybomber markg85 nate https://commits.kde.org/dolphin/5454283008f26d377a6403861a3cdd7992dbbd38 0 oldest_to_newest 818845 0 edwin 2009-08-26 00:08:15 +0000 Version: 1.3 (using 4.3.00 (KDE 4.3.0), Debian packages) Compiler: cc OS: Linux (x86_64) release 2.6.30-1-amd64 With Windows you can do two left mouse-button clicks and you can edit the file (node). With Dolphin i have to select the file, press right mouse button, select "rename", make the change and press "rename" again. I find the Windows solution quicker and more intuitive. 819015 1 finex 2009-08-26 11:16:20 +0000 I could agree with the "quicker", but about the "more intuitive" I completely disagree. It is intuitive for you which are used to do this action in Windows, but how many Windows users knows that? P.S: I don't want to criticize the request, absolutly! I've simply wrote my opinion about _one_ of your reasons. 819035 2 edwin 2009-08-26 12:01:53 +0000 i don't mind if the right-click-way is kept, the question if this "new" way bothers other users (when accidently getting in the edit mode). I guess not, they wil select another file or pressing "esc". But i think much "windows power users" will miss this way. But otherways, a option could be introduced in the settings screen to turn it on/off. It may be off by default. 833659 3 finex 2009-09-20 23:56:55 +0000 *** Bug 173135 has been marked as a duplicate of this bug. *** 833759 4 emdeck 2009-09-21 08:30:32 +0000 This is not something new, this feature was available in Konqueror in 3.5 (or maybe before, don't know) but was lost during porting... 858205 5 markg85 2009-11-08 21:22:37 +0000 Proposal on how to do this for single click and double click. = Single click = possible method -- When the user left clicks a file and holds it the mouse button pressed AND does not move the button then the inline rename mode is activated possible method -- When the user single clicks a file and keeps it pressed then presses the right mouse button (so, left press - right press -- both pressed) then the inline rename mode is activated. In other words. the user selects the file with the left mutton, holds it and right clicks to activate the inline rename. Then (once active) both buttons can be released and the user can type what he/she wants = Double Click = Same was as in windows. left click to select the file and another left click on a active file to activate the inline rename. Just some ideas on how it could be possibly done. If someone could make a patch to test those ideas.. that would be awesome. 859374 6 ejbiow 2009-11-10 18:25:52 +0000 I have missed this feature since I started using Linux almost exclusively 5 years ago. However I would love to know how to enable the double click file rename feature in konqueror 3.5, I still use it extensively (and love it) in Hardy and Lenny and I've looked on the net for a way to do this and never found anything. Hints, Emdek? 859380 7 emdeck 2009-11-10 18:35:00 +0000 (In reply to comment #6) > Hints, Emdek? Sorry, but I don't remember where that setting was placed, I'm using KDE4 for long time now and my distribution dropped support for KDE3 some time ago so I can't check it... I don't know if this worked also with "single click to open file" (it is default mode in Debian/Ubuntu, right?), I was using it with "double click" mode only. 1233381 8 ach 2012-03-06 22:02:00 +0000 Just my two cents: a) doing the rename inline and not in a dialog would be a really good thing IMHO. b) If (SHIFT)-<TAB>then would jump to (prev)-next file and allows inline rename of it would be very handy (and worth a blog entry) Independently: Thx a lot for your great dolpin work! Achim 1291375 9 vanmeeuwen 2012-08-24 16:22:30 +0000 Resetting assignee to default as per bug #305719 1587337 10 funkybomber 2016-04-08 06:18:30 +0000 Hello, I'm currently using Linux Mint with KDE 4.14.2, and this bug still hasn't been resolved after all these years. Is it safe to assume that this feature is not going to be implemented in KDE 4 ? Are there any plans for it to be implemented in KDE 5 ? Should we look forward to it? I think that a lot of people transitioning to Linux from a Windows environment find the lack of this feature as a handicap. This functionality really IS intuitive, at least for power users. One click to select the item (file/folder), second click (on the text) to rename it. I know that the default answer here is "press F2 to rename", but it's just not the same. I spend one second to find and press F2, while I can do a second click in 200ms and start renaming. ( In Windows I always set my double click speed to a very low value, just to be able to enter rename mode faster! ) Don't take just my word for it. Why do you think that this issue comes up again time after time? Here's another request for this feature (in Nautilus - but the concept is the same), dating back to 2006 ! https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/48671 People will keep asking for this in 10 years time if it's not done! :) And for a good reason! Please note I'm not suggesting that this should be the default behavior, just an extra option "Click selected to edit" to go along with the single/double click options. Kind regards! 1587689 11 98318 andreas.krutzler 2016-04-10 12:53:26 +0000 Created attachment 98318 debut-patch When I was switch from windows to linux about 10 years ago, this was also one big feature that I have missed. I got more or less used to it but I still think its very usefull so i wrote an patch to add this feature. By default its turned off. To turn it on go to Control->Configure dolphin->General. There should be an switch called "Fast renaming" (maybe we should change that). The behavior is quite the same as in windows file manager. 1587950 12 funkybomber 2016-04-12 05:03:09 +0000 Do I have to apply the patch manually or should I wait for it to become available through the regular updates of my distribution? (that might take a while I suppose) If it's the former, then could you please describe the proper steps to apply the patch? Either way, thanks for your effort! 1666190 13 funkybomber 2017-03-14 12:29:42 +0000 Follow up in the review board: https://git.reviewboard.kde.org/r/128715/ Hopefully this will trigger a discussion on what needs to be done for this bug. The more people who give feedback on this issue, the better. I have made my opinion known all too many times by now. 1695289 14 nate 2017-08-18 15:07:09 +0000 I hate to keep jerking you guys around, but can you re-post the patch to Phabricator? That's the infrastructure that KDE has moved to. https://phabricator.kde.org/ Please add "KDE Applications" and "Dolphin" as review groups, to make sure it gets seen. 1695368 15 nate 2017-08-18 18:05:58 +0000 *** Bug 246645 has been marked as a duplicate of this bug. *** 1708366 16 nate 2017-10-27 13:06:57 +0000 Git commit 5454283008f26d377a6403861a3cdd7992dbbd38 by Nathaniel Graham, on behalf of Andreas Krutzler. Committed on 27/10/2017 at 13:06. Pushed by ngraham into branch 'master'. Two clicks on file/folder to rename Summary: Make renaming of files/folders faster by clicking a second time on the items text to start renaming. Test Plan: This feature works as follows: 1. select an item by single-click, or one is already selected 2. wait the "double-click-interval" 3. click on the items text 4. none of the cancellations (see below) happens within the double-click-interval 5. inline-renaming starts Cancellations: * open any file/folder * select different item(s) * start dragging items * Dolphin loses focus This feature is just enabled while "Double-click to open files and folders" in system-settings and "Rename inline" in Dolphin are enabled. Reviewers: #dolphin, #kde_applications, elvisangelaccio, emmanuelp, ngraham, markg, rkflx Reviewed By: #dolphin, #kde_applications, elvisangelaccio, ngraham, rkflx Subscribers: rkflx, markg, funkybomber, sars, elvisangelaccio, ngraham Differential Revision: https://phabricator.kde.org/D7647 M +4 -0 src/kitemviews/kitemlistcontroller.cpp M +2 -0 src/kitemviews/kitemlistcontroller.h M +13 -0 src/kitemviews/kitemlistview.cpp M +1 -0 src/kitemviews/kitemlistview.h M +47 -6 src/views/dolphinview.cpp M +8 -0 src/views/dolphinview.h https://commits.kde.org/dolphin/5454283008f26d377a6403861a3cdd7992dbbd38 1708571 17 nate 2017-10-27 22:05:14 +0000 *** Bug 386268 has been marked as a duplicate of this bug. *** 1723535 18 ach 2018-01-19 09:36:06 +0000 I've found it works also with single-click. At least with 17.12.1 * Click (without release) on the name of a already selected file/folder * After the (double-click?)-timeout without releasing the mouse button the filename can be edited inline. Thx a lot for implementing it! 98318 2016-04-10 12:53:26 +0000 2016-04-10 12:53:26 +0000 debut-patch bug_205157.patch text/plain 8797 andreas.krutzler RnJvbSA4Njg5OTAyYWM4N2E5MTBkYmY0MDg0NzViNDE5MjkwYjkzODM5MWNlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbmRyZWFzIEtydXR6bGVyIDxhbmRpLmtydXR6bGVyQGdtYWls LmNvbT4KRGF0ZTogU3VuLCAxMCBBcHIgMjAxNiAxNDoyOToyOSArMDIwMApTdWJqZWN0OiBbUEFU Q0hdIEJ1ZyAyMDUxNTcgLSB0d28gY2xpY2tzIG9uIGZpbGUgdG8gcmVuYW1lCgotLS0KIHNyYy9r aXRlbXZpZXdzL2tpdGVtbGlzdGNvbnRyb2xsZXIuY3BwICAgICAgICB8ICA1ICsrKysrCiBzcmMv a2l0ZW12aWV3cy9raXRlbWxpc3Rjb250cm9sbGVyLmggICAgICAgICAgfCAgMiArKwogc3JjL2tp dGVtdmlld3Mva2l0ZW1saXN0dmlldy5jcHAgICAgICAgICAgICAgIHwgMTMgKysrKysrKysrKysr Kwogc3JjL2tpdGVtdmlld3Mva2l0ZW1saXN0dmlldy5oICAgICAgICAgICAgICAgIHwgIDEgKwog c3JjL3NldHRpbmdzL2RvbHBoaW5fZ2VuZXJhbHNldHRpbmdzLmtjZmcgICAgIHwgIDQgKysrKwog c3JjL3NldHRpbmdzL2dlbmVyYWwvYmVoYXZpb3JzZXR0aW5nc3BhZ2UuY3BwIHwgMTAgKysrKysr KysrLQogc3JjL3NldHRpbmdzL2dlbmVyYWwvYmVoYXZpb3JzZXR0aW5nc3BhZ2UuaCAgIHwgIDEg Kwogc3JjL3ZpZXdzL2RvbHBoaW52aWV3LmNwcCAgICAgICAgICAgICAgICAgICAgIHwgIDggKysr KysrKysKIHNyYy92aWV3cy9kb2xwaGludmlldy5oICAgICAgICAgICAgICAgICAgICAgICB8ICAx ICsKIDkgZmlsZXMgY2hhbmdlZCwgNDQgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlm ZiAtLWdpdCBhL3NyYy9raXRlbXZpZXdzL2tpdGVtbGlzdGNvbnRyb2xsZXIuY3BwIGIvc3JjL2tp dGVtdmlld3Mva2l0ZW1saXN0Y29udHJvbGxlci5jcHAKaW5kZXggMWM4NmZmMC4uNWJmYzA4YyAx MDA2NDQKLS0tIGEvc3JjL2tpdGVtdmlld3Mva2l0ZW1saXN0Y29udHJvbGxlci5jcHAKKysrIGIv c3JjL2tpdGVtdmlld3Mva2l0ZW1saXN0Y29udHJvbGxlci5jcHAKQEAgLTU4Myw2ICs1ODMsMTEg QEAgYm9vbCBLSXRlbUxpc3RDb250cm9sbGVyOjptb3VzZVByZXNzRXZlbnQoUUdyYXBoaWNzU2Nl bmVNb3VzZUV2ZW50KiBldmVudCwgY29uc3QKICAgICAgICAgLy8gLT4gcmVtZW1iZXIgdGhhdCB0 aGUgdXNlciBwcmVzc2VkIGFuIGl0ZW0gd2hpY2ggaGFkIGJlZW4gc2VsZWN0ZWQgYWxyZWFkeSBh bmQKICAgICAgICAgLy8gICAgY2xlYXIgdGhlIHNlbGVjdGlvbiBpbiBtb3VzZVJlbGVhc2VFdmVu dCgpLCB1bmxlc3MgdGhlIGl0ZW1zIGFyZSBkcmFnZ2VkLgogICAgICAgICBtX2NsZWFyU2VsZWN0 aW9uSWZJdGVtc0FyZU5vdERyYWdnZWQgPSB0cnVlOworCisgICAgICAgIGlmIChtX3NlbGVjdGlv bk1hbmFnZXItPnNlbGVjdGVkSXRlbXMoKS5jb3VudCgpID09IDEgJiYKKyAgICAgICAgICAgIG1f dmlldy0+aXNBYm92ZVRleHQobV9wcmVzc2VkSW5kZXgsIG1fcHJlc3NlZE1vdXNlUG9zKSkgewor ICAgICAgICAgICAgZW1pdCBzZWxlY3RlZEl0ZW1UZXh0UHJlc3NlZChtX3ByZXNzZWRJbmRleCk7 CisgICAgICAgIH0KICAgICB9CiAKICAgICBpZiAoIXNoaWZ0UHJlc3NlZCkgewpkaWZmIC0tZ2l0 IGEvc3JjL2tpdGVtdmlld3Mva2l0ZW1saXN0Y29udHJvbGxlci5oIGIvc3JjL2tpdGVtdmlld3Mv a2l0ZW1saXN0Y29udHJvbGxlci5oCmluZGV4IGI4YTkzZWQuLjA2MGNlMTEgMTAwNjQ0Ci0tLSBh L3NyYy9raXRlbXZpZXdzL2tpdGVtbGlzdGNvbnRyb2xsZXIuaAorKysgYi9zcmMva2l0ZW12aWV3 cy9raXRlbWxpc3Rjb250cm9sbGVyLmgKQEAgLTIzNyw2ICsyMzcsOCBAQCBzaWduYWxzOgogICAg IHZvaWQgbW9kZWxDaGFuZ2VkKEtJdGVtTW9kZWxCYXNlKiBjdXJyZW50LCBLSXRlbU1vZGVsQmFz ZSogcHJldmlvdXMpOwogICAgIHZvaWQgdmlld0NoYW5nZWQoS0l0ZW1MaXN0VmlldyogY3VycmVu dCwgS0l0ZW1MaXN0VmlldyogcHJldmlvdXMpOwogCisgICAgdm9pZCBzZWxlY3RlZEl0ZW1UZXh0 UHJlc3NlZChpbnQgaW5kZXgpOworCiBwcml2YXRlIHNsb3RzOgogICAgIHZvaWQgc2xvdFZpZXdT Y3JvbGxPZmZzZXRDaGFuZ2VkKHFyZWFsIGN1cnJlbnQsIHFyZWFsIHByZXZpb3VzKTsKIApkaWZm IC0tZ2l0IGEvc3JjL2tpdGVtdmlld3Mva2l0ZW1saXN0dmlldy5jcHAgYi9zcmMva2l0ZW12aWV3 cy9raXRlbWxpc3R2aWV3LmNwcAppbmRleCBkZjY1Mzk5Li40MjFhNjJjIDEwMDY0NAotLS0gYS9z cmMva2l0ZW12aWV3cy9raXRlbWxpc3R2aWV3LmNwcAorKysgYi9zcmMva2l0ZW12aWV3cy9raXRl bWxpc3R2aWV3LmNwcApAQCAtNDQ4LDYgKzQ0OCwxOSBAQCBib29sIEtJdGVtTGlzdFZpZXc6Omlz QWJvdmVFeHBhbnNpb25Ub2dnbGUoaW50IGluZGV4LCBjb25zdCBRUG9pbnRGJiBwb3MpIGNvbnN0 CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCitib29sIEtJdGVtTGlzdFZpZXc6OmlzQWJvdmVUZXh0 KGludCBpbmRleCwgY29uc3QgUVBvaW50RiAmcG9zKSBjb25zdAoreworICAgIGNvbnN0IEtJdGVt TGlzdFdpZGdldCogd2lkZ2V0ID0gbV92aXNpYmxlSXRlbXMudmFsdWUoaW5kZXgpOworICAgIGlm ICh3aWRnZXQpIHsKKyAgICAgICAgY29uc3QgUVJlY3RGICZ0ZXh0UmVjdCA9IHdpZGdldC0+dGV4 dFJlY3QoKTsKKyAgICAgICAgaWYgKCF0ZXh0UmVjdC5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAg IGNvbnN0IFFQb2ludEYgbWFwcGVkUG9zID0gd2lkZ2V0LT5tYXBGcm9tSXRlbSh0aGlzLCBwb3Mp OworICAgICAgICAgICAgcmV0dXJuIHRleHRSZWN0LmNvbnRhaW5zKG1hcHBlZFBvcyk7CisgICAg ICAgIH0KKyAgICB9CisgICAgcmV0dXJuIGZhbHNlOworfQorCiBpbnQgS0l0ZW1MaXN0Vmlldzo6 Zmlyc3RWaXNpYmxlSW5kZXgoKSBjb25zdAogewogICAgIHJldHVybiBtX2xheW91dGVyLT5maXJz dFZpc2libGVJbmRleCgpOwpkaWZmIC0tZ2l0IGEvc3JjL2tpdGVtdmlld3Mva2l0ZW1saXN0dmll dy5oIGIvc3JjL2tpdGVtdmlld3Mva2l0ZW1saXN0dmlldy5oCmluZGV4IDlhZGY5ZjguLjkyNzNh ZmUgMTAwNjQ0Ci0tLSBhL3NyYy9raXRlbXZpZXdzL2tpdGVtbGlzdHZpZXcuaAorKysgYi9zcmMv a2l0ZW12aWV3cy9raXRlbWxpc3R2aWV3LmgKQEAgLTE3OCw2ICsxNzgsNyBAQCBwdWJsaWM6CiAg ICAgaW50IGl0ZW1BdChjb25zdCBRUG9pbnRGJiBwb3MpIGNvbnN0OwogICAgIGJvb2wgaXNBYm92 ZVNlbGVjdGlvblRvZ2dsZShpbnQgaW5kZXgsIGNvbnN0IFFQb2ludEYmIHBvcykgY29uc3Q7CiAg ICAgYm9vbCBpc0Fib3ZlRXhwYW5zaW9uVG9nZ2xlKGludCBpbmRleCwgY29uc3QgUVBvaW50RiYg cG9zKSBjb25zdDsKKyAgICBib29sIGlzQWJvdmVUZXh0KGludCBpbmRleCwgY29uc3QgUVBvaW50 RiYgcG9zKSBjb25zdDsKIAogICAgIC8qKgogICAgICAqIEByZXR1cm4gSW5kZXggb2YgdGhlIGZp cnN0IGl0ZW0gdGhhdCBpcyBhdCBsZWFzdCBwYXJ0bHkgdmlzaWJsZS4KZGlmZiAtLWdpdCBhL3Ny Yy9zZXR0aW5ncy9kb2xwaGluX2dlbmVyYWxzZXR0aW5ncy5rY2ZnIGIvc3JjL3NldHRpbmdzL2Rv bHBoaW5fZ2VuZXJhbHNldHRpbmdzLmtjZmcKaW5kZXggZGU3MzkwYi4uODc2ZWUxMSAxMDA2NDQK LS0tIGEvc3JjL3NldHRpbmdzL2RvbHBoaW5fZ2VuZXJhbHNldHRpbmdzLmtjZmcKKysrIGIvc3Jj L3NldHRpbmdzL2RvbHBoaW5fZ2VuZXJhbHNldHRpbmdzLmtjZmcKQEAgLTU4LDYgKzU4LDEwIEBA CiAgICAgICAgICAgICA8bGFiZWw+UmVuYW1lIGlubGluZTwvbGFiZWw+CiAgICAgICAgICAgICA8 ZGVmYXVsdD50cnVlPC9kZWZhdWx0PgogICAgICAgICA8L2VudHJ5PgorICAgICAgICA8ZW50cnkg bmFtZT0iRmFzdFJlbmFtaW5nIiB0eXBlPSJCb29sIj4KKyAgICAgICAgICAgIDxsYWJlbD5GYXN0 IHJlbmFtaW5nPC9sYWJlbD4KKyAgICAgICAgICAgIDxkZWZhdWx0PmZhbHNlPC9kZWZhdWx0Pgor ICAgICAgICA8L2VudHJ5PgogICAgICAgICA8ZW50cnkgbmFtZT0iU2hvd1NlbGVjdGlvblRvZ2ds ZSIgdHlwZT0iQm9vbCI+CiAgICAgICAgICAgICA8bGFiZWw+U2hvdyBzZWxlY3Rpb24gdG9nZ2xl PC9sYWJlbD4KICAgICAgICAgICAgIDxkZWZhdWx0PnRydWU8L2RlZmF1bHQ+CmRpZmYgLS1naXQg YS9zcmMvc2V0dGluZ3MvZ2VuZXJhbC9iZWhhdmlvcnNldHRpbmdzcGFnZS5jcHAgYi9zcmMvc2V0 dGluZ3MvZ2VuZXJhbC9iZWhhdmlvcnNldHRpbmdzcGFnZS5jcHAKaW5kZXggODZhNGFkMy4uMGNk MWM5NyAxMDA2NDQKLS0tIGEvc3JjL3NldHRpbmdzL2dlbmVyYWwvYmVoYXZpb3JzZXR0aW5nc3Bh Z2UuY3BwCisrKyBiL3NyYy9zZXR0aW5ncy9nZW5lcmFsL2JlaGF2aW9yc2V0dGluZ3NwYWdlLmNw cApAQCAtNDEsNyArNDEsOCBAQCBCZWhhdmlvclNldHRpbmdzUGFnZTo6QmVoYXZpb3JTZXR0aW5n c1BhZ2UoY29uc3QgUVVybCYgdXJsLCBRV2lkZ2V0KiBwYXJlbnQpIDoKICAgICBtX25hdHVyYWxT b3J0aW5nKDApLAogICAgIG1fY2FzZVNlbnNpdGl2ZVNvcnRpbmcoMCksCiAgICAgbV9jYXNlSW5z ZW5zaXRpdmVTb3J0aW5nKDApLAotICAgIG1fcmVuYW1lSW5saW5lKDApCisgICAgbV9yZW5hbWVJ bmxpbmUoMCksCisgICAgbV9mYXN0UmVuYW1pbmcoMCkKIHsKICAgICBRVkJveExheW91dCogdG9w TGF5b3V0ID0gbmV3IFFWQm94TGF5b3V0KHRoaXMpOwogCkBAIC03OCwxMSArNzksMTUgQEAgQmVo YXZpb3JTZXR0aW5nc1BhZ2U6OkJlaGF2aW9yU2V0dGluZ3NQYWdlKGNvbnN0IFFVcmwmIHVybCwg UVdpZGdldCogcGFyZW50KSA6CiAgICAgLy8gJ0lubGluZSByZW5hbWluZyBvZiBpdGVtcycKICAg ICBtX3JlbmFtZUlubGluZSA9IG5ldyBRQ2hlY2tCb3goaTE4bmMoIm9wdGlvbjpjaGVjayIsICJS ZW5hbWUgaW5saW5lIiksIHRoaXMpOwogCisgICAgLy8gJ1JlbmFtaW5nIG9uIHRleHQgY2xpY2tl ZCBvZiBpdGVtcycKKyAgICBtX2Zhc3RSZW5hbWluZyA9IG5ldyBRQ2hlY2tCb3goaTE4bmMoIm9w dGlvbjpjaGVjayIsICJGYXN0IHJlbmFtaW5nIiksIHRoaXMpOworCiAgICAgdG9wTGF5b3V0LT5h ZGRXaWRnZXQodmlld1Byb3BzQm94KTsKICAgICB0b3BMYXlvdXQtPmFkZFdpZGdldChzb3J0aW5n UHJvcHNCb3gpOwogICAgIHRvcExheW91dC0+YWRkV2lkZ2V0KG1fc2hvd1Rvb2xUaXBzKTsKICAg ICB0b3BMYXlvdXQtPmFkZFdpZGdldChtX3Nob3dTZWxlY3Rpb25Ub2dnbGUpOwogICAgIHRvcExh eW91dC0+YWRkV2lkZ2V0KG1fcmVuYW1lSW5saW5lKTsKKyAgICB0b3BMYXlvdXQtPmFkZFdpZGdl dChtX2Zhc3RSZW5hbWluZyk7CiAgICAgdG9wTGF5b3V0LT5hZGRTdHJldGNoKCk7CiAKICAgICBs b2FkU2V0dGluZ3MoKTsKQEAgLTk1LDYgKzEwMCw3IEBAIEJlaGF2aW9yU2V0dGluZ3NQYWdlOjpC ZWhhdmlvclNldHRpbmdzUGFnZShjb25zdCBRVXJsJiB1cmwsIFFXaWRnZXQqIHBhcmVudCkgOgog ICAgIGNvbm5lY3QobV9jYXNlSW5zZW5zaXRpdmVTb3J0aW5nLCAmUVJhZGlvQnV0dG9uOjp0b2dn bGVkLCB0aGlzLCAmQmVoYXZpb3JTZXR0aW5nc1BhZ2U6OmNoYW5nZWQpOwogICAgIGNvbm5lY3Qo bV9jYXNlU2Vuc2l0aXZlU29ydGluZywgJlFSYWRpb0J1dHRvbjo6dG9nZ2xlZCwgdGhpcywgJkJl aGF2aW9yU2V0dGluZ3NQYWdlOjpjaGFuZ2VkKTsKICAgICBjb25uZWN0KG1fcmVuYW1lSW5saW5l LCAmUUNoZWNrQm94Ojp0b2dnbGVkLCB0aGlzLCAmQmVoYXZpb3JTZXR0aW5nc1BhZ2U6OmNoYW5n ZWQpOworICAgIGNvbm5lY3QobV9mYXN0UmVuYW1pbmcsICZRQ2hlY2tCb3g6OnRvZ2dsZWQsIHRo aXMsICZCZWhhdmlvclNldHRpbmdzUGFnZTo6Y2hhbmdlZCk7CiB9CiAKIEJlaGF2aW9yU2V0dGlu Z3NQYWdlOjp+QmVoYXZpb3JTZXR0aW5nc1BhZ2UoKQpAQCAtMTEyLDYgKzExOCw3IEBAIHZvaWQg QmVoYXZpb3JTZXR0aW5nc1BhZ2U6OmFwcGx5U2V0dGluZ3MoKQogICAgIHNldHRpbmdzLT5zZXRT aG93U2VsZWN0aW9uVG9nZ2xlKG1fc2hvd1NlbGVjdGlvblRvZ2dsZS0+aXNDaGVja2VkKCkpOwog ICAgIHNldFNvcnRpbmdDaG9pY2VWYWx1ZShzZXR0aW5ncyk7CiAgICAgc2V0dGluZ3MtPnNldFJl bmFtZUlubGluZShtX3JlbmFtZUlubGluZS0+aXNDaGVja2VkKCkpOworICAgIHNldHRpbmdzLT5z ZXRGYXN0UmVuYW1pbmcobV9mYXN0UmVuYW1pbmctPmlzQ2hlY2tlZCgpKTsKICAgICBzZXR0aW5n cy0+c2F2ZSgpOwogCiAgICAgaWYgKHVzZUdsb2JhbFZpZXdQcm9wcykgewpAQCAtMTQxLDYgKzE0 OCw3IEBAIHZvaWQgQmVoYXZpb3JTZXR0aW5nc1BhZ2U6OmxvYWRTZXR0aW5ncygpCiAgICAgbV9z aG93VG9vbFRpcHMtPnNldENoZWNrZWQoR2VuZXJhbFNldHRpbmdzOjpzaG93VG9vbFRpcHMoKSk7 CiAgICAgbV9zaG93U2VsZWN0aW9uVG9nZ2xlLT5zZXRDaGVja2VkKEdlbmVyYWxTZXR0aW5nczo6 c2hvd1NlbGVjdGlvblRvZ2dsZSgpKTsKICAgICBtX3JlbmFtZUlubGluZS0+c2V0Q2hlY2tlZChH ZW5lcmFsU2V0dGluZ3M6OnJlbmFtZUlubGluZSgpKTsKKyAgICBtX2Zhc3RSZW5hbWluZy0+c2V0 Q2hlY2tlZChHZW5lcmFsU2V0dGluZ3M6OmZhc3RSZW5hbWluZygpKTsKIAogICAgIGxvYWRTb3J0 aW5nQ2hvaWNlU2V0dGluZ3MoKTsKIH0KZGlmZiAtLWdpdCBhL3NyYy9zZXR0aW5ncy9nZW5lcmFs L2JlaGF2aW9yc2V0dGluZ3NwYWdlLmggYi9zcmMvc2V0dGluZ3MvZ2VuZXJhbC9iZWhhdmlvcnNl dHRpbmdzcGFnZS5oCmluZGV4IDYyMTM3MzQuLmJmNGMyZWIgMTAwNjQ0Ci0tLSBhL3NyYy9zZXR0 aW5ncy9nZW5lcmFsL2JlaGF2aW9yc2V0dGluZ3NwYWdlLmgKKysrIGIvc3JjL3NldHRpbmdzL2dl bmVyYWwvYmVoYXZpb3JzZXR0aW5nc3BhZ2UuaApAQCAtNjUsNiArNjUsNyBAQCBwcml2YXRlOgog ICAgIFFSYWRpb0J1dHRvbiogbV9jYXNlSW5zZW5zaXRpdmVTb3J0aW5nOwogCiAgICAgUUNoZWNr Qm94KiBtX3JlbmFtZUlubGluZTsKKyAgICBRQ2hlY2tCb3gqIG1fZmFzdFJlbmFtaW5nOwogfTsK IAogI2VuZGlmCmRpZmYgLS1naXQgYS9zcmMvdmlld3MvZG9scGhpbnZpZXcuY3BwIGIvc3JjL3Zp ZXdzL2RvbHBoaW52aWV3LmNwcAppbmRleCBjM2RmM2E5Li4zMWZlZGE4IDEwMDY0NAotLS0gYS9z cmMvdmlld3MvZG9scGhpbnZpZXcuY3BwCisrKyBiL3NyYy92aWV3cy9kb2xwaGludmlldy5jcHAK QEAgLTE1Myw2ICsxNTMsNyBAQCBEb2xwaGluVmlldzo6RG9scGhpblZpZXcoY29uc3QgUVVybCYg dXJsLCBRV2lkZ2V0KiBwYXJlbnQpIDoKICAgICBjb25uZWN0KGNvbnRyb2xsZXIsICZLSXRlbUxp c3RDb250cm9sbGVyOjppdGVtRHJvcEV2ZW50LCB0aGlzLCAmRG9scGhpblZpZXc6OnNsb3RJdGVt RHJvcEV2ZW50KTsKICAgICBjb25uZWN0KGNvbnRyb2xsZXIsICZLSXRlbUxpc3RDb250cm9sbGVy Ojplc2NhcGVQcmVzc2VkLCB0aGlzLCAmRG9scGhpblZpZXc6OnN0b3BMb2FkaW5nKTsKICAgICBj b25uZWN0KGNvbnRyb2xsZXIsICZLSXRlbUxpc3RDb250cm9sbGVyOjptb2RlbENoYW5nZWQsIHRo aXMsICZEb2xwaGluVmlldzo6c2xvdE1vZGVsQ2hhbmdlZCk7CisgICAgY29ubmVjdChjb250cm9s bGVyLCAmS0l0ZW1MaXN0Q29udHJvbGxlcjo6c2VsZWN0ZWRJdGVtVGV4dFByZXNzZWQsIHRoaXMs ICZEb2xwaGluVmlldzo6c2xvdFNlbGVjdGVkSXRlbVRleHRQcmVzc2VkKTsKIAogICAgIGNvbm5l Y3QobV9tb2RlbCwgJktGaWxlSXRlbU1vZGVsOjpkaXJlY3RvcnlMb2FkaW5nU3RhcnRlZCwgICAg ICAgdGhpcywgJkRvbHBoaW5WaWV3OjpzbG90RGlyZWN0b3J5TG9hZGluZ1N0YXJ0ZWQpOwogICAg IGNvbm5lY3QobV9tb2RlbCwgJktGaWxlSXRlbU1vZGVsOjpkaXJlY3RvcnlMb2FkaW5nQ29tcGxl dGVkLCAgICAgdGhpcywgJkRvbHBoaW5WaWV3OjpzbG90RGlyZWN0b3J5TG9hZGluZ0NvbXBsZXRl ZCk7CkBAIC0xMDkwLDYgKzEwOTEsMTMgQEAgdm9pZCBEb2xwaGluVmlldzo6c2xvdE1vdXNlQnV0 dG9uUHJlc3NlZChpbnQgaXRlbUluZGV4LCBRdDo6TW91c2VCdXR0b25zIGJ1dHRvbnMKICAgICB9 CiB9CiAKK3ZvaWQgRG9scGhpblZpZXc6OnNsb3RTZWxlY3RlZEl0ZW1UZXh0UHJlc3NlZChpbnQg aW5kZXgpCit7CisgICAgUV9VTlVTRUQoaW5kZXgpCisgICAgaWYgKEdlbmVyYWxTZXR0aW5nczo6 ZmFzdFJlbmFtaW5nKCkpCisgICAgICAgIHJlbmFtZVNlbGVjdGVkSXRlbXMoKTsKK30KKwogdm9p ZCBEb2xwaGluVmlldzo6c2xvdEl0ZW1DcmVhdGVkKGNvbnN0IFFVcmwmIHVybCkKIHsKICAgICBp ZiAobV9tYXJrRmlyc3ROZXdseVNlbGVjdGVkSXRlbUFzQ3VycmVudCkgewpkaWZmIC0tZ2l0IGEv c3JjL3ZpZXdzL2RvbHBoaW52aWV3LmggYi9zcmMvdmlld3MvZG9scGhpbnZpZXcuaAppbmRleCBk MWE1ZDUwLi5lYWZjMzcxIDEwMDY0NAotLS0gYS9zcmMvdmlld3MvZG9scGhpbnZpZXcuaAorKysg Yi9zcmMvdmlld3MvZG9scGhpbnZpZXcuaApAQCAtNTcyLDYgKzU3Miw3IEBAIHByaXZhdGUgc2xv dHM6CiAgICAgdm9pZCBzbG90SXRlbURyb3BFdmVudChpbnQgaW5kZXgsIFFHcmFwaGljc1NjZW5l RHJhZ0Ryb3BFdmVudCogZXZlbnQpOwogICAgIHZvaWQgc2xvdE1vZGVsQ2hhbmdlZChLSXRlbU1v ZGVsQmFzZSogY3VycmVudCwgS0l0ZW1Nb2RlbEJhc2UqIHByZXZpb3VzKTsKICAgICB2b2lkIHNs b3RNb3VzZUJ1dHRvblByZXNzZWQoaW50IGl0ZW1JbmRleCwgUXQ6Ok1vdXNlQnV0dG9ucyBidXR0 b25zKTsKKyAgICB2b2lkIHNsb3RTZWxlY3RlZEl0ZW1UZXh0UHJlc3NlZChpbnQgaW5kZXgpOwog CiAgICAgLyoKICAgICAgKiBJcyBjYWxsZWQgd2hlbiBuZXcgaXRlbXMgZ2V0IHBhc3RlZCBvciBk cm9wcGVkLgotLSAKMi44LjAKCg==