Skip to content

Merge back @antmd 's changes #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
perfaram wants to merge 33 commits into from
Closed

Merge back @antmd 's changes #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
910bfd9
Better error messages when running sys load
antmd Feb 28, 2014
4fb025a
Handle custom getters properly for property introspection
antmd Feb 28, 2014
58a2cc5
Remove obsolete frameworks from 10.9 build
antmd Jun 19, 2014
247f814
Add alt keyboard shortcut to view browser, to select exact view shown…
antmd Jun 19, 2014
84c1c7a
Rudimentary history support
antmd Oct 2, 2014
e1aaf5b
Upgraded NIBs to XIBs, but only use FSConsole and FSScriptPreferences…
antmd Oct 2, 2014
563d654
Migrated a few more nibs
antmd Nov 16, 2014
9492f74
Started to enhance readability and configurability of FSObjectBrowser…
antmd Nov 16, 2014
a627fd6
Finished converting boilerplate code in FSObjectBrowserViewObjectInfo…
antmd Nov 16, 2014
5424498
Moved enum information into separate file
antmd Nov 16, 2014
7cece38
Reformat object browser view and browser view object info. Remove dea…
antmd Nov 17, 2014
a261fa1
Continuing development of view inspector
antmd Nov 17, 2014
857ad97
Initial draft of detailed object inspectors
antmd Nov 17, 2014
39b8e05
Improvements to inspector view
antmd Nov 18, 2014
b5ab3a5
Added different cell types for different value types in inspector. Ed…
antmd Nov 19, 2014
40a7be1
Tweaks
antmd Nov 19, 2014
4b3238c
Added getter and setter to object info
antmd Nov 19, 2014
b93ad50
Inspector now supports colour editing
antmd Nov 20, 2014
137f2a7
Added string editing in inspector view
antmd Nov 20, 2014
991cb61
Inspector now handles options correctly
antmd Nov 21, 2014
2e0fc85
Inspector now is independent of the browser; added Refresh and Browse…
antmd Nov 21, 2014
bb1c299
Can now edit sizes and rects
antmd Nov 22, 2014
1f3e958
Removed CHBidirectionalDictionary
antmd Nov 22, 2014
df1e963
Added pragma marks for each specific subclass
antmd Nov 22, 2014
783b8f6
Only use new inspector if the object is derived from an inspectable b…
antmd Nov 22, 2014
f159836
Fixed nib loading when F-Script is injected into a host app
antmd Nov 22, 2014
b0b0486
Added comments. Checkpoint in minor re-write of FSObjectBrowserViewOb…
antmd Nov 23, 2014
0013aea
Completed re-write of FSObjectBrowserViewObjectInfo to make it more r…
antmd Nov 23, 2014
85204de
Cleaner code in FSObjectBrowserViewObjectInfo
antmd Nov 24, 2014
3825a44
Improvements to detailed object inspector. Added a path hierarchy at …
antmd Nov 25, 2014
17e414a
Added NSStackView. FSObjectEnumInfo can now handle multiple enums wit…
antmd Nov 26, 2014
7595e96
Added NSEdgeInsets as a supported type
antmd Dec 5, 2014
4921d1c
Nibified FSObjectBrowser. Added float button to float the browser win…
antmd Dec 8, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 53 additions & 0 deletions .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
---
Language: Cpp
# BasedOnStyle: WebKit
AccessModifierOffset: -4
ConstructorInitializerIndentWidth: 4
AlignEscapedNewlinesLeft: false
AlignTrailingComments: false
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
AlwaysBreakTemplateDeclarations: false
AlwaysBreakBeforeMultilineStrings: false
BreakBeforeBinaryOperators: true
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: true
BinPackParameters: true
ColumnLimit: 0
ConstructorInitializerAllOnOneLineOrOnePerLine: false
DerivePointerBinding: false
ExperimentalAutoDetectBinPacking: false
IndentCaseLabels: false
MaxEmptyLinesToKeep: 2
KeepEmptyLinesAtTheStartOfBlocks: true
NamespaceIndentation: Inner
ObjCSpaceAfterProperty: true
ObjCSpaceBeforeProtocolList: true
PenaltyBreakBeforeFirstCallParameter: 19
PenaltyBreakComment: 300
PenaltyBreakString: 1000
PenaltyBreakFirstLessLess: 120
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 60
PointerBindsToType: true
SpacesBeforeTrailingComments: 1
Cpp11BracedListStyle: false
Standard: Cpp03
IndentWidth: 8
TabWidth: 8
UseTab: Never
BreakBeforeBraces: Stroustrup
IndentFunctionDeclarationAfterType: false
SpacesInParentheses: false
SpacesInAngles: false
SpaceInEmptyParentheses: false
SpacesInCStyleCastParentheses: false
SpacesInContainerLiterals: true
SpaceBeforeAssignmentOperators: true
ContinuationIndentWidth: 20
CommentPragmas: '^ IWYU pragma:'
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
SpaceBeforeParens: ControlStatements
...
109 changes: 109 additions & 0 deletions F-Script 10.9 copy-Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>F-Script</string>
<key>CFBundleGetInfoString</key>
<string></string>
<key>CFBundleIconFile</key>
<string>fs.icns</string>
<key>CFBundleIdentifier</key>
<string>org.fscript.fscriptapp</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>F-Script</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>2.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>2.2</string>
<key>LSEnvironment</key>
<dict/>
<key>NSAppleScriptEnabled</key>
<string>YES</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 1998-2010 Philippe Mougin. </string>
<key>NSMainNibFile</key>
<string>fs.nib</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>NSServices</key>
<array>
<dict>
<key>NSMenuItem</key>
<dict>
<key>default</key>
<string>F-Script/Execute Selection</string>
</dict>
<key>NSMessage</key>
<string>execute</string>
<key>NSPortName</key>
<string>F-Script</string>
<key>NSReturnTypes</key>
<array>
<string>NSStringPboardType</string>
</array>
<key>NSSendTypes</key>
<array>
<string>NSStringPboardType</string>
</array>
</dict>
<dict>
<key>NSMenuItem</key>
<dict>
<key>default</key>
<string>F-Script/View/Put Command</string>
</dict>
<key>NSMessage</key>
<string>putCommand</string>
<key>NSPortName</key>
<string>F-Script</string>
<key>NSSendTypes</key>
<array>
<string>NSStringPboardType</string>
</array>
</dict>
<dict>
<key>NSMenuItem</key>
<dict>
<key>default</key>
<string>F-Script/View/Put Command (Ret=execute)</string>
</dict>
<key>NSMessage</key>
<string>putCommand</string>
<key>NSPortName</key>
<string>F-Script</string>
<key>NSSendTypes</key>
<array>
<string>NSStringPboardType</string>
</array>
<key>NSUserData</key>
<string>DECOMPOSE</string>
</dict>
<dict>
<key>NSMenuItem</key>
<dict>
<key>default</key>
<string>F-Script/View/Put Command (Ret=newline)</string>
</dict>
<key>NSMessage</key>
<string>putCommand</string>
<key>NSPortName</key>
<string>F-Script</string>
<key>NSSendTypes</key>
<array>
<string>NSStringPboardType</string>
</array>
<key>NSUserData</key>
<string>NO_DECOMPOSE</string>
</dict>
</array>
</dict>
</plist>
Loading