Skip to content

Commit

Permalink
bump
Browse files Browse the repository at this point in the history 
- lots of little tweaks
- working on searchable view of all tweaks
  • Loading branch information
@w0lfschild
w0lfschild committed Jun 20, 2017
1 parent d7b7358 commit 0c4740d
Show file tree
Hide file tree
Showing 24 changed files with 717 additions and 1,252 deletions.
10 changes: 10 additions & 0 deletions LISCENSE
View file
@@ -0,0 +1,10 @@
Copyright (c) 2015 - 2017 Wolfgang Baird

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
13 changes: 4 additions & 9 deletions SIMBLHelper/AppDelegate.m
View file
Expand Up @@ -32,11 +32,9 @@ - (void)checkForUpdates {
NSURL *appurl = [[NSWorkspace sharedWorkspace] URLForApplicationWithBundleIdentifier:@"org.w0lf.mySIMBL"];
NSBundle *GUIBundle = [NSBundle bundleWithURL:appurl];
SUUpdater *myUpdater = [SUUpdater updaterForBundle:GUIBundle];
if ([myUpdater feedURL])
{
if ([myUpdater feedURL]) {
NSDictionary *GUIDefaults = [[NSUserDefaults standardUserDefaults] persistentDomainForName:@"org.w0lf.mySIMBL"];
if (![[GUIDefaults objectForKey:@"SUHasLaunchedBefore"] boolValue])
{
if (![[GUIDefaults objectForKey:@"SUHasLaunchedBefore"] boolValue]) {
[myUpdater setAutomaticallyChecksForUpdates:true];
[myUpdater setAutomaticallyDownloadsUpdates:true];
[myUpdater setUpdateCheckInterval:86400];
Expand All @@ -48,7 +46,6 @@ - (void)checkForUpdates {

- (void)checkSIMBL {
Boolean openAPP = false;

SIMBLManager *sim_m = [SIMBLManager sharedInstance];
id <SUVersionComparison> comparator = [SUStandardVersionComparator defaultComparator];
NSDictionary* key = [[NSDictionary alloc] init];
Expand All @@ -66,10 +63,8 @@ - (void)checkSIMBL {
if (result == NSOrderedDescending)
openAPP = true;

if (openAPP)
{
if (![[[NSWorkspace sharedWorkspace] runningApplications] containsObject:[[NSRunningApplication runningApplicationsWithBundleIdentifier:@"org.w0lf.mySIMBL"] objectAtIndex:0]])
{
if (openAPP) {
if (![[[NSWorkspace sharedWorkspace] runningApplications] containsObject:[[NSRunningApplication runningApplicationsWithBundleIdentifier:@"org.w0lf.mySIMBL"] objectAtIndex:0]]) {
NSString *path = [[NSBundle bundleWithIdentifier:@"org.w0lf.mySIMBL"] bundlePath];
[[NSWorkspace sharedWorkspace] launchApplication:path];
}
Expand Down
667 changes: 0 additions & 667 deletions SIMBLHelper/Base.lproj/MainMenu.xib
View file

This file was deleted.

2 changes: 0 additions & 2 deletions SIMBLHelper/Info.plist
View file
Expand Up @@ -28,8 +28,6 @@
<true/>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2016 Wolfgang Baird. All rights reserved.</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>SUFeedURL</key>
Expand Down
7 changes: 6 additions & 1 deletion SIMBLHelper/main.m
View file
Expand Up @@ -6,8 +6,13 @@
// Copyright © 2016 Wolfgang Baird. All rights reserved.
//

#import "AppDelegate.h"
#import <Cocoa/Cocoa.h>

int main(int argc, const char * argv[]) {
return NSApplicationMain(argc, argv);
AppDelegate * delegate = [[AppDelegate alloc] init];
[[NSApplication sharedApplication] setDelegate:delegate];
[NSApp run];
return EXIT_SUCCESS;
// return NSApplicationMain(argc, argv);
}
44 changes: 21 additions & 23 deletions mySIMBL.xcodeproj/project.pbxproj
View file
Expand Up @@ -11,7 +11,7 @@
FB09A4F71C4B64F80072C553 /* webicon.png in Resources */ = {isa = PBXBuildFile; fileRef = FB09A4F61C4B64F80072C553 /* webicon.png */; };
FB0CF69F1C61D1E9002CF3DE /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = FB0CF69E1C61D1E9002CF3DE /* AppDelegate.m */; };
FB0CF6A21C61D1E9002CF3DE /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = FB0CF6A11C61D1E9002CF3DE /* main.m */; };
FB0CF6A71C61D1E9002CF3DE /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = FB0CF6A51C61D1E9002CF3DE /* MainMenu.xib */; };
FB1836441EF78E5A009CAEBC /* discoverTable.m in Sources */ = {isa = PBXBuildFile; fileRef = FB1836431EF78E5A009CAEBC /* discoverTable.m */; };
FB24B09E1C952FF700443CA0 /* pluginTable.m in Sources */ = {isa = PBXBuildFile; fileRef = FB24B09D1C952FF700443CA0 /* pluginTable.m */; };
FB24B0A21C955D2C00443CA0 /* shareClass.m in Sources */ = {isa = PBXBuildFile; fileRef = FB24B0A11C955D2C00443CA0 /* shareClass.m */; };
FB50D3461D4B0C7E004668C0 /* update.png in Resources */ = {isa = PBXBuildFile; fileRef = FB50D3451D4B0C7E004668C0 /* update.png */; };
Expand Down Expand Up @@ -75,8 +75,8 @@
FB0CF69D1C61D1E9002CF3DE /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
FB0CF69E1C61D1E9002CF3DE /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
FB0CF6A11C61D1E9002CF3DE /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
FB0CF6A61C61D1E9002CF3DE /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
FB0CF6A81C61D1E9002CF3DE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
FB1836431EF78E5A009CAEBC /* discoverTable.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = discoverTable.m; sourceTree = "<group>"; };
FB24B09D1C952FF700443CA0 /* pluginTable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = pluginTable.m; sourceTree = "<group>"; };
FB24B0A11C955D2C00443CA0 /* shareClass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = shareClass.m; sourceTree = "<group>"; };
FB24B0A31C955EEC00443CA0 /* shareClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = shareClass.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -136,7 +136,8 @@
FB0CF69C1C61D1E9002CF3DE /* mySIMBLHelper */ = {
isa = PBXGroup;
children = (
FB0CF6A01C61D1E9002CF3DE /* Supporting Files */,
FBB793531C7AB7C5006BF301 /* dsa_pub.pem */,
FB0CF6A11C61D1E9002CF3DE /* main.m */,
FB0CF69D1C61D1E9002CF3DE /* AppDelegate.h */,
FB0CF69E1C61D1E9002CF3DE /* AppDelegate.m */,
FB0CF6A81C61D1E9002CF3DE /* Info.plist */,
Expand All @@ -145,16 +146,6 @@
path = SIMBLHelper;
sourceTree = "<group>";
};
FB0CF6A01C61D1E9002CF3DE /* Supporting Files */ = {
isa = PBXGroup;
children = (
FBB793531C7AB7C5006BF301 /* dsa_pub.pem */,
FB0CF6A51C61D1E9002CF3DE /* MainMenu.xib */,
FB0CF6A11C61D1E9002CF3DE /* main.m */,
);
name = "Supporting Files";
sourceTree = "<group>";
};
FB57959C1C4DCFA2001A76AC /* Images */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -219,6 +210,7 @@
children = (
FB24B0A31C955EEC00443CA0 /* shareClass.h */,
FB24B0A11C955D2C00443CA0 /* shareClass.m */,
FB1836431EF78E5A009CAEBC /* discoverTable.m */,
FB24B09D1C952FF700443CA0 /* pluginTable.m */,
FBBF6AF51DFFA6B300BBCF28 /* updatesTable.m */,
FBA9EB331C965E9F00511BE3 /* sourcesTable.m */,
Expand Down Expand Up @@ -339,7 +331,7 @@
FB5F44AB1C41EA4000DE80B4 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0810;
LastUpgradeCheck = 0900;
ORGANIZATIONNAME = "Wolfgang Baird";
TargetAttributes = {
FB0CF69A1C61D1E8002CF3DE = {
Expand Down Expand Up @@ -381,7 +373,6 @@
buildActionMask = 2147483647;
files = (
FBB793541C7AB7C5006BF301 /* dsa_pub.pem in Resources */,
FB0CF6A71C61D1E9002CF3DE /* MainMenu.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -439,6 +430,7 @@
buildActionMask = 2147483647;
files = (
FB24B09E1C952FF700443CA0 /* pluginTable.m in Sources */,
FB1836441EF78E5A009CAEBC /* discoverTable.m in Sources */,
FBA9EB341C965E9F00511BE3 /* sourcesTable.m in Sources */,
FB24B0A21C955D2C00443CA0 /* shareClass.m in Sources */,
FB7A4B741DF384B50071589B /* StartAtLoginController.m in Sources */,
Expand All @@ -455,14 +447,6 @@
/* End PBXSourcesBuildPhase section */

/* Begin PBXVariantGroup section */
FB0CF6A51C61D1E9002CF3DE /* MainMenu.xib */ = {
isa = PBXVariantGroup;
children = (
FB0CF6A61C61D1E9002CF3DE /* Base */,
);
name = MainMenu.xib;
sourceTree = "<group>";
};
FB5F44BE1C41EA4000DE80B4 /* Appliaction.xib */ = {
isa = PBXVariantGroup;
children = (
Expand All @@ -486,6 +470,7 @@
);
INFOPLIST_FILE = SIMBLHelper/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../../../../Frameworks/DevMateKit @loader_path/../../../../../Frameworks $(PROJECT_DIR)/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.9;
PRODUCT_BUNDLE_IDENTIFIER = org.w0lf.mySIMBLAgent;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
Expand All @@ -505,6 +490,7 @@
);
INFOPLIST_FILE = SIMBLHelper/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../../../../Frameworks/DevMateKit @loader_path/../../../../../Frameworks $(PROJECT_DIR)/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.9;
PRODUCT_BUNDLE_IDENTIFIER = org.w0lf.mySIMBLAgent;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
Expand All @@ -521,14 +507,20 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -568,14 +560,20 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down
Binary file modified ....xcodeproj/project.xcworkspace/xcuserdata/w0lf.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion mySIMBL.xcodeproj/xcuserdata/w0lf.xcuserdatad/xcschemes/SIMBLHelper.xcscheme
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0810"
LastUpgradeVersion = "0900"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion mySIMBL.xcodeproj/xcuserdata/w0lf.xcuserdatad/xcschemes/mySIMBL.xcscheme
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0810"
LastUpgradeVersion = "0900"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
34 changes: 18 additions & 16 deletions mySIMBL/AppDelegate.h
View file
Expand Up @@ -27,8 +27,8 @@

// Tab views
@property IBOutlet NSView *tabMain;

@property IBOutlet NSView *tabAbout;
@property IBOutlet NSView *tabAccount;
@property IBOutlet NSView *tabPlugins;
@property IBOutlet NSView *tabSIMBL;
@property IBOutlet NSView *tabPreferences;
Expand All @@ -47,42 +47,46 @@
@property IBOutlet NSButton *addsourcesAccept;
@property IBOutlet NSTextField *addsourcesTextFiled;

// Sources view
// Discover view
@property IBOutlet NSView *sourcesRoot;
@property IBOutlet NSView *sourcesBundle;
@property IBOutlet NSScrollView *sourcesURLS;
@property IBOutlet NSScrollView *sourcesPlugins;
@property IBOutlet NSScrollView *discoverChanges;
@property IBOutlet NSButton *sourcesPush;
@property IBOutlet NSButton *sourcesPop;
@property IBOutlet NSButton *sourcestoRoot;
@property IBOutlet NSButton *sourcesAdd;
@property IBOutlet NSButton *sourcesRefresh;
@property IBOutlet NSButton *discoverSelectChanges;
@property IBOutlet NSButton *discoverSelectSources;

// Tab bar items
@property IBOutlet NSButton *viewPlugins;
@property IBOutlet NSButton *viewPreferences;
@property IBOutlet NSButton *viewSources;
@property IBOutlet NSButton *viewAbout;
@property IBOutlet NSButton *viewDiscover;
@property IBOutlet NSButton *viewChanges;
@property IBOutlet NSButton *viewUpdateCounter;
@property IBOutlet NSButton *viewAccount;
@property IBOutlet NSButton *viewSIMBL;
@property IBOutlet NSButton *feedbackButton;
@property IBOutlet NSButton *donateButton;
@property IBOutlet NSButton *reportButton;


// About view
@property IBOutlet NSTextField *appName;
@property IBOutlet NSTextField *appVersion;
@property IBOutlet NSTextField *appCopyright;
@property IBOutlet NSButton *gitButton;
@property IBOutlet NSButton *sourceButton;
@property IBOutlet NSButton *emailButton;
@property IBOutlet NSButton *webButton;
@property IBOutlet NSButton *showCredits;
@property IBOutlet NSButton *showChanges;
@property IBOutlet NSButton *showEULA;
@property IBOutlet NSTextView *changeLog;
@property IBOutlet NSTextField *appName;
@property IBOutlet NSTextField *appVersion;
@property IBOutlet NSTextField *appCopyright;
@property IBOutlet NSButton *gitButton;
@property IBOutlet NSButton *sourceButton;
@property IBOutlet NSButton *emailButton;
@property IBOutlet NSButton *webButton;
@property IBOutlet NSButton *showCredits;
@property IBOutlet NSButton *showChanges;
@property IBOutlet NSButton *showEULA;
@property IBOutlet NSTextView *changeLog;

// Preferences view
@property IBOutlet NSButton *prefVibrant;
Expand All @@ -96,10 +100,8 @@
// SIMBL View
@property IBOutlet NSButton *libValXcode;
@property IBOutlet NSButton *libValSafari;

@property IBOutlet NSTextField *SIMBLAgentText;
@property IBOutlet NSTextField *SIMBLOSAXText;

@property IBOutlet NSButton *SIMBLAgentToggle;
@property IBOutlet NSButton *SIMBLTogggle;
@property IBOutlet NSPopUpButton *SIMBLLogging;
Expand Down

0 comments on commit 0c4740d

Please sign in to comment.