------=_Part_24269_8768436.1206581151748 Content-Type: multipart/alternative; boundary="----=_Part_24270_12694950.1206581151748" ------=_Part_24270_12694950.1206581151748 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Your mail was really interested Torsten, and I would like to specify the reason why I submit the first patch for System Settings : This is only because, in any other places in KDE, tabs which display many important information (not 2 or 3 useless options) are never as small as the System Settings tabs were. And I'm not only talking about the Advanced tab, but also about the General tab, which was not really easy to see too. Here is a new proposal, which follow the mockup of Michael, that I like too= . I've also _artificially_ increase the button size by adding the Settings word for each text, which makes them more important. The other advantage of this displaying is that even if the user is in a KCM module, it can still see where he is, and directly switch between modules. The font size and icons are not anymore problematic because font size is standard, and all toolbar actions use icons. http://stuff.forum-software.org/kde/systemsettings-after3.png http://stuff.forum-software.org/kde/systemsettings-after4.png Cheers. On Wed, Mar 26, 2008 at 7:59 PM, Torsten Rahn wrote: > On Wednesday 26 March 2008 17:00:24 Michael Lentner wrote: > > Updated mockup: > > http://img256.imageshack.us/img256/5748/systemsettings2ym9.png > > Well, although I do have quite some experience with visual design I get > more > and more the impression that Nicolas et al. are trying to fix an issue > that > doesn't match the requirements of our target user base. > > I haven't seen any explanation on what is supposed to get fixed and this > is of > course something that needs to get discussed before coming up with (in > this > case IMHO rather dubious) solutions. > > Dialogs need to have a clear structure which guides the target user by > means > of a clear layout and proper usage of markups. Obviously the more > important > things should be set bold and if they are items that are supposed to be > clicked often they should have icons. The original version of the dialog, > i.e. the one before Nicolas sent his first patch, did this pretty well an= d > looked pretty decent (That being said I wouldn't claim that a better > solution doesn't exist however I haven't seen one so far). > > Now, what should get put into an advanced tab? Stuff that is supposed to > be > not relevant for most people (think of maybe 90%). And even for the > remaining > 10% the stuff that gets displayed under "Advanced" is only relevant in > very > few cases. So it's pretty likely that "Advanced" gets clicked maybe in > about > 1% of the cases where "Systemsettings" gets started by some random user. > Keep > in mind that the term "Advanced" doesn't necessarily indicate that a user > will make more use of a setting the more his experience grows. It just > indicates that there's a rather special need that can get fullfilled by > choosing the "Advanced tab". > > Now the first version that Nicolas came up with increased the text size, > boldness, added icons, increased the "hit size" of the tabs and I'm > convinced > that he would have added sound cues to it if it would have been easy > enough > to do it (of course I'm exaggerating with the latter). > This resulted in a "General/Advanced - tab" appearance that was equally o= r > more prominent than other clearly more important and more clicked items > which > get displayed by the settings dialog as well. This is bad because > over-usage > of bold/large/icon-accompagnied labels is one of the reasons that KDE get= s > often criticized for clutter. If every item gets its icon and bold/large > font then the usage of these markups is defeated and you get a clutterful > look where every item on the screen tries to punch into your face in a > fight > for more visibility. > > A good layout with only prominent icons being styled in a more obvious wa= y > will enable an advanced user to find "his" advanced tab more easily. Even > if > the advanced tab shows up as a plain normal tab entry without bells and > whistles in the user interface. Why? Because an "advanced" user knows muc= h > better what to look for and where stuff gets "hidden" that is used more > rarely. Being sensitive he will be much more easily able to find things i= n > a > dialog with a clear layout and structure than in a dialog where people > have > been fighting for "visibility" of their personal pet peeve (and where as = a > result all the items are "fighting" for visibility one over the other). > > Additionally in terms of artwork I don't think that any of > the "g/a-t-visibility"-proposals that I've seen so far has matched the > intended style for "Oxygen" as well as the original status did. I think > that > all of them have looked inferior. > > Best wishes, > > Torsten > > -- > Torsten Rahn > > Tel.: 0 21 61 - 46 43 - 192 > > credativ GmbH, HRB M=F6nchengladbach 12080 > Hohenzollernstr. 133, 41061 M=F6nchengladbach > Gesch=E4ftsf=FChrung: Dr. Michael Meskes, J=F6rg Folz > ------=_Part_24270_12694950.1206581151748 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Your mail was really interested Torsten, and I would like to specify the re= ason why I submit the first patch for System Settings : This is only becaus= e, in any other places in KDE, tabs which display many important informatio= n (not 2 or 3 useless options) are never as small as the System Settings ta= bs were.

And I'm not only talking about the Advanced tab, but also about the= General tab, which was not really easy to see too.

Here is a new pr= oposal, which follow the mockup of Michael, that I like too. I've also = _artificially_ increase the button size by adding the Settings word for eac= h text, which makes them more important. The other advantage of this displa= ying is that even if the user is in a KCM module, it can still see where he= is, and directly switch between modules.

The font size and icons are not anymore problematic because font size i= s standard, and all toolbar actions use icons.

http://stuff.forum-sof= tware.org/kde/systemsettings-after3.png
h= ttp://stuff.forum-software.org/kde/systemsettings-after4.png

Che= ers.

On Wed, Mar 26, 2008 at 7:59 PM, Tor= sten Rahn <torsten.rahn@cred= ativ.de> wrote:
On Wednesday 26 March 2008 17:00:24 Michael Lentner wrote:
> Updated mockup:
> http://img256.imageshack.us/img256/5748/systemsettin= gs2ym9.png

Well, although I do have quite some experience with visual design I g= et more
and more the impression that Nicolas et al. are trying to fix an issue that=
doesn't match the requirements of our target user base.

I haven't seen any explanation on what is supposed to get fixed and thi= s is of
course something that needs to get discussed before coming up with (in this=
case IMHO rather dubious) solutions.

Dialogs need to have a clear structure which guides the target user by mean= s
of a clear layout and proper usage of markups. Obviously the more important=
things should be set bold and if they are items that are supposed to be
clicked often they should have icons. The original version of the dialog, i.e. the one before Nicolas sent his first patch, did this pretty well and<= br> looked pretty decent  (That being said I wouldn't claim that a bet= ter
solution doesn't exist however I haven't seen one so far).

Now, what should get put into an advanced tab? Stuff that is supposed to be=
not relevant for most people (think of maybe 90%). And even for the remaini= ng
10% the stuff that gets displayed under "Advanced" is only releva= nt in very
few cases. So it's pretty likely that "Advanced" gets clicked= maybe in about
1% of the cases where "Systemsettings" gets started by some rando= m user. Keep
in mind that the term "Advanced" doesn't necessarily indicate= that a user
will make more use of a setting the more his experience grows. It just
indicates that there's a rather special need that can get fullfilled by=
choosing the "Advanced tab".

Now the first version that Nicolas came up with increased the text size, boldness, added icons, increased the "hit size" of the tabs and I= 'm convinced
that he would have added sound cues to it if it would have been easy enough=
to do it (of course I'm exaggerating with the latter).
This resulted in a "General/Advanced - tab" appearance that was e= qually or
more prominent than other clearly more important and more clicked items whi= ch
get displayed by the settings dialog as well. This is bad because over-usag= e
of bold/large/icon-accompagnied labels is one of the reasons that KDE gets<= br> often criticized for clutter.  If every item gets its icon and bold/la= rge
font then the usage of these markups is defeated and you get a clutterful look where every item on the screen tries to punch into your face in a figh= t
for more visibility.

A good layout with only prominent icons being styled in a more obvious way<= br> will enable an advanced user to find "his" advanced tab more easi= ly. Even if
the advanced tab shows up as a plain normal tab entry without bells and
whistles in the user interface. Why? Because an "advanced" user k= nows much
better what to look for and where stuff gets "hidden" that is use= d more
rarely. Being sensitive he will be much more easily able to find things in = a
dialog with a clear layout and structure than in a dialog where people have=
been fighting for "visibility" of their personal pet peeve (and w= here as a
result all the items are "fighting" for visibility one over the o= ther).

Additionally in terms of artwork I don't think that any of
the "g/a-t-visibility"-proposals that I've seen so far has ma= tched the
intended style for "Oxygen" as well as the original status did. I= think that
all of them have looked inferior.

Best wishes,

Torsten

--
 Torsten Rahn

 Tel.: 0 21 61 - 46 43 - 192

credativ GmbH, HRB M=F6nchengladbach 12080
Hohenzollernstr. 133, 41061 M=F6nchengladbach
Gesch=E4ftsf=FChrung: Dr. Michael Meskes, J=F6rg Folz

------=_Part_24270_12694950.1206581151748-- ------=_Part_24269_8768436.1206581151748 Content-Type: text/x-diff; name=system-settings-using-tooltab.patch Content-Transfer-Encoding: base64 X-Attachment-Id: f_fean8obd0 Content-Disposition: attachment; filename=system-settings-using-tooltab.patch SW5kZXg6IG1vZHVsZXRhYmJhci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gbW9kdWxldGFiYmFyLmNwcAko csOpdmlzaW9uIDc4OTMwOSkKKysrIG1vZHVsZXRhYmJhci5jcHAJKGNvcGllIGRlIHRyYXZhaWwp CkBAIC0yOSwxNCArMjksMTAgQEAKIAk6IEtUYWJCYXIocGFyZW50KSAKIHsKIAkKLX0KKyAgICBR Rm9udCBtb2RpZmllZEZvbnQgPSBmb250KCk7CisgICAgbW9kaWZpZWRGb250LnNldFBvaW50U2l6 ZSggbW9kaWZpZWRGb250LnBvaW50U2l6ZSgpICogMS4yICk7CisgICAgc2V0Rm9udChtb2RpZmll ZEZvbnQpOwogCi1RU2l6ZSBNb2R1bGVUYWJCYXI6OnRhYlNpemVIaW50ICggaW50IGluZGV4ICkg Y29uc3QgewotCVFTaXplIHRhYlNpemUgPSBLVGFiQmFyOjp0YWJTaXplSGludChpbmRleCk7Ci0J Ci0JdGFiU2l6ZS5zZXRXaWR0aCggc2l6ZSgpLndpZHRoKCkgLyBjb3VudCgpIC0yKTsKLQkKLQly ZXR1cm4gdGFiU2l6ZTsKIH0KIAogI2luY2x1ZGUgIm1vZHVsZXRhYmJhci5tb2MiCkluZGV4OiBj YXRlZ29yaWVzL3NldHRpbmdzLWdlbmVyYWwuZGVza3RvcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBjYXRlZ29y aWVzL3NldHRpbmdzLWdlbmVyYWwuZGVza3RvcAkocsOpdmlzaW9uIDc4OTMwOSkKKysrIGNhdGVn b3JpZXMvc2V0dGluZ3MtZ2VuZXJhbC5kZXNrdG9wCShjb3BpZSBkZSB0cmF2YWlsKQpAQCAtNCw4 ICs0LDkgQEAKIFgtS0RFLVdlaWdodD0xMDAKIFgtS0RFLVN5c3RlbS1TZXR0aW5ncy1DYXRlZ29y eT1nZW5lcmFsCiBYLUtERS1TeXN0ZW0tU2V0dGluZ3MtUGFyZW50LUNhdGVnb3J5PQorSWNvbj1w cmVmZXJlbmNlcy1zeXN0ZW0KIAotTmFtZT1HZW5lcmFsCitOYW1lPUdlbmVyYWwgU2V0dGluZ3MK IE5hbWVbYXJdPdi52KfZhQogTmFtZVtiZV090JDQs9GD0LvRjNC90YvRjwogTmFtZVtiZ1090J7R gdC90L7QstC90L4KSW5kZXg6IGNhdGVnb3JpZXMvc2V0dGluZ3MtYWR2YW5jZWQuZGVza3RvcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBjYXRlZ29yaWVzL3NldHRpbmdzLWFkdmFuY2VkLmRlc2t0b3AJKHLDqXZp c2lvbiA3ODkzMDkpCisrKyBjYXRlZ29yaWVzL3NldHRpbmdzLWFkdmFuY2VkLmRlc2t0b3AJKGNv cGllIGRlIHRyYXZhaWwpCkBAIC00LDggKzQsOSBAQAogWC1LREUtV2VpZ2h0PTIwMAogWC1LREUt U3lzdGVtLVNldHRpbmdzLUNhdGVnb3J5PWFkdmFuY2VkCiBYLUtERS1TeXN0ZW0tU2V0dGluZ3Mt UGFyZW50LUNhdGVnb3J5PQorSWNvbj1hcHBsaWNhdGlvbnMtZW5naW5lZXJpbmcKIAotTmFtZT1B ZHZhbmNlZAorTmFtZT1BZHZhbmNlZCBTZXR0aW5ncwogTmFtZVthZl09R2V2b3JkZXJkZQogTmFt ZVthcl092YXYqtmC2K/ZhQogTmFtZVtiZV090JDRgdCw0LHQu9GW0LLRiwpJbmRleDogbW9kdWxl dGFiYmFyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gbW9kdWxldGFiYmFyLmgJKHLDqXZpc2lvbiA3ODkzMDkp CisrKyBtb2R1bGV0YWJiYXIuaAkoY29waWUgZGUgdHJhdmFpbCkKQEAgLTMxLDkgKzMxLDYgQEAK IHB1YmxpYzoKIAlNb2R1bGVUYWJCYXIgKFFXaWRnZXQgKnBhcmVudD0wKTsKIAotcHJvdGVjdGVk OgotCQotCXZpcnR1YWwgUVNpemUgdGFiU2l6ZUhpbnQoaW50IGluZGV4KSBjb25zdDsKIH07CiAK ICNlbmRpZgpJbmRleDogbWFpbndpbmRvdy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gbWFpbndpbmRvdy5j cHAJKHLDqXZpc2lvbiA3ODkzMDkpCisrKyBtYWlud2luZG93LmNwcAkoY29waWUgZGUgdHJhdmFp bCkKQEAgLTY1LDExICs2NSwyMSBAQAogCS8vIExvYWQgdGhlIG1lbnUgc3RydWN0dXJlIGluIGZy b20gZGlzay4KICAgICByZWFkTWVudSggcm9vdEl0ZW0gKTsKICAgICBxU3RhYmxlU29ydCggcm9v dEl0ZW0tPmNoaWxkcmVuLmJlZ2luKCksIHJvb3RJdGVtLT5jaGlsZHJlbi5lbmQoKSwgcGFnZUxl c3NUaGFuICk7IC8vIHNvcnQgdGFicyBieSB3ZWlnaHQKLQltb2R1bGVUYWJzID0gbmV3IE1vZHVs ZVRhYih0aGlzKTsKKwltb2R1bGVUYWJzID0gbmV3IFFTdGFja2VkV2lkZ2V0KHRoaXMpOwogCWJ1 aWxkQWN0aW9ucygpOwogCWJ1aWxkTWFpbldpZGdldCgpOwogICAgIC8vIFdlIGhpZGUgdGhlIG1l bnViYXIuIFNvIGVuc3VyZSB0aGUgdG9vbGJhciBpcyBhbHdheXMgdmlzaWJsZSBiZWNhdXNlIHlv dSBjYW5ub3QgZ2V0IGl0IGJhY2sKICAgICBzZXR1cEdVSShTYXZlfENyZWF0ZSxRU3RyaW5nKCkp OworICAgIAorICAgIHVucGx1Z0FjdGlvbkxpc3QoIm1vZHVsZXMiKTsKKyAgICBwbHVnQWN0aW9u TGlzdCgibW9kdWxlcyIsIG1lbnVBY3Rpb25zLT5hY3Rpb25zKCkpOworICAgIAorICAgIC8vU2Vs ZWN0IGZpcnN0IG1vZHVsZSB2aWV3CisgICAgaWYgKG1lbnVBY3Rpb25zLT5hY3Rpb25zKCkuaXNF bXB0eSgpPT1mYWxzZSkgeworICAgIAltZW51QWN0aW9ucy0+YWN0aW9ucygpLmZpcnN0KCktPnNl dENoZWNrZWQodHJ1ZSk7CisgICAgCWNoYW5nZU1vZHVsZShtZW51QWN0aW9ucy0+YWN0aW9ucygp LmZpcnN0KCkpOworICAgIH0KKwogICAgIG1lbnVCYXIoKS0+aGlkZSgpOwogCiAJY29ubmVjdCht b2R1bGVUYWJzLCBTSUdOQUwoY3VycmVudENoYW5nZWQoaW50KSksIFNMT1Qod2lkZ2V0Q2hhbmdl KCkpKTsKQEAgLTE4NCwxNCArMTk0LDIzIEBACiAgICAgICAgICAgICAgICAga2NzZnBtLCBTTE9U KHNldEZpbHRlclJlZ0V4cChjb25zdCBRU3RyaW5nJikpKTsKICAgICAgICAgY29ubmVjdCgga2Nz ZnBtLCBTSUdOQUwobGF5b3V0Q2hhbmdlZCgpKSwKICAgICAgICAgICAgICAgICB0aGlzLCBTTE9U KHVwZGF0ZVNlYXJjaEhpdHMoKSkgKTsKLSAgICAgICAgbW9kdWxlVGFicy0+YWRkVGFiKHR2LCBp dGVtLT5zZXJ2aWNlLT5uYW1lKCkgKTsKKworICAgICAgICBtb2R1bGVUYWJzLT5hZGRXaWRnZXQo dHYpOwogICAgICAgICAKKyAgICAgICAgUUFjdGlvbiogbWVudUFjdGlvbiA9IG5ldyBRQWN0aW9u KHRoaXMpOworICAgICAgICBtZW51QWN0aW9uLT5zZXRJY29uKEtJY29uKGl0ZW0tPnNlcnZpY2Ut Pmljb24oKSkpOworICAgICAgICBtZW51QWN0aW9uLT5zZXRUZXh0KGl0ZW0tPnNlcnZpY2UtPm5h bWUoKSk7CisgICAgICAgIG1lbnVBY3Rpb24tPnNldENoZWNrYWJsZSh0cnVlKTsKKyAgICAgICAg bWVudUFjdGlvbnMtPmFkZEFjdGlvbihtZW51QWN0aW9uKTsKKyAgICAgICAgYWRkQWN0aW9uKG1l bnVBY3Rpb24pOwogICAgICAgICAKKyAgICAgICAgCiAKICAgICAgICAgLy8gcmVjb3JkIHRoZSBp bmRleCBvZiB0aGUgbmV3bHkgYWRkZWQgdGFiIHNvIHRoYXQgd2UgY2FuIGxhdGVyIHVwZGF0ZSB0 aGUgbGFiZWwgc2hvd2luZwogICAgICAgICAvLyBudW1iZXIgb2Ygc2VhcmNoIGhpdHMKICAgICAg ICAgbW9kZWxUb1RhYkhhc2guaW5zZXJ0KCBrY3NmcG0sIG1vZHVsZVRhYnMtPmNvdW50KCkgLSAx ICk7CiAgICAgfQorCiAgICAgd2luZG93U3RhY2stPmFkZFdpZGdldChtb2R1bGVUYWJzKTsKICAg ICB3aW5kb3dTdGFjay0+c2V0Q3VycmVudFdpZGdldChtb2R1bGVUYWJzKTsKICAgICBzZXRDZW50 cmFsV2lkZ2V0KHdpbmRvd1N0YWNrKTsKQEAgLTIwOCw2ICsyMjcsMTIgQEAKIAlzaG93T3ZlcnZp ZXdBY3Rpb24tPnNldEVuYWJsZWQoZmFsc2UpOwogCWFkZEFjdGlvbihzaG93T3ZlcnZpZXdBY3Rp b24pOwogCisJbWVudUFjdGlvbnMgPSBuZXcgUUFjdGlvbkdyb3VwKCB0aGlzICk7CisJLy9Db3Vs ZCBub3QgdXNlIGV4Y2x1c2l2ZSBpbiBhY3Rpb24gZ3JvdXAgdG8gYWxsb3cgdGhlIHVzZXIgcmVj bGlja3Mgb24gYSBjaGVja2VkIGFjdGlvbiAKKwkvL3RvIGNvbWUgYmFjayBmcm9tIGEgbW9kdWxl IHRvIG1haW4gcGFnZS4KKwltZW51QWN0aW9ucy0+c2V0RXhjbHVzaXZlKGZhbHNlKTsKKwljb25u ZWN0KG1lbnVBY3Rpb25zLCBTSUdOQUwodHJpZ2dlcmVkKFFBY3Rpb24qKSksIHRoaXMsIFNMT1Qo Y2hhbmdlTW9kdWxlKFFBY3Rpb24qKSkpOworCQogCVFXaWRnZXQgKnNlYXJjaFdpZCA9IG5ldyBR V2lkZ2V0KCB0aGlzICk7CiAJUUxhYmVsICogc2VhcmNoSWNvbiA9IG5ldyBRTGFiZWwoIHNlYXJj aFdpZCApOwogCXNlYXJjaEljb24tPnNldFBpeG1hcCggQmFySWNvbiggInN5c3RlbS1zZWFyY2gi ICkgKTsKQEAgLTMzNiw3ICszNjEsMTUgQEAKICAgICAvLyB2aXNpYmxlCiAgICAgd2luZG93U3Rh Y2stPnNldEN1cnJlbnRXaWRnZXQoIGdyb3VwV2lkZ2V0ICk7CiAKLSAgICBzZXRDYXB0aW9uKCBt SXRlbS0+c2VydmljZS0+bmFtZSgpICk7CisgICAgUUFjdGlvbiogY2hlY2tlZEFjdGlvbiA9IE5V TEw7CisgICAgZm9yZWFjaChRQWN0aW9uKiBhY3Rpb24sIG1lbnVBY3Rpb25zLT5hY3Rpb25zKCkp IHsKKyAgICAJaWYgKGFjdGlvbi0+aXNDaGVja2VkKCkpIHsKKyAgICAJCWNoZWNrZWRBY3Rpb24g PSBhY3Rpb247CisgICAgCQlicmVhazsKKyAgICAJfQorICAgIH0KKyAgICAKKyAgICBzZXRDYXB0 aW9uKCBpMThuYygiTW9kdWxlIC0gTW9kdWxlIFBsYWNlW0dlbmVyYWwvQWR2YW5jZWRdIiwgIiUx IC0gJTIiLCBtSXRlbS0+c2VydmljZS0+bmFtZSgpLCBjaGVja2VkQWN0aW9uLT50ZXh0KCkpICk7 CiAgICAgc2hvd092ZXJ2aWV3QWN0aW9uLT5zZXRFbmFibGVkKHRydWUpOwogICAgIHNlYXJjaFRl eHQtPnNldEVuYWJsZWQoZmFsc2UpOwogICAgIHNlYXJjaC0+c2V0RW5hYmxlZChmYWxzZSk7CkBA IC0zODcsNiArNDIwLDIzIEBACiAgICAgfQogfQogCit2b2lkIE1haW5XaW5kb3c6OmNoYW5nZU1v ZHVsZShRQWN0aW9uKiBhY3Rpb24pIAoreworCWtEZWJ1ZygpIDw8ICJDaGFuZ2UgbW9kdWxlIiA8 PCBlbmRsOworCWlmICh3aW5kb3dTdGFjay0+Y3VycmVudFdpZGdldCgpICE9IG1vZHVsZVRhYnMp IHsKKwkJc2hvd092ZXJ2aWV3KCk7CisJfQorCQorCW1vZHVsZVRhYnMtPnNldEN1cnJlbnRJbmRl eChtZW51QWN0aW9ucy0+YWN0aW9ucygpLmluZGV4T2YoYWN0aW9uKSk7CisgICAgc2V0Q2FwdGlv biggYWN0aW9uLT50ZXh0KCkgKTsKKworICAgIGZvcmVhY2goUUFjdGlvbiogY3VycmVudEFjdGlv biwgbWVudUFjdGlvbnMtPmFjdGlvbnMoKSkgeworICAgIAljdXJyZW50QWN0aW9uLT5zZXRDaGVj a2VkKGZhbHNlKTsKKyAgICB9CisgICAgYWN0aW9uLT5zZXRDaGVja2VkKHRydWUpOworICAgIAor fQorCiBib29sIHBhZ2VMZXNzVGhhbiggTWVudUl0ZW0gKnBhZ2UxLCBNZW51SXRlbSAqcGFnZTIg KQogewogICAgIHJldHVybiBwYWdlMS0+aXRlbS53ZWlnaHQoKSA8IHBhZ2UyLT5pdGVtLndlaWdo dCgpOwpJbmRleDogbW9kdWxldGFiLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBtb2R1bGV0YWIuY3BwCShy w6l2aXNpb24gNzg5MzA5KQorKysgbW9kdWxldGFiLmNwcAkoY29waWUgZGUgdHJhdmFpbCkKQEAg LTIxLDcgKzIxLDYgQEAKICNpbmNsdWRlICJtb2R1bGV0YWIuaCIKIAogI2luY2x1ZGUgPFFUYWJC YXI+Ci0jaW5jbHVkZSA8UUZvbnQ+CiAjaW5jbHVkZSA8UVN0YWNrZWRXaWRnZXQ+CiAjaW5jbHVk ZSA8UVZCb3hMYXlvdXQ+CiAKQEAgLTQ1LDE0ICs0NCw4IEBACiAJCiAJZC0+dGFiQmFyID0gbmV3 IE1vZHVsZVRhYkJhcih0aGlzKTsKIAlkLT50YWJCYXItPnNldFNpemVQb2xpY3koUVNpemVQb2xp Y3k6OkV4cGFuZGluZywgUVNpemVQb2xpY3k6Ok1pbmltdW0pOwotCWQtPnRhYkJhci0+c2V0U2hh cGUoUVRhYkJhcjo6VHJpYW5ndWxhck5vcnRoKTsKIAltYWluTGF5b3V0LT5hZGRXaWRnZXQoZC0+ dGFiQmFyKTsKLQkKLSAgICBRRm9udCBmb250ID0gZC0+dGFiQmFyLT5mb250KCk7Ci0gICAgZm9u dC5zZXRCb2xkKHRydWUpOwotICAgIGZvbnQuc2V0UG9pbnRTaXplKCBmb250LnBvaW50U2l6ZSgp ICogMS4yICk7Ci0gICAgZC0+dGFiQmFyLT5zZXRGb250KGZvbnQpOwotICAgIAorCiAgICAgZC0+ c3RhY2tlZFdpZGdldCA9IG5ldyBRU3RhY2tlZFdpZGdldCh0aGlzKTsKICAgICBtYWluTGF5b3V0 LT5hZGRXaWRnZXQoZC0+c3RhY2tlZFdpZGdldCk7CiAgICAgCkBAIC03Nyw5ICs3MCwxMCBAQAog CXJldHVybiBkLT5zdGFja2VkV2lkZ2V0LT5jdXJyZW50V2lkZ2V0KCk7CiB9CiAKLXZvaWQgTW9k dWxlVGFiOjphZGRUYWIoUVdpZGdldCogdmlldywgY29uc3QgUVN0cmluZyYgbmFtZSkKK3ZvaWQg TW9kdWxlVGFiOjphZGRUYWIoUVdpZGdldCogdmlldywgY29uc3QgUUljb24mIGljb24sIGNvbnN0 IFFTdHJpbmcmIG5hbWUpCiB7Ci0JZC0+dGFiQmFyLT5hZGRUYWIobmFtZSk7CisJZC0+dGFiQmFy LT5hZGRUYWIoaWNvbiwgbmFtZSk7CisJCiAJZC0+c3RhY2tlZFdpZGdldC0+YWRkV2lkZ2V0KHZp ZXcpOwogfQogCkluZGV4OiBtYWlud2luZG93LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gbWFpbndpbmRvdy5o CShyw6l2aXNpb24gNzg5MzA5KQorKysgbWFpbndpbmRvdy5oCShjb3BpZSBkZSB0cmF2YWlsKQpA QCAtMjgsNiArMjgsNyBAQAogCiBjbGFzcyBRQWJzdHJhY3RJdGVtTW9kZWw7CiBjbGFzcyBRQWN0 aW9uOworY2xhc3MgUUFjdGlvbkdyb3VwOwogY2xhc3MgUUxhYmVsOwogY2xhc3MgUU1vZGVsSW5k ZXg7CiBjbGFzcyBRU3RhY2tlZFdpZGdldDsKQEAgLTU5LDIzICs2MCwyNSBAQAogICAgIHZvaWQg dXBkYXRlU2VhcmNoSGl0cygpOwogCXZvaWQgc2hvd092ZXJ2aWV3KCk7CiAJdm9pZCB3aWRnZXRD aGFuZ2UoKTsKLQorCXZvaWQgY2hhbmdlTW9kdWxlKFFBY3Rpb24qIGFjdGlvbik7CisJCiBwcml2 YXRlOgogICAgIHZvaWQgcmVhZE1lbnUoIE1lbnVJdGVtICogKTsKIAogCUtDTW9kdWxlTW9kZWwg Km1vZGVsOwogCUtTZXJ2aWNlOjpMaXN0IGNhdGVnb3JpZXM7CiAJS1NlcnZpY2U6Okxpc3QgbW9k dWxlczsKLQlNZW51SXRlbSAqIHJvb3RJdGVtOworCU1lbnVJdGVtICpyb290SXRlbTsKIAlRU3Rh Y2tlZFdpZGdldCAqd2luZG93U3RhY2s7Ci0JTW9kdWxlVGFiICptb2R1bGVUYWJzOwotICAgIEtM aW5lRWRpdCAqIHNlYXJjaDsKKwlRU3RhY2tlZFdpZGdldCAqbW9kdWxlVGFiczsKKyAgICBLTGlu ZUVkaXQgKnNlYXJjaDsKIAogCUtDTXVsdGlXaWRnZXQgKmdyb3VwV2lkZ2V0OwogCiAJUUhhc2g8 S1NlcnZpY2U6OlB0cixLQ011bHRpV2lkZ2V0Kj4gbW9kdWxlSXRlbVRvV2lkZ2V0RGljdDsKIAlR SGFzaDxjb25zdCBRQWJzdHJhY3RJdGVtTW9kZWwgKixpbnQ+IG1vZGVsVG9UYWJIYXNoOwogCisJ UUFjdGlvbkdyb3VwKiBtZW51QWN0aW9uczsKIAlRQWN0aW9uICpzaG93T3ZlcnZpZXdBY3Rpb247 CiAJS0FjdGlvbiAqc2VhcmNoVGV4dDsKIAlLQWN0aW9uICpzZWFyY2hDbGVhcjsKSW5kZXg6IG1v ZHVsZXRhYi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIG1vZHVsZXRhYi5oCShyw6l2aXNpb24gNzg5MzA5KQor KysgbW9kdWxldGFiLmgJKGNvcGllIGRlIHRyYXZhaWwpCkBAIC0yMiw2ICsyMiw3IEBACiAKICNp bmNsdWRlIDxRTGlzdD4KICNpbmNsdWRlIDxRU3RyaW5nPgorI2luY2x1ZGUgPFFJY29uPgogCiAj aW5jbHVkZSA8a3RhYndpZGdldC5oPgogI2luY2x1ZGUgPGt0YWJiYXIuaD4KQEAgLTM5LDcgKzQw LDcgQEAKIAkKIAlRV2lkZ2V0KiBjdXJyZW50V2lkZ2V0KCkgY29uc3Q7CiAJCi0Jdm9pZCBhZGRU YWIoUVdpZGdldCogdmlldywgY29uc3QgUVN0cmluZyYgbmFtZSk7CisJdm9pZCBhZGRUYWIoUVdp ZGdldCogdmlldywgY29uc3QgUUljb24mIGljb24sIGNvbnN0IFFTdHJpbmcmIG5hbWUpOwogCQog c2lnbmFsczoKIApJbmRleDogc3lzdGVtc2V0dGluZ3N1aS5yYwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBzeXN0 ZW1zZXR0aW5nc3VpLnJjCShyw6l2aXNpb24gNzg5MzA5KQorKysgc3lzdGVtc2V0dGluZ3N1aS5y YwkoY29waWUgZGUgdHJhdmFpbCkKQEAgLTMsNiArMyw3IEBACiAKIDxUb29sQmFyIG5hbWU9Im1h aW5Ub29sQmFyIiBpY29uVGV4dD0iaWNvbnRleHRyaWdodCI+CiAJPEFjdGlvbiBuYW1lPSJzaG93 QWxsIi8+CisJPEFjdGlvbkxpc3QgbmFtZT0ibW9kdWxlcyIgLz4KIAk8U2VwYXJhdG9yLz4KIAk8 QWN0aW9uIG5hbWU9InNwYWNlciIvPgogCTxBY3Rpb24gbmFtZT0ic2VhcmNoVGV4dCIvPgo= ------=_Part_24269_8768436.1206581151748--