more preferences; update version number

scrod · Jan 2, 2011 · b9adb88 · b9adb88
1 parent fd6e027
commit b9adb88
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 3 deletions.
diff --git a/GlobalPrefs.h b/GlobalPrefs.h
@@ -109,6 +109,9 @@ extern NSString *NVPTFPboardType;
 - (void)setPastePreservesStyle:(BOOL)value sender:(id)sender;
 - (BOOL)pastePreservesStyle;
 
+- (void)setAutoFormatsDoneTag:(BOOL)value sender:(id)sender;
+- (BOOL)autoFormatsDoneTag;
+
 - (void)setLinksAutoSuggested:(BOOL)value sender:(id)sender;
 - (BOOL)linksAutoSuggested;
 
@@ -131,6 +134,9 @@ extern NSString *NVPTFPboardType;
 - (float)tableFontSize;
 - (void)setTableFontSize:(float)fontSize sender:(id)sender;
 
+- (void)setHorizontalLayout:(BOOL)value sender:(id)sender;
+- (BOOL)horizontalLayout;
+
 - (BOOL)autoCompleteSearches;
 - (void)setAutoCompleteSearches:(BOOL)value sender:(id)sender;
 

diff --git a/GlobalPrefs.m b/GlobalPrefs.m
@@ -45,6 +45,7 @@
 static NSString *QuitWhenClosingMainWindowKey = @"QuitWhenClosingMainWindow";
 static NSString *TabKeyIndentsKey = @"TabKeyIndents";
 static NSString *PastePreservesStyleKey = @"PastePreservesStyle";
+static NSString *AutoFormatsDoneTagKey = @"AutoFormatsDoneTag";
 static NSString *AutoSuggestLinksKey = @"AutoSuggestLinks";
 static NSString *HighlightSearchTermsKey = @"HighlightSearchTerms";
 static NSString *SearchTermHighlightColorKey = @"SearchTermHighlightColor";
@@ -56,6 +57,7 @@
 static NSString *MakeURLsClickableKey = @"MakeURLsClickable";
 static NSString *AppActivationKeyCodeKey = @"AppActivationKeyCode";
 static NSString *AppActivationModifiersKey = @"AppActivationModifiers";
+static NSString *HorizontalLayoutKey = @"HorizontalLayout";
 static NSString *BookmarksKey = @"Bookmarks";
 static NSString *LastScrollOffsetKey = @"LastScrollOffset";
 static NSString *LastSearchStringKey = @"LastSearchString";
@@ -97,7 +99,8 @@ - (id)init {
 		tableColumns = nil;
 
 		[defaults registerDefaults:[NSDictionary dictionaryWithObjectsAndKeys:
-			[NSNumber numberWithBool:NO], AutoSuggestLinksKey,
+			[NSNumber numberWithBool:YES], AutoSuggestLinksKey,
+			[NSNumber numberWithBool:YES], AutoFormatsDoneTagKey, 
 			[NSNumber numberWithBool:NO], UseSoftTabsKey,
 			[NSNumber numberWithInt:4], NumberOfSpacesInTabKey,
 			[NSNumber numberWithBool:YES], PastePreservesStyleKey,
@@ -109,6 +112,7 @@ - (id)init {
 			[NSNumber numberWithBool:YES], QuitWhenClosingMainWindowKey, 
 			[NSNumber numberWithBool:NO], TriedToImportBlorKey,
 			[NSNumber numberWithBool:NO], DrawFocusRingKey,
+			[NSNumber numberWithBool:NO], HorizontalLayoutKey,
 			[NSNumber numberWithBool:YES], MakeURLsClickableKey,
 			[NSNumber numberWithBool:YES], TableColumnsHaveBodyPreviewKey, 
 			[NSNumber numberWithDouble:0.0], LastScrollOffsetKey,
@@ -331,6 +335,15 @@ - (BOOL)pastePreservesStyle {
     return [defaults boolForKey:PastePreservesStyleKey];
 }
 
+- (void)setAutoFormatsDoneTag:(BOOL)value sender:(id)sender {
+    [defaults setBool:value forKey:AutoFormatsDoneTagKey];
+
+	SEND_CALLBACKS();
+}
+- (BOOL)autoFormatsDoneTag {
+	return [defaults boolForKey:AutoFormatsDoneTagKey];
+}
+
 - (void)setLinksAutoSuggested:(BOOL)value sender:(id)sender {
     [defaults setBool:value forKey:AutoSuggestLinksKey];
 
@@ -486,6 +499,8 @@ - (NSDictionary*)noteBodyAttributes {
 		noteBodyAttributes = [[NSDictionary dictionaryWithObjectsAndKeys:bodyFont, NSFontAttributeName, 
 			[self foregroundTextColor], NSForegroundColorAttributeName,
 			/* background text color is handled directly by the NSTextView subclass and so does not need to be stored here */
+							   /*NSTextWritingDirectionEmbedding*/
+			//[NSArray arrayWithObjects:[NSNumber numberWithInt:0], [NSNumber numberWithInt:0], nil], @"NSWritingDirection", //for auto-LTR-RTL text
 		monospace ? [self noteBodyParagraphStyle] : nil, NSParagraphStyleAttributeName, nil] retain];
 	}
 	return noteBodyAttributes;
@@ -621,6 +636,15 @@ - (BOOL)tableIsReverseSorted {
     return [defaults boolForKey:TableIsReverseSortedKey];
 }
 
+- (void)setHorizontalLayout:(BOOL)value sender:(id)sender {
+	[defaults setBool:value forKey:HorizontalLayoutKey];
+
+	SEND_CALLBACKS();
+}
+- (BOOL)horizontalLayout {
+	return [defaults boolForKey:HorizontalLayoutKey];
+}
+
 - (NSString*)lastSelectedPreferencesPane {
 	return [defaults stringForKey:LastSelectedPreferencesPaneKey];
 }

diff --git a/Info.plist b/Info.plist
@@ -132,7 +132,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Notational Velocity</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.0 β3, Copyright © 2010 Zachary Schneirov, All Rights Reserved.</string>
+	<string>2.0 β4, Copyright © 2010 Zachary Schneirov, All Rights Reserved.</string>
 	<key>CFBundleIconFile</key>
 	<string>Notality</string>
 	<key>CFBundleIdentifier</key>
@@ -142,7 +142,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0 β3</string>
+	<string>2.0 β4</string>
 	<key>CFBundleSignature</key>
 	<string>N†l√</string>
 	<key>CFBundleVersion</key>