Organise more! Part 3

Author: npyl

Manage Conky/ConkyPreferencesSheetController.m

@@ -79,7 +79,7 @@ - (void)initStuff
     {
         /* first try to read already written information */
 
-        _searchLocationsTableContents = [[[NSUserDefaults standardUserDefaults] objectForKey:@"additionalSearchPaths"] mutableCopy];
+        _searchLocationsTableContents = [[MCSettings sharedSettings] additionalSearchPaths];
 
         if (!_searchLocationsTableContents)
             _searchLocationsTableContents = [NSMutableArray array];
@@ -100,7 +100,7 @@ - (void)initStuff
         /*
          * Conky configsLocation textfield
          */
-        NSString *conkyConfigsPath = [[NSUserDefaults standardUserDefaults] objectForKey:@"configsLocation"];
+        NSString *conkyConfigsPath = [[MCSettings sharedSettings] configsLocation];
         [_conkyConfigLocationTextfield setStringValue:conkyConfigsPath];
         _oldConfigsLocation = _conkyConfigLocationTextfield.stringValue;
 
@@ -320,6 +320,8 @@ - (void)controlTextDidChange:(NSNotification *)obj
 {
     NSString *senderID = [[obj object] identifier];
 
+    // XXX id should be a define...
+    
     if ([senderID isEqualToString:@"startupDelayField"])
     {
         [self enableMustInstallAgentMode];
@@ -421,12 +423,9 @@ - (IBAction)applyChanges:(id)sender
             shownX11TakesAlotTimeWarning = YES;
         }
 
-        [MCSettingsHolder setConkyRunsAtStartup:YES];
-        
-        [[NSUserDefaults standardUserDefaults] setObject:[NSNumber numberWithBool:keepAlive]
-                                                  forKey:@"keepAlive"];
-        [[NSUserDefaults standardUserDefaults] setObject:[NSNumber numberWithInteger:startupDelay_]
-                                                  forKey:@"startupDelay"];
+        [[MCSettings sharedSettings] setConkyRunsAtStartup:YES];
+        [[MCSettings sharedSettings] setKeepAliveConky:keepAlive];
+        [[MCSettings sharedSettings] setConkyStartupDelay:startupDelay_];
 
         [[NSApp mainWindow] setDocumentEdited:NO];
     }

Manage Conky/MCObjects/MCObjects.m

@@ -17,7 +17,7 @@
  * Check if Xquartz and conky are installed
  * and if not, show an alert and return NO.
  */
-BOOL isXquartzAndConkyInstalled()
+BOOL isXquartzAndConkyInstalled(void)
 {
     BOOL res1 = (access(XQUARTZ, R_OK) == 0);
     BOOL res2 = (access(CONKY_SYMLINK.UTF8String, R_OK) == 0);
@@ -65,8 +65,7 @@ + (instancetype)sharedSettings
 
 - (void)setConkyRunsAtStartup:(BOOL)a
 {
-    [[NSUserDefaults standardUserDefaults] setObject:[NSNumber numberWithBool:a]
-                                              forKey:kMCRunConkyAtStartupKey];
+    [[NSUserDefaults standardUserDefaults] setObject:[NSNumber numberWithBool:a] forKey:kMCRunConkyAtStartupKey];
 }
 - (BOOL)conkyRunsAtStartup
 {
@@ -75,8 +74,7 @@ - (BOOL)conkyRunsAtStartup
 
 - (void)setKeepAliveConky:(BOOL)a
 {
-    [[NSUserDefaults standardUserDefaults] setObject:[NSNumber numberWithBool:a]
-                                              forKey:kMCKeepAliveConkyKey];
+    [[NSUserDefaults standardUserDefaults] setObject:[NSNumber numberWithBool:a] forKey:kMCKeepAliveConkyKey];
 }
 - (BOOL)keepAliveConky
 {
@@ -85,8 +83,7 @@ - (BOOL)keepAliveConky
 
 - (void)setConkyStartupDelay:(NSInteger)startupDelay
 {
-    [[NSUserDefaults standardUserDefaults] setObject:[NSNumber numberWithInteger:startupDelay]
-                                              forKey:kMCConkyStartupDelayKey];
+    [[NSUserDefaults standardUserDefaults] setObject:[NSNumber numberWithInteger:startupDelay] forKey:kMCConkyStartupDelayKey];
 }
 - (NSInteger)conkyStartupDelay
 {
@@ -95,8 +92,7 @@ - (NSInteger)conkyStartupDelay
 
 - (void)setConfigsLocation:(NSString *)a
 {
-    [[NSUserDefaults standardUserDefaults] setObject:a
-                                              forKey:kMCConkyConfigsLocationKey];
+    [[NSUserDefaults standardUserDefaults] setObject:a forKey:kMCConkyConfigsLocationKey];
 }
 - (NSString *)configsLocation
 {
@@ -773,14 +769,14 @@ - (void)enable
      */
     for (NSString *config in _conkyConfigs)
     {
+        NSString *correctedConfig = MCNormalise(config);
         NSString *configName = [[config lastPathComponent] stringByReplacingOccurrencesOfString:@" " withString:@"_"];
         NSString *label = [NSString stringWithFormat:@"org.npyl.ManageConky.Theme.%@", configName];
         NSString *workingDirectory = [config stringByDeletingLastPathComponent];
         const BOOL keepAlive = YES;
+
         NSError *error = nil;
-        
-        NSString *correctedConfig = MCNormalise(config);
-        
+
         createLaunchAgent(label,
                           @[CONKY_SYMLINK, @"-c", correctedConfig],
                           keepAlive,

Manage Conky/ViewController.m

@@ -539,9 +539,7 @@ - (IBAction)ignore:(id)sender
     if (error)
         NSLog(@"ignore: %@", error);
 
-    [self emptyWidgetsThemesArrays];
-    [self fillWidgetsThemesArrays];
-    [_widgetsThemesTable reloadData];
+    [self updateWidgetsThemesArray];
 }
 
 - (IBAction)openInFinder:(id)sender