Merge branch 'master' of git://github.com/ksuther/MenuTunes

[MenuTunes.git] / PreferencesController.m

diff --git a/PreferencesController.m b/PreferencesController.m
index 106b9b6..2b1bbf8 100755 (executable)
--- a/PreferencesController.m
+++ b/PreferencesController.m
@@ -16,25 +16,11 @@
 #import <sys/types.h>
 #import <sys/stat.h>
 
 #import <sys/types.h>
 #import <sys/stat.h>
 

-#import <ITKit/ITLoginItem.h>
-
-#import <ITKit/ITHotKeyCenter.h>
-#import <ITKit/ITKeyCombo.h>
-#import <ITKit/ITKeyComboPanel.h>
-#import <ITKit/ITWindowPositioning.h>
-#import <ITKit/ITKeyBroadcaster.h>
-
+#import <ITKit/ITKit.h>

 #import <ITKit/ITTSWBackgroundView.h>
 #import <ITKit/ITTSWBackgroundView.h>

-#import <ITKit/ITWindowEffect.h>
-#import <ITKit/ITCutWindowEffect.h>
-#import <ITKit/ITDissolveWindowEffect.h>
-#import <ITKit/ITSlideHorizontallyWindowEffect.h>
-#import <ITKit/ITSlideVerticallyWindowEffect.h>
-#import <ITKit/ITPivotWindowEffect.h>
-

 
 #define SENDER_STATE (([sender state] == NSOnState) ? YES : NO)
 
 #define SENDER_STATE (([sender state] == NSOnState) ? YES : NO)

-#define AUDIOSCROBBLER_KEYCHAIN_SERVICE "MenuTunes: Audioscrobbler"
+#define AUDIOSCROBBLER_KEYCHAIN_SERVICE(user) [[NSString stringWithFormat:@"Audioscrobbler: %@", user] UTF8String]

 #define AUDIOSCROBBLER_KEYCHAIN_KIND "application password"
 
 /*************************************************************************/
 #define AUDIOSCROBBLER_KEYCHAIN_KIND "application password"
 
 /*************************************************************************/


@@ -98,8 +84,8 @@ static PreferencesController *prefs = nil;
        attributes[1].data = AUDIOSCROBBLER_KEYCHAIN_KIND;
        attributes[1].length = strlen(AUDIOSCROBBLER_KEYCHAIN_KIND);
        attributes[2].tag = kSecLabelItemAttr;
        attributes[1].data = AUDIOSCROBBLER_KEYCHAIN_KIND;
        attributes[1].length = strlen(AUDIOSCROBBLER_KEYCHAIN_KIND);
        attributes[2].tag = kSecLabelItemAttr;

-       attributes[2].data = AUDIOSCROBBLER_KEYCHAIN_SERVICE;
-       attributes[2].length = strlen(AUDIOSCROBBLER_KEYCHAIN_SERVICE);
+       attributes[2].data = (char *)AUDIOSCROBBLER_KEYCHAIN_SERVICE(user);
+       attributes[2].length = strlen(AUDIOSCROBBLER_KEYCHAIN_SERVICE(user));

        list.count = 3;
        list.attr = attributes;
 
        list.count = 3;
        list.attr = attributes;
 


@@ -145,8 +131,8 @@ static PreferencesController *prefs = nil;
        attributes[1].data = AUDIOSCROBBLER_KEYCHAIN_KIND;
        attributes[1].length = strlen(AUDIOSCROBBLER_KEYCHAIN_KIND);
        attributes[2].tag = kSecLabelItemAttr;
        attributes[1].data = AUDIOSCROBBLER_KEYCHAIN_KIND;
        attributes[1].length = strlen(AUDIOSCROBBLER_KEYCHAIN_KIND);
        attributes[2].tag = kSecLabelItemAttr;

-       attributes[2].data = AUDIOSCROBBLER_KEYCHAIN_SERVICE;
-       attributes[2].length = strlen(AUDIOSCROBBLER_KEYCHAIN_SERVICE);
+       attributes[2].data = (char *)AUDIOSCROBBLER_KEYCHAIN_SERVICE(user);
+       attributes[2].length = strlen(AUDIOSCROBBLER_KEYCHAIN_SERVICE(user));

        list.count = 3;
        list.attr = attributes;
 
        list.count = 3;
        list.attr = attributes;
 


@@ -176,7 +162,7 @@ static PreferencesController *prefs = nil;
        OSStatus status = errSecNotAvailable;
        SecKeychainItemRef item = [PreferencesController keychainItemForUser:user];
        if (item != nil) {
        OSStatus status = errSecNotAvailable;
        SecKeychainItemRef item = [PreferencesController keychainItemForUser:user];
        if (item != nil) {

-               status = SecKeychainItemModifyContent(item, NULL, [password length], [password cString]);
+               status = SecKeychainItemModifyContent(item, NULL, [password length], [password UTF8String]);

                if (status != noErr) {
                        ITDebugLog(@"Audioscrobbler: Error deleting keychain item: %i", status);
                }
                if (status != noErr) {
                        ITDebugLog(@"Audioscrobbler: Error deleting keychain item: %i", status);
                }


@@ -197,18 +183,15 @@ static PreferencesController *prefs = nil;
                if (status != noErr) {
                        ITDebugLog(@"Audioscrobbler: Error getting keychain item password: %i", status);
                } else {
                if (status != noErr) {
                        ITDebugLog(@"Audioscrobbler: Error getting keychain item password: %i", status);
                } else {

-                       if ([NSString respondsToSelector:@selector(stringWithCString:encoding:)]) {
-                               pass = [NSString stringWithCString:buffer encoding:NSASCIIStringEncoding];
-                       } else {
-                               pass = [NSString stringWithCString:buffer];
-                       }
+                       pass = [[NSString alloc] initWithBytes:buffer length:length encoding:NSUTF8StringEncoding];

                }
                if (status != noErr) {
                        ITDebugLog(@"Audioscrobbler: Error deleting keychain item: %i", status);
                }
                }
                if (status != noErr) {
                        ITDebugLog(@"Audioscrobbler: Error deleting keychain item: %i", status);
                }

+               SecKeychainItemFreeContent(NULL, buffer);

                CFRelease(item);
        }
                CFRelease(item);
        }

-       return pass;
+       return [pass autorelease];

 }
 
 /*************************************************************************/
 }
 
 /*************************************************************************/


@@ -239,6 +222,7 @@ static PreferencesController *prefs = nil;
                                                        @"Rewind",
                                                        @"ShowPlayer",
                                                        @"TrackInfo",
                                                        @"Rewind",
                                                        @"ShowPlayer",
                                                        @"TrackInfo",

+                                                                                                          @"AlbumArt",

                                                        @"UpcomingSongs",
                                                        @"IncrementVolume",
                                                        @"DecrementVolume",
                                                        @"UpcomingSongs",
                                                        @"IncrementVolume",
                                                        @"DecrementVolume",


@@ -263,6 +247,7 @@ static PreferencesController *prefs = nil;
                                                        @"Rewind",
                                                        @"Show Player",
                                                        @"Track Info",
                                                        @"Rewind",
                                                        @"Show Player",
                                                        @"Track Info",

+                                                                                                          @"Album Art",

                                                        @"Upcoming Songs",
                                                        @"Increment Volume",
                                                        @"Decrement Volume",
                                                        @"Upcoming Songs",
                                                        @"Increment Volume",
                                                        @"Decrement Volume",


@@ -272,12 +257,12 @@ static PreferencesController *prefs = nil;
                                                        @"Toggle Loop",
                                                                                                           @"Toggle Song Included In Shuffle",
                                                        @"Pop-up status menu",
                                                        @"Toggle Loop",
                                                                                                           @"Toggle Song Included In Shuffle",
                                                        @"Pop-up status menu",

-                                                       [NSString stringWithUTF8String:"Set Rating: â\80\9aòÃ\9câ\80\9aòÃ\9câ\80\9aòÃ\9câ\80\9aòÃ\9câ\80\9aòÃ\9c"],
-                                                       [NSString stringWithUTF8String:"Set Rating: â\80\9aòÃ\96â\80\9aòÃ\9câ\80\9aòÃ\9câ\80\9aòÃ\9câ\80\9aòÃ\9c"],
-                                                       [NSString stringWithUTF8String:"Set Rating: â\80\9aòÃ\96â\80\9aòÃ\96â\80\9aòÃ\9câ\80\9aòÃ\9câ\80\9aòÃ\9c"],
-                                                       [NSString stringWithUTF8String:"Set Rating: â\80\9aòÃ\96â\80\9aòÃ\96â\80\9aòÃ\96â\80\9aòÃ\9câ\80\9aòÃ\9c"],
-                                                       [NSString stringWithUTF8String:"Set Rating: â\80\9aòÃ\96â\80\9aòÃ\96â\80\9aòÃ\96â\80\9aòÃ\96â\80\9aòÃ\9c"],
-                                                       [NSString stringWithUTF8String:"Set Rating: â\80\9aòÃ\96â\80\9aòÃ\96â\80\9aòÃ\96â\80\9aòÃ\96â\80\9aòÃ\96"],
+                                                       [NSString stringWithUTF8String:"Set Rating: â\98\86â\98\86â\98\86â\98\86â\98\86"],
+                                                       [NSString stringWithUTF8String:"Set Rating: â\98\85â\98\86â\98\86â\98\86â\98\86"],
+                                                       [NSString stringWithUTF8String:"Set Rating: â\98\85â\98\85â\98\86â\98\86â\98\86"],
+                                                       [NSString stringWithUTF8String:"Set Rating: â\98\85â\98\85â\98\85â\98\86â\98\86"],
+                                                       [NSString stringWithUTF8String:"Set Rating: â\98\85â\98\85â\98\85â\98\85â\98\86"],
+                                                       [NSString stringWithUTF8String:"Set Rating: â\98\85â\98\85â\98\85â\98\85"],

                                                        nil];
         hotKeysDictionary = [[NSMutableDictionary alloc] init];
         controller = nil;
                                                        nil];
         hotKeysDictionary = [[NSMutableDictionary alloc] init];
         controller = nil;


@@ -418,7 +403,7 @@ static PreferencesController *prefs = nil;
             [showScriptsButton setEnabled:NO];
         }
     } else if ( [sender tag] == 1120) {
             [showScriptsButton setEnabled:NO];
         }
     } else if ( [sender tag] == 1120) {

-        mkdir([[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"] cString], 0744);
+        mkdir([[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"] UTF8String], 0744);

         [[NSWorkspace sharedWorkspace] openFile:[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"]];
     } else if ( [sender tag] == 6010) {
                //Toggle the other Audioscrobbler options
         [[NSWorkspace sharedWorkspace] openFile:[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"]];
     } else if ( [sender tag] == 6010) {
                //Toggle the other Audioscrobbler options