Commit: dff82a897c1a42d7066a164ce1132e9c7e435a57 - BSTRAEditor (git)

BathyScapheのTitleRulerAppearanceを手軽に変更するツール

Commit MetaInfo

• Revision: dff82a897c1a42d7066a164ce1132e9c7e435a57 (tree)
• Time: 2009-06-01 23:21:00
• Author: masakih <masakih@user...>
• Commiter: masakih

Log Message

BSTitleRulerViewをプロジェクトおよびリポジトリから外した。
SDKを10.4に変更。

git-svn-id: svn+ssh://macmini/usr/local/svnrepos/BSTRAEditor/BSTRAEditor@5 f892931e-c658-45bd-90f1-b3d0def27f12

Change Summary

• modified: BSTRAEditor.xcodeproj/project.pbxproj
• delete: BSTitleRulerView.h
• delete: BSTitleRulerView.m

Incremental Difference

--- a/BSTRAEditor.xcodeproj/project.pbxproj
+++ b/BSTRAEditor.xcodeproj/project.pbxproj
@@ -66,8 +66,6 @@
 		F434415E0D86B8C900F9416E /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
 		F43441610D86B96500F9416E /* Japanese */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; name = Japanese; path = Japanese.lproj/Makefile; sourceTree = "<group>"; };
 		F43441710D86C85900F9416E /* Japanese */ = {isa = PBXFileReference; lastKnownFileType = text; name = Japanese; path = Japanese.lproj/Localizable.strings.sed; sourceTree = "<group>"; };
-		F479A5EC0D860C4C00A414C2 /* BSTitleRulerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BSTitleRulerView.h; sourceTree = "<group>"; };
-		F479A5ED0D860C4C00A414C2 /* BSTitleRulerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BSTitleRulerView.m; sourceTree = "<group>"; };
 		F479A5EF0D860C6C00A414C2 /* NSBezierPath_AMShading.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSBezierPath_AMShading.m; sourceTree = "<group>"; };
 		F479A5F00D860C6C00A414C2 /* NSBezierPath_AMShading.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSBezierPath_AMShading.h; sourceTree = "<group>"; };
 		F479A5FB0D860D7C00A414C2 /* BSTitleRulerAppearance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BSTitleRulerAppearance.h; sourceTree = "<group>"; };
@@ -192,8 +190,6 @@
 				F479A5FC0D860D7C00A414C2 /* BSTitleRulerAppearance.m */,
 				F479A5F00D860C6C00A414C2 /* NSBezierPath_AMShading.h */,
 				F479A5EF0D860C6C00A414C2 /* NSBezierPath_AMShading.m */,
-				F479A5EC0D860C4C00A414C2 /* BSTitleRulerView.h */,
-				F479A5ED0D860C4C00A414C2 /* BSTitleRulerView.m */,
 			);
 			name = "External Classes";
 			sourceTree = "<group>";
@@ -414,7 +410,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				PREBINDING = NO;
 				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";
-				"SDKROOT[arch=ppc]" = /Developer/SDKs/MacOSX10.3.9.sdk;
+				"SDKROOT[arch=ppc]" = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";
 			};
 			name = Debug;
 		};
@@ -429,7 +425,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				PREBINDING = NO;
 				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";
-				"SDKROOT[arch=ppc]" = /Developer/SDKs/MacOSX10.3.9.sdk;
+				"SDKROOT[arch=ppc]" = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";
 			};
 			name = Release;
 		};

--- a/BSTitleRulerView.h
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-//  BSTitleRulerView.h
-//  SGAppKit (BathyScaphe)
-//
-//  Created by Tsutomu Sawada on 05/09/22.
-//  Copyright 2005-2007 BathyScaphe Project. All rights reserved.
-//  encoding="UTF-8"
-//
-
-#import <Cocoa/Cocoa.h>
-
-@class BSTitleRulerAppearance;
-
-typedef enum _BSTitleRulerModeType {
-	BSTitleRulerShowTitleOnlyMode		= 0, // スレッドタイトルバーのみ
-	BSTitleRulerShowInfoOnlyMode		= 1, // 「dat 落ちと判定されました。」のみ
-	BSTitleRulerShowTitleAndInfoMode	= 2, // スレッドタイトルバー、その下に「dat 落ちと判定されました。」
-} BSTitleRulerModeType;
-
-@interface BSTitleRulerView : NSRulerView {
-	@private
-	BSTitleRulerAppearance *m_appearance;
-
-	NSString	*m_titleStr;
-	NSString	*m_infoStr;
-	NSString	*m_pathStr;
-
-	BSTitleRulerModeType	_currentMode;
-}
-
-// Designated initializer. Available in Twincam Angel/SGAppKit 1.7.1 and later.
-- (id)initWithScrollView:(NSScrollView *)aScrollView appearance:(BSTitleRulerAppearance *)appearance;
-
-- (BSTitleRulerAppearance *)appearance;
-- (void)setAppearance:(BSTitleRulerAppearance *)appearance;
-
-- (NSString *)titleStr;
-- (void)setTitleStr:(NSString *)aString;
-- (void)setTitleStrWithoutNeedingDisplay:(NSString *)aString;
-
-- (NSString *)infoStr;
-- (void)setInfoStr:(NSString *)aString;
-- (void)setInfoStrWithoutNeedingDisplay:(NSString *)aString;
-
-- (NSString *)pathStr;
-- (void)setPathStr:(NSString *)aString;
-
-- (BSTitleRulerModeType)currentMode;
-- (void)setCurrentMode:(BSTitleRulerModeType)newType;
-@end

--- a/BSTitleRulerView.m
+++ /dev/null
@@ -1,350 +0,0 @@
-//
-//  BSTitleRulerView.m
-//  SGAppKit (BathyScaphe)
-//
-//  Created by Tsutomu Sawada on 05/09/22.
-//  Copyright 2005-2007 BathyScaphe Project. All rights reserved.
-//  encoding="UTF-8"
-//
-
-#import "BSTitleRulerView.h"
-#import <SGAppKit/NSWorkspace-SGExtensions.h>
-#import <SGAppKit/BSTitleRulerAppearance.h>
-#import <SGAppKit/NSBezierPath_AMShading.h>
-
-#define	THICKNESS_FOR_TITLE	22.0
-#define	THICKNESS_FOR_INFO	36.0
-#define	TITLE_FONT_SIZE		12.0
-#define	INFO_FONT_SIZE		13.0
-
-@implementation BSTitleRulerView
-
-#pragma mark Accessors
-- (BSTitleRulerAppearance *)appearance
-{
-	return m_appearance;
-}
-
-- (void)setAppearance:(BSTitleRulerAppearance *)appearance
-{
-	[appearance retain];
-	[m_appearance release];
-	m_appearance = appearance;
-}
-
-- (NSString *)titleStr
-{
-	return m_titleStr;
-}
-
-- (void)setTitleStr:(NSString *)aString
-{
-	[self setTitleStrWithoutNeedingDisplay:aString];
-	[self setNeedsDisplay:YES];
-}
-
-- (void)setTitleStrWithoutNeedingDisplay:(NSString *)aString
-{
-	[aString retain];
-	[m_titleStr release];
-	m_titleStr = aString;
-}
-
-- (NSString *)infoStr
-{
-	return m_infoStr;
-}
-
-- (void)setInfoStr:(NSString *)aString
-{
-	[self setInfoStrWithoutNeedingDisplay:aString];
-	[self setNeedsDisplay:YES];
-}
-
-- (void)setInfoStrWithoutNeedingDisplay:(NSString *)aString
-{
-	[aString retain];
-	[m_infoStr release];
-	m_infoStr = aString;
-}
-
-- (NSString *)pathStr
-{
-	return m_pathStr;
-}
-
-- (void)setPathStr:(NSString *)aString
-{
-	[aString retain];
-	[m_pathStr release];
-	m_pathStr = aString;
-}
-
-- (BSTitleRulerModeType)currentMode
-{
-	return _currentMode;
-}
-
-- (void)setCurrentMode:(BSTitleRulerModeType)newType
-{
-	float newThickness;
-	_currentMode = newType;
-
-	switch(newType) {
-	case BSTitleRulerShowTitleOnlyMode:
-		newThickness = THICKNESS_FOR_TITLE;
-		break;
-	case BSTitleRulerShowInfoOnlyMode:
-		newThickness = THICKNESS_FOR_INFO;
-		break;
-	case BSTitleRulerShowTitleAndInfoMode:
-		newThickness = (THICKNESS_FOR_TITLE + THICKNESS_FOR_INFO);
-		break;
-	default:
-		newThickness = THICKNESS_FOR_TITLE;
-		break;
-	}
-	
-	[self setRuleThickness:newThickness];
-}
-
-#pragma mark Private Utilities
-- (NSDictionary *)attrTemplateForTitle
-{
-	static NSDictionary	*tmp = nil;
-	if (!tmp) {
-		NSColor			*color_;
-
-		color_ = [[self appearance] textColor];
-
-		tmp = [[NSDictionary alloc] initWithObjectsAndKeys:
-					[NSFont boldSystemFontOfSize:TITLE_FONT_SIZE], NSFontAttributeName,
-					color_, NSForegroundColorAttributeName,
-					nil];
-	}
-	return tmp;
-}
-
-- (NSDictionary *)attrTemplateForInfo
-{
-	static NSDictionary	*tmp2 = nil;
-	if (!tmp2) {
-		NSColor			*color_;
-
-		color_ = [[self appearance] infoColor];
-
-		tmp2 = [[NSDictionary alloc] initWithObjectsAndKeys:
-					[NSFont systemFontOfSize:INFO_FONT_SIZE], NSFontAttributeName,
-					color_, NSForegroundColorAttributeName,
-					nil];
-	}
-	return tmp2;
-}
-
-- (NSAttributedString *)titleForDrawing
-{
-	return [[[NSAttributedString alloc] initWithString:[self titleStr] attributes:[self attrTemplateForTitle]] autorelease];
-}
-
-- (NSAttributedString *)infoForDrawing
-{
-	return [[[NSAttributedString alloc] initWithString:[self infoStr] attributes:[self attrTemplateForInfo]] autorelease];
-}
-
-- (NSArray *)activeColors
-{
-	BSTitleRulerAppearance *appearance = [self appearance];
-	return ([NSColor currentControlTint] == NSGraphiteControlTint) ? [appearance activeGraphiteColors] : [appearance activeBlueColors];
-}
-
-#pragma mark Setup & Cleanup
-- (id)initWithScrollView:(NSScrollView *)aScrollView appearance:(BSTitleRulerAppearance *)appearance
-{
-	if (self = [super initWithScrollView:aScrollView orientation:NSHorizontalRuler]) {
-		NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
-		// Original NSRulerView Properties
-		[self setMarkers:nil];
-		[self setReservedThicknessForMarkers:0.0];
-
-		// Notifications
-		[nc addObserver:self
-			   selector:@selector(mainWinOrSystemColorsDidChange:)
-				   name:NSSystemColorsDidChangeNotification
-				 object:nil];
-
-		[nc addObserver:self
-			   selector:@selector(mainWinOrSystemColorsDidChange:)
-				   name:NSWindowDidBecomeMainNotification
-				 object:[self window]];
-
-		[nc addObserver:self
-			   selector:@selector(mainWinOrSystemColorsDidChange:)
-				   name:NSWindowDidResignMainNotification
-				 object:[self window]];
-
-		// BSTitleRulerView Properties
-		[self setCurrentMode:BSTitleRulerShowTitleOnlyMode];
-		[self setAppearance:appearance];
-	}
-	return self;
-}
-
-- (void)dealloc
-{
-	NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
-
-	[nc removeObserver:self
-				  name:NSSystemColorsDidChangeNotification
-				object:nil];
-
-	[nc removeObserver:self
-				  name:NSWindowDidBecomeMainNotification
-				object:[self window]];
-
-	[nc removeObserver:self
-				  name:NSWindowDidResignMainNotification
-				object:[self window]];
-
-	[m_titleStr release];
-	[m_infoStr release];
-	[m_pathStr release];
-	[m_appearance release];
-
-	[super dealloc];
-}
-
-#pragma mark Drawing
-- (void)drawTitleBarInRect:(NSRect)aRect
-{
-	NSArray	*colors_;
-	NSColor *gradientStartColor, *gradientEndColor;
-
-	BSTitleRulerAppearance	*appearance = [self appearance];
-
-	colors_ = [[self window] isMainWindow] ? [self activeColors] : [appearance inactiveColors];
-	
-	gradientStartColor = [colors_ objectAtIndex:0];
-	gradientEndColor = [colors_ objectAtIndex:1];
-
-	[[NSBezierPath bezierPathWithRect:aRect] linearGradientFillWithStartColor:gradientStartColor endColor:gradientEndColor];
-
-	if ([appearance drawsCarvedText]) {
-		// このへん、暫定的
-		NSMutableAttributedString *foo = [[self titleForDrawing] mutableCopy];
-		NSRange	range = NSMakeRange(0,[foo length]);
-		[foo removeAttribute:NSForegroundColorAttributeName range:range];
-		[foo addAttributes:[NSDictionary dictionaryWithObject:[NSColor grayColor] forKey:NSForegroundColorAttributeName] range:range];
-		[foo drawInRect:NSInsetRect(aRect, 5.0, 3.0)];
-		[foo release];
-	}
-
-	[[self titleForDrawing] drawInRect:NSInsetRect(aRect, 5.0, 2.0)];
-}
-
-- (BOOL)isOpaque
-{
-	return YES;
-}
-
-- (void)drawInfoBarInRect:(NSRect)aRect
-{
-	NSRect	iconRect;
-	NSImage *icon_ = [[NSWorkspace sharedWorkspace] systemIconForType:kAlertNoteIcon];
-	[icon_ setSize:NSMakeSize(32, 32)];
-	[icon_ setFlipped:[self isFlipped]];
-
-	[[[self appearance] infoBackgroundColor] set];
-	NSRectFill(aRect);	
-
-	iconRect = NSMakeRect(NSMinX(aRect)+5.0, NSMinY(aRect)+2.0, 32, 32);
-
-	[icon_ drawInRect:iconRect fromRect:NSMakeRect(0,0,32,32) operation:NSCompositeSourceOver fraction:1.0];
-
-	aRect = NSInsetRect(aRect, 5.0, 7.0);
-	aRect.origin.x += 36.0;
-	[[self infoForDrawing] drawInRect:NSInsetRect(aRect, 5.0, 2.0)];
-}
-
-- (void)drawRect:(NSRect)aRect
-{
-	switch ([self currentMode]) {
-	case BSTitleRulerShowTitleOnlyMode:
-		[self drawTitleBarInRect:aRect];
-		break;
-	case BSTitleRulerShowInfoOnlyMode:
-		[self drawInfoBarInRect:aRect];
-		break;
-	case BSTitleRulerShowTitleAndInfoMode:
-		{
-			NSRect titleRect, infoRect;
-			NSDivideRect(aRect, &infoRect, &titleRect, THICKNESS_FOR_INFO, NSMaxYEdge);
-			[self drawTitleBarInRect:titleRect];
-			[self drawInfoBarInRect:infoRect];
-		}
-		break;
-	}
-}
-
-#pragma mark Path Popup Menu Support
-- (IBAction)revealPathComponent:(id)sender
-{
-	NSString *path = [sender representedObject];
-	if (path) [[NSWorkspace sharedWorkspace] selectFile:path inFileViewerRootedAtPath:[path stringByDeletingLastPathComponent]];
-}
-
-static NSMenu *createPathMenu(NSString *fullPath)
-{
-	NSFileManager	*fm = [NSFileManager defaultManager];
-	NSWorkspace		*ws = [NSWorkspace sharedWorkspace];
-	NSMenu			*menu = [[NSMenu alloc] initWithTitle:@"Path"];
-	NSMenuItem		*menuItem;
-	NSImage			*img;
-	NSSize			size16 = NSMakeSize(16,16);
-	SEL				mySel = @selector(revealPathComponent:);
-
-	menuItem = [[NSMenuItem alloc] initWithTitle:[fm displayNameAtPath:fullPath] action:mySel keyEquivalent:@""];
-	img = [ws iconForFile:fullPath];
-	[img setSize:size16];
-	[menuItem setImage:img];
-	[menu addItem:menuItem];
-	[menuItem release];
-
-	NSString *bar = fullPath;
-	NSString *foo;
-
-	while (![bar isEqualToString:@"/"]) {
-		foo = [bar stringByDeletingLastPathComponent];
-		menuItem = [[NSMenuItem alloc] initWithTitle:[fm displayNameAtPath:foo] action:mySel keyEquivalent:@""];
-		img = [ws iconForFile:foo];
-		[img setSize:size16];
-		[menuItem setRepresentedObject:bar];
-		[menuItem setImage:img];
-		[menu addItem:menuItem];
-		[menuItem release];
-		bar = foo;
-	}
-	return [menu autorelease];
-}
-
-- (void)mouseDown:(NSEvent *)theEvent
-{
-	unsigned int flag = [theEvent modifierFlags];
-	if ([self pathStr] && (flag & NSCommandKeyMask)) {
-		[NSMenu popUpContextMenu:createPathMenu([self pathStr]) withEvent:theEvent forView:self];
-	}
-}
-
-- (NSMenu *)menuForEvent:(NSEvent *)theEvent
-{
-	if ([self pathStr]) {
-		return createPathMenu([self pathStr]);
-	}
-	return [super menuForEvent:theEvent];
-}
-
-#pragma mark Notifications
-- (void)mainWinOrSystemColorsDidChange:(NSNotification *)theNotification
-{
-	[self setNeedsDisplay:YES];
-}
-@end