Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

remove mandatory softtabs preference for simplenote; the benefit of s…

…eeing how your note will be modified before being uploaded is outweighed by the annoyance of using soft tabs with proportional fonts; users can always enable it selectively in any case
  • Loading branch information...
commit aa3bfb130c9d45dbd5b374ea4b41dfa870e5ff07 1 parent 47bc9a4
Zachary Schneirov authored
Showing with 4 additions and 8 deletions.
  1. +4 −0 .gitignore
  2. +0 −2  NotationPrefs.m
  3. +0 −6 PrefsWindowController.m
View
4 .gitignore
@@ -7,3 +7,7 @@ build/*
# Mac OS X specific
.DS_Store
profile
+English.lproj/MainMenu~.nib/classes.nib
+English.lproj/MainMenu~.nib/data.dependency
+English.lproj/MainMenu~.nib/info.nib
+English.lproj/MainMenu~.nib/keyedobjects.nib
View
2  NotationPrefs.m
@@ -643,8 +643,6 @@ - (void)setSyncEnabled:(BOOL)isEnabled forService:(NSString*)serviceName {
if ([self syncServiceIsEnabled:serviceName] != isEnabled) {
[accountDict setObject:[NSNumber numberWithBool:isEnabled] forKey:@"enabled"];
- //simplenote iPhone app cannot handle tabs
- [[GlobalPrefs defaultPrefs] setSoftTabs: isEnabled ? YES : [[GlobalPrefs defaultPrefs] softTabs] sender:self];
preferencesChanged = YES;
[delegate syncSettingsChangedForService:serviceName];
}
View
6 PrefsWindowController.m
@@ -3,7 +3,6 @@
#import "PTKeyCombo.h"
#import "NotationPrefsViewController.h"
#import "NSData_transformations.h"
-#import "SimplenoteSession.h"
#import "NSString_NV.h"
#import "NotationPrefs.h"
#import "GlobalPrefs.h"
@@ -21,7 +20,6 @@ - (id)init {
[prefsController registerForSettingChange:@selector(resolveNoteBodyFontFromNotationPrefsFromSender:) withTarget:self];
[prefsController registerForSettingChange:@selector(setCheckSpellingAsYouType:sender:) withTarget:self];
- [prefsController registerForSettingChange:@selector(setSoftTabs:sender:) withTarget:self];
}
return self;
}
@@ -204,9 +202,6 @@ - (void)settingChangedForSelectorString:(NSString*)selectorString {
[self previewNoteBodyFont];
} else if ([selectorString isEqualToString:SEL_STR(setCheckSpellingAsYouType:sender:)]) {
[checkSpellingButton setState:[prefsController checkSpellingAsYouType]];
- } else if ([selectorString isEqualToString:SEL_STR(setSoftTabs:sender:)]) {
- [softTabsButton setState:[prefsController softTabs]];
- [softTabsButton setEnabled:![[prefsController notationPrefs] syncServiceIsEnabled:SimplenoteServiceName]];
}
}
@@ -361,7 +356,6 @@ - (void)awakeFromNib {
[styledTextButton setState:[prefsController pastePreservesStyle]];
[autoSuggestLinksButton setState:[prefsController linksAutoSuggested]];
[softTabsButton setState:[prefsController softTabs]];
- [softTabsButton setEnabled:![[prefsController notationPrefs] syncServiceIsEnabled:SimplenoteServiceName]];
[makeURLsClickable setState:[prefsController URLsAreClickable]];
[searchHighlightColorWell setColor:[prefsController searchTermHighlightColor]];
[self previewNoteBodyFont];
Please sign in to comment.
Something went wrong with that request. Please try again.