289090 2011-12-16 03:48:18 +0000 Add option for disabling "expandable folders" 2012-04-05 21:09:16 +0000 1 1 2 Applications dolphin view-engine: details mode 1.99 Compiled Sources Linux RESOLVED FIXED NOR wishlist --- 1 mmodem00 peter.penz19 adjam7 alpeterson cris2007 cyberbeat elandread kairo m.wege msdobrescu nitro thomas 4.8.2 0 oldest_to_newest 1200348 0 mmodem00 2011-12-16 03:48:18 +0000 Version: 1.99 (using Devel) OS: Linux Dolphin is showing arrows (that indicate subfolders) in right panel. Why is this happening? I remember that in dolphin this only happened when the option "Expandable Folders" was selected from the details mode view in the configure window. And now theres no option to allow the user to choose... Reproducible: Always Steps to Reproduce: Start dolphin from master. Actual Results: Dolphin shows arrows in right panel and theres no option to disable this. Expected Results: The default behaviour should be to not show arrows, and also exist an option so that the user can choose to have expandable folders in right panel, or not. OS: Linux (x86_64) release 3.1.5-1.1-desktop Compiler: gcc 1200393 1 peter.penz19 2011-12-16 08:53:34 +0000 *** Bug 289089 has been marked as a duplicate of this bug. *** 1200738 2 peter.penz19 2011-12-16 23:08:59 +0000 *** Bug 289089 has been marked as a duplicate of this bug. *** 1204959 3 alpeterson 2011-12-26 10:57:49 +0000 This is not just a wishlist, it is a functional and accessibility issue, I need to be able to have a folder view with just the items in the one folder showing. This should be details view.. Expando view should be a new view option, as it is new behavior. (I also only use details view, and have double clicks to prevent accidental activation) As Dolphin still has the bug where multiple items get selected with single clicks, this compounds the danger. Someone with poor motor control will do unintended actions.. As cool as this expandable folder feature is, I rarely expect to need it, and I would like to turn it off. I do not intend to move files from multiple folders in one action to other folders. all I can think of is some way to limit selection to one folder at a time, and this gets complicated. How does this work with hard links between files in different folders? Also, this makes undoing harder. 1209995 4 peter.penz19 2012-01-05 18:17:13 +0000 *** Bug 290724 has been marked as a duplicate of this bug. *** 1210757 5 alpeterson 2012-01-06 22:19:38 +0000 would propose having a tree view and a details view again, as tree view may be useful to others. 1215593 6 cyberbeat 2012-01-17 15:27:28 +0000 I need that option back, too. Will you reimplement that? And if so, can you give some kde-version to plan with? Perhaps I could help with this. btw all other issues I had with dolphin-rc2 seem to be fixed in 4.8-head, thanks for that. 1215599 7 cyberbeat 2012-01-17 15:32:41 +0000 another thing to mention for other people, which can not live with some regressions: seems to me like dolphin from kde-4.7 branch compiles fine against kde-4.8 branch and also runs without problems so far. 1215625 8 67931 cyberbeat 2012-01-17 16:17:43 +0000 Created attachment 67931 patch to disable expansion in main-details-view I think it is possible to build uppon this patch, to re-add an option for expansion in detail-view. I am proud, that I managed disabling expansion while keeping folder-view working :-) 1216704 9 mmodem00 2012-01-20 04:14:14 +0000 Great work H.H. :) I think this patch can be shiped. 1216878 10 cyberbeat 2012-01-20 15:28:44 +0000 oh no, this patch is a workaround, the option in the gui is missing. with my patch tree-view is impossible. 1217165 11 68066 cyberbeat 2012-01-21 11:26:51 +0000 Created attachment 68066 Patch with gui option I succeeded to re-add the gui option. Only problem: I failed in getting that option applied on "apply". It is only applied on startup. @Peter Penz: Is my patch done the right way? Could you help me for the remaining issue (after kde-4.8 release stress)? 1217350 12 peter.penz19 2012-01-21 22:49:30 +0000 @H.H.: I'm really happy about any support I can get for Dolphin and I want to say thanks for your efforts. But I think it would have been better to wait for an answer before investigating so much work into this: I've removed this option on purpose and I wanted to readd it again only if there are a high number of complaints which might indicate that my decision was wrong (... and yes: I'm aware that anybody that is subscribed to this bug is convinced that my decision is wrong ;-)). Without going into too much implementation details: The patch with the UI option is not sufficient for a fully working version of this option. The drag & drop behavior must be adjusted too when "open folders during drag operation" is activated and there are other subtle differences that make the maintenance tricky... So I'd really like to wait for the user feedback after 4.8 is out before deciding to readd this option again. We anyhow may not add this feature for 4.8.x due to the new UI strings... I'm happy to use your patch as base then, but I cannot promise currently that this option will be added again. 1217372 13 cyberbeat 2012-01-22 00:50:10 +0000 Can you explain the problem with drag&drop behaviour, and more details about the other things? I am willing to fix all problems, if you give me some hints. I did not have problems with my patch so far. Even, if you won't adapt the feature again, I will maintain my patch, because I am sure, I'll never get used to the tree view on the right, that's what the folderview is for.. 1217408 14 peter.penz19 2012-01-22 05:20:23 +0000 Thanks for this great offer, but I'd suggest lets wait on the feedback first after 4.8 is out. I don't want to create any workload for you where I probably might not add the code into Dolphin ;-). I'm really open to change my opinion for this option: I wanted to use Dolphin 2.0 also as a chance to get rid of some codepaths for options that are (probably?) never or very rarely used (each codepath of course consumes time and workload for maintaining it). To me the current number of duplicates for this bug already indicates that after 4.8 the chances for more duplicates are high, so that my decision to remove this option was wrong. So lets wait a few weeks - afterwards it would be great if we could work together on this :-) 1217418 15 mmodem00 2012-01-22 06:08:46 +0000 I still havent a chance to test the last patch update since i prefer to have dolphin respecting the theme definitions and not have expandable folders in right panel, so im forced to go back to SHA 37247c00868a1ee2a84bf7b463cc92b16579f813 that dates from 30/07/2011. Anyway i get Peter point, but even if there wasnt a much revelant feedback against having expandable folders, the most reasonable choice would be to always give the user the ability to choose, thus providing an option to enable/disable that feature. 1218281 16 alpeterson 2012-01-25 00:02:55 +0000 @Peter, KDE is used by so many people. If this option gets removed from 4.8, so many distros will be unusable... they won't patch it. We should have a UI experimentation branch of KDE, and I would gladly play with that... I wish we didn't play with release software. Think of ubuntu Unity... That is a horrible steaming pile of slop... they have some cool ideas, but nobody can stand using it by default. And with KDE doing similar things to what users are used to, we all are switching to xfce and other window managers. We should have very very few complaints as our threshold for using software. Multiple options are great... yes more code paths yes, but if managed properly we can all be happy. Those of use who do lots of file wrangling will be forced to use another manager, and you won't hear about it. I beg you to put it back in for 4.8 so the distros that use it are usable out of the box. New features can run a cycle as an option, be default in the UI experimentation branch, and maybe switch to being default. How much money would it take to get the details view back? I value KDE enough that I will throw some money in. ( I am unemployed, so am trying to help with bugs and testing) Also, please remember, that very few people use 4.8 beta... So if it goes mainstream, you will probably get a lot of requests. Peter, Thank you for your work, and we want to support you. Let us know what we can do. 1218331 17 peter.penz19 2012-01-25 08:02:31 +0000 @all: Thanks for your feedback. 16 comments (although KDE apps 4.8.0 is not even released) show me that my decision was wrong and I'll readd the option again. I'll also backport this to 4.8.x but in 4.8.x you'll need to manually adjust the dolphinrc file to disable the expansion-toggle because no new user interface strings are allowed for the 4.8.x branch. I'll provide a detailed description here as soon as the patch has been merged. 1218789 18 mmodem00 2012-01-26 14:56:42 +0000 H.H. could you please attach the patch? At least i would start packaging dolphin providing to the end user the ability to choose and not force him to just use some option i would like more. 1220121 19 peter.penz19 2012-01-29 08:56:49 +0000 *** Bug 292760 has been marked as a duplicate of this bug. *** 1230483 20 mmodem00 2012-02-25 23:28:12 +0000 H.H. could you please update the patch? With latest changes in kde-baseapps from git master is no longer possible to apply the patch. 1230484 21 mmodem00 2012-02-25 23:47:15 +0000 Im really failing to understand why Peter does not allow the user to not use expandable folders, this isnt making any sense... He could even set to use expandable folder in detail view by default, but at least allow the user to have the choice to use it or not, like it used to happen untill dolphin 2.0. 1230550 22 msdobrescu 2012-02-26 12:10:55 +0000 (In reply to comment #21) > Im really failing to understand why Peter does not allow the user to not use > expandable folders, this isnt making any sense... > > He could even set to use expandable folder in detail view by default, but at > least allow the user to have the choice to use it or not, like it used to > happen untill dolphin 2.0. Because it would involve an 'if' somewhere in the code, that could be very expensive and he consumed all of them in other important tasks...Just kidding. Now, seriously, please, do not remove the customization, it is useful to us. 1230604 23 peter.penz19 2012-02-26 16:14:10 +0000 @Ze + Mihai: Is it really too much to read + understand the previous comments (see comment 17)? To state it again: I'll readd this option! But honestly: my motivation doing it really goes against 0 now... 1230609 24 cyberbeat 2012-02-26 16:30:16 +0000 @Peter Penz : oh no, don't loose your motivation. I really look forward all the time for the re-addition :-) I am really thankfull, that you care (and always did) about user-reports like this. @Ze: Why do you have to use dolphin trunk? 1230620 25 msdobrescu 2012-02-26 17:21:24 +0000 (In reply to comment #23) > @Ze + Mihai: Is it really too much to read + understand the previous comments > (see comment 17)? To state it again: I'll readd this option! But honestly: my > motivation doing it really goes against 0 now... Oh, please forgive my programmer humor. I am grateful for all of your work too. I'm so sad to hear that your motivation tends to 0. As software developer, I have thid mood too sometimes... 1230621 26 msdobrescu 2012-02-26 17:23:57 +0000 (In reply to comment #24) > @Peter Penz : oh no, don't loose your motivation. I really look forward all the > time for the re-addition :-) I am really thankfull, that you care (and always > did) about user-reports like this. > > @Ze: Why do you have to use dolphin trunk? Is Mr. Zé that Mandriva maintainer? 1231333 27 mmodem00 2012-02-28 18:20:58 +0000 Peter i didnt understand that way, i thought you were to simply drop it, so sorry for my last comment. Im using kde branch, thatys why. But now i have put dolphin back to the SHA previous to 2.0 development. 1231898 28 m.wege 2012-03-01 10:37:33 +0000 I would also like to have this feature back. I miss it very much. But in the old implementation there was one thing not working good. It was not possible to draganddrop upward a folder path. Meaning. I could not go up in the folder hierachy with files marked and ready for droping. I would suggest that a reimplemenation of this feature should also take care of this. My suggestion was/is to have in this mode a virtual folder ".." like other filemanagers have. It does not have to be "..", but a virtual folder with this function. 1234355 29 peter.penz19 2012-03-09 15:19:04 +0000 Git commit e04cb14b19e05282f58d5d39d790b3c334366172 by Peter Penz. Committed on 09/03/2012 at 16:12. Pushed by ppenz into branch 'KDE/4.8'. Details view: Allow to turn off expandable folders like in Dolphin 1.7 The option for turning off expandable folders has been removed with the new view-engine. Due to several requests this option has been readded again. As for 4.8.x no new user-interface strings may be introduced, the line ExpandableFolders=false must be manually added below the section "[DetailsMode]" in the file ~/.kde/share/config/dolphinrc if the expandable-folders feature should be disabled. Thanks to H.H. "cyberbeat" for the initial patch! FIXED-IN: 4.8.2 M +10 -3 dolphin/src/kitemviews/kfileitemlistview.cpp M +1 -0 dolphin/src/kitemviews/kfileitemlistview.h M +25 -5 dolphin/src/kitemviews/kfileitemlistwidget.cpp M +4 -0 dolphin/src/kitemviews/kfileitemlistwidget.h M +14 -8 dolphin/src/kitemviews/kitemlistview.cpp M +9 -15 dolphin/src/kitemviews/kitemlistview.h M +4 -0 dolphin/src/settings/dolphin_detailsmodesettings.kcfg M +42 -5 dolphin/src/settings/viewmodes/viewsettingstab.cpp M +2 -0 dolphin/src/settings/viewmodes/viewsettingstab.h M +8 -0 dolphin/src/views/dolphinitemlistcontainer.cpp http://commits.kde.org/kde-baseapps/e04cb14b19e05282f58d5d39d790b3c334366172 1234356 30 peter.penz19 2012-03-09 15:19:44 +0000 Git commit 4763cb6235a66f4eba5ed436a99bd3dd07a2acc8 by Peter Penz. Committed on 09/03/2012 at 16:12. Pushed by ppenz into branch 'master'. Details view: Allow to turn off expandable folders like in Dolphin 1.7 The option for turning off expandable folders has been removed with the new view-engine. Due to several requests this option has been readded again. As for 4.8.x no new user-interface strings may be introduced, the line ExpandableFolders=false must be manually added below the section "[DetailsMode]" in the file ~/.kde/share/config/dolphinrc if the expandable-folders feature should be disabled. Thanks to H.H. "cyberbeat" for the initial patch! FIXED-IN: 4.8.2 M +10 -3 dolphin/src/kitemviews/kfileitemlistview.cpp M +1 -0 dolphin/src/kitemviews/kfileitemlistview.h M +25 -5 dolphin/src/kitemviews/kfileitemlistwidget.cpp M +4 -0 dolphin/src/kitemviews/kfileitemlistwidget.h M +14 -8 dolphin/src/kitemviews/kitemlistview.cpp M +9 -15 dolphin/src/kitemviews/kitemlistview.h M +4 -0 dolphin/src/settings/dolphin_detailsmodesettings.kcfg M +42 -5 dolphin/src/settings/viewmodes/viewsettingstab.cpp M +2 -0 dolphin/src/settings/viewmodes/viewsettingstab.h M +8 -0 dolphin/src/views/dolphinitemlistcontainer.cpp http://commits.kde.org/kde-baseapps/4763cb6235a66f4eba5ed436a99bd3dd07a2acc8 1234362 31 peter.penz19 2012-03-09 15:24:42 +0000 Git commit b3ea19c528cac1eada2a2e159d50dcd9be3c2aba by Peter Penz. Committed on 09/03/2012 at 16:23. Pushed by ppenz into branch 'master'. Provide UI-option for "Expandable folders" M +4 -8 dolphin/src/settings/viewmodes/viewsettingstab.cpp http://commits.kde.org/kde-baseapps/b3ea19c528cac1eada2a2e159d50dcd9be3c2aba 1234365 32 peter.penz19 2012-03-09 15:28:59 +0000 Git commit 1d9074249fffe209296f6483572a11bbc885e0b2 by Peter Penz. Committed on 09/03/2012 at 16:27. Pushed by ppenz into branch 'master'. Folders Panel: Turn on items-expanding Since the fix of bug 289090 the items-expanding is not automatically turned on anymore when using the DetailsMode. M +1 -0 dolphin/src/panels/folders/folderspanel.cpp http://commits.kde.org/kde-baseapps/1d9074249fffe209296f6483572a11bbc885e0b2 1234367 33 peter.penz19 2012-03-09 15:29:38 +0000 Git commit 97662eee998f1c417be0ffa901d7063ca183585c by Peter Penz. Committed on 09/03/2012 at 16:27. Pushed by ppenz into branch 'KDE/4.8'. Folders Panel: Turn on items-expanding Since the fix of bug 289090 the items-expanding is not automatically turned on anymore when using the DetailsMode. M +1 -0 dolphin/src/panels/folders/folderspanel.cpp http://commits.kde.org/kde-baseapps/97662eee998f1c417be0ffa901d7063ca183585c 1234370 34 peter.penz19 2012-03-09 15:31:39 +0000 @all: As for 4.8.x no new user-interface strings may be introduced, the line ExpandableFolders=false must be manually added below the section "[DetailsMode]" in the file ~/.kde/share/config/dolphinrc if the expandable-folders feature should be disabled for 4.8.x The master branch already contains the checkbox "Expandable folders" in the settings. 1234601 35 elandread 2012-03-10 14:24:26 +0000 @Peter Penz: Thank you very much! As of now, Dolphin is truly the best and most usable file manager, imho. 1242500 36 peter.penz19 2012-04-03 12:48:50 +0000 *** Bug 297380 has been marked as a duplicate of this bug. *** 1243065 37 alpeterson 2012-04-05 06:25:09 +0000 Where can I send you beer money? 1243091 38 peter.penz19 2012-04-05 08:02:40 +0000 > Where can I send you beer money? I'll consume a beer today in the name of this bug ;-) But thanks for the offer! 1243263 39 peter.penz19 2012-04-05 19:14:30 +0000 *** Bug 296278 has been marked as a duplicate of this bug. *** 67931 2012-01-17 16:17:43 +0000 2012-01-21 11:26:51 +0000 patch to disable expansion in main-details-view dolphin.diff text/plain 5276 cyberbeat ZGlmZiAtLWdpdCBhL2RvbHBoaW4vc3JjL2tpdGVtdmlld3Mva2ZpbGVpdGVtbGlzdHZpZXcuY3Bw IGIvZG9scGhpbi9zcmMva2l0ZW12aWV3cy9rZmlsZWl0ZW1saXN0dmlldy5jcHAKaW5kZXggODZk YjI4ZC4uYTE4MzI4MiAxMDA2NDQKLS0tIGEvZG9scGhpbi9zcmMva2l0ZW12aWV3cy9rZmlsZWl0 ZW1saXN0dmlldy5jcHAKKysrIGIvZG9scGhpbi9zcmMva2l0ZW12aWV3cy9rZmlsZWl0ZW1saXN0 dmlldy5jcHAKQEAgLTQ3LDcgKzQ3LDggQEAgS0ZpbGVJdGVtTGlzdFZpZXc6OktGaWxlSXRlbUxp c3RWaWV3KFFHcmFwaGljc1dpZGdldCogcGFyZW50KSA6CiAgICAgbV9tb2RlbFJvbGVzVXBkYXRl cigwKSwKICAgICBtX3VwZGF0ZVZpc2libGVJbmRleFJhbmdlVGltZXIoMCksCiAgICAgbV91cGRh dGVJY29uU2l6ZVRpbWVyKDApLAotICAgIG1fbWluaW11bVJvbGVzV2lkdGhzKCkKKyAgICBtX21p bmltdW1Sb2xlc1dpZHRocygpLAorICAgIG1fZXhwYW5kYWJsZShmYWxzZSkKIHsKICAgICBzZXRB Y2NlcHREcm9wcyh0cnVlKTsKIApAQCAtMTAyLDYgKzEwMywxNiBAQCB2b2lkIEtGaWxlSXRlbUxp c3RWaWV3OjpzZXRJdGVtTGF5b3V0KExheW91dCBsYXlvdXQpCiAgICAgfQogfQogCit2b2lkIEtG aWxlSXRlbUxpc3RWaWV3OjpzZXRFeHBhbmRhYmxlKGJvb2wgZXhwYW5kYWJsZSkKK3sKKyAgICBt X2V4cGFuZGFibGUgPSBleHBhbmRhYmxlOworfQorCitib29sIEtGaWxlSXRlbUxpc3RWaWV3Ojpl eHBhbmRhYmxlKCkgY29uc3QgCit7CisgICAgcmV0dXJuIG1fZXhwYW5kYWJsZTsKK30KKwogS0Zp bGVJdGVtTGlzdFZpZXc6OkxheW91dCBLRmlsZUl0ZW1MaXN0Vmlldzo6aXRlbUxheW91dCgpIGNv bnN0CiB7CiAgICAgcmV0dXJuIG1faXRlbUxheW91dDsKQEAgLTIzNiw3ICsyNDcsNyBAQCBRSGFz aDxRQnl0ZUFycmF5LCBRU2l6ZUY+IEtGaWxlSXRlbUxpc3RWaWV3Ojp2aXNpYmxlUm9sZXNTaXpl cyhjb25zdCBLSXRlbVJhbmdlTAogCiBib29sIEtGaWxlSXRlbUxpc3RWaWV3OjpzdXBwb3J0c0l0 ZW1FeHBhbmRpbmcoKSBjb25zdAogewotICAgIHJldHVybiBtX2l0ZW1MYXlvdXQgPT0gRGV0YWls c0xheW91dDsKKyAgICByZXR1cm4gbV9leHBhbmRhYmxlICYmIG1faXRlbUxheW91dCA9PSBEZXRh aWxzTGF5b3V0OwogfQogCiBRUGl4bWFwIEtGaWxlSXRlbUxpc3RWaWV3OjpjcmVhdGVEcmFnUGl4 bWFwKGNvbnN0IFFTZXQ8aW50PiYgaW5kZXhlcykgY29uc3QKQEAgLTMyMCw3ICszMzEsNyBAQCB2 b2lkIEtGaWxlSXRlbUxpc3RWaWV3Ojppbml0aWFsaXplSXRlbUxpc3RXaWRnZXQoS0l0ZW1MaXN0 V2lkZ2V0KiBpdGVtKQogICAgIGNhc2UgRGV0YWlsc0xheW91dDogZmlsZUl0ZW1MaXN0V2lkZ2V0 LT5zZXRMYXlvdXQoS0ZpbGVJdGVtTGlzdFdpZGdldDo6RGV0YWlsc0xheW91dCk7IGJyZWFrOwog ICAgIGRlZmF1bHQ6ICAgICAgICAgICAgUV9BU1NFUlQoZmFsc2UpOyBicmVhazsKICAgICB9Ci0K KyAgICBmaWxlSXRlbUxpc3RXaWRnZXQtPnNldEV4cGFuZGFibGUobV9leHBhbmRhYmxlKTsKICAg ICBmaWxlSXRlbUxpc3RXaWRnZXQtPnNldEFsdGVybmF0aW5nQmFja2dyb3VuZENvbG9ycyhtX2l0 ZW1MYXlvdXQgPT0gRGV0YWlsc0xheW91dCAmJgogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZpc2libGVSb2xlcygpLmNvdW50KCkgPiAxKTsK IH0KZGlmZiAtLWdpdCBhL2RvbHBoaW4vc3JjL2tpdGVtdmlld3Mva2ZpbGVpdGVtbGlzdHZpZXcu aCBiL2RvbHBoaW4vc3JjL2tpdGVtdmlld3Mva2ZpbGVpdGVtbGlzdHZpZXcuaAppbmRleCAyMDNm Yjc4Li5hM2JjNDcyIDEwMDY0NAotLS0gYS9kb2xwaGluL3NyYy9raXRlbXZpZXdzL2tmaWxlaXRl bWxpc3R2aWV3LmgKKysrIGIvZG9scGhpbi9zcmMva2l0ZW12aWV3cy9rZmlsZWl0ZW1saXN0dmll dy5oCkBAIC01Nyw2ICs1Nyw5IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldEl0ZW1MYXlvdXQoTGF5 b3V0IGxheW91dCk7CiAgICAgTGF5b3V0IGl0ZW1MYXlvdXQoKSBjb25zdDsKIAorICAgIHZvaWQg c2V0RXhwYW5kYWJsZShib29sIGV4cGFuZGFibGUpOworICAgIGJvb2wgZXhwYW5kYWJsZSgpIGNv bnN0OworICAgIAogICAgIC8qKgogICAgICAqIFNldHMgdGhlIGxpc3Qgb2YgZW5hYmxlZCB0aHVt Ym5haWwgcGx1Z2lucyB0aGF0IGFyZSB1c2VkIGZvciBwcmV2aWV3cy4KICAgICAgKiBQZXIgZGVm YXVsdCBhbGwgcGx1Z2lucyBlbmFibGVkIGluIHRoZSBLQ29uZmlnR3JvdXAgIlByZXZpZXdTZXR0 aW5ncyIKQEAgLTEyNiw2ICsxMjksOCBAQCBwcml2YXRlOgogCiBwcml2YXRlOgogICAgIExheW91 dCBtX2l0ZW1MYXlvdXQ7CisgICAgCisgICAgYm9vbCBtX2V4cGFuZGFibGU7CiAKICAgICBLRmls ZUl0ZW1Nb2RlbFJvbGVzVXBkYXRlciogbV9tb2RlbFJvbGVzVXBkYXRlcjsKICAgICBRVGltZXIq IG1fdXBkYXRlVmlzaWJsZUluZGV4UmFuZ2VUaW1lcjsKZGlmZiAtLWdpdCBhL2RvbHBoaW4vc3Jj L2tpdGVtdmlld3Mva2ZpbGVpdGVtbGlzdHdpZGdldC5jcHAgYi9kb2xwaGluL3NyYy9raXRlbXZp ZXdzL2tmaWxlaXRlbWxpc3R3aWRnZXQuY3BwCmluZGV4IDYyYTIzODMuLjI0NzBhMDQgMTAwNjQ0 Ci0tLSBhL2RvbHBoaW4vc3JjL2tpdGVtdmlld3Mva2ZpbGVpdGVtbGlzdHdpZGdldC5jcHAKKysr IGIvZG9scGhpbi9zcmMva2l0ZW12aWV3cy9rZmlsZWl0ZW1saXN0d2lkZ2V0LmNwcApAQCAtODgs NiArODgsMTYgQEAgS0ZpbGVJdGVtTGlzdFdpZGdldDo6TGF5b3V0IEtGaWxlSXRlbUxpc3RXaWRn ZXQ6OmxheW91dCgpIGNvbnN0CiAgICAgcmV0dXJuIG1fbGF5b3V0OwogfQogCit2b2lkIEtGaWxl SXRlbUxpc3RXaWRnZXQ6OnNldEV4cGFuZGFibGUoYm9vbCBleHBhbmRhYmxlKQoreworICAgIG1f ZXhwYW5kYWJsZSA9IGV4cGFuZGFibGU7Cit9CisKK2Jvb2wgS0ZpbGVJdGVtTGlzdFdpZGdldDo6 ZXhwYW5kYWJsZSgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fZXhwYW5kYWJsZTsKK30KKwogdm9p ZCBLRmlsZUl0ZW1MaXN0V2lkZ2V0OjpwYWludChRUGFpbnRlciogcGFpbnRlciwgY29uc3QgUVN0 eWxlT3B0aW9uR3JhcGhpY3NJdGVtKiBvcHRpb24sIFFXaWRnZXQqIHdpZGdldCkKIHsKICAgICBj b25zdF9jYXN0PEtGaWxlSXRlbUxpc3RXaWRnZXQqPih0aGlzKS0+dHJpZ2dlckNhY2hlUmVmcmVz aGluZygpOwpAQCAtNDA4LDcgKzQxOCw3IEBAIHZvaWQgS0ZpbGVJdGVtTGlzdFdpZGdldDo6dHJp Z2dlckNhY2hlUmVmcmVzaGluZygpCiAgICAgcmVmcmVzaENhY2hlKCk7CiAKICAgICBjb25zdCBR SGFzaDxRQnl0ZUFycmF5LCBRVmFyaWFudD4gdmFsdWVzID0gZGF0YSgpOwotICAgIG1faXNFeHBh bmRhYmxlID0gdmFsdWVzWyJpc0V4cGFuZGFibGUiXS50b0Jvb2woKTsKKyAgICBtX2lzRXhwYW5k YWJsZSA9IG1fZXhwYW5kYWJsZSAmJiB2YWx1ZXNbImlzRXhwYW5kYWJsZSJdLnRvQm9vbCgpOwog ICAgIG1faXNIaWRkZW4gPSB2YWx1ZXNbIm5hbWUiXS50b1N0cmluZygpLnN0YXJ0c1dpdGgoUUxh dGluMUNoYXIoJy4nKSk7CiAKICAgICB1cGRhdGVFeHBhbnNpb25BcmVhKCk7CkBAIC00MjIsNyAr NDMyLDcgQEAgdm9pZCBLRmlsZUl0ZW1MaXN0V2lkZ2V0Ojp0cmlnZ2VyQ2FjaGVSZWZyZXNoaW5n KCkKIAogdm9pZCBLRmlsZUl0ZW1MaXN0V2lkZ2V0Ojp1cGRhdGVFeHBhbnNpb25BcmVhKCkKIHsK LSAgICBpZiAobV9sYXlvdXQgPT0gRGV0YWlsc0xheW91dCkgeworICAgIGlmIChtX2V4cGFuZGFi bGUgJiYgbV9sYXlvdXQgPT0gRGV0YWlsc0xheW91dCkgewogICAgICAgICBjb25zdCBRSGFzaDxR Qnl0ZUFycmF5LCBRVmFyaWFudD4gdmFsdWVzID0gZGF0YSgpOwogICAgICAgICBRX0FTU0VSVCh2 YWx1ZXMuY29udGFpbnMoImV4cGFuc2lvbkxldmVsIikpOwogICAgICAgICBjb25zdCBLSXRlbUxp c3RTdHlsZU9wdGlvbiYgb3B0aW9uID0gc3R5bGVPcHRpb24oKTsKZGlmZiAtLWdpdCBhL2RvbHBo aW4vc3JjL2tpdGVtdmlld3Mva2ZpbGVpdGVtbGlzdHdpZGdldC5oIGIvZG9scGhpbi9zcmMva2l0 ZW12aWV3cy9rZmlsZWl0ZW1saXN0d2lkZ2V0LmgKaW5kZXggOTFmMDBmZS4uYmZiN2U2MSAxMDA2 NDQKLS0tIGEvZG9scGhpbi9zcmMva2l0ZW12aWV3cy9rZmlsZWl0ZW1saXN0d2lkZ2V0LmgKKysr IGIvZG9scGhpbi9zcmMva2l0ZW12aWV3cy9rZmlsZWl0ZW1saXN0d2lkZ2V0LmgKQEAgLTQ1LDYg KzQ1LDkgQEAgcHVibGljOgogCiAgICAgdm9pZCBzZXRMYXlvdXQoTGF5b3V0IGxheW91dCk7CiAg ICAgTGF5b3V0IGxheW91dCgpIGNvbnN0OworICAgIAorICAgIHZvaWQgc2V0RXhwYW5kYWJsZShi b29sIGV4cGFuZGFibGUpOworICAgIGJvb2wgZXhwYW5kYWJsZSgpIGNvbnN0OwogCiAgICAgdmly dHVhbCB2b2lkIHBhaW50KFFQYWludGVyKiBwYWludGVyLCBjb25zdCBRU3R5bGVPcHRpb25HcmFw aGljc0l0ZW0qIG9wdGlvbiwgUVdpZGdldCogd2lkZ2V0ID0gMCk7CiAKQEAgLTEyOSw2ICsxMzIs NyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9pc0N1dDsKICAgICBib29sIG1faXNIaWRkZW47CiAg ICAgYm9vbCBtX2lzRXhwYW5kYWJsZTsKKyAgICBib29sIG1fZXhwYW5kYWJsZTsKIAogICAgIGJv b2wgbV9kaXJ0eUxheW91dDsKICAgICBib29sIG1fZGlydHlDb250ZW50OwpkaWZmIC0tZ2l0IGEv ZG9scGhpbi9zcmMvcGFuZWxzL2ZvbGRlcnMvZm9sZGVyc3BhbmVsLmNwcCBiL2RvbHBoaW4vc3Jj L3BhbmVscy9mb2xkZXJzL2ZvbGRlcnNwYW5lbC5jcHAKaW5kZXggZDljOGY3MS4uZWQ5MWYxZSAx MDA2NDQKLS0tIGEvZG9scGhpbi9zcmMvcGFuZWxzL2ZvbGRlcnMvZm9sZGVyc3BhbmVsLmNwcAor KysgYi9kb2xwaGluL3NyYy9wYW5lbHMvZm9sZGVycy9mb2xkZXJzcGFuZWwuY3BwCkBAIC0xNDYs NiArMTQ2LDcgQEAgdm9pZCBGb2xkZXJzUGFuZWw6OnNob3dFdmVudChRU2hvd0V2ZW50KiBldmVu dCkKICAgICAgICAgbV9kaXJMaXN0ZXItPnNldEF1dG9FcnJvckhhbmRsaW5nRW5hYmxlZChmYWxz ZSwgdGhpcyk7CiAKICAgICAgICAgS0ZpbGVJdGVtTGlzdFZpZXcqIHZpZXcgID0gbmV3IEtGaWxl SXRlbUxpc3RWaWV3KCk7CisgICAgICAgIHZpZXctPnNldEV4cGFuZGFibGUodHJ1ZSk7CiAgICAg ICAgIHZpZXctPnNldFdpZGdldENyZWF0b3IobmV3IEtJdGVtTGlzdFdpZGdldENyZWF0b3I8S0Zp bGVJdGVtTGlzdFdpZGdldD4oKSk7CiAKICAgICAgICAgS0l0ZW1MaXN0U3R5bGVPcHRpb24gc3R5 bGVPcHRpb24gPSB2aWV3LT5zdHlsZU9wdGlvbigpOwo= 68066 2012-01-21 11:26:51 +0000 2012-01-21 11:26:51 +0000 Patch with gui option dolphin2.diff text/plain 10113 cyberbeat ZGlmZiAtLWdpdCBhL2RvbHBoaW4vc3JjL2tpdGVtdmlld3Mva2ZpbGVpdGVtbGlzdHZpZXcuY3Bw IGIvZG9scGhpbi9zcmMva2l0ZW12aWV3cy9rZmlsZWl0ZW1saXN0dmlldy5jcHAKaW5kZXggODZk YjI4ZC4uYTE4MzI4MiAxMDA2NDQKLS0tIGEvZG9scGhpbi9zcmMva2l0ZW12aWV3cy9rZmlsZWl0 ZW1saXN0dmlldy5jcHAKKysrIGIvZG9scGhpbi9zcmMva2l0ZW12aWV3cy9rZmlsZWl0ZW1saXN0 dmlldy5jcHAKQEAgLTQ3LDcgKzQ3LDggQEAgS0ZpbGVJdGVtTGlzdFZpZXc6OktGaWxlSXRlbUxp c3RWaWV3KFFHcmFwaGljc1dpZGdldCogcGFyZW50KSA6CiAgICAgbV9tb2RlbFJvbGVzVXBkYXRl cigwKSwKICAgICBtX3VwZGF0ZVZpc2libGVJbmRleFJhbmdlVGltZXIoMCksCiAgICAgbV91cGRh dGVJY29uU2l6ZVRpbWVyKDApLAotICAgIG1fbWluaW11bVJvbGVzV2lkdGhzKCkKKyAgICBtX21p bmltdW1Sb2xlc1dpZHRocygpLAorICAgIG1fZXhwYW5kYWJsZShmYWxzZSkKIHsKICAgICBzZXRB Y2NlcHREcm9wcyh0cnVlKTsKIApAQCAtMTAyLDYgKzEwMywxNiBAQCB2b2lkIEtGaWxlSXRlbUxp c3RWaWV3OjpzZXRJdGVtTGF5b3V0KExheW91dCBsYXlvdXQpCiAgICAgfQogfQogCit2b2lkIEtG aWxlSXRlbUxpc3RWaWV3OjpzZXRFeHBhbmRhYmxlKGJvb2wgZXhwYW5kYWJsZSkKK3sKKyAgICBt X2V4cGFuZGFibGUgPSBleHBhbmRhYmxlOworfQorCitib29sIEtGaWxlSXRlbUxpc3RWaWV3Ojpl eHBhbmRhYmxlKCkgY29uc3QgCit7CisgICAgcmV0dXJuIG1fZXhwYW5kYWJsZTsKK30KKwogS0Zp bGVJdGVtTGlzdFZpZXc6OkxheW91dCBLRmlsZUl0ZW1MaXN0Vmlldzo6aXRlbUxheW91dCgpIGNv bnN0CiB7CiAgICAgcmV0dXJuIG1faXRlbUxheW91dDsKQEAgLTIzNiw3ICsyNDcsNyBAQCBRSGFz aDxRQnl0ZUFycmF5LCBRU2l6ZUY+IEtGaWxlSXRlbUxpc3RWaWV3Ojp2aXNpYmxlUm9sZXNTaXpl cyhjb25zdCBLSXRlbVJhbmdlTAogCiBib29sIEtGaWxlSXRlbUxpc3RWaWV3OjpzdXBwb3J0c0l0 ZW1FeHBhbmRpbmcoKSBjb25zdAogewotICAgIHJldHVybiBtX2l0ZW1MYXlvdXQgPT0gRGV0YWls c0xheW91dDsKKyAgICByZXR1cm4gbV9leHBhbmRhYmxlICYmIG1faXRlbUxheW91dCA9PSBEZXRh aWxzTGF5b3V0OwogfQogCiBRUGl4bWFwIEtGaWxlSXRlbUxpc3RWaWV3OjpjcmVhdGVEcmFnUGl4 bWFwKGNvbnN0IFFTZXQ8aW50PiYgaW5kZXhlcykgY29uc3QKQEAgLTMyMCw3ICszMzEsNyBAQCB2 b2lkIEtGaWxlSXRlbUxpc3RWaWV3Ojppbml0aWFsaXplSXRlbUxpc3RXaWRnZXQoS0l0ZW1MaXN0 V2lkZ2V0KiBpdGVtKQogICAgIGNhc2UgRGV0YWlsc0xheW91dDogZmlsZUl0ZW1MaXN0V2lkZ2V0 LT5zZXRMYXlvdXQoS0ZpbGVJdGVtTGlzdFdpZGdldDo6RGV0YWlsc0xheW91dCk7IGJyZWFrOwog ICAgIGRlZmF1bHQ6ICAgICAgICAgICAgUV9BU1NFUlQoZmFsc2UpOyBicmVhazsKICAgICB9Ci0K KyAgICBmaWxlSXRlbUxpc3RXaWRnZXQtPnNldEV4cGFuZGFibGUobV9leHBhbmRhYmxlKTsKICAg ICBmaWxlSXRlbUxpc3RXaWRnZXQtPnNldEFsdGVybmF0aW5nQmFja2dyb3VuZENvbG9ycyhtX2l0 ZW1MYXlvdXQgPT0gRGV0YWlsc0xheW91dCAmJgogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZpc2libGVSb2xlcygpLmNvdW50KCkgPiAxKTsK IH0KZGlmZiAtLWdpdCBhL2RvbHBoaW4vc3JjL2tpdGVtdmlld3Mva2ZpbGVpdGVtbGlzdHZpZXcu aCBiL2RvbHBoaW4vc3JjL2tpdGVtdmlld3Mva2ZpbGVpdGVtbGlzdHZpZXcuaAppbmRleCAyMDNm Yjc4Li5hM2JjNDcyIDEwMDY0NAotLS0gYS9kb2xwaGluL3NyYy9raXRlbXZpZXdzL2tmaWxlaXRl bWxpc3R2aWV3LmgKKysrIGIvZG9scGhpbi9zcmMva2l0ZW12aWV3cy9rZmlsZWl0ZW1saXN0dmll dy5oCkBAIC01Nyw2ICs1Nyw5IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldEl0ZW1MYXlvdXQoTGF5 b3V0IGxheW91dCk7CiAgICAgTGF5b3V0IGl0ZW1MYXlvdXQoKSBjb25zdDsKIAorICAgIHZvaWQg c2V0RXhwYW5kYWJsZShib29sIGV4cGFuZGFibGUpOworICAgIGJvb2wgZXhwYW5kYWJsZSgpIGNv bnN0OworICAgIAogICAgIC8qKgogICAgICAqIFNldHMgdGhlIGxpc3Qgb2YgZW5hYmxlZCB0aHVt Ym5haWwgcGx1Z2lucyB0aGF0IGFyZSB1c2VkIGZvciBwcmV2aWV3cy4KICAgICAgKiBQZXIgZGVm YXVsdCBhbGwgcGx1Z2lucyBlbmFibGVkIGluIHRoZSBLQ29uZmlnR3JvdXAgIlByZXZpZXdTZXR0 aW5ncyIKQEAgLTEyNiw2ICsxMjksOCBAQCBwcml2YXRlOgogCiBwcml2YXRlOgogICAgIExheW91 dCBtX2l0ZW1MYXlvdXQ7CisgICAgCisgICAgYm9vbCBtX2V4cGFuZGFibGU7CiAKICAgICBLRmls ZUl0ZW1Nb2RlbFJvbGVzVXBkYXRlciogbV9tb2RlbFJvbGVzVXBkYXRlcjsKICAgICBRVGltZXIq IG1fdXBkYXRlVmlzaWJsZUluZGV4UmFuZ2VUaW1lcjsKZGlmZiAtLWdpdCBhL2RvbHBoaW4vc3Jj L2tpdGVtdmlld3Mva2ZpbGVpdGVtbGlzdHdpZGdldC5jcHAgYi9kb2xwaGluL3NyYy9raXRlbXZp ZXdzL2tmaWxlaXRlbWxpc3R3aWRnZXQuY3BwCmluZGV4IDYyYTIzODMuLjI0NzBhMDQgMTAwNjQ0 Ci0tLSBhL2RvbHBoaW4vc3JjL2tpdGVtdmlld3Mva2ZpbGVpdGVtbGlzdHdpZGdldC5jcHAKKysr IGIvZG9scGhpbi9zcmMva2l0ZW12aWV3cy9rZmlsZWl0ZW1saXN0d2lkZ2V0LmNwcApAQCAtODgs NiArODgsMTYgQEAgS0ZpbGVJdGVtTGlzdFdpZGdldDo6TGF5b3V0IEtGaWxlSXRlbUxpc3RXaWRn ZXQ6OmxheW91dCgpIGNvbnN0CiAgICAgcmV0dXJuIG1fbGF5b3V0OwogfQogCit2b2lkIEtGaWxl SXRlbUxpc3RXaWRnZXQ6OnNldEV4cGFuZGFibGUoYm9vbCBleHBhbmRhYmxlKQoreworICAgIG1f ZXhwYW5kYWJsZSA9IGV4cGFuZGFibGU7Cit9CisKK2Jvb2wgS0ZpbGVJdGVtTGlzdFdpZGdldDo6 ZXhwYW5kYWJsZSgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fZXhwYW5kYWJsZTsKK30KKwogdm9p ZCBLRmlsZUl0ZW1MaXN0V2lkZ2V0OjpwYWludChRUGFpbnRlciogcGFpbnRlciwgY29uc3QgUVN0 eWxlT3B0aW9uR3JhcGhpY3NJdGVtKiBvcHRpb24sIFFXaWRnZXQqIHdpZGdldCkKIHsKICAgICBj b25zdF9jYXN0PEtGaWxlSXRlbUxpc3RXaWRnZXQqPih0aGlzKS0+dHJpZ2dlckNhY2hlUmVmcmVz aGluZygpOwpAQCAtNDA4LDcgKzQxOCw3IEBAIHZvaWQgS0ZpbGVJdGVtTGlzdFdpZGdldDo6dHJp Z2dlckNhY2hlUmVmcmVzaGluZygpCiAgICAgcmVmcmVzaENhY2hlKCk7CiAKICAgICBjb25zdCBR SGFzaDxRQnl0ZUFycmF5LCBRVmFyaWFudD4gdmFsdWVzID0gZGF0YSgpOwotICAgIG1faXNFeHBh bmRhYmxlID0gdmFsdWVzWyJpc0V4cGFuZGFibGUiXS50b0Jvb2woKTsKKyAgICBtX2lzRXhwYW5k YWJsZSA9IG1fZXhwYW5kYWJsZSAmJiB2YWx1ZXNbImlzRXhwYW5kYWJsZSJdLnRvQm9vbCgpOwog ICAgIG1faXNIaWRkZW4gPSB2YWx1ZXNbIm5hbWUiXS50b1N0cmluZygpLnN0YXJ0c1dpdGgoUUxh dGluMUNoYXIoJy4nKSk7CiAKICAgICB1cGRhdGVFeHBhbnNpb25BcmVhKCk7CkBAIC00MjIsNyAr NDMyLDcgQEAgdm9pZCBLRmlsZUl0ZW1MaXN0V2lkZ2V0Ojp0cmlnZ2VyQ2FjaGVSZWZyZXNoaW5n KCkKIAogdm9pZCBLRmlsZUl0ZW1MaXN0V2lkZ2V0Ojp1cGRhdGVFeHBhbnNpb25BcmVhKCkKIHsK LSAgICBpZiAobV9sYXlvdXQgPT0gRGV0YWlsc0xheW91dCkgeworICAgIGlmIChtX2V4cGFuZGFi bGUgJiYgbV9sYXlvdXQgPT0gRGV0YWlsc0xheW91dCkgewogICAgICAgICBjb25zdCBRSGFzaDxR Qnl0ZUFycmF5LCBRVmFyaWFudD4gdmFsdWVzID0gZGF0YSgpOwogICAgICAgICBRX0FTU0VSVCh2 YWx1ZXMuY29udGFpbnMoImV4cGFuc2lvbkxldmVsIikpOwogICAgICAgICBjb25zdCBLSXRlbUxp c3RTdHlsZU9wdGlvbiYgb3B0aW9uID0gc3R5bGVPcHRpb24oKTsKZGlmZiAtLWdpdCBhL2RvbHBo aW4vc3JjL2tpdGVtdmlld3Mva2ZpbGVpdGVtbGlzdHdpZGdldC5oIGIvZG9scGhpbi9zcmMva2l0 ZW12aWV3cy9rZmlsZWl0ZW1saXN0d2lkZ2V0LmgKaW5kZXggOTFmMDBmZS4uYmZiN2U2MSAxMDA2 NDQKLS0tIGEvZG9scGhpbi9zcmMva2l0ZW12aWV3cy9rZmlsZWl0ZW1saXN0d2lkZ2V0LmgKKysr IGIvZG9scGhpbi9zcmMva2l0ZW12aWV3cy9rZmlsZWl0ZW1saXN0d2lkZ2V0LmgKQEAgLTQ1LDYg KzQ1LDkgQEAgcHVibGljOgogCiAgICAgdm9pZCBzZXRMYXlvdXQoTGF5b3V0IGxheW91dCk7CiAg ICAgTGF5b3V0IGxheW91dCgpIGNvbnN0OworICAgIAorICAgIHZvaWQgc2V0RXhwYW5kYWJsZShi b29sIGV4cGFuZGFibGUpOworICAgIGJvb2wgZXhwYW5kYWJsZSgpIGNvbnN0OwogCiAgICAgdmly dHVhbCB2b2lkIHBhaW50KFFQYWludGVyKiBwYWludGVyLCBjb25zdCBRU3R5bGVPcHRpb25HcmFw aGljc0l0ZW0qIG9wdGlvbiwgUVdpZGdldCogd2lkZ2V0ID0gMCk7CiAKQEAgLTEyOSw2ICsxMzIs NyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9pc0N1dDsKICAgICBib29sIG1faXNIaWRkZW47CiAg ICAgYm9vbCBtX2lzRXhwYW5kYWJsZTsKKyAgICBib29sIG1fZXhwYW5kYWJsZTsKIAogICAgIGJv b2wgbV9kaXJ0eUxheW91dDsKICAgICBib29sIG1fZGlydHlDb250ZW50OwpkaWZmIC0tZ2l0IGEv ZG9scGhpbi9zcmMvcGFuZWxzL2ZvbGRlcnMvZm9sZGVyc3BhbmVsLmNwcCBiL2RvbHBoaW4vc3Jj L3BhbmVscy9mb2xkZXJzL2ZvbGRlcnNwYW5lbC5jcHAKaW5kZXggZDljOGY3MS4uZWQ5MWYxZSAx MDA2NDQKLS0tIGEvZG9scGhpbi9zcmMvcGFuZWxzL2ZvbGRlcnMvZm9sZGVyc3BhbmVsLmNwcAor KysgYi9kb2xwaGluL3NyYy9wYW5lbHMvZm9sZGVycy9mb2xkZXJzcGFuZWwuY3BwCkBAIC0xNDYs NiArMTQ2LDcgQEAgdm9pZCBGb2xkZXJzUGFuZWw6OnNob3dFdmVudChRU2hvd0V2ZW50KiBldmVu dCkKICAgICAgICAgbV9kaXJMaXN0ZXItPnNldEF1dG9FcnJvckhhbmRsaW5nRW5hYmxlZChmYWxz ZSwgdGhpcyk7CiAKICAgICAgICAgS0ZpbGVJdGVtTGlzdFZpZXcqIHZpZXcgID0gbmV3IEtGaWxl SXRlbUxpc3RWaWV3KCk7CisgICAgICAgIHZpZXctPnNldEV4cGFuZGFibGUodHJ1ZSk7CiAgICAg ICAgIHZpZXctPnNldFdpZGdldENyZWF0b3IobmV3IEtJdGVtTGlzdFdpZGdldENyZWF0b3I8S0Zp bGVJdGVtTGlzdFdpZGdldD4oKSk7CiAKICAgICAgICAgS0l0ZW1MaXN0U3R5bGVPcHRpb24gc3R5 bGVPcHRpb24gPSB2aWV3LT5zdHlsZU9wdGlvbigpOwpkaWZmIC0tZ2l0IGEvZG9scGhpbi9zcmMv c2V0dGluZ3MvZG9scGhpbl9kZXRhaWxzbW9kZXNldHRpbmdzLmtjZmcgYi9kb2xwaGluL3NyYy9z ZXR0aW5ncy9kb2xwaGluX2RldGFpbHNtb2Rlc2V0dGluZ3Mua2NmZwppbmRleCAwZmIxYmYwLi4w Yzc1YmQ0IDEwMDY0NAotLS0gYS9kb2xwaGluL3NyYy9zZXR0aW5ncy9kb2xwaGluX2RldGFpbHNt b2Rlc2V0dGluZ3Mua2NmZworKysgYi9kb2xwaGluL3NyYy9zZXR0aW5ncy9kb2xwaGluX2RldGFp bHNtb2Rlc2V0dGluZ3Mua2NmZwpAQCAtMzYsNiArMzYsMTAgQEAKICAgICAgICAgICAgIDxsYWJl bD5QcmV2aWV3IHNpemU8L2xhYmVsPgogICAgICAgICAgICAgPGRlZmF1bHQgY29kZT0idHJ1ZSI+ S0ljb25Mb2FkZXI6OlNpemVMYXJnZTwvZGVmYXVsdD4KICAgICAgICAgPC9lbnRyeT4KKyAgICAg ICAgPGVudHJ5IG5hbWU9IkV4cGFuZGFibGVGb2xkZXJzIiB0eXBlPSJCb29sIj4KKyAgICAgICAg ICAgICA8bGFiZWw+RXhwYW5kYWJsZSBmb2xkZXJzPC9sYWJlbD4KKyAgICAgICAgICAgICA8ZGVm YXVsdD5mYWxzZTwvZGVmYXVsdD4KKyAgICAgICAgPC9lbnRyeT4KICAgICAgICAgPGVudHJ5IG5h bWU9IkNvbHVtblBvc2l0aW9ucyIgdHlwZT0iSW50TGlzdCI+CiAgICAgICAgICAgICA8bGFiZWw+ UG9zaXRpb24gb2YgY29sdW1uczwvbGFiZWw+CiAgICAgICAgICAgICA8ZGVmYXVsdD4wLDEsMiwz LDQsNSw2LDcsODwvZGVmYXVsdD4KZGlmZiAtLWdpdCBhL2RvbHBoaW4vc3JjL3NldHRpbmdzL3Zp ZXdtb2Rlcy92aWV3c2V0dGluZ3N0YWIuY3BwIGIvZG9scGhpbi9zcmMvc2V0dGluZ3Mvdmlld21v ZGVzL3ZpZXdzZXR0aW5nc3RhYi5jcHAKaW5kZXggNmFkODY2My4uNmIwNTZlNSAxMDA2NDQKLS0t IGEvZG9scGhpbi9zcmMvc2V0dGluZ3Mvdmlld21vZGVzL3ZpZXdzZXR0aW5nc3RhYi5jcHAKKysr IGIvZG9scGhpbi9zcmMvc2V0dGluZ3Mvdmlld21vZGVzL3ZpZXdzZXR0aW5nc3RhYi5jcHAKQEAg LTMxLDYgKzMxLDcgQEAKICNpbmNsdWRlIDxRTGFiZWw+CiAjaW5jbHVkZSA8UVNsaWRlcj4KICNp bmNsdWRlIDxRVkJveExheW91dD4KKyNpbmNsdWRlIDxRQ2hlY2tCb3g+CiAKICNpbmNsdWRlIDx2 aWV3cy96b29tbGV2ZWxpbmZvLmg+CiAKQEAgLTQwLDcgKzQxLDggQEAgVmlld1NldHRpbmdzVGFi OjpWaWV3U2V0dGluZ3NUYWIoTW9kZSBtb2RlLCBRV2lkZ2V0KiBwYXJlbnQpIDoKICAgICBtX2Rl ZmF1bHRTaXplU2xpZGVyKDApLAogICAgIG1fcHJldmlld1NpemVTbGlkZXIoMCksCiAgICAgbV9m b250UmVxdWVzdGVyKDApLAotICAgIG1fdGV4dFdpZHRoQm94KDApCisgICAgbV90ZXh0V2lkdGhC b3goMCksCisgICAgbV9leHBhbmRhYmxlRm9sZGVycygwKQogewogICAgIFFWQm94TGF5b3V0KiB0 b3BMYXlvdXQgPSBuZXcgUVZCb3hMYXlvdXQodGhpcyk7CiAKQEAgLTkxLDggKzkzLDEzIEBAIFZp ZXdTZXR0aW5nc1RhYjo6Vmlld1NldHRpbmdzVGFiKE1vZGUgbW9kZSwgUVdpZGdldCogcGFyZW50 KSA6CiAgICAgICAgIHRleHRHcm91cExheW91dC0+YWRkV2lkZ2V0KG1fdGV4dFdpZHRoQm94LCAy LCAxKTsKICAgICB9CiAKKyAgICBpZiAobV9tb2RlID09IERldGFpbHNNb2RlKSB7CisgICAgICAg IC8vIGNyZWF0ZSAiRXhwYW5kYWJsZSBGb2xkZXJzIiBjaGVja2JveAorICAgICAgICBtX2V4cGFu ZGFibGVGb2xkZXJzID0gbmV3IFFDaGVja0JveChpMThuYygiQG9wdGlvbjpjaGVjayIsICJFeHBh bmRhYmxlIGZvbGRlcnMiKSwgdGhpcyk7CisgICAgfSAgICAKICAgICB0b3BMYXlvdXQtPmFkZFdp ZGdldChpY29uU2l6ZUdyb3VwKTsKICAgICB0b3BMYXlvdXQtPmFkZFdpZGdldCh0ZXh0R3JvdXAp OworICAgIHRvcExheW91dC0+YWRkV2lkZ2V0KG1fZXhwYW5kYWJsZUZvbGRlcnMpOwogICAgIHRv cExheW91dC0+YWRkU3RyZXRjaCgxKTsKIAogICAgIGxvYWRTZXR0aW5ncygpOwpAQCAtMTAwLDYg KzEwNyw5IEBAIFZpZXdTZXR0aW5nc1RhYjo6Vmlld1NldHRpbmdzVGFiKE1vZGUgbW9kZSwgUVdp ZGdldCogcGFyZW50KSA6CiAgICAgY29ubmVjdChtX2RlZmF1bHRTaXplU2xpZGVyLCBTSUdOQUwo dmFsdWVDaGFuZ2VkKGludCkpLCB0aGlzLCBTSUdOQUwoY2hhbmdlZCgpKSk7CiAgICAgY29ubmVj dChtX3ByZXZpZXdTaXplU2xpZGVyLCBTSUdOQUwodmFsdWVDaGFuZ2VkKGludCkpLCB0aGlzLCBT SUdOQUwoY2hhbmdlZCgpKSk7CiAgICAgY29ubmVjdChtX2ZvbnRSZXF1ZXN0ZXIsIFNJR05BTChj aGFuZ2VkKCkpLCB0aGlzLCBTSUdOQUwoY2hhbmdlZCgpKSk7CisgICAgaWYgKG1fbW9kZSA9PSBE ZXRhaWxzTW9kZSkgeworICAgICAgICBjb25uZWN0KG1fZXhwYW5kYWJsZUZvbGRlcnMsIFNJR05B TCh0b2dnbGVkKGJvb2wpKSwgdGhpcywgU0lHTkFMKGNoYW5nZWQoKSkpOworICAgIH0KICAgICBp ZiAobV9tb2RlID09IEljb25zTW9kZSkgewogICAgICAgICBjb25uZWN0KG1fdGV4dFdpZHRoQm94 LCBTSUdOQUwoY3VycmVudEluZGV4Q2hhbmdlZChpbnQpKSwgdGhpcywgU0lHTkFMKGNoYW5nZWQo KSkpOwogICAgIH0KQEAgLTExNyw2ICsxMjcsOSBAQCB2b2lkIFZpZXdTZXR0aW5nc1RhYjo6YXBw bHlTZXR0aW5ncygpCiAgICAgaWYgKG1fbW9kZSA9PSBJY29uc01vZGUpIHsKICAgICAgICAgSWNv bnNNb2RlU2V0dGluZ3M6OnNldFRleHRXaWR0aEluZGV4KG1fdGV4dFdpZHRoQm94LT5jdXJyZW50 SW5kZXgoKSk7CiAgICAgfQorICAgIGlmIChtX21vZGUgPT0gRGV0YWlsc01vZGUpIHsKKyAgICAg ICAgRGV0YWlsc01vZGVTZXR0aW5nczo6c2V0RXhwYW5kYWJsZUZvbGRlcnMobV9leHBhbmRhYmxl Rm9sZGVycy0+aXNDaGVja2VkKCkpOworICAgIH0KIAogICAgIFZpZXdNb2RlU2V0dGluZ3Mgc2V0 dGluZ3Modmlld01vZGUoKSk7CiAKQEAgLTE3MSw2ICsxODQsOSBAQCB2b2lkIFZpZXdTZXR0aW5n c1RhYjo6bG9hZFNldHRpbmdzKCkKICAgICBmb250LnNldFdlaWdodChzZXR0aW5ncy5mb250V2Vp Z2h0KCkpOwogICAgIGZvbnQuc2V0UG9pbnRTaXplRihzZXR0aW5ncy5mb250U2l6ZSgpKTsKICAg ICBtX2ZvbnRSZXF1ZXN0ZXItPnNldEN1c3RvbUZvbnQoZm9udCk7CisgICAgaWYgKG1fbW9kZSA9 PSBEZXRhaWxzTW9kZSkgeworICAgICAgICBtX2V4cGFuZGFibGVGb2xkZXJzLT5zZXRDaGVja2Vk KERldGFpbHNNb2RlU2V0dGluZ3M6OmV4cGFuZGFibGVGb2xkZXJzKCkpOworICAgIH0KIH0KIAog Vmlld01vZGVTZXR0aW5nczo6Vmlld01vZGUgVmlld1NldHRpbmdzVGFiOjp2aWV3TW9kZSgpIGNv bnN0CmRpZmYgLS1naXQgYS9kb2xwaGluL3NyYy9zZXR0aW5ncy92aWV3bW9kZXMvdmlld3NldHRp bmdzdGFiLmggYi9kb2xwaGluL3NyYy9zZXR0aW5ncy92aWV3bW9kZXMvdmlld3NldHRpbmdzdGFi LmgKaW5kZXggMmUwZjQzOS4uNjc2ZmRiYSAxMDA2NDQKLS0tIGEvZG9scGhpbi9zcmMvc2V0dGlu Z3Mvdmlld21vZGVzL3ZpZXdzZXR0aW5nc3RhYi5oCisrKyBiL2RvbHBoaW4vc3JjL3NldHRpbmdz L3ZpZXdtb2Rlcy92aWV3c2V0dGluZ3N0YWIuaApAQCAtMjYsNiArMjYsNyBAQAogY2xhc3MgRG9s cGhpbkZvbnRSZXF1ZXN0ZXI7CiBjbGFzcyBLQ29tYm9Cb3g7CiBjbGFzcyBRU2xpZGVyOworY2xh c3MgUUNoZWNrQm94OwogCiAvKioKICAqIEBicmllZiBSZXByZXNlbnRzIG9uZSB0YWIgb2YgdGhl IHZpZXctc2V0dGluZ3MgcGFnZS4KQEAgLTYzLDYgKzY0LDcgQEAgcHJpdmF0ZToKIAogICAgIERv bHBoaW5Gb250UmVxdWVzdGVyKiBtX2ZvbnRSZXF1ZXN0ZXI7CiAgICAgS0NvbWJvQm94KiBtX3Rl eHRXaWR0aEJveDsKKyAgICBRQ2hlY2tCb3gqIG1fZXhwYW5kYWJsZUZvbGRlcnM7CiB9OwogCiAj ZW5kaWYKZGlmZiAtLWdpdCBhL2RvbHBoaW4vc3JjL3ZpZXdzL2RvbHBoaW5pdGVtbGlzdGNvbnRh aW5lci5jcHAgYi9kb2xwaGluL3NyYy92aWV3cy9kb2xwaGluaXRlbWxpc3Rjb250YWluZXIuY3Bw CmluZGV4IGQyOGFhMzYuLmYxN2Y4NGIgMTAwNjQ0Ci0tLSBhL2RvbHBoaW4vc3JjL3ZpZXdzL2Rv bHBoaW5pdGVtbGlzdGNvbnRhaW5lci5jcHAKKysrIGIvZG9scGhpbi9zcmMvdmlld3MvZG9scGhp bml0ZW1saXN0Y29udGFpbmVyLmNwcApAQCAtMTQwLDYgKzE0MCw3IEBAIHZvaWQgRG9scGhpbkl0 ZW1MaXN0Q29udGFpbmVyOjpzZXRJdGVtTGF5b3V0KEtGaWxlSXRlbUxpc3RWaWV3OjpMYXlvdXQg bGF5b3V0KQogICAgIGNhc2UgS0ZpbGVJdGVtTGlzdFZpZXc6OkRldGFpbHNMYXlvdXQ6CiAgICAg ICAgIG1fZmlsZUl0ZW1MaXN0Vmlldy0+c2V0U2Nyb2xsT3JpZW50YXRpb24oUXQ6OlZlcnRpY2Fs KTsKICAgICAgICAgbV9maWxlSXRlbUxpc3RWaWV3LT5zZXRIZWFkZXJTaG93bih0cnVlKTsKKyAg ICAgICAgbV9maWxlSXRlbUxpc3RWaWV3LT5zZXRFeHBhbmRhYmxlKERldGFpbHNNb2RlU2V0dGlu Z3M6OmV4cGFuZGFibGVGb2xkZXJzKCkpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIEtGaWxl SXRlbUxpc3RWaWV3OjpDb21wYWN0TGF5b3V0OgogICAgICAgICBtX2ZpbGVJdGVtTGlzdFZpZXct PnNldFNjcm9sbE9yaWVudGF0aW9uKFF0OjpIb3Jpem9udGFsKTsKQEAgLTE3Niw3ICsxNzcsNyBA QCB2b2lkIERvbHBoaW5JdGVtTGlzdENvbnRhaW5lcjo6cmVmcmVzaCgpCiAgICAgc2V0dGluZ3Mu cmVhZENvbmZpZygpOwogCiAgICAgYmVnaW5UcmFuc2FjdGlvbigpOwotCisgICAgCiAgICAgbV9m aWxlSXRlbUxpc3RWaWV3LT5zZXRFbmFibGVkU2VsZWN0aW9uVG9nZ2xlcyhHZW5lcmFsU2V0dGlu Z3M6OnNob3dTZWxlY3Rpb25Ub2dnbGUoKSk7CiAgICAgdXBkYXRlQXV0b0FjdGl2YXRpb25EZWxh eSgpOwogICAgIHVwZGF0ZUZvbnQoKTsK