Merge branch 'dev'

* dev: bump version add: GPL license add: donate add: system requirement to README better auto update fix: search keyword will be percent encoded twice
ddddxxx · May 5, 2017 · 3206e13 · 3206e13
2 parents af0d7b1 + 4b9ba7a
commit 3206e13
Show file tree

Hide file tree

Showing 39 changed files with 1,289 additions and 67 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/LyricsX/AppController.swift b/LyricsX/AppController.swift
@@ -3,7 +3,21 @@
 //  LyricsX
 //
 //  Created by 邓翔 on 2017/2/6.
-//  Copyright © 2017年 ddddxxx. All rights reserved.
+//
+//  Copyright (C) 2017  Xander Deng
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
 import Foundation

diff --git a/LyricsX/AppDelegate.swift b/LyricsX/AppDelegate.swift
@@ -3,7 +3,21 @@
 //  LyricsX
 //
 //  Created by 邓翔 on 2017/2/4.
-//  Copyright © 2017年 ddddxxx. All rights reserved.
+//
+//  Copyright (C) 2017  Xander Deng
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
 import Cocoa
@@ -48,8 +62,9 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     }
 
     @IBAction func checkUpdateAction(_ sender: Any) {
-        let url = URL(string: "https://github.com/XQS6LB3A/LyricsX/releases")!
-        NSWorkspace.shared().open(url)
+        DispatchQueue.global().async {
+            UpdateManager.shared.checkForUpdate(force: true)
+        }
     }
 }
 
diff --git a/LyricsX/Assets.xcassets/donate_alipay.imageset/Contents.json b/LyricsX/Assets.xcassets/donate_alipay.imageset/Contents.json
@@ -0,0 +1,17 @@
+{
+  "images" : [
+    {
+      "idiom" : "mac",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "filename" : "donate_alipay.png",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/LyricsX/Assets.xcassets/donate_alipay.imageset/donate_alipay.png b/LyricsX/Assets.xcassets/donate_alipay.imageset/donate_alipay.png
diff --git a/LyricsX/Base.lproj/Main.storyboard b/LyricsX/Base.lproj/Main.storyboard
@@ -171,6 +171,12 @@
                                 <action selector="checkUpdateAction:" target="Voe-Tx-rLC" id="L25-7q-sbM"/>
                             </connections>
                         </menuItem>
+                        <menuItem title="Donate..." id="EoO-ld-6Xv">
+                            <modifierMask key="keyEquivalentModifierMask"/>
+                            <connections>
+                                <segue destination="e4U-yI-muf" kind="show" id="Ssw-2c-afe"/>
+                            </connections>
+                        </menuItem>
                         <menuItem isSeparatorItem="YES" id="eB1-fb-ptE"/>
                         <menuItem title="Quit LyricsX" keyEquivalent="q" id="RPR-IV-34T">
                             <connections>
@@ -1772,13 +1778,62 @@ IA
             </objects>
             <point key="canvasLocation" x="75" y="1024"/>
         </scene>
+        <!--Donate Window Controller-->
+        <scene sceneID="ttD-5N-HU8">
+            <objects>
+                <windowController showSeguePresentationStyle="single" id="e4U-yI-muf" userLabel="Donate Window Controller" customClass="AutoActivateWindowController" customModule="LyricsX" customModuleProvider="target" sceneMemberID="viewController">
+                    <window key="window" title="Donate" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" frameAutosaveName="Donate" animationBehavior="default" id="CW0-AL-Z6N">
+                        <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
+                        <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+                        <rect key="contentRect" x="163" y="208" width="280" height="270"/>
+                        <rect key="screenRect" x="0.0" y="0.0" width="1280" height="800"/>
+                    </window>
+                    <connections>
+                        <segue destination="cxf-WZ-T1I" kind="relationship" relationship="window.shadowedContentViewController" id="Ve6-mm-IrS"/>
+                    </connections>
+                </windowController>
+                <customObject id="fDl-4Y-pyj" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-372" y="1471"/>
+        </scene>
+        <!--Donate View Controller-->
+        <scene sceneID="Xh3-eq-XhM">
+            <objects>
+                <viewController id="cxf-WZ-T1I" userLabel="Donate View Controller" sceneMemberID="viewController">
+                    <view key="view" id="Btv-Tm-tpH">
+                        <rect key="frame" x="0.0" y="0.0" width="280" height="270"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <subviews>
+                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="odr-DA-p5E">
+                                <rect key="frame" x="18" y="165" width="244" height="85"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="left" id="o52-Z0-lue">
+                                    <font key="font" metaFont="system"/>
+                                    <string key="title">If you enjoy using LyricsX, and would like to buy me a cup of coffee, as well as help me keep this software going, you can scan QR code below to make a generous donation.</string>
+                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                </textFieldCell>
+                            </textField>
+                            <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="urv-5s-cvf">
+                                <rect key="frame" x="90" y="36" width="100" height="100"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="donate_alipay" id="xyA-hb-xlw"/>
+                            </imageView>
+                        </subviews>
+                    </view>
+                </viewController>
+                <customObject id="r7B-B4-Qpg" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="75" y="1471"/>
+        </scene>
     </scenes>
     <resources>
         <image name="NSAddTemplate" width="11" height="11"/>
         <image name="NSApplicationIcon" width="128" height="128"/>
         <image name="NSFontPanel" width="32" height="32"/>
         <image name="NSPreferencesGeneral" width="32" height="32"/>
         <image name="NSRemoveTemplate" width="11" height="11"/>
+        <image name="donate_alipay" width="200" height="200"/>
         <image name="font_panel" width="22" height="20"/>
         <image name="hud_button_lock_off" width="11" height="11"/>
         <image name="hud_button_lock_on" width="11" height="11"/>

diff --git a/LyricsX/Controller/AboutViewController.swift b/LyricsX/Controller/AboutViewController.swift
@@ -3,7 +3,21 @@
 //  LyricsX
 //
 //  Created by 邓翔 on 2017/3/21.
-//  Copyright © 2017年 ddddxxx. All rights reserved.
+//
+//  Copyright (C) 2017  Xander Deng
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
 import Cocoa

diff --git a/LyricsX/Controller/AutoActivateWindowController.swift b/LyricsX/Controller/AutoActivateWindowController.swift
@@ -3,7 +3,21 @@
 //  LyricsX
 //
 //  Created by 邓翔 on 2017/3/22.
-//  Copyright © 2017年 ddddxxx. All rights reserved.
+//
+//  Copyright (C) 2017  Xander Deng
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
 import Cocoa

diff --git a/LyricsX/Controller/DesktopLyricsController.swift b/LyricsX/Controller/DesktopLyricsController.swift
@@ -3,7 +3,21 @@
 //  LyricsX
 //
 //  Created by 邓翔 on 2017/2/4.
-//  Copyright © 2017年 ddddxxx. All rights reserved.
+//
+//  Copyright (C) 2017  Xander Deng
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
 import Cocoa

diff --git a/LyricsX/Controller/LyricsHUDViewController.swift b/LyricsX/Controller/LyricsHUDViewController.swift
@@ -3,7 +3,21 @@
 //  LyricsX
 //
 //  Created by 邓翔 on 2017/2/10.
-//  Copyright © 2017年 ddddxxx. All rights reserved.
+//
+//  Copyright (C) 2017  Xander Deng
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
 import Cocoa

diff --git a/LyricsX/Controller/MenuBarLyrics.swift b/LyricsX/Controller/MenuBarLyrics.swift
@@ -3,7 +3,21 @@
 //  LyricsX
 //
 //  Created by 邓翔 on 2017/2/8.
-//  Copyright © 2017年 ddddxxx. All rights reserved.
+//
+//  Copyright (C) 2017  Xander Deng
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
 import Cocoa

diff --git a/LyricsX/Controller/Preferences/PreferenceDisplayViewController.swift b/LyricsX/Controller/Preferences/PreferenceDisplayViewController.swift
@@ -3,7 +3,21 @@
 //  LyricsX
 //
 //  Created by 邓翔 on 2017/2/9.
-//  Copyright © 2017年 ddddxxx. All rights reserved.
+//
+//  Copyright (C) 2017  Xander Deng
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
 import Cocoa

diff --git a/LyricsX/Controller/Preferences/PreferenceFilterViewController.swift b/LyricsX/Controller/Preferences/PreferenceFilterViewController.swift
@@ -3,7 +3,21 @@
 //  LyricsX
 //
 //  Created by 邓翔 on 2017/3/20.
-//  Copyright © 2017年 ddddxxx. All rights reserved.
+//
+//  Copyright (C) 2017  Xander Deng
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
 import Cocoa

diff --git a/LyricsX/Controller/Preferences/PreferenceGeneralViewController.swift b/LyricsX/Controller/Preferences/PreferenceGeneralViewController.swift
@@ -3,7 +3,21 @@
 //  LyricsX
 //
 //  Created by 邓翔 on 2017/3/4.
-//  Copyright © 2017年 ddddxxx. All rights reserved.
+//
+//  Copyright (C) 2017  Xander Deng
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
 import Cocoa

diff --git a/LyricsX/Controller/SearchLyricsViewController.swift b/LyricsX/Controller/SearchLyricsViewController.swift
@@ -3,7 +3,21 @@
 //  LyricsX
 //
 //  Created by 邓翔 on 2017/2/18.
-//  Copyright © 2017年 ddddxxx. All rights reserved.
+//
+//  Copyright (C) 2017  Xander Deng
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
 import Cocoa

diff --git a/LyricsX/Extension.swift b/LyricsX/Extension.swift
@@ -3,7 +3,21 @@
 //  LyricsX
 //
 //  Created by 邓翔 on 2017/3/24.
-//  Copyright © 2017年 ddddxxx. All rights reserved.
+//
+//  Copyright (C) 2017  Xander Deng
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
 import Foundation