зеркало из https://github.com/mozilla/pjs.git
make blocked popup view color less objectionable, add close button, fix leaking of view.
This commit is contained in:
Родитель
cf49675a47
Коммит
5479181ecb
|
@ -3,6 +3,7 @@
|
||||||
{
|
{
|
||||||
ACTIONS = {
|
ACTIONS = {
|
||||||
configurePopupBlocking = id;
|
configurePopupBlocking = id;
|
||||||
|
hideBlockedPopupView = id;
|
||||||
reloadWithNewCharset = id;
|
reloadWithNewCharset = id;
|
||||||
unblockPopupSites = id;
|
unblockPopupSites = id;
|
||||||
};
|
};
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<key>IBEditorPositions</key>
|
<key>IBEditorPositions</key>
|
||||||
<dict>
|
<dict>
|
||||||
<key>5</key>
|
<key>5</key>
|
||||||
<string>284 781 609 73 0 0 1920 1178 </string>
|
<string>655 769 645 72 0 0 1920 1178 </string>
|
||||||
</dict>
|
</dict>
|
||||||
<key>IBFramework Version</key>
|
<key>IBFramework Version</key>
|
||||||
<string>443.0</string>
|
<string>443.0</string>
|
||||||
|
|
Двоичные данные
camino/resources/localized/English.lproj/PopupBlockView.nib/keyedobjects.nib
сгенерированный
Двоичные данные
camino/resources/localized/English.lproj/PopupBlockView.nib/keyedobjects.nib
сгенерированный
Двоичный файл не отображается.
|
@ -133,7 +133,7 @@ class nsISupportsArray;
|
||||||
NSString* mLoadingStatusString;
|
NSString* mLoadingStatusString;
|
||||||
ToolTip* mToolTip;
|
ToolTip* mToolTip;
|
||||||
|
|
||||||
IBOutlet NSView* mBlockedPopupView; // loaded on demand, can be nil
|
IBOutlet NSView* mBlockedPopupView; // loaded on demand, can be nil, STRONG
|
||||||
|
|
||||||
double mProgress;
|
double mProgress;
|
||||||
|
|
||||||
|
@ -181,6 +181,7 @@ class nsISupportsArray;
|
||||||
- (void)getBlockedSites:(nsISupportsArray**)outSites;
|
- (void)getBlockedSites:(nsISupportsArray**)outSites;
|
||||||
- (IBAction)configurePopupBlocking:(id)sender;
|
- (IBAction)configurePopupBlocking:(id)sender;
|
||||||
- (IBAction)unblockPopupSites:(id)sender;
|
- (IBAction)unblockPopupSites:(id)sender;
|
||||||
|
- (IBAction)hideBlockedPopupView:(id)sender;
|
||||||
|
|
||||||
- (void)loadURI:(NSString *)urlSpec referrer:(NSString*)referrer flags:(unsigned int)flags activate:(BOOL)activate allowPopups:(BOOL)inAllowPopups;
|
- (void)loadURI:(NSString *)urlSpec referrer:(NSString*)referrer flags:(unsigned int)flags activate:(BOOL)activate allowPopups:(BOOL)inAllowPopups;
|
||||||
|
|
||||||
|
|
|
@ -177,6 +177,10 @@ static NSString* const kOfflineNotificationName = @"offlineModeChanged";
|
||||||
[mBrowserView release];
|
[mBrowserView release];
|
||||||
[mContentViewProviders release];
|
[mContentViewProviders release];
|
||||||
|
|
||||||
|
// |mBlockedPopupView| has a retain count of 1 when it comes out of the nib,
|
||||||
|
// we have to release it manually.
|
||||||
|
[mBlockedPopupView release];
|
||||||
|
|
||||||
[super dealloc];
|
[super dealloc];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1056,6 +1060,11 @@ static NSString* const kOfflineNotificationName = @"offlineModeChanged";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (IBAction)hideBlockedPopupView:(id)sender
|
||||||
|
{
|
||||||
|
[self removeBlockedPopupViewAndDisplay];
|
||||||
|
}
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
#pragma mark -
|
#pragma mark -
|
||||||
|
@ -1070,7 +1079,7 @@ static NSString* const kOfflineNotificationName = @"offlineModeChanged";
|
||||||
- (void)drawRect:(NSRect)aRect
|
- (void)drawRect:(NSRect)aRect
|
||||||
{
|
{
|
||||||
// draw background color
|
// draw background color
|
||||||
[[NSColor orangeColor] set];
|
[[NSColor colorWithCalibratedRed:1.0 green:0.9 blue:0.58 alpha:1.0] set];
|
||||||
NSRectFill([self frame]);
|
NSRectFill([self frame]);
|
||||||
|
|
||||||
// draw shadowed border
|
// draw shadowed border
|
||||||
|
|
Загрузка…
Ссылка в новой задаче