Skip to content

Commit

Permalink
Move away from the prefixed instance variables.
Browse files Browse the repository at this point in the history
  • Loading branch information
@eczarny
eczarny committed Feb 1, 2013
1 parent e6edc70 commit 4698d07
Show file tree
Hide file tree
Showing 15 changed files with 283 additions and 311 deletions.
2 changes: 1 addition & 1 deletion Frameworks/ZeroKit
Submodule ZeroKit updated 16 files
+1 −1 ZKAccessibilityElement.h
+21 −21 ZKAccessibilityElement.m
+13 −13 ZKHotKey.h
+42 −44 ZKHotKey.m
+13 −13 ZKHotKeyRecorderCell.h
+49 −61 ZKHotKeyRecorderCell.m
+1 −1 ZKHotKeyTranslator.h
+5 −5 ZKHotKeyTranslator.m
+2 −2 ZKPreferencePaneManager.h
+14 −16 ZKPreferencePaneManager.m
+3 −3 ZKPreferencesWindowController.h
+23 −23 ZKPreferencesWindowController.m
+8 −8 ZKURLConnection.h
+30 −30 ZKURLConnection.m
+1 −1 ZKURLConnectionManager.h
+8 −8 ZKURLConnectionManager.m
86 changes: 34 additions & 52 deletions Languages/en.lproj/Spectacle.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1070</int>
<string key="IBDocument.SystemVersion">11E53</string>
<string key="IBDocument.InterfaceBuilderVersion">2549</string>
<string key="IBDocument.AppKitVersion">1138.47</string>
<string key="IBDocument.SystemVersion">11G63</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string>
<string key="IBDocument.AppKitVersion">1138.51</string>
<string key="IBDocument.HIToolboxVersion">569.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">2549</string>
<string key="NS.object.0">3084</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>NSCustomObject</string>
Expand Down Expand Up @@ -2006,14 +2006,6 @@
</object>
<int key="connectionID">422</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">myStatusItemMenu</string>
<reference key="source" ref="606044648"/>
<reference key="destination" ref="257670533"/>
</object>
<int key="connectionID">878</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">showPreferencesWindow:</string>
Expand All @@ -2030,6 +2022,14 @@
</object>
<int key="connectionID">1150</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">statusItemMenu</string>
<reference key="source" ref="606044648"/>
<reference key="destination" ref="257670533"/>
</object>
<int key="connectionID">1169</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">checkForUpdates:</string>
Expand Down Expand Up @@ -3245,7 +3245,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">1168</int>
<int key="maxID">1169</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
Expand Down Expand Up @@ -3335,13 +3335,13 @@
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">myStatusItemMenu</string>
<string key="NS.key.0">statusItemMenu</string>
<string key="NS.object.0">NSMenu</string>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<string key="NS.key.0">myStatusItemMenu</string>
<string key="NS.key.0">statusItemMenu</string>
<object class="IBToOneOutletInfo" key="NS.object.0">
<string key="name">myStatusItemMenu</string>
<string key="name">statusItemMenu</string>
<string key="candidateClassName">NSMenu</string>
</object>
</object>
Expand All @@ -3354,28 +3354,24 @@
<string key="className">SpectacleWindowActionController</string>
<string key="superclassName">NSObject</string>
<dictionary class="NSMutableDictionary" key="actions">
<string key="moveFrontMostWindowToBottomDisplay:">id</string>
<string key="moveFrontMostWindowToBottomHalf:">id</string>
<string key="moveFrontMostWindowToCenter:">id</string>
<string key="moveFrontMostWindowToFullscreen:">id</string>
<string key="moveFrontMostWindowToLeftDisplay:">id</string>
<string key="moveFrontMostWindowToLeftHalf:">id</string>
<string key="moveFrontMostWindowToLowerLeft:">id</string>
<string key="moveFrontMostWindowToLowerRight:">id</string>
<string key="moveFrontMostWindowToRightDisplay:">id</string>
<string key="moveFrontMostWindowToNextDisplay:">id</string>
<string key="moveFrontMostWindowToNextThird:">id</string>
<string key="moveFrontMostWindowToPreviousDisplay:">id</string>
<string key="moveFrontMostWindowToPreviousThird:">id</string>
<string key="moveFrontMostWindowToRightHalf:">id</string>
<string key="moveFrontMostWindowToTopDisplay:">id</string>
<string key="moveFrontMostWindowToTopHalf:">id</string>
<string key="moveFrontMostWindowToUpperLeft:">id</string>
<string key="moveFrontMostWindowToUpperRight:">id</string>
<string key="redoLastWindowAction:">id</string>
<string key="undoLastWindowAction:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="moveFrontMostWindowToBottomDisplay:">
<string key="name">moveFrontMostWindowToBottomDisplay:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="moveFrontMostWindowToBottomHalf:">
<string key="name">moveFrontMostWindowToBottomHalf:</string>
<string key="candidateClassName">id</string>
Expand All @@ -3388,10 +3384,6 @@
<string key="name">moveFrontMostWindowToFullscreen:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="moveFrontMostWindowToLeftDisplay:">
<string key="name">moveFrontMostWindowToLeftDisplay:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="moveFrontMostWindowToLeftHalf:">
<string key="name">moveFrontMostWindowToLeftHalf:</string>
<string key="candidateClassName">id</string>
Expand All @@ -3404,16 +3396,24 @@
<string key="name">moveFrontMostWindowToLowerRight:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="moveFrontMostWindowToRightDisplay:">
<string key="name">moveFrontMostWindowToRightDisplay:</string>
<object class="IBActionInfo" key="moveFrontMostWindowToNextDisplay:">
<string key="name">moveFrontMostWindowToNextDisplay:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="moveFrontMostWindowToRightHalf:">
<string key="name">moveFrontMostWindowToRightHalf:</string>
<object class="IBActionInfo" key="moveFrontMostWindowToNextThird:">
<string key="name">moveFrontMostWindowToNextThird:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="moveFrontMostWindowToTopDisplay:">
<string key="name">moveFrontMostWindowToTopDisplay:</string>
<object class="IBActionInfo" key="moveFrontMostWindowToPreviousDisplay:">
<string key="name">moveFrontMostWindowToPreviousDisplay:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="moveFrontMostWindowToPreviousThird:">
<string key="name">moveFrontMostWindowToPreviousThird:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="moveFrontMostWindowToRightHalf:">
<string key="name">moveFrontMostWindowToRightHalf:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="moveFrontMostWindowToTopHalf:">
Expand Down Expand Up @@ -3442,24 +3442,6 @@
<string key="minorKey">./Classes/SpectacleWindowActionController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">WebView</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">reloadFromOrigin:</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<string key="NS.key.0">reloadFromOrigin:</string>
<object class="IBActionInfo" key="NS.object.0">
<string key="name">reloadFromOrigin:</string>
<string key="candidateClassName">id</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/WebView.h</string>
</object>
</object>
</array>
</object>
<int key="IBDocument.localizationMode">0</int>
Expand Down
Loading

0 comments on commit 4698d07

Please sign in to comment.