зеркало из https://github.com/mozilla/pjs.git
Updating lock icons. Also fixing test of security state for new
state bits in nsIWebProgressListener.
This commit is contained in:
Родитель
11e1c7df19
Коммит
2d1ca6b0dd
Двоичный файл не отображается.
|
@ -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;
|
||||
|
|
Двоичный файл не отображается.
|
@ -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;
|
||||
|
|
Двоичный файл не отображается.
Двоичный файл не отображается.
Двоичные данные
camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib
сгенерированный
Двоичные данные
camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib
сгенерированный
Двоичный файл не отображается.
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Двоичный файл не отображается.
|
@ -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;
|
||||
|
|
Двоичный файл не отображается.
|
@ -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;
|
||||
|
|
Двоичный файл не отображается.
Двоичный файл не отображается.
Двоичные данные
chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib
сгенерированный
Двоичные данные
chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib
сгенерированный
Двоичный файл не отображается.
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче