Removed extraneous NSPanel subclass ‘InfoWindow’. The Info Window still exists, it's just a normal NSPanel now.

This commit is contained in:
Nicholas Shanks
2002-02-15 01:52:23 +00:00
parent 667ed16d05
commit 316e5e45cc
9 changed files with 32 additions and 40 deletions

View File

@@ -1,6 +0,0 @@
#import <Cocoa/Cocoa.h>
@interface InfoWindow : NSPanel
{
}
@end

View File

@@ -1,15 +0,0 @@
#import "InfoWindow.h"
@implementation InfoWindow
- (BOOL)canBecomeKeyWindow
{
return NO;
}
- (BOOL)canBecomeMainWindow
{
return NO;
}
@end

View File

@@ -22,6 +22,9 @@
{ {
[super windowDidLoad]; [super windowDidLoad];
// set window to only accept key when editing text boxes
[(NSPanel *)[self window] setBecomesKeyOnlyIfNeeded:YES];
// retain views for swapping in and out // retain views for swapping in and out
[documentView retain]; [documentView retain];
[documentView removeFromSuperview]; [documentView removeFromSuperview];

View File

@@ -57,6 +57,17 @@
[dataSource setResources:resources]; [dataSource setResources:resources];
} }
- (void)printShowingPrintPanel:(BOOL)flag
{
NSPrintOperation *printOperation = [NSPrintOperation printOperationWithView:[[outlineView window] contentView]];
[printOperation runOperationModalForWindow:[outlineView window] delegate:self didRunSelector:@selector(printOperationDidRun:success:contextInfo:) contextInfo:nil];
}
- (void)printOperationDidRun:(NSPrintOperation *)printOperation success:(BOOL)success contextInfo:(void *)contextInfo
{
if( !success ) NSLog( @"Printing Failed!" );
}
- (BOOL)keepBackupFile - (BOOL)keepBackupFile
{ {
return [[NSUserDefaults standardUserDefaults] boolForKey:@"PreserveBackups"]; return [[NSUserDefaults standardUserDefaults] boolForKey:@"PreserveBackups"];
@@ -64,12 +75,22 @@
- (BOOL)validateMenuItem:(NSMenuItem *)item - (BOOL)validateMenuItem:(NSMenuItem *)item
{ {
int selectedRows = [outlineView numberOfSelectedRows];
Resource *resource = (Resource *) [outlineView itemAtRow:[outlineView selectedRow]]; Resource *resource = (Resource *) [outlineView itemAtRow:[outlineView selectedRow]];
// file menu
if( [item action] == @selector(saveDocument:) ) return [self isDocumentEdited]; if( [item action] == @selector(saveDocument:) ) return [self isDocumentEdited];
else if( [item action] == @selector(openResource:) ) return ([outlineView numberOfSelectedRows] == 1)? YES:NO;
else if( [item action] == @selector(openResourceAsHex:) ) return [outlineView numberOfSelectedRows]? YES:NO; // edit menu
else if( [item action] == @selector(playSound:) ) return [[resource type] isEqualToString:@"snd "]; else if( [item action] == @selector(clear:) ) return selectedRows > 0;
else if( [item action] == @selector(revertResourceToSaved:) ) return [resource isDirty]; else if( [item action] == @selector(selectAll:) ) return [outlineView numberOfRows] > 0;
else if( [item action] == @selector(deselectAll:) ) return selectedRows > 0;
// resource menu
else if( [item action] == @selector(openResource:) ) return selectedRows == 1;
else if( [item action] == @selector(openResourceAsHex:) ) return selectedRows > 0;
else if( [item action] == @selector(playSound:) ) return selectedRows == 1 && [[resource type] isEqualToString:@"snd "];
else if( [item action] == @selector(revertResourceToSaved:) ) return selectedRows == 1 && [resource isDirty];
else return [super validateMenuItem:item]; else return [super validateMenuItem:item];
} }

View File

@@ -11,6 +11,10 @@
</dict> </dict>
<key>IBFramework Version</key> <key>IBFramework Version</key>
<string>248.0</string> <string>248.0</string>
<key>IBOpenObjects</key>
<array>
<integer>29</integer>
</array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>5P48</string> <string>5P48</string>
</dict> </dict>

Binary file not shown.

View File

@@ -1,7 +1,6 @@
{ {
IBClasses = ( IBClasses = (
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{CLASS = InfoWindow; LANGUAGE = ObjC; SUPERCLASS = NSPanel; },
{ {
ACTIONS = {attributesChanged = id; }; ACTIONS = {attributesChanged = id; };
CLASS = InfoWindowController; CLASS = InfoWindowController;

Binary file not shown.

View File

@@ -493,7 +493,6 @@
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
F5B5884F0156D40B01000001, F5B5884F0156D40B01000001,
F5B588510156D40B01000001,
F5B588520156D40B01000001, F5B588520156D40B01000001,
F5B588530156D40B01000001, F5B588530156D40B01000001,
F5B588540156D40B01000001, F5B588540156D40B01000001,
@@ -542,7 +541,6 @@
F5B588660156D40B01000001, F5B588660156D40B01000001,
F5B588670156D40B01000001, F5B588670156D40B01000001,
F5B588680156D40B01000001, F5B588680156D40B01000001,
F5B588690156D40B01000001,
F5B5886A0156D40B01000001, F5B5886A0156D40B01000001,
F5B5886B0156D40B01000001, F5B5886B0156D40B01000001,
F5B5886C0156D40B01000001, F5B5886C0156D40B01000001,
@@ -926,12 +924,6 @@
settings = { settings = {
}; };
}; };
F5B588510156D40B01000001 = {
fileRef = F5B588230156D40B01000001;
isa = PBXBuildFile;
settings = {
};
};
F5B588520156D40B01000001 = { F5B588520156D40B01000001 = {
fileRef = F5B588250156D40B01000001; fileRef = F5B588250156D40B01000001;
isa = PBXBuildFile; isa = PBXBuildFile;
@@ -1064,12 +1056,6 @@
settings = { settings = {
}; };
}; };
F5B588690156D40B01000001 = {
fileRef = F5B588240156D40B01000001;
isa = PBXBuildFile;
settings = {
};
};
F5B5886A0156D40B01000001 = { F5B5886A0156D40B01000001 = {
fileRef = F5B588260156D40B01000001; fileRef = F5B588260156D40B01000001;
isa = PBXBuildFile; isa = PBXBuildFile;