Changeset 42363 in webkit
- Timestamp:
- Apr 9, 2009 10:06:03 AM (15 years ago)
- Location:
- trunk/WebKit
- Files:
-
- 6 edited
-
English.lproj/Localizable.strings (modified) (2 diffs)
-
mac/ChangeLog (modified) (1 diff)
-
mac/Panels/English.lproj/WebAuthenticationPanel.nib/designable.nib (modified) (34 diffs)
-
mac/Panels/English.lproj/WebAuthenticationPanel.nib/keyedobjects.nib (modified) (previous)
-
mac/Panels/WebAuthenticationPanel.h (modified) (1 diff)
-
mac/Panels/WebAuthenticationPanel.m (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/English.lproj/Localizable.strings
r41750 r42363 323 323 "The user name or password you entered for the %@ proxy server %@ was incorrect. Make sure you’re entering them correctly, and then try again." = "The user name or password you entered for the %@ proxy server %@ was incorrect. Make sure you’re entering them correctly, and then try again."; 324 324 325 /* prompt string in authentication panel */ 326 "The user name or password you entered for this area on %@ was incorrect. Make sure you’re entering them correctly, and then try again." = "The user name or password you entered for this area on %@ was incorrect. Make sure you’re entering them correctly, and then try again."; 327 325 328 /* text that appears at the start of nearly-obsolete web pages in the form of a 'searchable index' */ 326 329 "This is a searchable index. Enter search keywords: " = "This is a searchable index. Enter search keywords: "; … … 335 338 "To view this page, you must log in to the %@ proxy server %@." = "To view this page, you must log in to the %@ proxy server %@."; 336 339 340 /* prompt string in authentication panel */ 341 "To view this page, you must log in to this area on %@:" = "To view this page, you must log in to this area on %@:"; 342 337 343 /* Undo action name */ 338 344 "Turn Off Kerning (Undo action name)" = "Turn Off Kerning"; -
trunk/WebKit/mac/ChangeLog
r42361 r42363 1 2009-04-09 Mike Thole <mthole@apple.com> 2 3 Reviewed by Ada Chan. 4 5 <rdar://problem/5697111> Basic authentication dialog spoofing vulnerability 6 7 * Panels/WebAuthenticationPanel.h: 8 Added IBOutlet for separateRealmLabel 9 * Panels/WebAuthenticationPanel.m: 10 (-[WebAuthenticationPanel setUpForChallenge:]): 11 In the realm case, decide if it is a simple or complex realm name. A realm name 12 is considered complex if it has any whitespace or newline characters. Present 13 alternative text and layout for the complex case, where the realm name isn't inline 14 with the rest of the sheet's text. 15 16 * Panels/English.lproj/WebAuthenticationPanel.nib/designable.nib: 17 * Panels/English.lproj/WebAuthenticationPanel.nib/keyedobjects.nib: 18 Updated the nib with a new 'separateRealmLabel' outlet. 19 Updated the File's Owner to correctly be WebAuthenticationPanel. 20 Fixed springs on the sheet's icon to keep it from moving during a resize. 21 1 22 2009-04-09 David Kilzer <ddkilzer@apple.com> 2 23 -
trunk/WebKit/mac/Panels/English.lproj/WebAuthenticationPanel.nib/designable.nib
r40280 r42363 4 4 <int key="IBDocument.SystemTarget">1050</int> 5 5 <string key="IBDocument.SystemVersion">9G55</string> 6 <string key="IBDocument.InterfaceBuilderVersion">67 2</string>7 <string key="IBDocument.AppKitVersion">949. 43</string>6 <string key="IBDocument.InterfaceBuilderVersion">670</string> 7 <string key="IBDocument.AppKitVersion">949.34</string> 8 8 <string key="IBDocument.HIToolboxVersion">353.00</string> 9 9 <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> … … 18 18 <bool key="EncodedWithXMLCoder">YES</bool> 19 19 <object class="NSCustomObject" id="238662661"> 20 <string key="NSClassName"> IFAuthenticationPanel</string>20 <string key="NSClassName">WebAuthenticationPanel</string> 21 21 </object> 22 22 <object class="NSCustomObject" id="729335755"> … … 29 29 <int key="NSWindowStyleMask">1</int> 30 30 <int key="NSWindowBacking">2</int> 31 <string key="NSWindowRect">{{93, 112}, {424, 239}}</string>31 <string key="NSWindowRect">{{93, 72}, {424, 279}}</string> 32 32 <int key="NSWTFlags">1886912512</int> 33 33 <string key="NSWindowTitle">Log In</string> … … 36 36 <characters key="NS.bytes">View</characters> 37 37 </object> 38 <string key="NSWindowContentMaxSize">{500, 202}</string>39 <string key="NSWindowContentMinSize">{300, 100}</string>40 38 <object class="NSView" key="NSWindowView" id="327235052"> 41 39 <reference key="NSNextResponder"/> … … 46 44 <reference key="NSNextResponder" ref="327235052"/> 47 45 <int key="NSvFlags">266</int> 48 <string key="NSFrame">{{101, 185}, {306, 34}}</string>46 <string key="NSFrame">{{101, 225}, {306, 34}}</string> 49 47 <reference key="NSSuperview" ref="327235052"/> 50 48 <int key="NSTag">1</int> … … 53 51 <int key="NSCellFlags">69336577</int> 54 52 <int key="NSCellFlags2">4194304</int> 55 <string type="base64-UTF8" key="NSContents">VG8gdmlldyB0aGlzIHBhZ2UsIHlvdSBuZWVkIHRvIGxvZyBpbiB0byBhcmVhIOKAnFNvbWUgUmVhbG3i 56 gJ0gb24gd3d3LnNlcnZlci5jb20uCi4uA</string> 53 <string key="NSContents">To view this page, you must log in to this area on www.server.com:</string> 57 54 <object class="NSFont" key="NSSupport" id="897649771"> 58 55 <string key="NSName">LucidaGrande</string> … … 85 82 <reference key="NSNextResponder" ref="327235052"/> 86 83 <int key="NSvFlags">290</int> 87 <string key="NSFrame">{{101, 1 57}, {291, 20}}</string>84 <string key="NSFrame">{{101, 147}, {306, 20}}</string> 88 85 <reference key="NSSuperview" ref="327235052"/> 89 86 <int key="NSTag">2</int> … … 153 150 <reference key="NSNextResponder" ref="327235052"/> 154 151 <int key="NSvFlags">290</int> 155 <string key="NSFrame">{{174, 1 27}, {210, 22}}</string>152 <string key="NSFrame">{{174, 117}, {230, 22}}</string> 156 153 <reference key="NSSuperview" ref="327235052"/> 157 154 <int key="NSTag">3</int> … … 185 182 <reference key="NSNextResponder" ref="327235052"/> 186 183 <int key="NSvFlags">290</int> 187 <string key="NSFrame">{{174, 97}, {210, 22}}</string>184 <string key="NSFrame">{{174, 87}, {230, 22}}</string> 188 185 <reference key="NSSuperview" ref="327235052"/> 189 186 <int key="NSTag">4</int> … … 203 200 <object class="NSTextField" id="477300420"> 204 201 <reference key="NSNextResponder" ref="327235052"/> 205 <int key="NSvFlags">2 89</int>206 <string key="NSFrame">{{101, 1 29}, {71, 17}}</string>202 <int key="NSvFlags">292</int> 203 <string key="NSFrame">{{101, 119}, {68, 17}}</string> 207 204 <reference key="NSSuperview" ref="327235052"/> 208 205 <bool key="NSEnabled">YES</bool> … … 210 207 <int key="NSCellFlags">67239424</int> 211 208 <int key="NSCellFlags2">4194304</int> 212 <string type="base64-UTF8" key="NSContents">TmFtZToKA</string>209 <string key="NSContents">Name:</string> 213 210 <reference key="NSSupport" ref="897649771"/> 214 211 <reference key="NSControlView" ref="477300420"/> … … 219 216 <object class="NSTextField" id="833115728"> 220 217 <reference key="NSNextResponder" ref="327235052"/> 221 <int key="NSvFlags">2 89</int>222 <string key="NSFrame">{{101, 94}, {68, 22}}</string>218 <int key="NSvFlags">292</int> 219 <string key="NSFrame">{{101, 89}, {68, 17}}</string> 223 220 <reference key="NSSuperview" ref="327235052"/> 224 221 <bool key="NSEnabled">YES</bool> … … 226 223 <int key="NSCellFlags">67239424</int> 227 224 <int key="NSCellFlags2">4194304</int> 228 <string type="base64-UTF8" key="NSContents">UGFzc3dvcmQ6Cg</string>225 <string key="NSContents">Password:</string> 229 226 <reference key="NSSupport" ref="897649771"/> 230 227 <reference key="NSControlView" ref="833115728"/> … … 235 232 <object class="NSImageView" id="285173040"> 236 233 <reference key="NSNextResponder" ref="327235052"/> 237 <int key="NSvFlags">2 56</int>234 <int key="NSvFlags">268</int> 238 235 <object class="NSMutableSet" key="NSDragTypes"> 239 236 <bool key="EncodedWithXMLCoder">YES</bool> … … 248 245 </object> 249 246 </object> 250 <string key="NSFrame">{{20, 1 55}, {64, 64}}</string>247 <string key="NSFrame">{{20, 195}, {64, 64}}</string> 251 248 <reference key="NSSuperview" ref="327235052"/> 252 249 <bool key="NSEnabled">YES</bool> … … 263 260 <object class="NSButton" id="657854151"> 264 261 <reference key="NSNextResponder" ref="327235052"/> 265 <int key="NSvFlags">2 89</int>262 <int key="NSvFlags">292</int> 266 263 <string key="NSFrame">{{102, 58}, {280, 18}}</string> 267 264 <reference key="NSSuperview" ref="327235052"/> … … 284 281 </object> 285 282 </object> 286 </object> 287 <string key="NSFrameSize">{424, 239}</string> 283 <object class="NSTextField" id="1000280557"> 284 <reference key="NSNextResponder" ref="327235052"/> 285 <int key="NSvFlags">290</int> 286 <string key="NSFrame">{{113, 175}, {282, 42}}</string> 287 <reference key="NSSuperview" ref="327235052"/> 288 <int key="NSTag">3</int> 289 <bool key="NSEnabled">YES</bool> 290 <object class="NSTextFieldCell" key="NSCell" id="96725843"> 291 <int key="NSCellFlags">-2078147071</int> 292 <int key="NSCellFlags2">4194560</int> 293 <string type="base64-UTF8" key="NSContents">R29vZ2xlIEFjY291bnQgKGh0dHBzOi8vd3d3Lmdvb2dsZS5jb20vKScnIENlcnRpZmllZCBieTogVmVy 294 aVNpZ24gSW5jLiBHZXQgbW9yZSBpbmZvcm1hdGlvbiBieSBjbGlja2luZyAnJ0NlcnRpZmljYXRlA</string> 295 <object class="NSFont" key="NSSupport"> 296 <string key="NSName">LucidaGrande</string> 297 <double key="NSSize">1.100000e+01</double> 298 <int key="NSfFlags">16</int> 299 </object> 300 <int key="NSTag">3</int> 301 <reference key="NSControlView" ref="1000280557"/> 302 <reference key="NSBackgroundColor" ref="301231121"/> 303 <reference key="NSTextColor" ref="577315227"/> 304 </object> 305 </object> 306 </object> 307 <string key="NSFrameSize">{424, 279}</string> 288 308 <reference key="NSSuperview"/> 289 309 </object> 290 310 <string key="NSScreenRect">{{0, 0}, {2560, 1578}}</string> 291 <string key="NSMinSize">{300, 122}</string> 292 <string key="NSMaxSize">{500, 224}</string> 311 <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> 293 312 <string key="NSFrameAutosaveName">Authentication Panel</string> 294 313 </object> … … 433 452 <int key="connectionID">100046</int> 434 453 </object> 454 <object class="IBConnectionRecord"> 455 <object class="IBOutletConnection" key="connection"> 456 <string key="label">nextKeyView</string> 457 <reference key="source" ref="1000280557"/> 458 <reference key="destination" ref="368270689"/> 459 </object> 460 <int key="connectionID">100051</int> 461 </object> 462 <object class="IBConnectionRecord"> 463 <object class="IBOutletConnection" key="connection"> 464 <string key="label">separateRealmLabel</string> 465 <reference key="source" ref="238662661"/> 466 <reference key="destination" ref="1000280557"/> 467 </object> 468 <int key="connectionID">100057</int> 469 </object> 435 470 </object> 436 471 <object class="IBMutableOrderedSet" key="objectRecords"> … … 439 474 <object class="IBObjectRecord"> 440 475 <int key="objectID">0</int> 441 <object class="NSArray" key="object" id=" 0">476 <object class="NSArray" key="object" id="498544300"> 442 477 <bool key="EncodedWithXMLCoder">YES</bool> 443 478 </object> … … 448 483 <int key="objectID">-2</int> 449 484 <reference key="object" ref="238662661"/> 450 <reference key="parent" ref=" 0"/>485 <reference key="parent" ref="498544300"/> 451 486 <string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string> 452 487 </object> … … 454 489 <int key="objectID">-1</int> 455 490 <reference key="object" ref="729335755"/> 456 <reference key="parent" ref=" 0"/>491 <reference key="parent" ref="498544300"/> 457 492 <string key="objectName">First Responder</string> 458 493 </object> … … 460 495 <int key="objectID">-3</int> 461 496 <reference key="object" ref="239643893"/> 462 <reference key="parent" ref=" 0"/>497 <reference key="parent" ref="498544300"/> 463 498 <string key="objectName">Application</string> 464 499 </object> … … 470 505 <reference ref="327235052"/> 471 506 </object> 472 <reference key="parent" ref=" 0"/>507 <reference key="parent" ref="498544300"/> 473 508 <string key="objectName">Panel</string> 474 509 </object> … … 478 513 <object class="NSMutableArray" key="children"> 479 514 <bool key="EncodedWithXMLCoder">YES</bool> 480 <reference ref="705333610"/>481 <reference ref="199018347"/>482 515 <reference ref="305175176"/> 483 516 <reference ref="494193237"/> … … 488 521 <reference ref="285173040"/> 489 522 <reference ref="657854151"/> 523 <reference ref="705333610"/> 524 <reference ref="199018347"/> 525 <reference ref="1000280557"/> 490 526 </object> 491 527 <reference key="parent" ref="118512579"/> … … 630 666 <reference key="object" ref="358614001"/> 631 667 <reference key="parent" ref="657854151"/> 668 </object> 669 <object class="IBObjectRecord"> 670 <int key="objectID">100047</int> 671 <reference key="object" ref="1000280557"/> 672 <object class="NSMutableArray" key="children"> 673 <bool key="EncodedWithXMLCoder">YES</bool> 674 <reference ref="96725843"/> 675 </object> 676 <reference key="parent" ref="327235052"/> 677 </object> 678 <object class="IBObjectRecord"> 679 <int key="objectID">100050</int> 680 <reference key="object" ref="96725843"/> 681 <reference key="parent" ref="1000280557"/> 632 682 </object> 633 683 </object> … … 637 687 <object class="NSMutableArray" key="dict.sortedKeys"> 638 688 <bool key="EncodedWithXMLCoder">YES</bool> 639 <string>-1.IBPluginDependency</string>640 <string>-2.IBPluginDependency</string>641 689 <string>-3.IBPluginDependency</string> 642 690 <string>-3.ImportedFromIB2</string> 643 691 <string>10.IBPluginDependency</string> 644 692 <string>10.ImportedFromIB2</string> 693 <string>100010.IBPluginDependency</string> 694 <string>100011.IBPluginDependency</string> 695 <string>100012.IBPluginDependency</string> 696 <string>100013.IBPluginDependency</string> 697 <string>100014.IBPluginDependency</string> 698 <string>100015.IBPluginDependency</string> 699 <string>100016.IBPluginDependency</string> 700 <string>100017.IBPluginDependency</string> 701 <string>100019.IBPluginDependency</string> 702 <string>100039.IBPluginDependency</string> 703 <string>100047.IBPluginDependency</string> 704 <string>100047.ImportedFromIB2</string> 705 <string>100050.IBPluginDependency</string> 645 706 <string>11.IBPluginDependency</string> 646 707 <string>11.ImportedFromIB2</string> … … 664 725 <string>5.IBEditorWindowLastContentRect</string> 665 726 <string>5.IBPluginDependency</string> 727 <string>5.IBViewEditorWindowController.showingLayoutRectangles</string> 666 728 <string>5.IBWindowTemplateEditedContentRect</string> 667 729 <string>5.ImportedFromIB2</string> … … 676 738 <bool key="EncodedWithXMLCoder">YES</bool> 677 739 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 678 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 679 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 680 <integer value="1" id="5"/> 681 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 682 <reference ref="5"/> 683 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 684 <reference ref="5"/> 685 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 686 <reference ref="5"/> 687 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 688 <reference ref="5"/> 689 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 690 <reference ref="5"/> 740 <integer value="1" id="9"/> 741 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 742 <reference ref="9"/> 743 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 744 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 745 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 746 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 747 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 748 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 749 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 750 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 751 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 752 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 753 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 754 <reference ref="9"/> 755 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 756 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 757 <reference ref="9"/> 758 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 759 <reference ref="9"/> 760 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 761 <reference ref="9"/> 762 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 763 <reference ref="9"/> 691 764 <string>NSSecureTextField</string> 692 765 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 693 <reference ref="5"/> 694 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 695 <reference ref="5"/> 696 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 697 <reference ref="5"/> 698 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 699 <reference ref="5"/> 700 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 701 <reference ref="5"/> 702 <string>{{0, 1306}, {424, 239}}</string> 703 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 704 <string>{{0, 1306}, {424, 239}}</string> 705 <reference ref="5"/> 706 <reference ref="5"/> 707 <reference ref="5"/> 708 <string>{500, 202}</string> 709 <string>{300, 100}</string> 710 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 711 <reference ref="5"/> 766 <reference ref="9"/> 767 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 768 <reference ref="9"/> 769 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 770 <reference ref="9"/> 771 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 772 <reference ref="9"/> 773 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 774 <reference ref="9"/> 775 <string>{{288, 709}, {424, 279}}</string> 776 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 777 <integer value="1"/> 778 <string>{{288, 709}, {424, 279}}</string> 779 <reference ref="9"/> 780 <integer value="0" id="6"/> 781 <reference ref="6"/> 782 <string>{424, 282}</string> 783 <string>{424, 282}</string> 784 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 785 <reference ref="9"/> 712 786 </object> 713 787 </object> … … 732 806 </object> 733 807 <nil key="sourceID"/> 734 <int key="maxID">1000 46</int>808 <int key="maxID">100057</int> 735 809 </object> 736 810 <object class="IBClassDescriber" key="IBDocument.Classes"> … … 746 820 </object> 747 821 <object class="IBPartialClassDescription"> 748 <string key="className">IFAuthenticationPanel</string> 822 <string key="className">NSControl</string> 823 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 824 <string key="majorKey">IBProjectSource</string> 825 <string key="minorKey">mac/Misc/WebNSControlExtras.h</string> 826 </object> 827 </object> 828 <object class="IBPartialClassDescription"> 829 <string key="className">NSControl</string> 830 <string key="superclassName">NSView</string> 831 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 832 <string key="majorKey">IBUserSource</string> 833 <string key="minorKey"/> 834 </object> 835 </object> 836 <object class="IBPartialClassDescription"> 837 <string key="className">NSObject</string> 838 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 839 <string key="majorKey">IBProjectSource</string> 840 <string key="minorKey">mac/Misc/WebDownload.h</string> 841 </object> 842 </object> 843 <object class="IBPartialClassDescription"> 844 <string key="className">NSObject</string> 845 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 846 <string key="majorKey">IBProjectSource</string> 847 <string key="minorKey">mac/Misc/WebIconDatabaseDelegate.h</string> 848 </object> 849 </object> 850 <object class="IBPartialClassDescription"> 851 <string key="className">NSObject</string> 852 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 853 <string key="majorKey">IBProjectSource</string> 854 <string key="minorKey">mac/Misc/WebNSObjectExtras.h</string> 855 </object> 856 </object> 857 <object class="IBPartialClassDescription"> 858 <string key="className">NSObject</string> 859 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 860 <string key="majorKey">IBProjectSource</string> 861 <string key="minorKey">mac/Plugins/WebJavaPlugIn.h</string> 862 </object> 863 </object> 864 <object class="IBPartialClassDescription"> 865 <string key="className">NSObject</string> 866 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 867 <string key="majorKey">IBProjectSource</string> 868 <string key="minorKey">mac/Plugins/WebPlugin.h</string> 869 </object> 870 </object> 871 <object class="IBPartialClassDescription"> 872 <string key="className">NSObject</string> 873 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 874 <string key="majorKey">IBProjectSource</string> 875 <string key="minorKey">mac/Plugins/WebPluginContainer.h</string> 876 </object> 877 </object> 878 <object class="IBPartialClassDescription"> 879 <string key="className">NSObject</string> 880 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 881 <string key="majorKey">IBProjectSource</string> 882 <string key="minorKey">mac/Plugins/WebPluginContainerPrivate.h</string> 883 </object> 884 </object> 885 <object class="IBPartialClassDescription"> 886 <string key="className">NSObject</string> 887 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 888 <string key="majorKey">IBProjectSource</string> 889 <string key="minorKey">mac/Plugins/WebPluginDatabase.h</string> 890 </object> 891 </object> 892 <object class="IBPartialClassDescription"> 893 <string key="className">NSObject</string> 894 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 895 <string key="majorKey">IBProjectSource</string> 896 <string key="minorKey">mac/Plugins/WebPluginPrivate.h</string> 897 </object> 898 </object> 899 <object class="IBPartialClassDescription"> 900 <string key="className">NSObject</string> 901 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 902 <string key="majorKey">IBProjectSource</string> 903 <string key="minorKey">mac/WebInspector/WebNodeHighlight.h</string> 904 </object> 905 </object> 906 <object class="IBPartialClassDescription"> 907 <string key="className">NSObject</string> 908 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 909 <string key="majorKey">IBProjectSource</string> 910 <string key="minorKey">mac/WebView/WebEditingDelegate.h</string> 911 </object> 912 </object> 913 <object class="IBPartialClassDescription"> 914 <string key="className">NSObject</string> 915 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 916 <string key="majorKey">IBProjectSource</string> 917 <string key="minorKey">mac/WebView/WebEditingDelegatePrivate.h</string> 918 </object> 919 </object> 920 <object class="IBPartialClassDescription"> 921 <string key="className">NSObject</string> 922 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 923 <string key="majorKey">IBProjectSource</string> 924 <string key="minorKey">mac/WebView/WebFrameInternal.h</string> 925 </object> 926 </object> 927 <object class="IBPartialClassDescription"> 928 <string key="className">NSObject</string> 929 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 930 <string key="majorKey">IBProjectSource</string> 931 <string key="minorKey">mac/WebView/WebFrameLoadDelegate.h</string> 932 </object> 933 </object> 934 <object class="IBPartialClassDescription"> 935 <string key="className">NSObject</string> 936 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 937 <string key="majorKey">IBProjectSource</string> 938 <string key="minorKey">mac/WebView/WebPolicyDelegate.h</string> 939 </object> 940 </object> 941 <object class="IBPartialClassDescription"> 942 <string key="className">NSObject</string> 943 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 944 <string key="majorKey">IBProjectSource</string> 945 <string key="minorKey">mac/WebView/WebPolicyDelegatePrivate.h</string> 946 </object> 947 </object> 948 <object class="IBPartialClassDescription"> 949 <string key="className">NSObject</string> 950 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 951 <string key="majorKey">IBProjectSource</string> 952 <string key="minorKey">mac/WebView/WebResourceLoadDelegate.h</string> 953 </object> 954 </object> 955 <object class="IBPartialClassDescription"> 956 <string key="className">NSObject</string> 957 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 958 <string key="majorKey">IBProjectSource</string> 959 <string key="minorKey">mac/WebView/WebResourceLoadDelegatePrivate.h</string> 960 </object> 961 </object> 962 <object class="IBPartialClassDescription"> 963 <string key="className">NSObject</string> 964 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 965 <string key="majorKey">IBProjectSource</string> 966 <string key="minorKey">mac/WebView/WebScriptDebugDelegate.h</string> 967 </object> 968 </object> 969 <object class="IBPartialClassDescription"> 970 <string key="className">NSObject</string> 971 <object class="NSMutableDictionary" key="actions"> 972 <bool key="EncodedWithXMLCoder">YES</bool> 973 <object class="NSMutableArray" key="dict.sortedKeys"> 974 <bool key="EncodedWithXMLCoder">YES</bool> 975 <string>webViewClose:</string> 976 <string>webViewFocus:</string> 977 <string>webViewRunModal:</string> 978 <string>webViewShow:</string> 979 <string>webViewUnfocus:</string> 980 </object> 981 <object class="NSMutableArray" key="dict.values"> 982 <bool key="EncodedWithXMLCoder">YES</bool> 983 <string>WebView</string> 984 <string>WebView</string> 985 <string>WebView</string> 986 <string>WebView</string> 987 <string>WebView</string> 988 </object> 989 </object> 990 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 991 <string key="majorKey">IBProjectSource</string> 992 <string key="minorKey">mac/WebView/WebUIDelegate.h</string> 993 </object> 994 </object> 995 <object class="IBPartialClassDescription"> 996 <string key="className">NSObject</string> 997 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 998 <string key="majorKey">IBProjectSource</string> 999 <string key="minorKey">mac/WebView/WebUIDelegatePrivate.h</string> 1000 </object> 1001 </object> 1002 <object class="IBPartialClassDescription"> 1003 <string key="className">NSObject</string> 1004 <object class="IBClassDescriptionSource" key="sourceIdentifier" id="153972132"> 1005 <string key="majorKey">IBProjectSource</string> 1006 <string key="minorKey">mac/WebView/WebViewPrivate.h</string> 1007 </object> 1008 </object> 1009 <object class="IBPartialClassDescription"> 1010 <string key="className">NSObject</string> 1011 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1012 <string key="majorKey">IBUserSource</string> 1013 <string key="minorKey"/> 1014 </object> 1015 </object> 1016 <object class="IBPartialClassDescription"> 1017 <string key="className">NSView</string> 1018 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1019 <string key="majorKey">IBProjectSource</string> 1020 <string key="minorKey">mac/Misc/WebNSViewExtras.h</string> 1021 </object> 1022 </object> 1023 <object class="IBPartialClassDescription"> 1024 <string key="className">NSView</string> 1025 <string key="superclassName">NSResponder</string> 1026 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1027 <string key="majorKey">IBUserSource</string> 1028 <string key="minorKey"/> 1029 </object> 1030 </object> 1031 <object class="IBPartialClassDescription"> 1032 <string key="className">NSWindow</string> 1033 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1034 <string key="majorKey">IBProjectSource</string> 1035 <string key="minorKey">mac/Misc/WebNSWindowExtras.h</string> 1036 </object> 1037 </object> 1038 <object class="IBPartialClassDescription"> 1039 <string key="className">NSWindow</string> 1040 <string key="superclassName">NSResponder</string> 1041 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1042 <string key="majorKey">IBUserSource</string> 1043 <string key="minorKey"/> 1044 </object> 1045 </object> 1046 <object class="IBPartialClassDescription"> 1047 <string key="className">NonBlockingPanel</string> 1048 <string key="superclassName">NSPanel</string> 1049 <object class="IBClassDescriptionSource" key="sourceIdentifier" id="1064703436"> 1050 <string key="majorKey">IBProjectSource</string> 1051 <string key="minorKey">mac/Panels/WebAuthenticationPanel.h</string> 1052 </object> 1053 </object> 1054 <object class="IBPartialClassDescription"> 1055 <string key="className">NonBlockingPanel</string> 1056 <string key="superclassName">NSPanel</string> 1057 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1058 <string key="majorKey">IBUserSource</string> 1059 <string key="minorKey"/> 1060 </object> 1061 </object> 1062 <object class="IBPartialClassDescription"> 1063 <string key="className">WebAuthenticationPanel</string> 749 1064 <string key="superclassName">NSObject</string> 750 1065 <object class="NSMutableDictionary" key="actions"> … … 765 1080 <object class="NSMutableArray" key="dict.sortedKeys"> 766 1081 <bool key="EncodedWithXMLCoder">YES</bool> 1082 <string>callback</string> 767 1083 <string>imageView</string> 768 1084 <string>mainLabel</string> … … 770 1086 <string>password</string> 771 1087 <string>remember</string> 1088 <string>separateRealmLabel</string> 772 1089 <string>smallLabel</string> 773 1090 <string>username</string> … … 782 1099 <string>id</string> 783 1100 <string>id</string> 784 </object> 785 </object> 786 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 787 <string key="majorKey">IBUserSource</string> 788 <string key="minorKey"/> 789 </object> 790 </object> 791 <object class="IBPartialClassDescription"> 792 <string key="className">NSControl</string> 793 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 794 <string key="majorKey">IBProjectSource</string> 795 <string key="minorKey">mac/Misc/WebNSControlExtras.h</string> 796 </object> 797 </object> 798 <object class="IBPartialClassDescription"> 799 <string key="className">NSControl</string> 800 <string key="superclassName">NSView</string> 801 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 802 <string key="majorKey">IBUserSource</string> 803 <string key="minorKey"/> 804 </object> 805 </object> 806 <object class="IBPartialClassDescription"> 807 <string key="className">NSObject</string> 808 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 809 <string key="majorKey">IBProjectSource</string> 810 <string key="minorKey">mac/Misc/WebDownload.h</string> 811 </object> 812 </object> 813 <object class="IBPartialClassDescription"> 814 <string key="className">NSObject</string> 815 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 816 <string key="majorKey">IBProjectSource</string> 817 <string key="minorKey">mac/Misc/WebIconDatabaseDelegate.h</string> 818 </object> 819 </object> 820 <object class="IBPartialClassDescription"> 821 <string key="className">NSObject</string> 822 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 823 <string key="majorKey">IBProjectSource</string> 824 <string key="minorKey">mac/Misc/WebNSObjectExtras.h</string> 825 </object> 826 </object> 827 <object class="IBPartialClassDescription"> 828 <string key="className">NSObject</string> 829 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 830 <string key="majorKey">IBProjectSource</string> 831 <string key="minorKey">mac/Plugins/WebJavaPlugIn.h</string> 832 </object> 833 </object> 834 <object class="IBPartialClassDescription"> 835 <string key="className">NSObject</string> 836 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 837 <string key="majorKey">IBProjectSource</string> 838 <string key="minorKey">mac/Plugins/WebPlugin.h</string> 839 </object> 840 </object> 841 <object class="IBPartialClassDescription"> 842 <string key="className">NSObject</string> 843 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 844 <string key="majorKey">IBProjectSource</string> 845 <string key="minorKey">mac/Plugins/WebPluginContainer.h</string> 846 </object> 847 </object> 848 <object class="IBPartialClassDescription"> 849 <string key="className">NSObject</string> 850 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 851 <string key="majorKey">IBProjectSource</string> 852 <string key="minorKey">mac/Plugins/WebPluginContainerPrivate.h</string> 853 </object> 854 </object> 855 <object class="IBPartialClassDescription"> 856 <string key="className">NSObject</string> 857 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 858 <string key="majorKey">IBProjectSource</string> 859 <string key="minorKey">mac/Plugins/WebPluginDatabase.h</string> 860 </object> 861 </object> 862 <object class="IBPartialClassDescription"> 863 <string key="className">NSObject</string> 864 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 865 <string key="majorKey">IBProjectSource</string> 866 <string key="minorKey">mac/Plugins/WebPluginPrivate.h</string> 867 </object> 868 </object> 869 <object class="IBPartialClassDescription"> 870 <string key="className">NSObject</string> 871 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 872 <string key="majorKey">IBProjectSource</string> 873 <string key="minorKey">mac/WebInspector/WebNodeHighlight.h</string> 874 </object> 875 </object> 876 <object class="IBPartialClassDescription"> 877 <string key="className">NSObject</string> 878 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 879 <string key="majorKey">IBProjectSource</string> 880 <string key="minorKey">mac/WebView/WebEditingDelegate.h</string> 881 </object> 882 </object> 883 <object class="IBPartialClassDescription"> 884 <string key="className">NSObject</string> 885 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 886 <string key="majorKey">IBProjectSource</string> 887 <string key="minorKey">mac/WebView/WebEditingDelegatePrivate.h</string> 888 </object> 889 </object> 890 <object class="IBPartialClassDescription"> 891 <string key="className">NSObject</string> 892 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 893 <string key="majorKey">IBProjectSource</string> 894 <string key="minorKey">mac/WebView/WebFrameInternal.h</string> 895 </object> 896 </object> 897 <object class="IBPartialClassDescription"> 898 <string key="className">NSObject</string> 899 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 900 <string key="majorKey">IBProjectSource</string> 901 <string key="minorKey">mac/WebView/WebFrameLoadDelegate.h</string> 902 </object> 903 </object> 904 <object class="IBPartialClassDescription"> 905 <string key="className">NSObject</string> 906 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 907 <string key="majorKey">IBProjectSource</string> 908 <string key="minorKey">mac/WebView/WebPolicyDelegate.h</string> 909 </object> 910 </object> 911 <object class="IBPartialClassDescription"> 912 <string key="className">NSObject</string> 913 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 914 <string key="majorKey">IBProjectSource</string> 915 <string key="minorKey">mac/WebView/WebPolicyDelegatePrivate.h</string> 916 </object> 917 </object> 918 <object class="IBPartialClassDescription"> 919 <string key="className">NSObject</string> 920 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 921 <string key="majorKey">IBProjectSource</string> 922 <string key="minorKey">mac/WebView/WebResourceLoadDelegate.h</string> 923 </object> 924 </object> 925 <object class="IBPartialClassDescription"> 926 <string key="className">NSObject</string> 927 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 928 <string key="majorKey">IBProjectSource</string> 929 <string key="minorKey">mac/WebView/WebResourceLoadDelegatePrivate.h</string> 930 </object> 931 </object> 932 <object class="IBPartialClassDescription"> 933 <string key="className">NSObject</string> 934 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 935 <string key="majorKey">IBProjectSource</string> 936 <string key="minorKey">mac/WebView/WebScriptDebugDelegate.h</string> 937 </object> 938 </object> 939 <object class="IBPartialClassDescription"> 940 <string key="className">NSObject</string> 941 <object class="NSMutableDictionary" key="actions"> 942 <bool key="EncodedWithXMLCoder">YES</bool> 943 <object class="NSMutableArray" key="dict.sortedKeys"> 944 <bool key="EncodedWithXMLCoder">YES</bool> 945 <string>webViewClose:</string> 946 <string>webViewFocus:</string> 947 <string>webViewRunModal:</string> 948 <string>webViewShow:</string> 949 <string>webViewUnfocus:</string> 950 </object> 951 <object class="NSMutableArray" key="dict.values"> 952 <bool key="EncodedWithXMLCoder">YES</bool> 953 <string>WebView</string> 954 <string>WebView</string> 955 <string>WebView</string> 956 <string>WebView</string> 957 <string>WebView</string> 958 </object> 959 </object> 960 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 961 <string key="majorKey">IBProjectSource</string> 962 <string key="minorKey">mac/WebView/WebUIDelegate.h</string> 963 </object> 964 </object> 965 <object class="IBPartialClassDescription"> 966 <string key="className">NSObject</string> 967 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 968 <string key="majorKey">IBProjectSource</string> 969 <string key="minorKey">mac/WebView/WebUIDelegatePrivate.h</string> 970 </object> 971 </object> 972 <object class="IBPartialClassDescription"> 973 <string key="className">NSObject</string> 974 <object class="IBClassDescriptionSource" key="sourceIdentifier" id="153972132"> 975 <string key="majorKey">IBProjectSource</string> 976 <string key="minorKey">mac/WebView/WebViewPrivate.h</string> 977 </object> 978 </object> 979 <object class="IBPartialClassDescription"> 980 <string key="className">NSObject</string> 981 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 982 <string key="majorKey">IBUserSource</string> 983 <string key="minorKey"/> 984 </object> 985 </object> 986 <object class="IBPartialClassDescription"> 987 <string key="className">NSView</string> 988 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 989 <string key="majorKey">IBProjectSource</string> 990 <string key="minorKey">mac/Misc/WebNSViewExtras.h</string> 991 </object> 992 </object> 993 <object class="IBPartialClassDescription"> 994 <string key="className">NSView</string> 995 <string key="superclassName">NSResponder</string> 996 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 997 <string key="majorKey">IBUserSource</string> 998 <string key="minorKey"/> 999 </object> 1000 </object> 1001 <object class="IBPartialClassDescription"> 1002 <string key="className">NSWindow</string> 1003 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1004 <string key="majorKey">IBProjectSource</string> 1005 <string key="minorKey">mac/Misc/WebNSWindowExtras.h</string> 1006 </object> 1007 </object> 1008 <object class="IBPartialClassDescription"> 1009 <string key="className">NSWindow</string> 1010 <string key="superclassName">NSResponder</string> 1011 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1012 <string key="majorKey">IBUserSource</string> 1013 <string key="minorKey"/> 1014 </object> 1015 </object> 1016 <object class="IBPartialClassDescription"> 1017 <string key="className">NonBlockingPanel</string> 1018 <string key="superclassName">NSPanel</string> 1019 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1020 <string key="majorKey">IBProjectSource</string> 1021 <string key="minorKey">mac/Panels/WebAuthenticationPanel.h</string> 1022 </object> 1023 </object> 1024 <object class="IBPartialClassDescription"> 1025 <string key="className">NonBlockingPanel</string> 1026 <string key="superclassName">NSPanel</string> 1027 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1028 <string key="majorKey">IBUserSource</string> 1029 <string key="minorKey"/> 1030 </object> 1101 <string>id</string> 1102 <string>id</string> 1103 </object> 1104 </object> 1105 <reference key="sourceIdentifier" ref="1064703436"/> 1031 1106 </object> 1032 1107 <object class="IBPartialClassDescription"> -
trunk/WebKit/mac/Panels/WebAuthenticationPanel.h
r11962 r42363 41 41 IBOutlet id imageView; 42 42 IBOutlet id remember; 43 IBOutlet id separateRealmLabel; 43 44 BOOL nibLoaded; 44 45 BOOL usingSheet; -
trunk/WebKit/mac/Panels/WebAuthenticationPanel.m
r38373 r42363 132 132 NSString *message; 133 133 134 // Consider the realm name to be "simple" if it does not contain any whitespace or newline characters. 135 // If the realm name is determined to be complex, we will use a slightly different sheet layout, designed 136 // to keep a malicious realm name from spoofing the wording in the sheet text. 137 BOOL realmNameIsSimple = [realm rangeOfCharacterFromSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]].location == NSNotFound; 138 134 139 if ([chall previousFailureCount] == 0) { 135 140 if ([space isProxy]) { … … 138 143 [space proxyType], host]; 139 144 } else { 140 message = [NSString stringWithFormat:UI_STRING("To view this page, you must log in to area “%@” on %@.", 141 "prompt string in authentication panel"), 142 realm, host]; 145 if (realmNameIsSimple) 146 message = [NSString stringWithFormat:UI_STRING("To view this page, you must log in to area “%@” on %@.", 147 "prompt string in authentication panel"), realm, host]; 148 else 149 message = [NSString stringWithFormat:UI_STRING("To view this page, you must log in to this area on %@:", 150 "prompt string in authentication panel"), host]; 143 151 } 144 152 } else { … … 148 156 [space proxyType], host]; 149 157 } else { 150 message = [NSString stringWithFormat:UI_STRING("The user name or password you entered for area “%@” on %@ was incorrect. Make sure you’re entering them correctly, and then try again.", 151 "prompt string in authentication panel"), 152 realm, host]; 158 if (realmNameIsSimple) 159 message = [NSString stringWithFormat:UI_STRING("The user name or password you entered for area “%@” on %@ was incorrect. Make sure you’re entering them correctly, and then try again.", 160 "prompt string in authentication panel"), realm, host]; 161 else 162 message = [NSString stringWithFormat:UI_STRING("The user name or password you entered for this area on %@ was incorrect. Make sure you’re entering them correctly, and then try again.", 163 "prompt string in authentication panel"), host]; 153 164 } 154 165 } 155 166 167 if (![space isProxy] && !realmNameIsSimple) { 168 [separateRealmLabel setHidden:NO]; 169 [separateRealmLabel setStringValue:realm]; 170 [separateRealmLabel setAutoresizingMask:NSViewMinYMargin]; 171 [separateRealmLabel sizeToFitAndAdjustWindowHeight]; 172 [separateRealmLabel setAutoresizingMask:NSViewMaxYMargin]; 173 } else { 174 // In the proxy or "simple" realm name case, we need to hide the 'separateRealmLabel' 175 // and move the rest of the contents up appropriately to fill the space. 176 NSRect mainLabelFrame = [mainLabel frame]; 177 NSRect realmFrame = [separateRealmLabel frame]; 178 NSRect smallLabelFrame = [smallLabel frame]; 179 180 // Find the distance between the 'smallLabel' and the label above it, initially the 'separateRealmLabel'. 181 // Then, find the current distance between 'smallLabel' and 'mainLabel'. The difference between 182 // these two is how much shorter the panel needs to be after hiding the 'separateRealmLabel'. 183 CGFloat smallLabelMargin = NSMinY(realmFrame) - NSMaxY(smallLabelFrame); 184 CGFloat smallLabelToMainLabel = NSMinY(mainLabelFrame) - NSMaxY(smallLabelFrame); 185 CGFloat deltaMargin = smallLabelToMainLabel - smallLabelMargin; 186 187 [separateRealmLabel setHidden:YES]; 188 NSRect windowFrame = [panel frame]; 189 windowFrame.size.height -= deltaMargin; 190 [panel setFrame:windowFrame display:NO]; 191 } 192 156 193 [mainLabel setStringValue:message]; 157 194 [mainLabel sizeToFitAndAdjustWindowHeight];
Note: See TracChangeset
for help on using the changeset viewer.
