diff --git a/README.md b/README.md index d5cdaf8d..a8c313ec 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ -[Google Music for Mac][1] +[Radiant Player for Google Play Musicâ„¢][1] ========================= -![](https://raw.github.com/kbhomes/GoogleMusicMac/gh-pages/images/application.png) +![](https://raw.github.com/kbhomes/google-music-mac/gh-pages/images/application.png) -Turn Google Music into a separate, beautiful application that integrates with your Mac. +Turn Google Play Music into a separate, beautiful application that integrates with your Mac. Developed by [Sajid Anwar][2]. Originally created by [James Fator][3] at [JamesFator/GoogleMusicMac][4]. -No affiliation with Google. +No affiliation with Google. Google Play is a trademark of Google Inc. [1]: http://kbhomes.github.io/google-music-mac/ [2]: https://github.com/kbhomes/ diff --git a/google-music-mac.xcodeproj/project.pbxproj b/google-music-mac.xcodeproj/project.pbxproj index f08637e3..20e3034b 100644 --- a/google-music-mac.xcodeproj/project.pbxproj +++ b/google-music-mac.xcodeproj/project.pbxproj @@ -17,7 +17,7 @@ 1A7B687417453E4C001E509E /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A7B687317453E4C001E509E /* WebKit.framework */; }; 1A7B68811745ABBD001E509E /* icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 1A7B68801745ABBD001E509E /* icon.icns */; }; 2B8FC1C018C9CB0E006D04FF /* google-music-mac.sdef in Resources */ = {isa = PBXBuildFile; fileRef = 2B8FC1BF18C9CB0E006D04FF /* google-music-mac.sdef */; }; - 2B8FC1C318C9CB16006D04FF /* GoogleMusicScriptCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B8FC1C218C9CB16006D04FF /* GoogleMusicScriptCommand.m */; }; + 2B8FC1C318C9CB16006D04FF /* RadiantPlayerScriptCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B8FC1C218C9CB16006D04FF /* RadiantPlayerScriptCommand.m */; }; 38D0C36DAD0F40F5A7254224 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BABD1B4DDCC34CB291C66033 /* libPods.a */; }; D302E13418B561E100CCD18E /* Preferences.plist in Resources */ = {isa = PBXBuildFile; fileRef = D302E13318B561E100CCD18E /* Preferences.plist */; }; D3091F6318C32961007C8DCD /* Utilities.m in Sources */ = {isa = PBXBuildFile; fileRef = D3091F6218C32961007C8DCD /* Utilities.m */; }; @@ -49,7 +49,7 @@ /* Begin PBXFileReference section */ 1A68DAD61803B588004CBA25 /* CustomWebView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomWebView.h; sourceTree = ""; }; 1A68DAD71803B588004CBA25 /* CustomWebView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomWebView.m; sourceTree = ""; }; - 1A7B683C17453E40001E509E /* Google Music.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Google Music.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 1A7B683C17453E40001E509E /* Radiant Player.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Radiant Player.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 1A7B683F17453E40001E509E /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; 1A7B684217453E40001E509E /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; 1A7B684317453E40001E509E /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; }; @@ -65,8 +65,8 @@ 1A7B687317453E4C001E509E /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; }; 1A7B68801745ABBD001E509E /* icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = icon.icns; sourceTree = ""; }; 2B8FC1BF18C9CB0E006D04FF /* google-music-mac.sdef */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "google-music-mac.sdef"; sourceTree = ""; }; - 2B8FC1C118C9CB16006D04FF /* GoogleMusicScriptCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GoogleMusicScriptCommand.h; sourceTree = ""; }; - 2B8FC1C218C9CB16006D04FF /* GoogleMusicScriptCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GoogleMusicScriptCommand.m; sourceTree = ""; }; + 2B8FC1C118C9CB16006D04FF /* RadiantPlayerScriptCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RadiantPlayerScriptCommand.h; sourceTree = ""; }; + 2B8FC1C218C9CB16006D04FF /* RadiantPlayerScriptCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RadiantPlayerScriptCommand.m; sourceTree = ""; }; A32790DC482A48E18B516D0B /* Pods.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.xcconfig; path = Pods/Pods.xcconfig; sourceTree = ""; }; BABD1B4DDCC34CB291C66033 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; }; D302E13318B561E100CCD18E /* Preferences.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Preferences.plist; sourceTree = ""; }; @@ -144,7 +144,7 @@ 1A7B683D17453E40001E509E /* Products */ = { isa = PBXGroup; children = ( - 1A7B683C17453E40001E509E /* Google Music.app */, + 1A7B683C17453E40001E509E /* Radiant Player.app */, ); name = Products; sourceTree = ""; @@ -215,8 +215,8 @@ isa = PBXGroup; children = ( 2B8FC1BF18C9CB0E006D04FF /* google-music-mac.sdef */, - 2B8FC1C118C9CB16006D04FF /* GoogleMusicScriptCommand.h */, - 2B8FC1C218C9CB16006D04FF /* GoogleMusicScriptCommand.m */, + 2B8FC1C118C9CB16006D04FF /* RadiantPlayerScriptCommand.h */, + 2B8FC1C218C9CB16006D04FF /* RadiantPlayerScriptCommand.m */, ); path = AppleScript; sourceTree = ""; @@ -285,9 +285,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 1A7B683B17453E40001E509E /* Google Music */ = { + 1A7B683B17453E40001E509E /* Radiant Player */ = { isa = PBXNativeTarget; - buildConfigurationList = 1A7B686D17453E40001E509E /* Build configuration list for PBXNativeTarget "Google Music" */; + buildConfigurationList = 1A7B686D17453E40001E509E /* Build configuration list for PBXNativeTarget "Radiant Player" */; buildPhases = ( 7A2071DB33B24D5B85C39505 /* Check Pods Manifest.lock */, 1A7B683817453E40001E509E /* Sources */, @@ -300,9 +300,9 @@ ); dependencies = ( ); - name = "Google Music"; + name = "Radiant Player"; productName = GoogleMusic; - productReference = 1A7B683C17453E40001E509E /* Google Music.app */; + productReference = 1A7B683C17453E40001E509E /* Radiant Player.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -326,7 +326,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 1A7B683B17453E40001E509E /* Google Music */, + 1A7B683B17453E40001E509E /* Radiant Player */, ); }; /* End PBXProject section */ @@ -407,7 +407,7 @@ D3B1668318BB0E43003FCE6B /* DummyWebViewPolicyDelegate.m in Sources */, 1A68DAD81803B588004CBA25 /* CustomWebView.m in Sources */, D318341B18CFC7C500E8F9B1 /* ApplicationStyle.m in Sources */, - 2B8FC1C318C9CB16006D04FF /* GoogleMusicScriptCommand.m in Sources */, + 2B8FC1C318C9CB16006D04FF /* RadiantPlayerScriptCommand.m in Sources */, D3B71C2F18C2D5770041358B /* LastFmPreferencesViewController.m in Sources */, 1A7B684C17453E40001E509E /* main.m in Sources */, D3DB8FF518BD2AEC00ABE93B /* PlaybackConstants.m in Sources */, @@ -525,7 +525,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "google-music-mac/prefix.pch"; INFOPLIST_FILE = "google-music-mac/info.plist"; - PRODUCT_NAME = "Google Music"; + PRODUCT_NAME = "Radiant Player"; WRAPPER_EXTENSION = app; }; name = Debug; @@ -539,7 +539,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "google-music-mac/prefix.pch"; INFOPLIST_FILE = "google-music-mac/info.plist"; - PRODUCT_NAME = "Google Music"; + PRODUCT_NAME = "Radiant Player"; WRAPPER_EXTENSION = app; }; name = Release; @@ -556,7 +556,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 1A7B686D17453E40001E509E /* Build configuration list for PBXNativeTarget "Google Music" */ = { + 1A7B686D17453E40001E509E /* Build configuration list for PBXNativeTarget "Radiant Player" */ = { isa = XCConfigurationList; buildConfigurations = ( 1A7B686E17453E40001E509E /* Debug */, diff --git a/google-music-mac/AppDelegate.m b/google-music-mac/AppDelegate.m index 7681c610..346c0e0f 100644 --- a/google-music-mac/AppDelegate.m +++ b/google-music-mac/AppDelegate.m @@ -307,7 +307,7 @@ - (IBAction) backAction:(id)sender } /** - * Increases volume of Google Music by 10. + * Increases volume of Google Play Music by 10. */ - (IBAction) volumeUp:(id)sender { @@ -315,7 +315,7 @@ - (IBAction) volumeUp:(id)sender } /** - * Decreases volume of Google Music by 10. + * Decreases volume of Google Play Music by 10. */ - (IBAction) volumeDown:(id)sender { diff --git a/google-music-mac/AppleScript/GoogleMusicScriptCommand.h b/google-music-mac/AppleScript/RadiantPlayerScriptCommand.h similarity index 60% rename from google-music-mac/AppleScript/GoogleMusicScriptCommand.h rename to google-music-mac/AppleScript/RadiantPlayerScriptCommand.h index 39427dce..6ec55532 100644 --- a/google-music-mac/AppleScript/GoogleMusicScriptCommand.h +++ b/google-music-mac/AppleScript/RadiantPlayerScriptCommand.h @@ -1,5 +1,5 @@ /* - * GoogleMusicScriptCommand.h + * RadiantPlayerScriptCommand.h * * Originally created by Walter Da Col. * @@ -9,5 +9,5 @@ #import -@interface GoogleMusicScriptCommand : NSScriptCommand +@interface RadiantPlayerScriptCommand : NSScriptCommand @end diff --git a/google-music-mac/AppleScript/GoogleMusicScriptCommand.m b/google-music-mac/AppleScript/RadiantPlayerScriptCommand.m similarity index 92% rename from google-music-mac/AppleScript/GoogleMusicScriptCommand.m rename to google-music-mac/AppleScript/RadiantPlayerScriptCommand.m index d9bcc7e3..93602986 100644 --- a/google-music-mac/AppleScript/GoogleMusicScriptCommand.m +++ b/google-music-mac/AppleScript/RadiantPlayerScriptCommand.m @@ -1,5 +1,5 @@ /* - * GoogleMusicScriptCommand.m + * RadiantPlayerScriptCommand.m * * Originally created by Walter Da Col. * @@ -7,10 +7,10 @@ * */ -#import "GoogleMusicScriptCommand.h" +#import "RadiantPlayerScriptCommand.h" #import "AppDelegate.h" -@implementation GoogleMusicScriptCommand +@implementation RadiantPlayerScriptCommand /** Called when supported AppleScript are executed diff --git a/google-music-mac/AppleScript/google-music-mac.sdef b/google-music-mac/AppleScript/google-music-mac.sdef index 94155a53..9315d935 100644 --- a/google-music-mac/AppleScript/google-music-mac.sdef +++ b/google-music-mac/AppleScript/google-music-mac.sdef @@ -1,30 +1,30 @@ - - + + - + - + - + - + - + - + - + - + \ No newline at end of file diff --git a/google-music-mac/en.lproj/MainMenu.xib b/google-music-mac/en.lproj/MainMenu.xib index 34384a54..5e5d92ad 100644 --- a/google-music-mac/en.lproj/MainMenu.xib +++ b/google-music-mac/en.lproj/MainMenu.xib @@ -27,10 +27,10 @@ - - + + - + @@ -53,7 +53,7 @@ - + @@ -72,7 +72,7 @@ - + @@ -270,7 +270,7 @@ - + @@ -328,16 +328,16 @@ - + - + - + @@ -346,12 +346,12 @@ - + - + @@ -378,7 +378,7 @@ - + @@ -391,26 +391,39 @@ + + + + + + + + + - + + + + + + - diff --git a/google-music-mac/info.plist b/google-music-mac/info.plist index 6f53b310..711b1c27 100644 --- a/google-music-mac/info.plist +++ b/google-music-mac/info.plist @@ -5,7 +5,7 @@ ApplicationHomepage https://kbhomes.github.io/google-music-mac ApplicationName - Google Music for Mac + Radiant Player for Google Play Music CFBundleDevelopmentRegion en CFBundleExecutable @@ -21,7 +21,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.1.1 + 1.1.2 CFBundleSignature ???? LSApplicationCategoryType diff --git a/google-music-mac/js/appbar.js b/google-music-mac/js/appbar.js index 695b80c3..5c367216 100644 --- a/google-music-mac/js/appbar.js +++ b/google-music-mac/js/appbar.js @@ -2,7 +2,7 @@ * js/appbar.js * * This script is part of the JavaScript interface used to interact with - * the Google Music page, enabling dragging of the application bar. + * the Google Play Music page, enabling dragging of the application bar. * * Created by Sajid Anwar. * diff --git a/google-music-mac/js/keyboard.js b/google-music-mac/js/keyboard.js index 157b7266..b428f4c4 100644 --- a/google-music-mac/js/keyboard.js +++ b/google-music-mac/js/keyboard.js @@ -2,7 +2,7 @@ * js/keyboard.js * * This script is part of the JavaScript interface used to interact with - * the Google Music page, allowing key events to be sent to elements. + * the Google Play Music page, allowing key events to be sent to elements. * * Created by Sajid Anwar. * diff --git a/google-music-mac/js/main.js b/google-music-mac/js/main.js index acf4e7c4..03b94fd7 100644 --- a/google-music-mac/js/main.js +++ b/google-music-mac/js/main.js @@ -2,7 +2,7 @@ * js/main.js * * This script is part of the JavaScript interface used to interact with - * the Google Music page, in order to provide notifications functionality. + * the Google Play Music page, in order to provide notifications functionality. * * Created by Sajid Anwar. * @@ -116,7 +116,7 @@ if (typeof window.MusicAPI === 'undefined') { } }, - // Taken from the Google Music page. + // Taken from the Google Play Music page. toggleVisualization: function() { SJBpost('toggleVisualization'); } diff --git a/google-music-mac/js/mouse.js b/google-music-mac/js/mouse.js index 06d39137..bc59944f 100644 --- a/google-music-mac/js/mouse.js +++ b/google-music-mac/js/mouse.js @@ -2,7 +2,7 @@ * js/mouse.js * * This script is part of the JavaScript interface used to interact with - * the Google Music page, allowing mouse events to be sent to elements. + * the Google Play Music page, allowing mouse events to be sent to elements. * * Created by Sajid Anwar. * diff --git a/google-music-mac/js/navigation.js b/google-music-mac/js/navigation.js index c432942c..80920d1f 100644 --- a/google-music-mac/js/navigation.js +++ b/google-music-mac/js/navigation.js @@ -2,7 +2,7 @@ * js/navigation.js * * This script is part of the JavaScript interface used to interact with - * the Google Music page, adding back and forward buttons to the page. + * the Google Play Music page, adding back and forward buttons to the page. * * Created by Sajid Anwar. * diff --git a/google-music-mac/js/styles.js b/google-music-mac/js/styles.js index 823534e7..d32f6f65 100644 --- a/google-music-mac/js/styles.js +++ b/google-music-mac/js/styles.js @@ -2,7 +2,7 @@ * js/styles.js * * This script is part of the JavaScript interface used to interact with - * the Google Music page, allowing custom styles to be applied. + * the Google Play Music page, allowing custom styles to be applied. * * Created by Sajid Anwar. * diff --git a/google-music-mac/js/styles/dark.js b/google-music-mac/js/styles/dark.js index 0896ce32..a4e43d00 100644 --- a/google-music-mac/js/styles/dark.js +++ b/google-music-mac/js/styles/dark.js @@ -1,7 +1,7 @@ /* - * js/styles/cocoa.js + * js/styles/dark.js * - * This script contains code needed for the Cocoa style. + * This script contains code needed for the Dark style. * * Subject to terms and conditions in LICENSE.md. *