diff --git a/osx/Nide.xcodeproj/project.pbxproj b/osx/Nide.xcodeproj/project.pbxproj index b29988d..a030430 100644 --- a/osx/Nide.xcodeproj/project.pbxproj +++ b/osx/Nide.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 9428CF8C177887BF00968D67 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9428CF8B177887BF00968D67 /* WebKit.framework */; }; F52B613214B568F400031F38 /* nide.icns in Resources */ = {isa = PBXBuildFile; fileRef = F52B613114B568F400031F38 /* nide.icns */; }; F5B0128914B482BA00145F5E /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B0128814B482BA00145F5E /* Cocoa.framework */; }; F5B0129314B482BA00145F5E /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F5B0129114B482BA00145F5E /* InfoPlist.strings */; }; @@ -14,13 +15,13 @@ F5B0129914B482BA00145F5E /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = F5B0129714B482BA00145F5E /* Credits.rtf */; }; F5B0129C14B482BA00145F5E /* NDAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = F5B0129B14B482BA00145F5E /* NDAppDelegate.m */; }; F5B0129F14B482BA00145F5E /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = F5B0129D14B482BA00145F5E /* MainMenu.xib */; }; - F5B012BD14B485CA00145F5E /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B012BC14B485CA00145F5E /* WebKit.framework */; }; F5B012BF14B48A3A00145F5E /* ProjectWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = F5B012BE14B48A3A00145F5E /* ProjectWindow.xib */; }; F5B012C214B48C0600145F5E /* NDProjectWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = F5B012C114B48C0600145F5E /* NDProjectWindowController.m */; }; F5B0CCD614BE82D6007CD4A6 /* nide-project.icns in Resources */ = {isa = PBXBuildFile; fileRef = F5B0CCD514BE82D6007CD4A6 /* nide-project.icns */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 9428CF8B177887BF00968D67 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; }; F52B613114B568F400031F38 /* nide.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = nide.icns; path = ../nide.icns; sourceTree = ""; }; F5B0128414B482BA00145F5E /* Nide.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Nide.app; sourceTree = BUILT_PRODUCTS_DIR; }; F5B0128814B482BA00145F5E /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; @@ -36,7 +37,6 @@ F5B0129B14B482BA00145F5E /* NDAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NDAppDelegate.m; sourceTree = ""; }; F5B0129E14B482BA00145F5E /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainMenu.xib; sourceTree = ""; }; F5B012A614B482BB00145F5E /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; }; - F5B012BC14B485CA00145F5E /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = SDKs/MacOSX10.6.sdk/System/Library/Frameworks/WebKit.framework; sourceTree = DEVELOPER_DIR; }; F5B012BE14B48A3A00145F5E /* ProjectWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ProjectWindow.xib; sourceTree = ""; }; F5B012C014B48C0600145F5E /* NDProjectWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NDProjectWindowController.h; sourceTree = ""; }; F5B012C114B48C0600145F5E /* NDProjectWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NDProjectWindowController.m; sourceTree = ""; }; @@ -48,7 +48,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - F5B012BD14B485CA00145F5E /* WebKit.framework in Frameworks */, + 9428CF8C177887BF00968D67 /* WebKit.framework in Frameworks */, F5B0128914B482BA00145F5E /* Cocoa.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -56,6 +56,35 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 94AAEB31177889A10001AF1A /* Delegates */ = { + isa = PBXGroup; + children = ( + F5B0129A14B482BA00145F5E /* NDAppDelegate.h */, + F5B0129B14B482BA00145F5E /* NDAppDelegate.m */, + ); + name = Delegates; + sourceTree = ""; + }; + 94AAEB32177889A80001AF1A /* ProjectWindowController */ = { + isa = PBXGroup; + children = ( + F5B012C014B48C0600145F5E /* NDProjectWindowController.h */, + F5B012C114B48C0600145F5E /* NDProjectWindowController.m */, + F5B012BE14B48A3A00145F5E /* ProjectWindow.xib */, + ); + name = ProjectWindowController; + sourceTree = ""; + }; + 94AAEB33177889B50001AF1A /* Resources */ = { + isa = PBXGroup; + children = ( + F5B0CCD514BE82D6007CD4A6 /* nide-project.icns */, + F52B613114B568F400031F38 /* nide.icns */, + F5B0129D14B482BA00145F5E /* MainMenu.xib */, + ); + name = Resources; + sourceTree = ""; + }; F5B0127914B482B900145F5E = { isa = PBXGroup; children = ( @@ -76,7 +105,7 @@ F5B0128714B482BA00145F5E /* Frameworks */ = { isa = PBXGroup; children = ( - F5B012BC14B485CA00145F5E /* WebKit.framework */, + 9428CF8B177887BF00968D67 /* WebKit.framework */, F5B0128814B482BA00145F5E /* Cocoa.framework */, F5B012A614B482BB00145F5E /* SenTestingKit.framework */, F5B0128A14B482BA00145F5E /* Other Frameworks */, @@ -97,15 +126,10 @@ F5B0128E14B482BA00145F5E /* Nide */ = { isa = PBXGroup; children = ( - F5B0CCD514BE82D6007CD4A6 /* nide-project.icns */, - F52B613114B568F400031F38 /* nide.icns */, - F5B0129A14B482BA00145F5E /* NDAppDelegate.h */, - F5B0129B14B482BA00145F5E /* NDAppDelegate.m */, - F5B0129D14B482BA00145F5E /* MainMenu.xib */, - F5B012BE14B48A3A00145F5E /* ProjectWindow.xib */, + 94AAEB31177889A10001AF1A /* Delegates */, + 94AAEB32177889A80001AF1A /* ProjectWindowController */, + 94AAEB33177889B50001AF1A /* Resources */, F5B0128F14B482BA00145F5E /* Supporting Files */, - F5B012C014B48C0600145F5E /* NDProjectWindowController.h */, - F5B012C114B48C0600145F5E /* NDProjectWindowController.m */, ); path = Nide; sourceTree = ""; @@ -149,7 +173,7 @@ F5B0127B14B482B900145F5E /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0420; + LastUpgradeCheck = 0460; }; buildConfigurationList = F5B0127E14B482B900145F5E /* Build configuration list for PBXProject "Nide" */; compatibilityVersion = "Xcode 3.2"; @@ -247,6 +271,10 @@ ALWAYS_SEARCH_USER_PATHS = NO; ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; @@ -261,8 +289,9 @@ GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.8; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; }; @@ -274,6 +303,10 @@ ALWAYS_SEARCH_USER_PATHS = NO; ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -282,8 +315,9 @@ GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.8; SDKROOT = macosx; }; name = Release; @@ -292,12 +326,13 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = NO; + COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Nide/Nide-Prefix.pch"; INFOPLIST_FILE = "Nide/Nide-Info.plist"; MACOSX_DEPLOYMENT_TARGET = 10.6; PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = macosx10.6; + SDKROOT = macosx; WRAPPER_EXTENSION = app; }; name = Debug; @@ -306,12 +341,13 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = NO; + COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Nide/Nide-Prefix.pch"; INFOPLIST_FILE = "Nide/Nide-Info.plist"; MACOSX_DEPLOYMENT_TARGET = 10.6; PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = macosx10.6; + SDKROOT = macosx; WRAPPER_EXTENSION = app; }; name = Release; diff --git a/osx/Nide.xcodeproj/project.xcworkspace/xcuserdata/Ryan.xcuserdatad/UserInterfaceState.xcuserstate b/osx/Nide.xcodeproj/project.xcworkspace/xcuserdata/Ryan.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..71991b6 Binary files /dev/null and b/osx/Nide.xcodeproj/project.xcworkspace/xcuserdata/Ryan.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/osx/Nide.xcodeproj/project.xcworkspace/xcuserdata/Ryan.xcuserdatad/WorkspaceSettings.xcsettings b/osx/Nide.xcodeproj/project.xcworkspace/xcuserdata/Ryan.xcuserdatad/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..659c876 --- /dev/null +++ b/osx/Nide.xcodeproj/project.xcworkspace/xcuserdata/Ryan.xcuserdatad/WorkspaceSettings.xcsettings @@ -0,0 +1,10 @@ + + + + + HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges + + SnapshotAutomaticallyBeforeSignificantChanges + + + diff --git a/osx/Nide.xcodeproj/xcuserdata/Ryan.xcuserdatad/xcschemes/Nide.xcscheme b/osx/Nide.xcodeproj/xcuserdata/Ryan.xcuserdatad/xcschemes/Nide.xcscheme new file mode 100644 index 0000000..7ba7d4a --- /dev/null +++ b/osx/Nide.xcodeproj/xcuserdata/Ryan.xcuserdatad/xcschemes/Nide.xcscheme @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/osx/Nide.xcodeproj/xcuserdata/Ryan.xcuserdatad/xcschemes/xcschememanagement.plist b/osx/Nide.xcodeproj/xcuserdata/Ryan.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..1e6e30b --- /dev/null +++ b/osx/Nide.xcodeproj/xcuserdata/Ryan.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,22 @@ + + + + + SchemeUserState + + Nide.xcscheme + + orderHint + 0 + + + SuppressBuildableAutocreation + + F5B0128314B482BA00145F5E + + primary + + + + + diff --git a/osx/Nide/NDAppDelegate.h b/osx/Nide/NDAppDelegate.h index c8f33ed..e66759f 100644 --- a/osx/Nide/NDAppDelegate.h +++ b/osx/Nide/NDAppDelegate.h @@ -9,6 +9,7 @@ #import @interface NDAppDelegate : NSObject { + int port; NSWindow *window; } diff --git a/osx/Nide/NDAppDelegate.m b/osx/Nide/NDAppDelegate.m index 65bc422..fce6e1d 100644 --- a/osx/Nide/NDAppDelegate.m +++ b/osx/Nide/NDAppDelegate.m @@ -65,6 +65,4 @@ - (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filenam return YES; } - - @end diff --git a/osx/Nide/NDProjectWindowController.h b/osx/Nide/NDProjectWindowController.h index c5a8c85..9018a00 100644 --- a/osx/Nide/NDProjectWindowController.h +++ b/osx/Nide/NDProjectWindowController.h @@ -10,6 +10,7 @@ #import @interface NDProjectWindowController : NSWindowController { + NSString *projectPath; int port; BOOL shouldInit; diff --git a/osx/Nide/ProjectWindow.xib b/osx/Nide/ProjectWindow.xib index 1179cb8..10531e2 100644 --- a/osx/Nide/ProjectWindow.xib +++ b/osx/Nide/ProjectWindow.xib @@ -1,11 +1,11 @@ - 1060 - 11C74 - 1938 - 1138.23 - 567.00 + 1080 + 12A256 + 3084 + 1185 + 622.00 YES @@ -13,18 +13,18 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.WebKitIBPlugin - + YES - 1938 - 822 + 3084 + 2053 YES - WebView - NSWindowTemplate - NSView NSCustomObject + NSView + NSWindowTemplate + WebView YES @@ -106,7 +106,7 @@ WebKitMinimumFontSize WebKitPluginsEnabled - + YES @@ -127,9 +127,9 @@ - {{0, 0}, {1280, 800}} + {{0, 0}, {1366, 768}} {780, 452} - {9.9999998e+12, 9.9999998e+12} + {10000000000000, 10000000000000} 3 128 YES @@ -222,7 +222,7 @@ 2.IBPluginDependency 3.IBPluginDependency - + YES com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -270,32 +270,10 @@ ./Classes/NDProjectWindowController.h - - WebView - - reloadFromOrigin: - id - - - reloadFromOrigin: - - reloadFromOrigin: - id - - - - IBProjectSource - ./Classes/WebView.h - - 0 IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 diff --git a/osx/Nide/en.lproj/Credits.rtf b/osx/Nide/en.lproj/Credits.rtf index d2abf66..708a6a6 100644 --- a/osx/Nide/en.lproj/Credits.rtf +++ b/osx/Nide/en.lproj/Credits.rtf @@ -1,7 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf1185 {\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 Zapfino;} {\colortbl;\red255\green255\blue255;} -\paperw11900\paperh16840\vieww9600\viewh8400\viewkind0 +\paperw11905\paperh16837\vieww9600\viewh8400\viewkind0 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc \f0\b\fs24 \cf0 \ @@ -59,7 +59,7 @@ transformjs\ \b0 \ \ -\b Thanks to everyone who supported nide with donations, bug reports, patches and suggestions.\ +\b Thanks to everyone who supported Nide with donations, bug reports, patches and suggestions.\ \ -Thanks to everyone involved with Node.JS and NPM development.\ +Thanks to everyone involved with Node.js and NPM development.\ } \ No newline at end of file