Add License in About ConkyX

Follows the requirements of MIT License
Conky-for-macOS · Feb 2, 2018 · 397f248 · 397f248
1 parent fdddfa8
commit 397f248
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 5 deletions.
diff --git a/ConkyX.xcodeproj/project.pbxproj b/ConkyX.xcodeproj/project.pbxproj
@@ -17,6 +17,7 @@
 		EC923C3320169A230019C772 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = EC923C3220169A230019C772 /* main.m */; };
 		EC923C3B20169A540019C772 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = EC923C3A20169A540019C772 /* MainWindow.xib */; };
 		EC923C3E20169B410019C772 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = EC923C3D20169B410019C772 /* AppDelegate.m */; };
+		ECA1EEF42024A1A0003EB518 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = ECA1EEF32024A1A0003EB518 /* Credits.rtf */; };
 		ECCA0537201D32FF00F14527 /* ConfigureConky.xib in Resources */ = {isa = PBXBuildFile; fileRef = ECCA0536201D32FF00F14527 /* ConfigureConky.xib */; };
 		ECCA053F201D378B00F14527 /* ConfigureConkyController.m in Sources */ = {isa = PBXBuildFile; fileRef = ECCA053E201D378B00F14527 /* ConfigureConkyController.m */; };
 		ECEDCC1C201CA99000BF1A90 /* MainWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = ECEDCC1B201CA99000BF1A90 /* MainWindowController.m */; };
@@ -83,6 +84,7 @@
 		EC923C3A20169A540019C772 /* MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainWindow.xib; sourceTree = "<group>"; };
 		EC923C3C20169B410019C772 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		EC923C3D20169B410019C772 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
+		ECA1EEF32024A1A0003EB518 /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = Credits.rtf; sourceTree = "<group>"; };
 		ECCA0536201D32FF00F14527 /* ConfigureConky.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ConfigureConky.xib; sourceTree = "<group>"; };
 		ECCA053D201D378B00F14527 /* ConfigureConkyController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ConfigureConkyController.h; sourceTree = "<group>"; };
 		ECCA053E201D378B00F14527 /* ConfigureConkyController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ConfigureConkyController.m; sourceTree = "<group>"; };
@@ -156,12 +158,13 @@
 				EC923C3C20169B410019C772 /* AppDelegate.h */,
 				EC923C3D20169B410019C772 /* AppDelegate.m */,
 				EC923C3220169A230019C772 /* main.m */,
+				ECCA0536201D32FF00F14527 /* ConfigureConky.xib */,
 				ECCA053D201D378B00F14527 /* ConfigureConkyController.h */,
 				ECCA053E201D378B00F14527 /* ConfigureConkyController.m */,
-				ECCA0536201D32FF00F14527 /* ConfigureConky.xib */,
+				EC923C3A20169A540019C772 /* MainWindow.xib */,
 				ECEDCC1A201CA99000BF1A90 /* MainWindowController.h */,
 				ECEDCC1B201CA99000BF1A90 /* MainWindowController.m */,
-				EC923C3A20169A540019C772 /* MainWindow.xib */,
+				ECA1EEF32024A1A0003EB518 /* Credits.rtf */,
 			);
 			path = ConkyX;
 			sourceTree = "<group>";
@@ -256,6 +259,7 @@
 				ECCA0537201D32FF00F14527 /* ConfigureConky.xib in Resources */,
 				EC923C2D20169A230019C772 /* Assets.xcassets in Resources */,
 				EC923C3020169A230019C772 /* Main.storyboard in Resources */,
+				ECA1EEF42024A1A0003EB518 /* Credits.rtf in Resources */,
 				EC923C3B20169A540019C772 /* MainWindow.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

diff --git a/ConkyX.xcodeproj/xcuserdata/np.xcuserdatad/xcschemes/xcschememanagement.plist b/ConkyX.xcodeproj/xcuserdata/np.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
 		<key>ConkyX.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>0</integer>
+			<integer>1</integer>
 		</dict>
 	</dict>
 </dict>

diff --git a/ConkyX/Credits.rtf b/ConkyX/Credits.rtf
@@ -0,0 +1,67 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1561\cocoasubrtf200
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 Menlo-Regular;}
+{\colortbl;\red255\green255\blue255;\red0\green0\blue0;\red255\green255\blue255;}
+{\*\expandedcolortbl;;\csgenericrgb\c0\c0\c0;\csgray\c100000;}
+\margl1440\margr1440\vieww9000\viewh8400\viewkind0
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
+
+\f0\fs24 \cf0 \
+This app is provided under the MIT License:\
+\
+\pard\tx543\pardeftab543\pardirnatural\partightenfactor0
+
+\f1\fs22 \cf2 \cb3 MIT License
+\f0\fs24 \cf0 \
+\
+
+\f1\fs22 \cf2 Copyright (c) 2018 npyl
+\f0\fs24 \cf0 \
+\
+
+\f1\fs22 \cf2 Permission is hereby granted, free of charge, to any person obtaining a copy
+\f0\fs24 \cf0 \
+
+\f1\fs22 \cf2 of this software and associated documentation files (the "Software"), to deal
+\f0\fs24 \cf0 \
+
+\f1\fs22 \cf2 in the Software without restriction, including without limitation the rights
+\f0\fs24 \cf0 \
+
+\f1\fs22 \cf2 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+\f0\fs24 \cf0 \
+
+\f1\fs22 \cf2 copies of the Software, and to permit persons to whom the Software is
+\f0\fs24 \cf0 \
+
+\f1\fs22 \cf2 furnished to do so, subject to the following conditions:
+\f0\fs24 \cf0 \
+\
+
+\f1\fs22 \cf2 The above copyright notice and this permission notice shall be included in all
+\f0\fs24 \cf0 \
+
+\f1\fs22 \cf2 copies or substantial portions of the Software.
+\f0\fs24 \cf0 \
+\
+
+\f1\fs22 \cf2 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+\f0\fs24 \cf0 \
+
+\f1\fs22 \cf2 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+\f0\fs24 \cf0 \
+
+\f1\fs22 \cf2 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+\f0\fs24 \cf0 \
+
+\f1\fs22 \cf2 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+\f0\fs24 \cf0 \
+
+\f1\fs22 \cf2 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+\f0\fs24 \cf0 \
+
+\f1\fs22 \cf2 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+\f0\fs24 \cf0 \
+
+\f1\fs22 \cf2 SOFTWARE.
+\f0\fs24 \cf0 \
+}
diff --git a/ConkyX/main.m b/ConkyX/main.m
@@ -12,7 +12,7 @@ int main(int argc, const char * argv[])
 {
     NSUserDefaults * conkyDefaults = [[NSUserDefaults alloc] init];
 
-    if (![conkyDefaults valueForKey:@"isInstalled"])
+    if ([conkyDefaults valueForKey:@"isInstalled"])
     {
         NSLog(@"conky: not installed");
 

diff --git a/conky-for-macOS b/conky-for-macOS