mirror of
				https://github.com/arsenetar/dupeguru.git
				synced 2025-09-11 17:58:17 +00:00 
			
		
		
		
	Re-organized the definition of prefs default values.
By doing so, I also fixed a bug where DebugMode and CustomCommand prefs weren't correctly reset.
This commit is contained in:
		
							parent
							
								
									a2553da578
								
							
						
					
					
						commit
						caf04f0d3f
					
				| @ -37,6 +37,7 @@ http://www.hardcoded.net/licenses/bsd_license | ||||
| @property (readwrite, retain) SUUpdater *updater; | ||||
| 
 | ||||
| /* Virtual */ | ||||
| + (NSDictionary *)defaultPreferences; | ||||
| - (PyDupeGuru *)model; | ||||
| - (ResultWindowBase *)createResultWindow; | ||||
| - (DirectoryPanel *)createDirectoryPanel; | ||||
|  | ||||
| @ -12,6 +12,7 @@ http://www.hardcoded.net/licenses/bsd_license | ||||
| #import "HSPyUtil.h" | ||||
| #import "Consts.h" | ||||
| #import "Dialogs.h" | ||||
| #import "Utils.h" | ||||
| #import "ValueTransformers.h" | ||||
| #import "PreferencesPanel_UI.h" | ||||
| 
 | ||||
| @ -21,10 +22,30 @@ http://www.hardcoded.net/licenses/bsd_license | ||||
| @synthesize columnsMenu; | ||||
| @synthesize updater; | ||||
| 
 | ||||
| + (NSDictionary *)defaultPreferences | ||||
| { | ||||
|     NSMutableDictionary *d = [NSMutableDictionary dictionary]; | ||||
|     [d setObject:i2n(1) forKey:@"recreatePathType"]; | ||||
|     [d setObject:i2n(11) forKey:TableFontSize]; | ||||
|     [d setObject:b2n(YES) forKey:@"mixFileKind"]; | ||||
|     [d setObject:b2n(NO) forKey:@"useRegexpFilter"]; | ||||
|     [d setObject:b2n(NO) forKey:@"ignoreHardlinkMatches"]; | ||||
|     [d setObject:b2n(NO) forKey:@"removeEmptyFolders"]; | ||||
|     [d setObject:b2n(NO) forKey:@"DebugMode"]; | ||||
|     [d setObject:@"" forKey:@"CustomCommand"]; | ||||
|     [d setObject:[NSArray array] forKey:@"recentDirectories"]; | ||||
|     [d setObject:[NSArray array] forKey:@"columnsOrder"]; | ||||
|     [d setObject:[NSDictionary dictionary] forKey:@"columnsWidth"]; | ||||
|     return d; | ||||
| } | ||||
| 
 | ||||
| + (void)initialize | ||||
| { | ||||
|     HSVTAdd *vt = [[[HSVTAdd alloc] initWithValue:4] autorelease]; | ||||
|     [NSValueTransformer setValueTransformer:vt forName:@"vtRowHeightOffset"]; | ||||
|     NSDictionary *d = [self defaultPreferences]; | ||||
|     [[NSUserDefaultsController sharedUserDefaultsController] setInitialValues:d]; | ||||
|     [[NSUserDefaults standardUserDefaults] registerDefaults:d]; | ||||
| } | ||||
| 
 | ||||
| - (id)init | ||||
|  | ||||
| @ -17,33 +17,20 @@ http://www.hardcoded.net/licenses/bsd_license | ||||
| #import "Consts.h" | ||||
| 
 | ||||
| @implementation AppDelegate | ||||
| + (void)initialize | ||||
| + (NSDictionary *)defaultPreferences | ||||
| { | ||||
|     [super initialize]; | ||||
|     NSUserDefaults *ud = [NSUserDefaults standardUserDefaults]; | ||||
|     NSMutableDictionary *d = [NSMutableDictionary dictionaryWithCapacity:10]; | ||||
|     NSMutableDictionary *d = [NSMutableDictionary dictionaryWithDictionary:[super defaultPreferences]]; | ||||
|     [d setObject:i2n(3) forKey:@"scanType"]; | ||||
|     [d setObject:i2n(80) forKey:@"minMatchPercentage"]; | ||||
|     [d setObject:i2n(1) forKey:@"recreatePathType"]; | ||||
|     [d setObject:i2n(11) forKey:TableFontSize]; | ||||
|     [d setObject:b2n(NO) forKey:@"wordWeighting"]; | ||||
|     [d setObject:b2n(NO) forKey:@"matchSimilarWords"]; | ||||
|     [d setObject:b2n(YES) forKey:@"mixFileKind"]; | ||||
|     [d setObject:b2n(NO) forKey:@"useRegexpFilter"]; | ||||
|     [d setObject:b2n(NO) forKey:@"ignoreHardlinkMatches"]; | ||||
|     [d setObject:b2n(NO) forKey:@"removeEmptyFolders"]; | ||||
|     [d setObject:b2n(NO) forKey:@"debug"]; | ||||
|     [d setObject:b2n(NO) forKey:@"scanTagTrack"]; | ||||
|     [d setObject:b2n(YES) forKey:@"scanTagArtist"]; | ||||
|     [d setObject:b2n(YES) forKey:@"scanTagAlbum"]; | ||||
|     [d setObject:b2n(YES) forKey:@"scanTagTitle"]; | ||||
|     [d setObject:b2n(NO) forKey:@"scanTagGenre"]; | ||||
|     [d setObject:b2n(NO) forKey:@"scanTagYear"]; | ||||
|     [d setObject:[NSArray array] forKey:@"recentDirectories"]; | ||||
|     [d setObject:[NSArray array] forKey:@"columnsOrder"]; | ||||
|     [d setObject:[NSDictionary dictionary] forKey:@"columnsWidth"]; | ||||
|     [[NSUserDefaultsController sharedUserDefaultsController] setInitialValues:d]; | ||||
|     [ud registerDefaults:d]; | ||||
|     return d; | ||||
| } | ||||
| 
 | ||||
| - (id)init | ||||
|  | ||||
| @ -16,26 +16,13 @@ http://www.hardcoded.net/licenses/bsd_license | ||||
| #import "ResultWindow.h" | ||||
| 
 | ||||
| @implementation AppDelegate | ||||
| + (void)initialize | ||||
| + (NSDictionary *)defaultPreferences | ||||
| { | ||||
|     [super initialize]; | ||||
|     NSUserDefaults *ud = [NSUserDefaults standardUserDefaults]; | ||||
|     NSMutableDictionary *d = [NSMutableDictionary dictionaryWithCapacity:10]; | ||||
|     NSMutableDictionary *d = [NSMutableDictionary dictionaryWithDictionary:[super defaultPreferences]]; | ||||
|     [d setObject:i2n(0) forKey:@"scanType"]; | ||||
|     [d setObject:i2n(95) forKey:@"minMatchPercentage"]; | ||||
|     [d setObject:i2n(1) forKey:@"recreatePathType"]; | ||||
|     [d setObject:i2n(11) forKey:TableFontSize]; | ||||
|     [d setObject:b2n(NO) forKey:@"matchScaled"]; | ||||
|     [d setObject:b2n(YES) forKey:@"mixFileKind"]; | ||||
|     [d setObject:b2n(NO) forKey:@"useRegexpFilter"]; | ||||
|     [d setObject:b2n(NO) forKey:@"ignoreHardlinkMatches"]; | ||||
|     [d setObject:b2n(NO) forKey:@"removeEmptyFolders"]; | ||||
|     [d setObject:b2n(NO) forKey:@"debug"]; | ||||
|     [d setObject:[NSArray array] forKey:@"recentDirectories"]; | ||||
|     [d setObject:[NSArray array] forKey:@"columnsOrder"]; | ||||
|     [d setObject:[NSDictionary dictionary] forKey:@"columnsWidth"]; | ||||
|     [[NSUserDefaultsController sharedUserDefaultsController] setInitialValues:d]; | ||||
|     [ud registerDefaults:d]; | ||||
|     return d; | ||||
| } | ||||
| 
 | ||||
| - (id)init | ||||
|  | ||||
| @ -16,29 +16,16 @@ http://www.hardcoded.net/licenses/bsd_license | ||||
| #import "Consts.h" | ||||
| 
 | ||||
| @implementation AppDelegate | ||||
| + (void)initialize | ||||
| + (NSDictionary *)defaultPreferences | ||||
| { | ||||
|     [super initialize]; | ||||
|     NSUserDefaults *ud = [NSUserDefaults standardUserDefaults]; | ||||
|     NSMutableDictionary *d = [NSMutableDictionary dictionary]; | ||||
|     NSMutableDictionary *d = [NSMutableDictionary dictionaryWithDictionary:[super defaultPreferences]]; | ||||
|     [d setObject:i2n(1) forKey:@"scanType"]; | ||||
|     [d setObject:i2n(80) forKey:@"minMatchPercentage"]; | ||||
|     [d setObject:i2n(30) forKey:@"smallFileThreshold"]; | ||||
|     [d setObject:i2n(1) forKey:@"recreatePathType"]; | ||||
|     [d setObject:i2n(11) forKey:TableFontSize]; | ||||
|     [d setObject:b2n(YES) forKey:@"wordWeighting"]; | ||||
|     [d setObject:b2n(NO) forKey:@"matchSimilarWords"]; | ||||
|     [d setObject:b2n(YES) forKey:@"mixFileKind"]; | ||||
|     [d setObject:b2n(NO) forKey:@"useRegexpFilter"]; | ||||
|     [d setObject:b2n(NO) forKey:@"ignoreHardlinkMatches"]; | ||||
|     [d setObject:b2n(NO) forKey:@"removeEmptyFolders"]; | ||||
|     [d setObject:b2n(YES) forKey:@"ignoreSmallFiles"]; | ||||
|     [d setObject:b2n(NO) forKey:@"debug"]; | ||||
|     [d setObject:[NSArray array] forKey:@"recentDirectories"]; | ||||
|     [d setObject:[NSArray array] forKey:@"columnsOrder"]; | ||||
|     [d setObject:[NSDictionary dictionary] forKey:@"columnsWidth"]; | ||||
|     [[NSUserDefaultsController sharedUserDefaultsController] setInitialValues:d]; | ||||
|     [ud registerDefaults:d]; | ||||
|     return d; | ||||
| } | ||||
| 
 | ||||
| - (id)init | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user