[webkit-changes] cvs commit:
WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib
classes.nib info.nib objects.nib
John
sullivan at opensource.apple.com
Thu Aug 4 10:15:03 PDT 2005
sullivan 05/08/04 10:15:03
Modified: . ChangeLog
Panels.subproj WebAuthenticationPanel.h
WebAuthenticationPanel.m
Panels.subproj/English.lproj/WebAuthenticationPanel.nib
classes.nib info.nib objects.nib
Log:
Reviewed by Geoff Garen.
- fixed <rdar://problem/3918675> Remove code to replace authentication dialog
with a subclass when out of localization freeze
* Panels.subproj/WebAuthenticationPanel.h:
moved declaration of NonBlockingPanel here so it can be accessed by the nib
* Panels.subproj/WebAuthenticationPanel.m:
(-[WebAuthenticationPanel replacePanelWithSubclassHack]):
removed this method
(-[WebAuthenticationPanel loadNib]):
stop calling the removed method
* Panels.subproj/English.lproj/WebAuthenticationPanel.nib/classes.nib:
* Panels.subproj/English.lproj/WebAuthenticationPanel.nib/info.nib:
* Panels.subproj/English.lproj/WebAuthenticationPanel.nib/objects.nib:
the panel in the nib now has custom class NonBlockingPanel
Revision Changes Path
1.3281 +20 -0 WebKit/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebKit/ChangeLog,v
retrieving revision 1.3280
retrieving revision 1.3281
diff -u -r1.3280 -r1.3281
--- ChangeLog 3 Aug 2005 16:46:57 -0000 1.3280
+++ ChangeLog 4 Aug 2005 17:15:00 -0000 1.3281
@@ -1,3 +1,23 @@
+2005-08-03 John Sullivan <sullivan at apple.com>
+
+ Reviewed by Geoff Garen.
+
+ - fixed <rdar://problem/3918675> Remove code to replace authentication dialog
+ with a subclass when out of localization freeze
+
+ * Panels.subproj/WebAuthenticationPanel.h:
+ moved declaration of NonBlockingPanel here so it can be accessed by the nib
+ * Panels.subproj/WebAuthenticationPanel.m:
+ (-[WebAuthenticationPanel replacePanelWithSubclassHack]):
+ removed this method
+ (-[WebAuthenticationPanel loadNib]):
+ stop calling the removed method
+
+ * Panels.subproj/English.lproj/WebAuthenticationPanel.nib/classes.nib:
+ * Panels.subproj/English.lproj/WebAuthenticationPanel.nib/info.nib:
+ * Panels.subproj/English.lproj/WebAuthenticationPanel.nib/objects.nib:
+ the panel in the nib now has custom class NonBlockingPanel
+
2005-08-03 Beth Dakin <bdakin at apple.com>
Reviewed by cblu
1.10 +5 -0 WebKit/Panels.subproj/WebAuthenticationPanel.h
Index: WebAuthenticationPanel.h
===================================================================
RCS file: /cvs/root/WebKit/Panels.subproj/WebAuthenticationPanel.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- WebAuthenticationPanel.h 5 Jun 2005 17:54:34 -0000 1.9
+++ WebAuthenticationPanel.h 4 Aug 2005 17:15:02 -0000 1.10
@@ -61,3 +61,8 @@
- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo;
@end
+
+// This is in the header so it can be used from the nib file
+ at interface NonBlockingPanel : NSPanel
+ at end
+
1.33 +0 -33 WebKit/Panels.subproj/WebAuthenticationPanel.m
Index: WebAuthenticationPanel.m
===================================================================
RCS file: /cvs/root/WebKit/Panels.subproj/WebAuthenticationPanel.m,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- WebAuthenticationPanel.m 5 Jun 2005 17:54:34 -0000 1.32
+++ WebAuthenticationPanel.m 4 Aug 2005 17:15:02 -0000 1.33
@@ -39,9 +39,6 @@
#define WebAuthenticationPanelNibName @"WebAuthenticationPanel"
- at interface NonBlockingPanel : NSPanel
- at end
-
@implementation WebAuthenticationPanel
-(id)initWithCallback:(id)cb selector:(SEL)sel
@@ -101,42 +98,12 @@
}
}
--(void)replacePanelWithSubclassHack
-{
- // This is a hack to fix 3744583 without requiring a localization change. We
- // need to use a subclass of NSPanel so we can override _blocksActionWhenModal,
- // but using a subclass in the nib would require re-localization. So instead
- // we make a new panel and move all the subviews into it. This will keep the
- // IBOutlets wired appropriately, except that we have to manually reset the
- // IBOutlet for the panel itself.
- NSPanel *newPanel = [[NonBlockingPanel alloc] initWithContentRect:[panel contentRectForFrameRect:[panel frame]]
- styleMask:[panel styleMask]
- backing:[panel backingType]
- defer:NO];
- [newPanel setTitle:[panel title]];
-
- NSView *newContentView = [newPanel contentView];
- NSArray *subviews = [[panel contentView] subviews];
- int subviewCount = [subviews count];
- int index;
- for (index = 0; index < subviewCount; ++index) {
- NSView *subview = [subviews objectAtIndex:0];
- [subview removeFromSuperviewWithoutNeedingDisplay];
- [newContentView addSubview:subview];
- }
-
- [panel release];
- panel = newPanel;
-}
-
- (BOOL)loadNib
{
if (!nibLoaded) {
if ([NSBundle loadNibNamed:WebAuthenticationPanelNibName owner:self]) {
nibLoaded = YES;
[imageView setImage:[NSImage imageNamed:@"NSApplicationIcon"]];
- // FIXME 3918675: remove the following hack when we're out of localization freeze
- [self replacePanelWithSubclassHack];
} else {
ERROR("couldn't load nib named '%@'", WebAuthenticationPanelNibName);
return FALSE;
1.7 +17 -0 WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib/classes.nib
Index: classes.nib
===================================================================
RCS file: /cvs/root/WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib/classes.nib,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- classes.nib 28 Sep 2004 01:08:17 -0000 1.6
+++ classes.nib 4 Aug 2005 17:15:02 -0000 1.7
@@ -15,6 +15,23 @@
username = id;
};
SUPERCLASS = NSObject;
+ },
+ {CLASS = NonBlockingPanel; LANGUAGE = ObjC; SUPERCLASS = NSPanel; },
+ {
+ ACTIONS = {cancel = id; logIn = id; };
+ CLASS = WebAuthenticationPanel;
+ LANGUAGE = ObjC;
+ OUTLETS = {
+ callback = id;
+ imageView = id;
+ mainLabel = id;
+ panel = id;
+ password = id;
+ remember = id;
+ smallLabel = id;
+ username = id;
+ };
+ SUPERCLASS = NSObject;
}
);
IBVersion = 1;
1.7 +3 -3 WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib/info.nib
Index: info.nib
===================================================================
RCS file: /cvs/root/WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib/info.nib,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- info.nib 28 Sep 2004 01:08:17 -0000 1.6
+++ info.nib 4 Aug 2005 17:15:03 -0000 1.7
@@ -3,14 +3,14 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
- <string>727 229 356 240 0 0 1440 878 </string>
+ <string>907 171 356 240 0 0 1440 878 </string>
<key>IBFramework Version</key>
- <string>399.0</string>
+ <string>439.0</string>
<key>IBOpenObjects</key>
<array>
<integer>5</integer>
</array>
<key>IBSystem Version</key>
- <string>8A259</string>
+ <string>8C46</string>
</dict>
</plist>
1.7 +6 -5 WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib/objects.nib
<<Binary file>>
More information about the webkit-changes
mailing list