mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-21 17:59:34 +00:00
Updating lock icons. Also fixing test of security state for new
state bits in nsIWebProgressListener.
This commit is contained in:
parent
d19ba0f868
commit
892d68e3c8
BIN
camino/BrowserWindow.nib/objects.nib
generated
BIN
camino/BrowserWindow.nib/objects.nib
generated
Binary file not shown.
@ -1012,7 +1012,7 @@ static NSString *PrintToolbarItemIdentifier = @"Print Toolbar Item";
|
||||
//
|
||||
- (void)updateLock:(unsigned int)inSecurityState
|
||||
{
|
||||
switch ( inSecurityState ) {
|
||||
switch ( inSecurityState & 0x000000FF ) {
|
||||
case nsIWebProgressListener::STATE_IS_INSECURE:
|
||||
[mLock setImage:[BrowserWindowController insecureIcon]];
|
||||
break;
|
||||
@ -1037,7 +1037,7 @@ static NSString *PrintToolbarItemIdentifier = @"Print Toolbar Item";
|
||||
{
|
||||
static NSImage* sSecureIcon = nil;
|
||||
if ( !sSecureIcon )
|
||||
sSecureIcon = [NSImage imageNamed:@"historyicon"];
|
||||
sSecureIcon = [NSImage imageNamed:@"security_lock"];
|
||||
return sSecureIcon;
|
||||
}
|
||||
|
||||
@ -1045,7 +1045,7 @@ static NSString *PrintToolbarItemIdentifier = @"Print Toolbar Item";
|
||||
{
|
||||
static NSImage* sBrokenIcon = nil;
|
||||
if ( !sBrokenIcon )
|
||||
sBrokenIcon = [NSImage imageNamed:@"smallbookmark"];
|
||||
sBrokenIcon = [NSImage imageNamed:@"security_broken"];
|
||||
return sBrokenIcon;
|
||||
}
|
||||
|
||||
|
@ -469,6 +469,8 @@
|
||||
F5179420027F3F2901A967DF,
|
||||
F5179423028275B901A967DF,
|
||||
F57F20730299A02301000106,
|
||||
F540BD1B029ED15301026D5D,
|
||||
F540BD1D029ED17901026D5D,
|
||||
);
|
||||
isa = PBXResourcesBuildPhase;
|
||||
name = "Bundle Resources";
|
||||
@ -721,6 +723,8 @@
|
||||
children = (
|
||||
F557149D023B46BF010001CA,
|
||||
F557149E023B46BF010001CA,
|
||||
F540BD1A029ED15301026D5D,
|
||||
F540BD1C029ED17901026D5D,
|
||||
);
|
||||
isa = PBXGroup;
|
||||
name = Graphics;
|
||||
@ -1861,6 +1865,28 @@
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F540BD1A029ED15301026D5D = {
|
||||
isa = PBXFileReference;
|
||||
path = security_lock.tif;
|
||||
refType = 4;
|
||||
};
|
||||
F540BD1B029ED15301026D5D = {
|
||||
fileRef = F540BD1A029ED15301026D5D;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F540BD1C029ED17901026D5D = {
|
||||
isa = PBXFileReference;
|
||||
path = security_broken.tif;
|
||||
refType = 4;
|
||||
};
|
||||
F540BD1D029ED17901026D5D = {
|
||||
fileRef = F540BD1C029ED17901026D5D;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F541495A02711A8301A80166 = {
|
||||
isa = PBXFileReference;
|
||||
path = CHToolbarAdditions.h;
|
||||
|
BIN
camino/English.lproj/BrowserWindow.nib/objects.nib
generated
BIN
camino/English.lproj/BrowserWindow.nib/objects.nib
generated
Binary file not shown.
@ -469,6 +469,8 @@
|
||||
F5179420027F3F2901A967DF,
|
||||
F5179423028275B901A967DF,
|
||||
F57F20730299A02301000106,
|
||||
F540BD1B029ED15301026D5D,
|
||||
F540BD1D029ED17901026D5D,
|
||||
);
|
||||
isa = PBXResourcesBuildPhase;
|
||||
name = "Bundle Resources";
|
||||
@ -721,6 +723,8 @@
|
||||
children = (
|
||||
F557149D023B46BF010001CA,
|
||||
F557149E023B46BF010001CA,
|
||||
F540BD1A029ED15301026D5D,
|
||||
F540BD1C029ED17901026D5D,
|
||||
);
|
||||
isa = PBXGroup;
|
||||
name = Graphics;
|
||||
@ -1861,6 +1865,28 @@
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F540BD1A029ED15301026D5D = {
|
||||
isa = PBXFileReference;
|
||||
path = security_lock.tif;
|
||||
refType = 4;
|
||||
};
|
||||
F540BD1B029ED15301026D5D = {
|
||||
fileRef = F540BD1A029ED15301026D5D;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F540BD1C029ED17901026D5D = {
|
||||
isa = PBXFileReference;
|
||||
path = security_broken.tif;
|
||||
refType = 4;
|
||||
};
|
||||
F540BD1D029ED17901026D5D = {
|
||||
fileRef = F540BD1C029ED17901026D5D;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F541495A02711A8301A80166 = {
|
||||
isa = PBXFileReference;
|
||||
path = CHToolbarAdditions.h;
|
||||
|
BIN
camino/resources/images/chrome/security_broken.tif
Normal file
BIN
camino/resources/images/chrome/security_broken.tif
Normal file
Binary file not shown.
BIN
camino/resources/images/chrome/security_lock.tif
Normal file
BIN
camino/resources/images/chrome/security_lock.tif
Normal file
Binary file not shown.
Binary file not shown.
BIN
camino/security_broken.tif
Normal file
BIN
camino/security_broken.tif
Normal file
Binary file not shown.
BIN
camino/security_lock.tif
Normal file
BIN
camino/security_lock.tif
Normal file
Binary file not shown.
@ -1012,7 +1012,7 @@ static NSString *PrintToolbarItemIdentifier = @"Print Toolbar Item";
|
||||
//
|
||||
- (void)updateLock:(unsigned int)inSecurityState
|
||||
{
|
||||
switch ( inSecurityState ) {
|
||||
switch ( inSecurityState & 0x000000FF ) {
|
||||
case nsIWebProgressListener::STATE_IS_INSECURE:
|
||||
[mLock setImage:[BrowserWindowController insecureIcon]];
|
||||
break;
|
||||
@ -1037,7 +1037,7 @@ static NSString *PrintToolbarItemIdentifier = @"Print Toolbar Item";
|
||||
{
|
||||
static NSImage* sSecureIcon = nil;
|
||||
if ( !sSecureIcon )
|
||||
sSecureIcon = [NSImage imageNamed:@"historyicon"];
|
||||
sSecureIcon = [NSImage imageNamed:@"security_lock"];
|
||||
return sSecureIcon;
|
||||
}
|
||||
|
||||
@ -1045,7 +1045,7 @@ static NSString *PrintToolbarItemIdentifier = @"Print Toolbar Item";
|
||||
{
|
||||
static NSImage* sBrokenIcon = nil;
|
||||
if ( !sBrokenIcon )
|
||||
sBrokenIcon = [NSImage imageNamed:@"smallbookmark"];
|
||||
sBrokenIcon = [NSImage imageNamed:@"security_broken"];
|
||||
return sBrokenIcon;
|
||||
}
|
||||
|
||||
|
BIN
chimera/BrowserWindow.nib/objects.nib
generated
BIN
chimera/BrowserWindow.nib/objects.nib
generated
Binary file not shown.
@ -1012,7 +1012,7 @@ static NSString *PrintToolbarItemIdentifier = @"Print Toolbar Item";
|
||||
//
|
||||
- (void)updateLock:(unsigned int)inSecurityState
|
||||
{
|
||||
switch ( inSecurityState ) {
|
||||
switch ( inSecurityState & 0x000000FF ) {
|
||||
case nsIWebProgressListener::STATE_IS_INSECURE:
|
||||
[mLock setImage:[BrowserWindowController insecureIcon]];
|
||||
break;
|
||||
@ -1037,7 +1037,7 @@ static NSString *PrintToolbarItemIdentifier = @"Print Toolbar Item";
|
||||
{
|
||||
static NSImage* sSecureIcon = nil;
|
||||
if ( !sSecureIcon )
|
||||
sSecureIcon = [NSImage imageNamed:@"historyicon"];
|
||||
sSecureIcon = [NSImage imageNamed:@"security_lock"];
|
||||
return sSecureIcon;
|
||||
}
|
||||
|
||||
@ -1045,7 +1045,7 @@ static NSString *PrintToolbarItemIdentifier = @"Print Toolbar Item";
|
||||
{
|
||||
static NSImage* sBrokenIcon = nil;
|
||||
if ( !sBrokenIcon )
|
||||
sBrokenIcon = [NSImage imageNamed:@"smallbookmark"];
|
||||
sBrokenIcon = [NSImage imageNamed:@"security_broken"];
|
||||
return sBrokenIcon;
|
||||
}
|
||||
|
||||
|
@ -469,6 +469,8 @@
|
||||
F5179420027F3F2901A967DF,
|
||||
F5179423028275B901A967DF,
|
||||
F57F20730299A02301000106,
|
||||
F540BD1B029ED15301026D5D,
|
||||
F540BD1D029ED17901026D5D,
|
||||
);
|
||||
isa = PBXResourcesBuildPhase;
|
||||
name = "Bundle Resources";
|
||||
@ -721,6 +723,8 @@
|
||||
children = (
|
||||
F557149D023B46BF010001CA,
|
||||
F557149E023B46BF010001CA,
|
||||
F540BD1A029ED15301026D5D,
|
||||
F540BD1C029ED17901026D5D,
|
||||
);
|
||||
isa = PBXGroup;
|
||||
name = Graphics;
|
||||
@ -1861,6 +1865,28 @@
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F540BD1A029ED15301026D5D = {
|
||||
isa = PBXFileReference;
|
||||
path = security_lock.tif;
|
||||
refType = 4;
|
||||
};
|
||||
F540BD1B029ED15301026D5D = {
|
||||
fileRef = F540BD1A029ED15301026D5D;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F540BD1C029ED17901026D5D = {
|
||||
isa = PBXFileReference;
|
||||
path = security_broken.tif;
|
||||
refType = 4;
|
||||
};
|
||||
F540BD1D029ED17901026D5D = {
|
||||
fileRef = F540BD1C029ED17901026D5D;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F541495A02711A8301A80166 = {
|
||||
isa = PBXFileReference;
|
||||
path = CHToolbarAdditions.h;
|
||||
|
BIN
chimera/English.lproj/BrowserWindow.nib/objects.nib
generated
BIN
chimera/English.lproj/BrowserWindow.nib/objects.nib
generated
Binary file not shown.
@ -469,6 +469,8 @@
|
||||
F5179420027F3F2901A967DF,
|
||||
F5179423028275B901A967DF,
|
||||
F57F20730299A02301000106,
|
||||
F540BD1B029ED15301026D5D,
|
||||
F540BD1D029ED17901026D5D,
|
||||
);
|
||||
isa = PBXResourcesBuildPhase;
|
||||
name = "Bundle Resources";
|
||||
@ -721,6 +723,8 @@
|
||||
children = (
|
||||
F557149D023B46BF010001CA,
|
||||
F557149E023B46BF010001CA,
|
||||
F540BD1A029ED15301026D5D,
|
||||
F540BD1C029ED17901026D5D,
|
||||
);
|
||||
isa = PBXGroup;
|
||||
name = Graphics;
|
||||
@ -1861,6 +1865,28 @@
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F540BD1A029ED15301026D5D = {
|
||||
isa = PBXFileReference;
|
||||
path = security_lock.tif;
|
||||
refType = 4;
|
||||
};
|
||||
F540BD1B029ED15301026D5D = {
|
||||
fileRef = F540BD1A029ED15301026D5D;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F540BD1C029ED17901026D5D = {
|
||||
isa = PBXFileReference;
|
||||
path = security_broken.tif;
|
||||
refType = 4;
|
||||
};
|
||||
F540BD1D029ED17901026D5D = {
|
||||
fileRef = F540BD1C029ED17901026D5D;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F541495A02711A8301A80166 = {
|
||||
isa = PBXFileReference;
|
||||
path = CHToolbarAdditions.h;
|
||||
|
BIN
chimera/resources/images/chrome/security_broken.tif
Normal file
BIN
chimera/resources/images/chrome/security_broken.tif
Normal file
Binary file not shown.
BIN
chimera/resources/images/chrome/security_lock.tif
Normal file
BIN
chimera/resources/images/chrome/security_lock.tif
Normal file
Binary file not shown.
Binary file not shown.
BIN
chimera/security_broken.tif
Normal file
BIN
chimera/security_broken.tif
Normal file
Binary file not shown.
BIN
chimera/security_lock.tif
Normal file
BIN
chimera/security_lock.tif
Normal file
Binary file not shown.
@ -1012,7 +1012,7 @@ static NSString *PrintToolbarItemIdentifier = @"Print Toolbar Item";
|
||||
//
|
||||
- (void)updateLock:(unsigned int)inSecurityState
|
||||
{
|
||||
switch ( inSecurityState ) {
|
||||
switch ( inSecurityState & 0x000000FF ) {
|
||||
case nsIWebProgressListener::STATE_IS_INSECURE:
|
||||
[mLock setImage:[BrowserWindowController insecureIcon]];
|
||||
break;
|
||||
@ -1037,7 +1037,7 @@ static NSString *PrintToolbarItemIdentifier = @"Print Toolbar Item";
|
||||
{
|
||||
static NSImage* sSecureIcon = nil;
|
||||
if ( !sSecureIcon )
|
||||
sSecureIcon = [NSImage imageNamed:@"historyicon"];
|
||||
sSecureIcon = [NSImage imageNamed:@"security_lock"];
|
||||
return sSecureIcon;
|
||||
}
|
||||
|
||||
@ -1045,7 +1045,7 @@ static NSString *PrintToolbarItemIdentifier = @"Print Toolbar Item";
|
||||
{
|
||||
static NSImage* sBrokenIcon = nil;
|
||||
if ( !sBrokenIcon )
|
||||
sBrokenIcon = [NSImage imageNamed:@"smallbookmark"];
|
||||
sBrokenIcon = [NSImage imageNamed:@"security_broken"];
|
||||
return sBrokenIcon;
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user