• added: AMIndeterminateProgressIndicatorCell for global spinning wheel

• added: spinning wheel background image 
• removed warning in TableContent (unused 'j')

3 files changed, 248 insertions, 1 deletions

diff --git a/Source/AMIndeterminateProgressIndicatorCell.h b/Source/AMIndeterminateProgressIndicatorCell.h
new file mode 100644
index 00000000..40193373
--- /dev/null
+++ b/Source/AMIndeterminateProgressIndicatorCell.h
@@ -0,0 +1,58 @@
+//
+//  $Id: SPFieldEditorController.h 802 2009-07-18 20:46:57Z bibiko $
+//
+//  AMIndeterminateProgressIndicatorCell.h
+//  sequel-pro
+//
+//  Created by Andreas Mayer on January 23, 2007
+//  Copyright 2007 Andreas Mayer (andreas@harmless.de). All rights reserved.
+//
+//  License: http://www.opensource.org/licenses/bsd-license.php
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 2 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+//  More info at <http://code.google.com/p/sequel-pro/>
+
+#import <Cocoa/Cocoa.h>
+
+
+@interface AMIndeterminateProgressIndicatorCell : NSCell {
+	double doubleValue;
+	NSTimeInterval animationDelay;
+	BOOL displayedWhenStopped;
+	BOOL spinning;
+	NSColor *color;
+	float redComponent;
+	float greenComponent;
+	float blueComponent;
+}
+
+- (NSColor *)color;
+- (void)setColor:(NSColor *)value;
+
+- (double)doubleValue;
+- (void)setDoubleValue:(double)value;
+
+- (NSTimeInterval)animationDelay;
+- (void)setAnimationDelay:(NSTimeInterval)value;
+
+- (BOOL)isDisplayedWhenStopped;
+- (void)setDisplayedWhenStopped:(BOOL)value;
+
+- (BOOL)isSpinning;
+- (void)setSpinning:(BOOL)value;
+
+
+@end
diff --git a/Source/AMIndeterminateProgressIndicatorCell.m b/Source/AMIndeterminateProgressIndicatorCell.m
new file mode 100644
index 00000000..16293202
--- /dev/null
+++ b/Source/AMIndeterminateProgressIndicatorCell.m
@@ -0,0 +1,189 @@
+//
+//  $Id: SPFieldEditorController.h 802 2009-07-18 20:46:57Z bibiko $
+//
+//  AMIndeterminateProgressIndicatorCell.m
+//  sequel-pro
+//
+//  Created by Andreas Mayer on January 23, 2007
+//  Copyright 2007 Andreas Mayer (andreas@harmless.de). All rights reserved.
+//
+//  License: http://www.opensource.org/licenses/bsd-license.php
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 2 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+//  More info at <http://code.google.com/p/sequel-pro/>
+
+#import "AMIndeterminateProgressIndicatorCell.h"
+
+#define ConvertAngle(a) (fmod((90.0-(a)), 360.0))
+
+#define DEG2RAD  0.017453292519943295
+
+@implementation AMIndeterminateProgressIndicatorCell
+
+- (id)init
+{
+	if (self = [super initImageCell:nil]) {
+		[self setAnimationDelay:5.0/60.0];
+		[self setDisplayedWhenStopped:YES];
+		[self setDoubleValue:0.0];
+		[self setColor:[NSColor blackColor]];
+	}
+	return self;
+}
+
+- (void)dealloc
+{
+	[NSColor release];
+	[super dealloc];
+}
+
+- (NSColor *)color
+{
+	return [[color retain] autorelease];
+}
+
+- (void)setColor:(NSColor *)value
+{
+	float alphaComponent;
+	if (color != value) {
+		[color release];
+		color = [value retain];
+		[[color colorUsingColorSpaceName:@"NSCalibratedRGBColorSpace"] getRed:&redComponent green:&greenComponent blue:&blueComponent alpha:&alphaComponent];
+		NSAssert((alphaComponent > 0.999), @"color must be opaque");
+	}
+}
+
+- (double)doubleValue
+{
+	return doubleValue;
+}
+
+- (void)setDoubleValue:(double)value
+{
+	if (doubleValue != value) {
+		doubleValue = value;
+		if (doubleValue > 1.0) {
+			doubleValue = 1.0;
+		} else if (doubleValue < 0.0) {
+			doubleValue = 0.0;
+		}
+	}
+}
+
+- (NSTimeInterval)animationDelay
+{
+	return animationDelay;
+}
+
+- (void)setAnimationDelay:(NSTimeInterval)value
+{
+	if (animationDelay != value) {
+		animationDelay = value;
+	}
+}
+
+- (BOOL)isDisplayedWhenStopped
+{
+	return displayedWhenStopped;
+}
+
+- (void)setDisplayedWhenStopped:(BOOL)value
+{
+	if (displayedWhenStopped != value) {
+		displayedWhenStopped = value;
+	}
+}
+
+- (BOOL)isSpinning
+{
+	return spinning;
+}
+
+- (void)setSpinning:(BOOL)value
+{
+	if (spinning != value) {
+		spinning = value;
+	}
+}
+
+- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView
+{
+	// cell has no border
+	[self drawInteriorWithFrame:cellFrame inView:controlView];
+}
+
+- (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView *)controlView
+{
+	//NSLog(@"cellFrame: %f %f %f %f", cellFrame.origin.x, cellFrame.origin.y, cellFrame.size.width, cellFrame.size.height);
+	if ([self isSpinning] || [self isDisplayedWhenStopped]) {
+		float flipFactor = ([controlView isFlipped] ? 1.0 : -1.0);
+		int step = round([self doubleValue]/(5.0/60.0));
+		float cellSize = MIN(cellFrame.size.width, cellFrame.size.height);
+		NSPoint center = cellFrame.origin;
+		center.x += cellSize/2.0;
+		center.y += cellFrame.size.height/2.0;
+		float outerRadius;
+		float innerRadius;
+		float strokeWidth = cellSize*0.08;
+		if (cellSize >= 32.0) {
+			outerRadius = cellSize*0.38;
+			innerRadius = cellSize*0.23;
+		} else {
+			outerRadius = cellSize*0.48;
+			innerRadius = cellSize*0.27;
+		}
+		float a; // angle
+		NSPoint inner;
+		NSPoint outer;
+		// remember defaults
+		NSLineCapStyle previousLineCapStyle = [NSBezierPath defaultLineCapStyle];
+		float previousLineWidth = [NSBezierPath defaultLineWidth]; 
+		// new defaults for our loop
+		[NSBezierPath setDefaultLineCapStyle:NSRoundLineCapStyle];
+		[NSBezierPath setDefaultLineWidth:strokeWidth];
+		if ([self isSpinning]) {
+			a = (270+(step* 30))*DEG2RAD;
+		} else {
+			a = 270*DEG2RAD;
+		}
+		a = flipFactor*a;
+		int i;
+		for (i = 0; i < 12; i++) {
+//			[[NSColor colorWithCalibratedWhite:MIN(sqrt(i)*0.25, 0.8) alpha:1.0] set];
+//			[[NSColor colorWithCalibratedWhite:0.0 alpha:1.0-sqrt(i)*0.25] set];
+			[[NSColor colorWithCalibratedRed:redComponent green:greenComponent blue:blueComponent alpha:1.0-sqrt(i)*0.25] set];
+			outer = NSMakePoint(center.x+cos(a)*outerRadius, center.y+sin(a)*outerRadius);
+			inner = NSMakePoint(center.x+cos(a)*innerRadius, center.y+sin(a)*innerRadius);
+			[NSBezierPath strokeLineFromPoint:inner toPoint:outer];
+			a -= flipFactor*30*DEG2RAD;
+		}
+		// restore previous defaults
+		[NSBezierPath setDefaultLineCapStyle:previousLineCapStyle];
+		[NSBezierPath setDefaultLineWidth:previousLineWidth];
+	}
+}
+
+- (void)setObjectValue:(id)value
+{
+	if ([value respondsToSelector:@selector(boolValue)]) {
+		[self setSpinning:[value boolValue]];
+	} else {
+		[self setSpinning:NO];
+	}
+}
+
+
+@end
diff --git a/Source/TableContent.m b/Source/TableContent.m
index c84ee3c7..8bcf4942 100644
--- a/Source/TableContent.m
+++ b/Source/TableContent.m
@@ -1400,7 +1400,7 @@
 	NSMutableString *argument = [NSMutableString string];
 	// NSString *columnType;
 	NSArray *columnNames;
-	int i,j;
+	int i;
 	
 	if ( row == -1 )
 		return @"";