Skip to content

Commit

Permalink
remove mandatory softtabs preference for simplenote; the benefit of s…
Browse files Browse the repository at this point in the history
…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
Zachary Schneirov committed Feb 1, 2010
1 parent 47bc9a4 commit aa3bfb1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Expand Up @@ -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
2 changes: 0 additions & 2 deletions NotationPrefs.m
Expand Up @@ -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];
}
Expand Down
6 changes: 0 additions & 6 deletions PrefsWindowController.m
Expand Up @@ -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"
Expand All @@ -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;
}
Expand Down Expand Up @@ -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]];
}
}

Expand Down Expand Up @@ -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];
Expand Down

0 comments on commit aa3bfb1

Please sign in to comment.