Log's should be stored in ~/Logs and not user customizable

bakerma07 · Feb 18, 2012 · db12a15 · db12a15
1 parent 3cf9e5f
commit db12a15
Show file tree

Hide file tree

Showing 7 changed files with 1,697 additions and 1,901 deletions.
diff --git a/Classes/Controllers/MenuController.m b/Classes/Controllers/MenuController.m
@@ -1488,7 +1488,7 @@ - (void)onMemberShun:(id)sender
 
 - (void)onWantToReadTextualLogs:(id)sender
 {	
-	NSString *path = [[Preferences transcriptFolder] stringByExpandingTildeInPath];
+	NSString *path = [NSHomeDirectory() stringByAppendingPathComponent:@"Logs"];
 
 	if ([_NSFileManager() fileExistsAtPath:path]) {
 		[_NSWorkspace() openURL:[NSURL fileURLWithPath:path]];

diff --git a/Classes/Dialogs/Preferences/PreferencesController.m b/Classes/Dialogs/Preferences/PreferencesController.m
@@ -11,7 +11,6 @@
 #define ADDONS_TOOLBAR_ITEM_INDEX	8
 
 @interface PreferencesController (Private)
-- (void)updateTranscriptFolder;
 - (void)updateTheme;
 - (void)updateAlert;
 
@@ -50,7 +49,6 @@ @implementation PreferencesController
 @synthesize alertButton;
 @synthesize alertSoundButton;
 @synthesize highlightNicknameButton;
-@synthesize transcriptFolderButton;
 @synthesize addExcludeWordButton;
 @synthesize useGrowlButton;
 @synthesize disableAlertWhenAwayButton;
@@ -102,7 +100,6 @@ - (void)show
 	installedScriptsTable.dataSource = scriptsController;
 	[installedScriptsTable reloadData];
 
-	[self updateTranscriptFolder];
 	[self updateTheme];
     [self updateAlert];
 
@@ -393,48 +390,6 @@ - (NSMutableArray *)sounds
 	return sounds;
 }
 
-#pragma mark -
-#pragma mark Transcript Folder Popup
-
-- (void)updateTranscriptFolder
-{
-	NSString *path = [[Preferences transcriptFolder] stringByExpandingTildeInPath];
-
-	NSImage *icon = [_NSWorkspace() iconForFile:path];
-	[icon setSize:NSMakeSize(16, 16)];
-
-	NSMenuItem *item = [transcriptFolderButton itemAtIndex:0];
-
-	[item setTitle:[[path lastPathComponent] decodeURIFragement]];
-	[item setImage:icon];
-}
-
-- (void)onTranscriptFolderChanged:(id)sender
-{
-	if ([transcriptFolderButton selectedTag] == 2) {
-		NSOpenPanel *d = [NSOpenPanel openPanel];
-
-		[d setCanChooseFiles:NO];
-		[d setCanChooseDirectories:YES];
-		[d setResolvesAliases:YES];
-		[d setAllowsMultipleSelection:NO];
-		[d setCanCreateDirectories:YES];
-
-		[d beginSheetModalForWindow:[NSApp keyWindow] completionHandler:^(NSInteger returnCode) {
-			[transcriptFolderButton selectItem:[transcriptFolderButton itemAtIndex:0]];
-
-			if (returnCode == NSOKButton) {
-				NSURL *pathURL = [[d URLs] safeObjectAtIndex:0];
-				NSString *path = [pathURL path];
-
-				[Preferences setTranscriptFolder:[path stringByAbbreviatingWithTildeInPath]];
-
-				[self updateTranscriptFolder];
-			}
-		}];
-	}
-}
-
 #pragma mark -
 #pragma mark Theme
 

diff --git a/Classes/Headers/Preferences.h b/Classes/Headers/Preferences.h
@@ -155,9 +155,6 @@ typedef enum {
 + (NSInteger)maxLogLines;
 + (void)setMaxLogLines:(NSInteger)value;
 
-+ (NSString *)transcriptFolder;
-+ (void)setTranscriptFolder:(NSString *)value;
-
 + (BOOL)stopGrowlOnActive;
 
 + (NSString *)titleForEvent:(GrowlNotificationType)event;

diff --git a/Classes/Headers/PreferencesController.h b/Classes/Headers/PreferencesController.h
@@ -38,7 +38,6 @@
 	IBOutlet NSArrayController *keywordsArrayController;
 	IBOutlet NSArrayController *excludeWordsArrayController;
 
-	IBOutlet NSPopUpButton *transcriptFolderButton;
 	IBOutlet NSPopUpButton *themeButton;
     IBOutlet NSPopUpButton *alertButton;
 	IBOutlet NSPopUpButton *alertSoundButton;
@@ -83,7 +82,6 @@
 @property (nonatomic, retain) NSTableView *installedScriptsTable;
 @property (nonatomic, retain) NSArrayController *keywordsArrayController;
 @property (nonatomic, retain) NSArrayController *excludeWordsArrayController;
-@property (nonatomic, retain) NSPopUpButton *transcriptFolderButton;
 @property (nonatomic, retain) NSPopUpButton *themeButton;
 @property (nonatomic, retain) NSPopUpButton *alertButton;
 @property (nonatomic, retain) NSPopUpButton *alertSoundButton;
@@ -108,7 +106,6 @@
 - (void)onOpenPathToThemes:(id)sender;
 - (void)onOpenPathToScripts:(id)sender;
 - (void)onChangedTransparency:(id)sender;
-- (void)onTranscriptFolderChanged:(id)sender;
 - (void)onHighlightLoggingChanged:(id)sender;
 - (void)onChangeAlert:(id)sender;
 - (void)onUseGrowl:(id)sender;

diff --git a/Classes/Library/FileLogger.m b/Classes/Library/FileLogger.m
@@ -91,7 +91,7 @@ - (void)open
 
 - (NSString *)buildPath
 {
-	NSString *base = [[Preferences transcriptFolder] stringByExpandingTildeInPath];
+	NSString *base = [NSHomeDirectory() stringByAppendingPathComponent:@"Logs"];
 
 	NSString *serv = [[client name] safeFileName];
 	NSString *chan = [[channel name] safeFileName];

diff --git a/Classes/Preferences/Preferences.m b/Classes/Preferences/Preferences.m
@@ -583,19 +583,6 @@ + (void)setMaxLogLines:(NSInteger)value
 	[_NSUserDefaults() setInteger:value forKey:@"Preferences.General.max_log_lines"];
 }
 
-#pragma mark -
-#pragma mark Transcript Folder
-
-+ (NSString *)transcriptFolder
-{
-	return [_NSUserDefaults() objectForKey:@"Preferences.General.transcript_folder"];
-}
-
-+ (void)setTranscriptFolder:(NSString *)value
-{
-	[_NSUserDefaults() setObject:value forKey:@"Preferences.General.transcript_folder"];
-}
-
 #pragma mark -
 #pragma mark Events
 
@@ -1023,7 +1010,6 @@ + (void)initPreferences
 	[d setObject:DEFAULT_TEXTUAL_FONT			forKey:@"Preferences.Theme.log_font_name"];
 	[d setObject:@"<%@%n>"						forKey:@"Preferences.Theme.nick_format"];
 	[d setObject:@"[%H:%M:%S]"					forKey:@"Preferences.Theme.timestamp_format"];
-	[d setObject:@"~/Documents/Textual Logs"	forKey:@"Preferences.General.transcript_folder"];
 
 	[d setInteger:5							forKey:@"Preferences.General.autojoin_maxchans"];
 	[d setInteger:300						forKey:@"Preferences.General.max_log_lines"];