Bug fixes.

bakerma07 · Jul 2, 2012 · 98c91a4 · 98c91a4
1 parent 8033d99
commit 98c91a4
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 26 deletions.
diff --git a/Classes/Controllers/TXMasterController.m b/Classes/Controllers/TXMasterController.m
@@ -619,12 +619,8 @@ - (void)themeStyleDidChange:(NSNotification *)note
 		[sf appendString:TXTLS(@"ThemeChangeOverridePromptChannelFont")];
 		[sf appendString:NSStringNewlinePlaceholder];
 	}
-
-	if ([TPCPreferences rightToLeftFormatting]) {
-		[self.text setBaseWritingDirection:NSWritingDirectionRightToLeft];
-	} else {
-		[self.text setBaseWritingDirection:NSWritingDirectionLeftToRight];
-	}
+
+	[self.text updateTextDirection];
 
 	sf = (NSMutableString *)[sf trim];
 

diff --git a/Classes/Headers/StaticDefinitions.h b/Classes/Headers/StaticDefinitions.h
@@ -74,7 +74,7 @@
 /* Miscellaneous functions to handle small tasks. */
 #define CFItemRefToID(s)					(id)s
 #define BOOLReverseValue(b)					((b == YES) ? NO : YES)
-#define BOOLValueFromObject(b)				BOOLReverseValue(PointerIsEmpty(b))
+#define BOOLValueFromObject(b)				PointerIsNotEmpty(b)
 #define NSDissimilarObjects(o,n)			(o != n)
 
 #define TEXTUAL_EXTERN                      __attribute__((visibility("default")))

diff --git a/Classes/Headers/TVCInputTextField.h b/Classes/Headers/TVCInputTextField.h
@@ -9,7 +9,9 @@
 @property (nonatomic, unsafe_unretained) SEL actionSelector;
 @property (nonatomic, strong) NSAttributedString *placeholderString;
 
+- (void)updateTextDirection;
 - (void)resetTextFieldCellSize;
+
 - (void)setReturnActionWithSelector:(SEL)selector owner:(id)owner;
 
 - (TVCInputTextFieldBackground *)backgroundView;

diff --git a/Classes/Helpers/Cocoa (Objective-C)/NSStringHelper.m b/Classes/Helpers/Cocoa (Objective-C)/NSStringHelper.m
@@ -84,7 +84,7 @@ - (NSString *)stringCharacterAtIndex:(NSInteger)index
 	return nil;
 }
 
-- (const UniChar*)getCharactersBuffer
+- (const UniChar *)getCharactersBuffer
 {
 	NSUInteger len = self.length;
 
@@ -579,7 +579,7 @@ - (NSString *)identFromHostmask
 		}
 	}
 
-	return @"";
+	return NSStringEmptyPlaceholder;
 }
 
 - (NSString *)hostFromHostmask
@@ -588,7 +588,7 @@ - (NSString *)hostFromHostmask
 		return [self safeSubstringAfterIndex:[self stringPosition:@"@"]];
 	}
 
-	return @"";
+	return NSStringEmptyPlaceholder;
 }
 
 - (NSString *)reservedCharactersToIRCFormatting

diff --git a/Classes/IRC/IRCClient.m b/Classes/IRC/IRCClient.m
@@ -2686,7 +2686,7 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString
 		{	
             NSString *command = [cmd lowercaseString];
 
-            NSArray *extensions = @[@".scpt", @".py", @".pyc", @".rb", @".pl", @".sh", @".bash", @""];
+            NSArray *extensions = @[@".scpt", @".py", @".pyc", @".rb", @".pl", @".sh", @".bash", NSStringEmptyPlaceholder];
 
 #ifdef TXUserScriptsFolderAvailable
 			NSArray *scriptPaths = @[

diff --git a/Classes/Library/TLOFileLogger.m b/Classes/Library/TLOFileLogger.m
@@ -59,7 +59,9 @@ - (void)open
 {
 	[self close];
 
-	if ([TPCPreferences transcriptFolder] == nil) {
+	NSString *path = [TPCPreferences transcriptFolder];
+
+	if (NSObjectIsEmpty(path)) {
 		return;
 	}
 

diff --git a/Classes/Library/TLOPopupPrompts.m b/Classes/Library/TLOPopupPrompts.m
@@ -47,7 +47,7 @@ - (void)sheetWindowWithQuestion:(NSWindow *)window
 {
 	BOOL useSupression = NO;
 
-	NSString *__suppressionKey = @"";
+	NSString *__suppressionKey = NSStringEmptyPlaceholder;
 
 	if (NSObjectIsNotEmpty(suppressKey)) {
         __suppressionKey = [TXPopupPromptSuppressionPrefix stringByAppendingString:suppressKey];
@@ -106,7 +106,7 @@ + (BOOL)dialogWindowWithQuestion:(NSString *)bodyText
 {
 	BOOL useSupression = NO;
 
-	NSString *__suppressKey = @"";
+	NSString *__suppressKey = NSStringEmptyPlaceholder;
 
 	if (NSObjectIsNotEmpty(suppressKey) && [suppressText isEqualToString:@"-"] == NO) {
         __suppressKey = [TXPopupPromptSuppressionPrefix stringByAppendingString:suppressKey];

diff --git a/Classes/Views/Input Text Field/TVCInputTextField.m b/Classes/Views/Input Text Field/TVCInputTextField.m
@@ -39,7 +39,7 @@ - (id)initWithCoder:(NSCoder *)coder
         self.placeholderString = [NSAttributedString alloc];
         self.placeholderString = [self.placeholderString initWithString:TXTLS(@"InputTextFieldPlaceholderValue") attributes:attrs];
     }
-
+	
     return self;
 }
 
@@ -53,6 +53,15 @@ - (TVCInputTextFieldBackground *)backgroundView
 	return (self.superview.superview.superview.subviews)[2];
 }
 
+- (void)updateTextDirection
+{
+	if ([TPCPreferences rightToLeftFormatting]) {
+		[self setBaseWritingDirection:NSWritingDirectionRightToLeft];
+	} else {
+		[self setBaseWritingDirection:NSWritingDirectionLeftToRight];
+	}
+}
+
 - (void)resetTextFieldCellSize
 {
 	BOOL drawBezel = YES;
@@ -76,19 +85,19 @@ - (void)resetTextFieldCellSize
 	if (NSObjectIsEmpty(stringv)) {
 		textBoxFrame.size.height    = _InputBoxDefaultHeight;
 		backgroundFrame.size.height = _InputBoxBackgroundDefaultHeight;
-
+		
 		if (_lastDrawnLineCount >= 2) {
 			drawBezel = YES;
 		}
-
+		
 		_lastDrawnLineCount = 1;
 	} else {
 		NSInteger totalLinesBase = [self numberOfLines];
 
 		if (_lastDrawnLineCount == totalLinesBase) {
 			drawBezel = NO;
 		}
-
+		
 		_lastDrawnLineCount = totalLinesBase;
 
 		if (drawBezel) {
@@ -139,16 +148,20 @@ - (void)textDidChange:(NSNotification *)aNotification
 }
 
 - (void)drawRect:(NSRect)dirtyRect
-{	
+{
+	[self updateTextDirection];
+
 	if ([TPCPreferences useLogAntialiasing] == NO) {
 		[_NSGraphicsCurrentContext() saveGraphicsState];
 		[_NSGraphicsCurrentContext() setShouldAntialias: NO];
 	}
 
 	NSString *value = [self stringValue];
 
-	if (NSObjectIsEmpty(value) && NSDissimilarObjects([self baseWritingDirection], NSWritingDirectionRightToLeft)) {
-		[self.placeholderString drawAtPoint:NSMakePoint(6, 1)];
+	if (NSObjectIsEmpty(value)) {
+		if (NSDissimilarObjects([self baseWritingDirection], NSWritingDirectionRightToLeft)) {
+			[self.placeholderString drawAtPoint:NSMakePoint(6, 1)];
+		}
 	} else {
 		[super drawRect:dirtyRect];
 	}
@@ -198,7 +211,7 @@ - (void)setWindowIsActive:(BOOL)value
 	if (NSDissimilarObjects(value, self.windowIsActive)) {
 		_windowIsActive = value;
 	}
-
+	
 	[self setNeedsDisplay:YES];
 }
 
@@ -222,7 +235,7 @@ - (void)drawRect:(NSRect)dirtyRect
 
 	/* Black Outline. */
 	controlFrame = NSMakeRect(0.0, 1.0, cellBounds.size.width, (cellBounds.size.height - 1.0));
-
+	
 	/* We force focused color during first run because we draw before
 	 our window has finished coming to the front so the wrong color
 	 is used for our border. */
@@ -252,7 +265,7 @@ - (void)drawRect:(NSRect)dirtyRect
 
 	[controlColor set];
 	[controlPath fill];
-
+	
 	if (_finishedFirstDraw == NO) {
 		_finishedFirstDraw = YES;
 	}

diff --git a/Resources/Info.plist b/Resources/Info.plist
@@ -47,8 +47,8 @@
 	<key>TXBundleBuildCodeName</key>
 	<string>Turtle Soup</string>
 	<key>TXBundleBuildNumber</key>
-	<string>11736</string>
+	<string>11741</string>
 	<key>TXBundleBuildReference</key>
-	<string>2.1.1-219-g0edd990-appstore,llvm4.0</string>
+	<string>2.1.1p2-220-g8033d99-debug,llvm4.0</string>
 </dict>
 </plist>