Properly disable indentation and fix color of Simplified Light.

bakerma07 · Jul 27, 2012 · 5ac3028 · 5ac3028
1 parent 4604582
commit 5ac3028
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/Classes/Preferences/Themes/TPCOtherTheme.m b/Classes/Preferences/Themes/TPCOtherTheme.m
@@ -39,7 +39,7 @@
 
 @interface TPCOtherTheme ()
 @property (nonatomic, strong) NSDictionary *styleSettings;
-@property (nonatomic, strong) GRMustacheTemplateRepository *templateRepository;
+@property (nonatomic, strong) GRMustacheTemplateRepository *styleTemplateRepository;
 @property (nonatomic, strong) GRMustacheTemplateRepository *appTemplateRepository;
 @end
 
@@ -61,7 +61,7 @@ - (NSColor *)colorForKey:(NSString *)key
 	NSString *hexValue = [self.styleSettings objectForKey:key];
 
 	if ([hexValue length] == 7 || [hexValue length] == 4) {
-		[NSColor fromCSS:hexValue];
+		return [NSColor fromCSS:hexValue];
 	}
 
 	return nil;
@@ -121,7 +121,7 @@ - (GRMustacheTemplate *)templateWithName:(NSString *)name
 {
 	NSError *load_error;
 
-	GRMustacheTemplate *tmpl = [self.templateRepository templateForName:name error:&load_error];
+	GRMustacheTemplate *tmpl = [self.styleTemplateRepository templateForName:name error:&load_error];
 
 	if (PointerIsEmpty(tmpl) || load_error) {
 		if (load_error.code == GRMustacheErrorCodeTemplateNotFound || load_error.code == 260) {
@@ -151,9 +151,9 @@ - (void)reload
 
 	dictPath = [self.path stringByAppendingPathComponent:@"/Data/Templates"];
 
-	self.templateRepository = [GRMustacheTemplateRepository templateRepositoryWithBaseURL:[NSURL fileURLWithPath:dictPath]];
+	self.styleTemplateRepository = [GRMustacheTemplateRepository templateRepositoryWithBaseURL:[NSURL fileURLWithPath:dictPath]];
 
-	if (PointerIsEmpty(self.templateRepository)) {
+	if (PointerIsEmpty(self.styleTemplateRepository)) {
 		exit(10);
 	}
 
@@ -192,6 +192,10 @@ - (void)reload
 
 	self.indentationOffset			= [self doubleForKey:@"Indentation Offset"];
 
+	if (self.indentationOffset <= 0.0) {
+		self.indentationOffset = TXThemeDisabledIndentationOffset;
+	}
+
 	// ---- //
 
 	[[_NSUserDefaultsController() values] setValue:@(NSObjectIsEmpty(self.nicknameFormat))				forKey:@"Theme -> Nickname Format Preference Enabled"];

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>12117</string>
+	<string>12124</string>
 	<key>TXBundleBuildReference</key>
-	<string>2.1.1-262-g1b17433-appstore</string>
+	<string>2.1.1-263-g4604582-debug</string>
 </dict>
 </plist>
diff --git a/Resources/Styles/Styles/Simplified Dark/Data/Settings/styleSettings.plist b/Resources/Styles/Styles/Simplified Dark/Data/Settings/styleSettings.plist
@@ -16,6 +16,6 @@
 	<key>Indentation Offset</key>
 	<integer>6</integer>
 	<key>Underlying Window Color</key>
-	<string>#000000</string>
+	<string>#FFFFFF</string>
 </dict>
 </plist>