Add a waiting Alert for Last.fm 's auth.

liaogang · liaogang · commit 76f5fa007f15 · 2015-03-23T17:30:59.000+06:00
diff --git a/Last.fm b/Last.fm
@@ -1 +1 @@
-Subproject commit 3d84e016f6b1f4078e26340ace08c10d53bf53fe
+Subproject commit 431263e767771362c8f3765eccd00969fcac8ae6
diff --git a/Preferences/AccountPreferences.mm b/Preferences/AccountPreferences.mm
@@ -99,15 +99,32 @@ - (IBAction)actionConnect:(id)sender
     }
     else
     {
+        NSAlert *alert = [[NSAlert alloc]init];
+        [alert setMessageText: NSLocalizedString(@"uPlayer is 'Waiting' for your authorization",nil ) ];
+        [alert setInformativeText: NSLocalizedString(@"Switch to the web instanse just opened and login in to allow uPlayer for scrobbling songs",nil) ];
+        [alert addButtonWithTitle: NSLocalizedString(@"Abort", nil)];
+        
+        __block bool stopAuth = false;
+        
         dojobInBkgnd(^{
-            if (auth( *_user , true ) )
+            
+            if (auth( *_user , true , stopAuth ) )
             {
+                
             }
             
         } , ^{
+            [(NSWindow *)alert.window close];
             [self updateUIUser: _user];
         });
 
+        if ([alert runModal] == NSAlertFirstButtonReturn)
+        {
+            stopAuth = true;
+            
+            [self updateUIUser: _user];
+        }
+        
     }
     
     
diff --git a/src/PlayerDocument.mm b/src/PlayerDocument.mm
@@ -30,7 +30,7 @@ -(instancetype)init
         self.resumeAtReboot = TRUE;
         self.playTime = -1;
         self.trackSongsWhenPlayStarted = TRUE;
-        self.lastFmEnabled =FALSE;
+        self.lastFmEnabled = FALSE;
         self.volume = 1.0;
         self.playerQueue=[[PlayerQueue alloc]init];
         self.playingIndexList = -1;
diff --git a/src/UPlayer.mm b/src/UPlayer.mm
@@ -22,7 +22,7 @@ void initLastFm()
     
     
     // Load Last.fm session locally
-    auth(* lastFmUser() , FALSE );
+    authLocal(* lastFmUser()  );
 }
 
 @interface UPlayer ()
diff --git a/uPlayer.xcodeproj/project.pbxproj b/uPlayer.xcodeproj/project.pbxproj
@@ -823,7 +823,7 @@
 				INFOPLIST_FILE = uPlayer/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = /usr/local/lib;
-				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				OTHER_LDFLAGS = (
 					"-ltag",
 					"-ljson",
@@ -855,7 +855,7 @@
 				INFOPLIST_FILE = uPlayer/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = /usr/local/lib;
-				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				OTHER_LDFLAGS = (
 					"-ltag",
 					"-ljson",
diff --git a/uPlayer/zh-Hans.lproj/Localizable.strings b/uPlayer/zh-Hans.lproj/Localizable.strings
@@ -46,4 +46,10 @@
 
 "Disconnect the session?" = "断开会话?";
 
-"The session connection needs login in on web browser." = "会话需要在浏览器里登录";
+"The session connection needs login in on web browser." = "会话需要在浏览器里登录";
+
+"uPlayer is 'Waiting' for your authorization" = "uPlayer正在'等待'您的授权";
+"Switch to the web instanse just opened and login in to allow uPlayer for scrobbling songs" = "切换到刚打开的网页然后登录来允许uPlayer Scrobble歌曲";
+"Abort" = "中止";
+
+

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ void initLastFm()`
`22`	`22`
`23`	`23`
`24`	`24`	`// Load Last.fm session locally`
`25`		`- auth(* lastFmUser() , FALSE );`
	`25`	`+ authLocal(* lastFmUser() );`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`@interface UPlayer ()`