get rid of blue globe/lock icon in status bar for UI cleanliness reasons. what did the blue globe mean anyway? b=297138 r=armen sr=pinkerton

This commit is contained in:
joshmoz%gmail.com 2005-06-09 18:09:57 +00:00
Родитель 694c84073d
Коммит dce080d536
5 изменённых файлов: 3 добавлений и 21 удалений

Просмотреть файл

@ -165,7 +165,6 @@
mLocationSheetURLField = NSTextField; mLocationSheetURLField = NSTextField;
mLocationSheetWindow = NSWindow; mLocationSheetWindow = NSWindow;
mLocationToolbarView = NSView; mLocationToolbarView = NSView;
mLock = NSImageView;
mMailToLinkMenu = NSMenu; mMailToLinkMenu = NSMenu;
mPageMenu = NSMenu; mPageMenu = NSMenu;
mPersonalToolbar = BookmarkToolbar; mPersonalToolbar = BookmarkToolbar;

Просмотреть файл

@ -3,7 +3,7 @@
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>IBDocumentLocation</key> <key>IBDocumentLocation</key>
<string>34 105 530 384 0 0 1280 938 </string> <string>3 3 530 384 0 0 1280 832 </string>
<key>IBEditorPositions</key> <key>IBEditorPositions</key>
<dict> <dict>
<key>1014</key> <key>1014</key>
@ -30,7 +30,7 @@
<string>124 551 213 61 0 0 1600 1002 </string> <string>124 551 213 61 0 0 1600 1002 </string>
</dict> </dict>
<key>IBFramework Version</key> <key>IBFramework Version</key>
<string>437.0</string> <string>439.0</string>
<key>IBLockedObjects</key> <key>IBLockedObjects</key>
<array> <array>
<integer>748</integer> <integer>748</integer>

Двоичные данные
camino/resources/localized/English.lproj/BrowserWindow.nib/keyedobjects.nib сгенерированный

Двоичный файл не отображается.

Просмотреть файл

@ -101,7 +101,6 @@ typedef enum
IBOutlet AutoCompleteTextField* mURLBar; IBOutlet AutoCompleteTextField* mURLBar;
IBOutlet NSTextField* mStatus; IBOutlet NSTextField* mStatus;
IBOutlet NSProgressIndicator* mProgress; // STRONG reference IBOutlet NSProgressIndicator* mProgress; // STRONG reference
IBOutlet NSImageView* mLock;
IBOutlet NSButton* mPopupBlocked; IBOutlet NSButton* mPopupBlocked;
IBOutlet NSWindow* mLocationSheetWindow; IBOutlet NSWindow* mLocationSheetWindow;
IBOutlet NSTextField* mLocationSheetURLField; IBOutlet NSTextField* mLocationSheetURLField;

Просмотреть файл

@ -593,7 +593,6 @@ enum BWCOpenDest {
// crash if we give them things that have gone away. // crash if we give them things that have gone away.
mProgress = nil; mProgress = nil;
mStatus = nil; mStatus = nil;
mLock = nil;
mPopupBlocked = nil; mPopupBlocked = nil;
} }
else { else {
@ -770,9 +769,6 @@ enum BWCOpenDest {
if (NSAppKitVersionNumber < kPantherAppKit) if (NSAppKitVersionNumber < kPantherAppKit)
[mURLBar setNextKeyView:mSearchBar]; [mURLBar setNextKeyView:mSearchBar];
} }
// needed when full keyboard access is enabled
[mLock setRefusesFirstResponder:YES];
} }
- (NSSize)windowWillResize:(NSWindow *)sender toSize:(NSSize)proposedFrameSize - (NSSize)windowWillResize:(NSWindow *)sender toSize:(NSSize)proposedFrameSize
@ -3155,22 +3151,10 @@ enum BWCOpenDest {
// updateLock: // updateLock:
// //
// Sets the lock icon in the status bar to the appropriate image and updates // updates the url bar display of security state appropriately.
// the url bar display of security state appropriately.
- (void)updateLock:(unsigned int)inSecurityState - (void)updateLock:(unsigned int)inSecurityState
{ {
unsigned char securityState = inSecurityState & 0x000000FF; unsigned char securityState = inSecurityState & 0x000000FF;
switch ( securityState ) {
case nsIWebProgressListener::STATE_IS_INSECURE:
[mLock setImage:[BrowserWindowController insecureIcon]];
break;
case nsIWebProgressListener::STATE_IS_SECURE:
[mLock setImage:[BrowserWindowController secureIcon]];;
break;
case nsIWebProgressListener::STATE_IS_BROKEN:
[mLock setImage:[BrowserWindowController brokenIcon]];
break;
}
[mURLBar setSecureState:securityState]; [mURLBar setSecureState:securityState];
} }