adium 4793:f422b67d00e3: I thought I switched status prefs to us...
commits at adium.im
commits at adium.im
Mon Apr 30 03:33:13 UTC 2012
details: http://hg.adium.im/adium/rev/f422b67d00e3
revision: 4793:f422b67d00e3
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Sun Apr 29 23:19:11 2012 -0400
I thought I switched status prefs to use bindings when I did f286fac450e3.
Subject: adium 4794:aa8a930a8e3b: Remove some unused/old files.
details: http://hg.adium.im/adium/rev/aa8a930a8e3b
revision: 4794:aa8a930a8e3b
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Sun Apr 29 23:19:45 2012 -0400
Remove some unused/old files.
Subject: adium 4795:5cf365ce9352: Today's lesson in not using Apple's private methods: somewhere between old/886f95f00431 and #9620 Apple changed their document icon setup process. Use the new methods and fix #9620.
details: http://hg.adium.im/adium/rev/5cf365ce9352
revision: 4795:5cf365ce9352
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Sun Apr 29 23:27:29 2012 -0400
Today's lesson in not using Apple's private methods: somewhere between old/886f95f00431 and #9620 Apple changed their document icon setup process. Use the new methods and fix #9620.
diffs (truncated from 1866 to 1000 lines):
diff -r f8f09244f5f3 -r 5cf365ce9352 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Sun Apr 29 15:09:07 2012 -0400
+++ b/Adium.xcodeproj/project.pbxproj Sun Apr 29 23:27:29 2012 -0400
@@ -241,7 +241,6 @@
34082675075B079800703011 /* Dock Icons in Copy Built-in Xtras */ = {isa = PBXBuildFile; fileRef = 3408254D075B078B00703011 /* Dock Icons */; };
340C1ABF0BD58FAB00D09235 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 340C1ABE0BD58FAB00D09235 /* Security.framework */; };
340C1E770BD59A0500D09235 /* GBImportPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 340C1E750BD59A0500D09235 /* GBImportPlugin.m */; };
- 340D859B0ADC82D100D05B3F /* sourceListBackground.png in Resources */ = {isa = PBXBuildFile; fileRef = 340670790A55A044004E22AC /* sourceListBackground.png */; };
34107B4C09E9923D001CC042 /* AIGuestAccountWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34107B4A09E9923D001CC042 /* AIGuestAccountWindowController.m */; };
34107B5609E992DA001CC042 /* GuestAccountWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34107B5509E992DA001CC042 /* GuestAccountWindow.xib */; };
3419DE730A81042F00C3FC68 /* AccountPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8326107CBD598006466F2 /* AccountPrefs.plist */; };
@@ -584,7 +583,6 @@
34A6FB2E07D6F98600972830 /* SoundFileIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 34A6FB2C07D6F98600972830 /* SoundFileIcon.png */; };
34A88E180C7A26E0006EB7D4 /* AIPasswordPromptController.m in Sources */ = {isa = PBXBuildFile; fileRef = F55B416603AB8BFC01A8010A /* AIPasswordPromptController.m */; };
34A88E190C7A26E1006EB7D4 /* AIPasswordPromptController.h in Headers */ = {isa = PBXBuildFile; fileRef = F55B416E03AB8C3201A8010A /* AIPasswordPromptController.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 34A9705A0C965F2400F46006 /* AISideSplitView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A970590C965F2400F46006 /* AISideSplitView.m */; };
34A9706F0C965F8E00F46006 /* AIAddBookmarkPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A9706D0C965F8E00F46006 /* AIAddBookmarkPlugin.m */; };
34A970740C965FC800F46006 /* AddBookmark.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34A970730C965FC800F46006 /* AddBookmark.xib */; };
34A9707E0C96602300F46006 /* sidebarStatusAreaBackground.png in Resources */ = {isa = PBXBuildFile; fileRef = 34A9707D0C96602200F46006 /* sidebarStatusAreaBackground.png */; };
@@ -1185,8 +1183,6 @@
633400220F9C14C2003C77A9 /* MVMenuButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FF390F9C14BF003C77A9 /* MVMenuButton.m */; };
633400230F9C14C2003C77A9 /* AIImageButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FF3B0F9C14BF003C77A9 /* AIImageButton.h */; settings = {ATTRIBUTES = (Public, ); }; };
633400240F9C14C2003C77A9 /* AIImageButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FF3C0F9C14BF003C77A9 /* AIImageButton.m */; };
- 633400250F9C14C2003C77A9 /* AIColoredBoxView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FF3E0F9C14BF003C77A9 /* AIColoredBoxView.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 633400260F9C14C2003C77A9 /* AIColoredBoxView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FF3F0F9C14BF003C77A9 /* AIColoredBoxView.m */; };
633400270F9C14C2003C77A9 /* AIDelayedTextField.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FF410F9C14BF003C77A9 /* AIDelayedTextField.h */; settings = {ATTRIBUTES = (Public, ); }; };
633400280F9C14C2003C77A9 /* AIDelayedTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FF420F9C14BF003C77A9 /* AIDelayedTextField.m */; };
633400290F9C14C2003C77A9 /* AIImageViewWithImagePicker.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FF440F9C14BF003C77A9 /* AIImageViewWithImagePicker.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1209,8 +1205,6 @@
6334003A0F9C14C2003C77A9 /* AIVariableHeightOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FF580F9C14C0003C77A9 /* AIVariableHeightOutlineView.m */; };
6334003B0F9C14C2003C77A9 /* AIMultiCellOutlineView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FF590F9C14C0003C77A9 /* AIMultiCellOutlineView.h */; settings = {ATTRIBUTES = (Public, ); }; };
6334003C0F9C14C2003C77A9 /* AIMultiCellOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FF5A0F9C14C0003C77A9 /* AIMultiCellOutlineView.m */; };
- 6334004D0F9C14C2003C77A9 /* AIToolbarTabView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FF6E0F9C14C0003C77A9 /* AIToolbarTabView.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 6334004E0F9C14C2003C77A9 /* AIToolbarTabView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FF6F0F9C14C0003C77A9 /* AIToolbarTabView.m */; };
6334004F0F9C14C2003C77A9 /* AISplitView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FF710F9C14C0003C77A9 /* AISplitView.h */; settings = {ATTRIBUTES = (Public, ); }; };
633400500F9C14C2003C77A9 /* AISplitView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FF720F9C14C0003C77A9 /* AISplitView.m */; };
633400510F9C14C2003C77A9 /* AIAlternatingRowTableView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FF740F9C14C0003C77A9 /* AIAlternatingRowTableView.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -2028,7 +2022,6 @@
340580AD087EEFA300664D64 /* ru */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = ru; path = "Plugins/WebKit Message View/Resources/ru.lproj/WebKitPreferencesView.xib"; sourceTree = "<group>"; };
34064D0E0F21B34200AA6FE3 /* PurpleFacebookAccountViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PurpleFacebookAccountViewController.m; path = "Plugins/Purple Service/PurpleFacebookAccountViewController.m"; sourceTree = "<group>"; };
34064D0F0F21B34200AA6FE3 /* PurpleFacebookAccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PurpleFacebookAccountViewController.h; path = "Plugins/Purple Service/PurpleFacebookAccountViewController.h"; sourceTree = "<group>"; };
- 340670790A55A044004E22AC /* sourceListBackground.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = sourceListBackground.png; path = Resources/sourceListBackground.png; sourceTree = "<group>"; };
3407AE870E0452A300DCE4B1 /* da */ = {isa = PBXFileReference; lastKnownFileType = folder; name = da; path = "Resources/da.lproj/Shared Dock Icon Images"; sourceTree = "<group>"; };
3408254D075B078B00703011 /* Dock Icons */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "Dock Icons"; path = "Resources/Dock Icons"; sourceTree = "<group>"; };
340833EA075C3A7900703011 /* AILocalizationTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AILocalizationTextField.h; path = "Frameworks/Adium Framework/Source/AILocalizationTextField.h"; sourceTree = "<group>"; };
@@ -3135,8 +3128,6 @@
34A81DD1093CE92300B0E93D /* pl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = pl; path = "Plugins/Purple Service/Resources/pl.lproj/DCPurpleMeanwhileJoinChatView.xib"; sourceTree = "<group>"; };
34A81DD2093CE92300B0E93D /* pl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = pl; path = "Plugins/Purple Service/Resources/pl.lproj/DCPurpleJabberJoinChatView.xib"; sourceTree = "<group>"; };
34A81DD5093CE92400B0E93D /* pl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = pl; path = Resources/pl.lproj/AccountProxy.xib; sourceTree = "<group>"; };
- 34A970580C965F2400F46006 /* AISideSplitView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AISideSplitView.h; path = "Plugins/Dual Window Interface/AISideSplitView.h"; sourceTree = "<group>"; };
- 34A970590C965F2400F46006 /* AISideSplitView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AISideSplitView.m; path = "Plugins/Dual Window Interface/AISideSplitView.m"; sourceTree = "<group>"; };
34A970660C965F6900F46006 /* AINewBookmarkWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AINewBookmarkWindowController.h; path = Source/AINewBookmarkWindowController.h; sourceTree = "<group>"; };
34A970670C965F6900F46006 /* AINewBookmarkWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AINewBookmarkWindowController.m; path = Source/AINewBookmarkWindowController.m; sourceTree = "<group>"; };
34A9706D0C965F8E00F46006 /* AIAddBookmarkPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIAddBookmarkPlugin.m; path = Source/AIAddBookmarkPlugin.m; sourceTree = "<group>"; };
@@ -4069,8 +4060,6 @@
6334FF390F9C14BF003C77A9 /* MVMenuButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MVMenuButton.m; path = "Frameworks/AIUtilities Framework/Source/MVMenuButton.m"; sourceTree = "<group>"; };
6334FF3B0F9C14BF003C77A9 /* AIImageButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIImageButton.h; path = "Frameworks/AIUtilities Framework/Source/AIImageButton.h"; sourceTree = "<group>"; };
6334FF3C0F9C14BF003C77A9 /* AIImageButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIImageButton.m; path = "Frameworks/AIUtilities Framework/Source/AIImageButton.m"; sourceTree = "<group>"; };
- 6334FF3E0F9C14BF003C77A9 /* AIColoredBoxView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIColoredBoxView.h; path = "Frameworks/AIUtilities Framework/Source/AIColoredBoxView.h"; sourceTree = "<group>"; };
- 6334FF3F0F9C14BF003C77A9 /* AIColoredBoxView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIColoredBoxView.m; path = "Frameworks/AIUtilities Framework/Source/AIColoredBoxView.m"; sourceTree = "<group>"; };
6334FF410F9C14BF003C77A9 /* AIDelayedTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIDelayedTextField.h; path = "Frameworks/AIUtilities Framework/Source/AIDelayedTextField.h"; sourceTree = "<group>"; };
6334FF420F9C14BF003C77A9 /* AIDelayedTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIDelayedTextField.m; path = "Frameworks/AIUtilities Framework/Source/AIDelayedTextField.m"; sourceTree = "<group>"; };
6334FF440F9C14BF003C77A9 /* AIImageViewWithImagePicker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIImageViewWithImagePicker.h; path = "Frameworks/AIUtilities Framework/Source/AIImageViewWithImagePicker.h"; sourceTree = "<group>"; };
@@ -4093,8 +4082,6 @@
6334FF580F9C14C0003C77A9 /* AIVariableHeightOutlineView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIVariableHeightOutlineView.m; path = "Frameworks/AIUtilities Framework/Source/AIVariableHeightOutlineView.m"; sourceTree = "<group>"; };
6334FF590F9C14C0003C77A9 /* AIMultiCellOutlineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIMultiCellOutlineView.h; path = "Frameworks/AIUtilities Framework/Source/AIMultiCellOutlineView.h"; sourceTree = "<group>"; };
6334FF5A0F9C14C0003C77A9 /* AIMultiCellOutlineView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIMultiCellOutlineView.m; path = "Frameworks/AIUtilities Framework/Source/AIMultiCellOutlineView.m"; sourceTree = "<group>"; };
- 6334FF6E0F9C14C0003C77A9 /* AIToolbarTabView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIToolbarTabView.h; path = "Frameworks/AIUtilities Framework/Source/AIToolbarTabView.h"; sourceTree = "<group>"; };
- 6334FF6F0F9C14C0003C77A9 /* AIToolbarTabView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIToolbarTabView.m; path = "Frameworks/AIUtilities Framework/Source/AIToolbarTabView.m"; sourceTree = "<group>"; };
6334FF710F9C14C0003C77A9 /* AISplitView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AISplitView.h; path = "Frameworks/AIUtilities Framework/Source/AISplitView.h"; sourceTree = "<group>"; };
6334FF720F9C14C0003C77A9 /* AISplitView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AISplitView.m; path = "Frameworks/AIUtilities Framework/Source/AISplitView.m"; sourceTree = "<group>"; };
6334FF740F9C14C0003C77A9 /* AIAlternatingRowTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIAlternatingRowTableView.h; path = "Frameworks/AIUtilities Framework/Source/AIAlternatingRowTableView.h"; sourceTree = "<group>"; };
@@ -6174,7 +6161,6 @@
34D834CD07CBE7A3006466F2 /* Text field for previewing font preferences */,
348B25C70A50FBF300B2B972 /* KNShelfSplitView.h */,
348B25C60A50FBF300B2B972 /* KNShelfSplitView.m */,
- 340670790A55A044004E22AC /* sourceListBackground.png */,
);
name = "External Sources";
sourceTree = "<group>";
@@ -7484,14 +7470,12 @@
6334FF760F9C14C0003C77A9 /* Text Field with dragging delegate */,
6334FF730F9C14C0003C77A9 /* Table View with several improvements */,
6334FF700F9C14C0003C77A9 /* Split View with thickness control */,
- 6334FF6D0F9C14C0003C77A9 /* Resizing preference window */,
5A8A6A46124456B1004965A8 /* Segmented control with menu popup */,
6334FF540F9C14C0003C77A9 /* Outline view with separate group & content cells */,
6334FF4D0F9C14BF003C77A9 /* OutlineView with several improvements */,
6334FF460F9C14BF003C77A9 /* Link Tracking Text View */,
6334FF430F9C14BF003C77A9 /* Image view with image picker from AB/iChat */,
6334FF400F9C14BF003C77A9 /* Delayed action textField */,
- 6334FF3D0F9C14BF003C77A9 /* Colored box view */,
6334FF370F9C14BF003C77A9 /* Button with a popup menu for toolbar items */,
6334FF340F9C14BF003C77A9 /* Button with rollover delegate action */,
6334FF310F9C14BF003C77A9 /* Auto-completing textField */,
@@ -7536,15 +7520,6 @@
name = "Version of this with an image floater";
sourceTree = "<group>";
};
- 6334FF3D0F9C14BF003C77A9 /* Colored box view */ = {
- isa = PBXGroup;
- children = (
- 6334FF3E0F9C14BF003C77A9 /* AIColoredBoxView.h */,
- 6334FF3F0F9C14BF003C77A9 /* AIColoredBoxView.m */,
- );
- name = "Colored box view";
- sourceTree = "<group>";
- };
6334FF400F9C14BF003C77A9 /* Delayed action textField */ = {
isa = PBXGroup;
children = (
@@ -7602,15 +7577,6 @@
name = "Outline view with separate group & content cells";
sourceTree = "<group>";
};
- 6334FF6D0F9C14C0003C77A9 /* Resizing preference window */ = {
- isa = PBXGroup;
- children = (
- 6334FF6E0F9C14C0003C77A9 /* AIToolbarTabView.h */,
- 6334FF6F0F9C14C0003C77A9 /* AIToolbarTabView.m */,
- );
- name = "Resizing preference window";
- sourceTree = "<group>";
- };
6334FF700F9C14C0003C77A9 /* Split View with thickness control */ = {
isa = PBXGroup;
children = (
@@ -8586,8 +8552,6 @@
3461621306FB482D009181D8 /* UserList Layout.plist */,
346371050BCA0A5400AD57AD /* AIMessageTabSplitView.h */,
346371060BCA0A5400AD57AD /* AIMessageTabSplitView.m */,
- 34A970580C965F2400F46006 /* AISideSplitView.h */,
- 34A970590C965F2400F46006 /* AISideSplitView.m */,
34F8D2AC0CF68FEB00F62536 /* AIUserListOutlineView.h */,
34F8D2AD0CF68FEB00F62536 /* AIUserListOutlineView.m */,
348C47150D3B20BE00FB6E7A /* AIMessageWindowOutgoingScrollView.h */,
@@ -9003,7 +8967,6 @@
6334001F0F9C14C2003C77A9 /* AIRolloverButton.h in Headers */,
633400210F9C14C2003C77A9 /* MVMenuButton.h in Headers */,
633400230F9C14C2003C77A9 /* AIImageButton.h in Headers */,
- 633400250F9C14C2003C77A9 /* AIColoredBoxView.h in Headers */,
633400270F9C14C2003C77A9 /* AIDelayedTextField.h in Headers */,
633400290F9C14C2003C77A9 /* AIImageViewWithImagePicker.h in Headers */,
6334002B0F9C14C2003C77A9 /* AILinkTextView.h in Headers */,
@@ -9015,7 +8978,6 @@
633400370F9C14C2003C77A9 /* AIVariableHeightFlexibleColumnsOutlineView.h in Headers */,
633400390F9C14C2003C77A9 /* AIVariableHeightOutlineView.h in Headers */,
6334003B0F9C14C2003C77A9 /* AIMultiCellOutlineView.h in Headers */,
- 6334004D0F9C14C2003C77A9 /* AIToolbarTabView.h in Headers */,
6334004F0F9C14C2003C77A9 /* AISplitView.h in Headers */,
633400510F9C14C2003C77A9 /* AIAlternatingRowTableView.h in Headers */,
633400530F9C14C2003C77A9 /* AITextFieldWithDraggingDelegate.h in Headers */,
@@ -9707,7 +9669,6 @@
34DC8AD90A7EEEF7003E1636 /* JoinChatWindow.xib in Resources */,
34DC8AE40A7EEEF7003E1636 /* stackImage.png in Resources */,
3419E2DF0A81445800C3FC68 /* Localizable.strings in Resources */,
- 340D859B0ADC82D100D05B3F /* sourceListBackground.png in Resources */,
34F144430BA8FF3C000473DE /* EmoticonNames.strings in Resources */,
34A1A8E70DFB276E00AC78CF /* SocialNetworkingCustomStatus.xib in Resources */,
114849BC0F78420300EA5264 /* AIAuthorizationRequestsWindow.xib in Resources */,
@@ -10251,7 +10212,6 @@
344D97530C3C442600498CA1 /* Presentity.m in Sources */,
0C79A2D90C5E633F005AE6FA /* AIMoveCommand.m in Sources */,
0C27C8650C75A23F002AA363 /* NSStringScriptingAdditions.m in Sources */,
- 34A9705A0C965F2400F46006 /* AISideSplitView.m in Sources */,
34A9706F0C965F8E00F46006 /* AIAddBookmarkPlugin.m in Sources */,
343BB5020C96CB2000506F9B /* AINewBookmarkWindowController.m in Sources */,
34F8D2AE0CF68FEB00F62536 /* AIUserListOutlineView.m in Sources */,
@@ -10460,7 +10420,6 @@
633400200F9C14C2003C77A9 /* AIRolloverButton.m in Sources */,
633400220F9C14C2003C77A9 /* MVMenuButton.m in Sources */,
633400240F9C14C2003C77A9 /* AIImageButton.m in Sources */,
- 633400260F9C14C2003C77A9 /* AIColoredBoxView.m in Sources */,
633400280F9C14C2003C77A9 /* AIDelayedTextField.m in Sources */,
6334002A0F9C14C2003C77A9 /* AIImageViewWithImagePicker.m in Sources */,
6334002C0F9C14C2003C77A9 /* AILinkTextView.m in Sources */,
@@ -10472,7 +10431,6 @@
633400380F9C14C2003C77A9 /* AIVariableHeightFlexibleColumnsOutlineView.m in Sources */,
6334003A0F9C14C2003C77A9 /* AIVariableHeightOutlineView.m in Sources */,
6334003C0F9C14C2003C77A9 /* AIMultiCellOutlineView.m in Sources */,
- 6334004E0F9C14C2003C77A9 /* AIToolbarTabView.m in Sources */,
633400500F9C14C2003C77A9 /* AISplitView.m in Sources */,
633400520F9C14C2003C77A9 /* AIAlternatingRowTableView.m in Sources */,
633400540F9C14C2003C77A9 /* AITextFieldWithDraggingDelegate.m in Sources */,
diff -r f8f09244f5f3 -r 5cf365ce9352 Frameworks/AIUtilities Framework/Source/AIColoredBoxView.h
--- a/Frameworks/AIUtilities Framework/Source/AIColoredBoxView.h Sun Apr 29 15:09:07 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
- * Adium is the legal property of its developers, whose names are listed in the copyright file included
- * with this source distribution.
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
- * General Public License as published by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with this program; if not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-/*!
- * @class AIColoredBoxView
- * @brief View which draws filled with a particular color
- *
- * View which draws, simply filling its bounds with a particular color.
- */
- at interface AIColoredBoxView : NSView {
- NSColor *color;
-}
-
-/*!
- * @brief The color of the view
- *
- * The <tt>NSColor</tt> to draw in the view
- */
- at property (readwrite, nonatomic, retain) NSColor *color;
-
- at end
diff -r f8f09244f5f3 -r 5cf365ce9352 Frameworks/AIUtilities Framework/Source/AIColoredBoxView.m
--- a/Frameworks/AIUtilities Framework/Source/AIColoredBoxView.m Sun Apr 29 15:09:07 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
- * Adium is the legal property of its developers, whose names are listed in the copyright file included
- * with this source distribution.
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
- * General Public License as published by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with this program; if not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#import "AIColoredBoxView.h"
-
-// A colored box
-
- at implementation AIColoredBoxView
-
- at synthesize color;
-
-- (BOOL)isOpaque
-{
- return NO;
-}
-
-- (void)drawRect:(NSRect)rect
-{
- // Clear the rect
- [[NSColor clearColor] set];
- NSRectFill(rect);
-
- // Fill it with our color
- if (!color) {
- self.color = [NSColor whiteColor];
- }
-
- [color set];
- NSRectFill(rect);
-
- // Draw our contents
- [super drawRect:rect];
-}
-
-- (void)dealloc
-{
- self.color = nil;
-
- [super dealloc];
-}
-
- at end
diff -r f8f09244f5f3 -r 5cf365ce9352 Frameworks/AIUtilities Framework/Source/AIToolbarTabView.h
--- a/Frameworks/AIUtilities Framework/Source/AIToolbarTabView.h Sun Apr 29 15:09:07 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-/*
- * Adium is the legal property of its developers, whose names are listed in the copyright file included
- * with this source distribution.
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
- * General Public License as published by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with this program; if not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-
-/*!
- * @protocol AIToolbarTabViewDelegate
- * @brief Methods which may optionally be implemented by an <tt>AIToolbarTabView</tt>'s delegate
- *
- * These methods allow the delegate greater control over the tab view.
- */
- at protocol AIToolbarTabViewDelegate
- at optional
-/*!
- * @brief Allows automatic creation of toolbar items for each <tt>NSTabViewItem</tt> the <tt>AIToolbarTabView</tt> contains.
- *
- * If this method is implemented by the delegate, the delegate will be queried for an image for each <tt>NSTabViewItem</tt>. These images will be used to automatically populate the window's toolbar with toolbar items.
- * @param tabView The <tt>NSTabView</tt> sending the message
- * @param tabViewItem The <tt>NSTabViewItem</tt> for which an image is requested
- * @result An <tt>NSImage</tt> to use for a toolbar item associated with <b>tabViewItem</b>.
- */
-- (NSImage *)tabView:(NSTabView *)tabView imageForTabViewItem:(NSTabViewItem *)tabViewItem;
-
-/*!
- * @brief Allows automatic resizing of the window when the toolbar is used to switch to an <tt>NSTabViewItem</tt>.
- *
- * If this method is implemented by the delegate, the delegate will be queried for a desired height when the user clicks the toolbar button associated with an <tt>NSTabViewItem</tt> (the toolbar item is created by implementation of tabView:imageForTabViewItem: by the delegate -- see its description.).
- * @param tabView The <tt>NSTabView</tt> sending the message
- * @param tabViewItem The <tt>NSTabViewItem</tt> for a height is requested
- * @result The height needed to display <b>tabViewItem</b>. The window will be smoothly resized to this height.
- */
-- (int)tabView:(NSTabView *)tabView heightForTabViewItem:(NSTabViewItem *)tabViewItem;
-
-/*!
- * @brief Label for the passed tab view item
- *
- * If this method is implemented, the delegate is queried for the label to show for each tab view item.
- * @result The label to use. If nil or unimplemented, [tabViewItem label] will be used.
- */
-- (NSString *)tabView:(NSTabView *)tabView labelForTabViewItem:(NSTabViewItem *)tabViewItem;
-/*
- * @brief Should the loading indicator be shown immediately until a tab view item is selected?
- *
- * If this method is implemented and returns YES, the loading pane will immediately be shown with its spinning progress
- * indicator animating. If this method is not implemented or returns NO, the load pane will not be shown until the run
- * loop after the user's click. YES is appropriate if loading may take an appreciable amount of time; NO looks better
- * if the loading process is near-instanteous.
- *
- * For example, in Adium, the first time a preferences tab is selected, this method returns YES.
- * For subsequent displays, when information is already cached and ready, the method returns NO.
- */
-- (BOOL)immediatelyShowLoadingIndicatorForTabView:(NSTabView *)tabView willSelectTabViewItem:(NSTabViewItem *)tabViewItem;
-
- at end
-
-
-/*!
- * @class AIToolbarTabView
- * @brief <tt>NSTabView</tt> subclass for creating preference-type windows
- *
- * <p>This is a special <tt>NSTabView</tt> subclass which is useful when creating preference-type windows. The tabview will automatically create a window toolbar and add an toolbar item for each tab it contains. The tabview delegate will be asked for the toolbar images.</p>
- * <p>This class also contains methods for auto-sizing the parent window based on the selected tab. The delegate is asked for the window size, and this tabview takes care of the animation.</p>
- * @see <tt><a href="category_n_s_object(_a_i_toolbar_tab_view_delegate).html" target="_top">NSObject(AIToolbarTabViewDelegate)</a></tt>
-*/
- at interface AIToolbarTabView : NSTabView <NSToolbarDelegate, AIToolbarTabViewDelegate> {
- NSMutableDictionary *toolbarItems;
- int oldHeight;
-
- IBOutlet NSTabViewItem *tabViewItem_loading;
- IBOutlet NSProgressIndicator *progressIndicator_loading;
-}
-
- at end
diff -r f8f09244f5f3 -r 5cf365ce9352 Frameworks/AIUtilities Framework/Source/AIToolbarTabView.m
--- a/Frameworks/AIUtilities Framework/Source/AIToolbarTabView.m Sun Apr 29 15:09:07 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,211 +0,0 @@
-/*
- * Adium is the legal property of its developers, whose names are listed in the copyright file included
- * with this source distribution.
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
- * General Public License as published by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with this program; if not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-/* AIToolbarTabView
-
- This is a special tab view subclass that's useful in creating preference-type windows. The tabview will
- automatically create a window toolbar and add an toolbar item for each tab it contains. The tabview
- delegate will be asked for the toolbar images.
-
- This class also contains methods for auto-sizing the parent window based on the selected tab. The delegate
- is asked for the window size, and this tabview takes care of the animation.
-
-*/
-
-#import "AIToolbarTabView.h"
-#import "AIToolbarUtilities.h"
-
- at interface AIToolbarTabView ()
-- (void)installToolbarItems;
-- (IBAction)selectCategory:(id)sender;
- at end
-
- at implementation AIToolbarTabView
-
-- (void)awakeFromNib
-{
- //
- toolbarItems = [[NSMutableDictionary dictionary] retain];
- oldHeight = 100; //Height of the original tab view content
-
- //Create our toolbar
- NSToolbar *toolbar = [[[NSToolbar alloc] initWithIdentifier:@"ToolbarTabView"] autorelease];
- [toolbar setDelegate:self];
- [toolbar setAllowsUserCustomization:NO];
- [toolbar setAutosavesConfiguration:NO];
-
- [self installToolbarItems];
- [[self window] setToolbar:toolbar];
-}
-
-//Dealloc
-- (void)dealloc
-{
- [toolbarItems release];
-
- [super dealloc];
-}
-
-
-//Toolbar --------------------------------------------------------------------------------------------------------------
-#pragma mark Toolbar
-//Install a toolbar item for each tab view item we contain
-- (void)installToolbarItems
-{
- if ([[self delegate] respondsToSelector:@selector(tabView:imageForTabViewItem:)]) {
- int i;
-
- for (i = 0; i < [self numberOfTabViewItems]; i++) {
- NSTabViewItem *tabViewItem = [self tabViewItemAtIndex:i];
- NSString *identifier = [NSString stringWithFormat:@"%i",i];
- NSString *label = nil;
-
- if ([[self delegate] respondsToSelector:@selector(tabView:labelForTabViewItem:)]) {
- label = [(id<AIToolbarTabViewDelegate>)[self delegate] tabView:self labelForTabViewItem:tabViewItem];
- }
-
- if (!label) label = [tabViewItem label];
-
- //We use the tab view item's index as identifier so we can easily sort our toolbar items into the same
- //ordering as the tabs.
- if (![toolbarItems objectForKey:identifier] && (tabViewItem != tabViewItem_loading)) {
- [AIToolbarUtilities addToolbarItemToDictionary:toolbarItems
- withIdentifier:identifier
- label:label
- paletteLabel:label
- toolTip:label
- target:self
- settingSelector:@selector(setImage:)
- itemContent:[(id<AIToolbarTabViewDelegate>)[self delegate] tabView:self
- imageForTabViewItem:tabViewItem]
- action:@selector(selectCategory:)
- menu:NULL];
- }
- }
-
- [[[self window] toolbar] setConfigurationFromDictionary:toolbarItems];
- }
-}
-
-//Select the category that invoked this method
-//Select the corresponding tab view item
-- (IBAction)selectCategory:(id)sender
-{
- [self selectTabViewItemAtIndex:[[sender itemIdentifier] intValue]];
-}
-
-//Enable all categories
-- (BOOL)validateToolbarItem:(NSToolbarItem *)theItem
-{
- return YES;
-}
-
-//Access to our toolbar items
-- (NSToolbarItem *)toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)itemIdentifier
- willBeInsertedIntoToolbar:(BOOL)flag
-{
- return [AIToolbarUtilities toolbarItemFromDictionary:toolbarItems withIdentifier:itemIdentifier];
-}
-
-//Default set (All items, sorted by name)
-- (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar*)toolbar
-{
- return [[toolbarItems allKeys] sortedArrayUsingSelector:@selector(compare:)];
-}
-
-- (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar*)toolbar
-{
- return [self toolbarDefaultItemIdentifiers:toolbar];
-}
-
-- (NSArray *)toolbarSelectableItemIdentifiers:(NSToolbar *)toolbar
-{
- return [self toolbarDefaultItemIdentifiers:toolbar];
-}
-
-
-//Window Resizing ------------------------------------------------------------------------------------------------------
-#pragma mark Window Resizing
-//Resize our window when the tabview selection changes
-- (void)selectTabViewItem:(NSTabViewItem *)tabViewItem
-{
- //Update the selected toolbar item (10.3 or higher)
- if ([[[self window] toolbar] respondsToSelector:@selector(setSelectedItemIdentifier:)]) {
- [[[self window] toolbar] setSelectedItemIdentifier:[NSString stringWithFormat:@"%i",[self indexOfTabViewItem:tabViewItem]]];
- }
-
- if (tabViewItem != [self selectedTabViewItem]) {
- if (tabViewItem_loading) {
- //Start the spinning progress indicator
- [progressIndicator_loading setUsesThreadedAnimation:YES];
- [progressIndicator_loading startAnimation:self];
-
- //Select the loading tab view
- [super selectTabViewItem:tabViewItem_loading];
-
- if (![[self delegate] respondsToSelector:@selector(immediatelyShowLoadingIndicatorForTabView:willSelectTabViewItem:)] ||
- [(id<AIToolbarTabViewDelegate>)[self delegate] immediatelyShowLoadingIndicatorForTabView:self willSelectTabViewItem:tabViewItem]) {
- [[self window] display];
- }
-
- /* Now inform our delegate that we will be selecting the desired tab view
- * since after [super selectTabViewItem:tabViewItem_loading]; it thinks we are selecting tabViewItem_loading */
- if ([[self delegate] respondsToSelector:@selector(tabView:willSelectTabViewItem:)]) {
- [[self delegate] tabView:self willSelectTabViewItem:tabViewItem];
- }
-
- } else if ([self respondsToSelector:@selector(setHidden:)]) {
- //If not, just hide
- [self setHidden:YES];
- }
- }
-
- if (!tabViewItem_loading) {
- //Select before resizing if we don't have a tab to show while loading
- [super selectTabViewItem:tabViewItem];
- }
-
- //Resize the window
- if ([[self delegate] respondsToSelector:@selector(tabView:heightForTabViewItem:)]) {
- int height = [(id<AIToolbarTabViewDelegate>)[self delegate] tabView:self heightForTabViewItem:tabViewItem];
- BOOL isVisible = [[self window] isVisible];
- NSRect frame = [[self window] frame];
-
- //Factor out old view's height, factor in new view's height
- frame.size.height += (height - oldHeight);
- frame.origin.y -= (height - oldHeight);
- oldHeight = height;
-
- [[self window] setFrame:frame display:isVisible animate:isVisible];
- }
-
- if (tabViewItem_loading) {
- //Select after resizing if we had a tab to show while loading
- [super selectTabViewItem:tabViewItem];
-
- //And stop the animation on the next run loop
- [progressIndicator_loading performSelector:@selector(stopAnimation:)
- withObject:self
- afterDelay:0];
-
- } else if ([self respondsToSelector:@selector(setHidden:)]) {
- //Otherwise, we simply hid before, so unhide now
- [self setHidden:NO];
- }
-}
-
-
- at end
diff -r f8f09244f5f3 -r 5cf365ce9352 Plugins/Dual Window Interface/AIMessageWindowController.h
--- a/Plugins/Dual Window Interface/AIMessageWindowController.h Sun Apr 29 15:09:07 2012 -0400
+++ b/Plugins/Dual Window Interface/AIMessageWindowController.h Sun Apr 29 23:27:29 2012 -0400
@@ -52,8 +52,6 @@
NSDictionary *toolbarItems;
NSMutableArray *m_containedChats;
- BOOL hasShownDocumentButton;
-
BOOL toolbar_selectedTabChanged;
NSToolbar *toolbar;
}
diff -r f8f09244f5f3 -r 5cf365ce9352 Plugins/Dual Window Interface/AIMessageWindowController.m
--- a/Plugins/Dual Window Interface/AIMessageWindowController.m Sun Apr 29 15:09:07 2012 -0400
+++ b/Plugins/Dual Window Interface/AIMessageWindowController.m Sun Apr 29 23:27:29 2012 -0400
@@ -68,11 +68,6 @@
- (void)_relayoutWindow;
@end
-//Used to squelch compiler warnings on this private call
- at interface NSWindow (AISecretWindowDocumentIconAdditions)
-- (void)addDocumentIconButton;
- at end
-
@implementation AIMessageWindowController
//Create a new message window controller
@@ -99,7 +94,6 @@
containerName = [inName retain];
containerID = [inContainerID retain];
m_containedChats = [[NSMutableArray alloc] init];
- hasShownDocumentButton = NO;
//Load our window
myWindow = [self window];
@@ -597,6 +591,12 @@
return tabPosition;
}
+//Prevent the document popup since we aren't using an actual file
+- (BOOL)window:(NSWindow *)window shouldPopUpDocumentPathMenu:(NSMenu *)menu
+{
+ return NO;
+}
+
//Contained Chats ------------------------------------------------------------------------------------------------------
#pragma mark Contained Chats
//Add a tab view item container at the end of the tabs (without changing the current selection)
@@ -751,26 +751,13 @@
if (title) [window setTitle:title];
//Window Icon (We display state in the window title if tabs are not visible)
- if (!hasShownDocumentButton) {
- if ([window respondsToSelector:@selector(addDocumentIconButton)]) {
- [window addDocumentIconButton];
- }
- hasShownDocumentButton = YES;
- }
-
button = [window standardWindowButton:NSWindowDocumentIconButton];
-
- if ([tabView_tabBar isTabBarHidden]) {
- NSImage *image = [(AIMessageTabViewItem *)[tabView_messages selectedTabViewItem] stateIcon];
- if (image != [button image]) {
- [button setImage:image];
- }
-
- } else {
- if ([button image]) {
- [button setImage:nil];
- }
- }
+ [window setRepresentedURL:[NSURL URLWithString:@"StatusIcon"]];
+
+ if ([tabView_tabBar isTabBarHidden])
+ [button setImage:[(AIMessageTabViewItem *)[tabView_messages selectedTabViewItem] icon]];
+ else
+ [button setImage:nil];
}
- (AIChat *)activeChat
diff -r f8f09244f5f3 -r 5cf365ce9352 Plugins/Dual Window Interface/AISideSplitView.h
--- a/Plugins/Dual Window Interface/AISideSplitView.h Sun Apr 29 15:09:07 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-/* AISideSplitView */
-
-#import <AIUtilities/AISplitView.h>
-
- at interface AISideSplitView : AISplitView
-{
-}
- at end
diff -r f8f09244f5f3 -r 5cf365ce9352 Plugins/Dual Window Interface/AISideSplitView.m
--- a/Plugins/Dual Window Interface/AISideSplitView.m Sun Apr 29 15:09:07 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
- * Adium is the legal property of its developers, whose names are listed in the copyright file included
- * with this source distribution.
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
- * General Public License as published by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with this program; if not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-#import "AISideSplitView.h"
-#import <AIUtilities/AISplitView.h>
-
- at implementation AISideSplitView
-
-- (CGFloat) dividerThickness
-{
- return .50f;
-}
-
-- (void)drawDividerInRect:(NSRect)aRect
-{
- [[NSColor colorWithCalibratedWhite:0.65f alpha:1.0f] set];
- NSRectFill(aRect);
-}
-
- at end
diff -r f8f09244f5f3 -r 5cf365ce9352 Resources/Preferences-Status.xib
--- a/Resources/Preferences-Status.xib Sun Apr 29 15:09:07 2012 -0400
+++ b/Resources/Preferences-Status.xib Sun Apr 29 23:27:29 2012 -0400
@@ -2,39 +2,39 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">11D50b</string>
- <string key="IBDocument.InterfaceBuilderVersion">2182</string>
+ <string key="IBDocument.SystemVersion">11D50</string>
+ <string key="IBDocument.InterfaceBuilderVersion">2488</string>
<string key="IBDocument.AppKitVersion">1138.32</string>
<string key="IBDocument.HIToolboxVersion">568.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">2182</string>
+ <string key="NS.object.0">2488</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
+ <string>NSBox</string>
+ <string>NSButton</string>
+ <string>NSButtonCell</string>
+ <string>NSCustomObject</string>
+ <string>NSCustomView</string>
+ <string>NSMenu</string>
+ <string>NSMenuItem</string>
+ <string>NSPopUpButton</string>
+ <string>NSPopUpButtonCell</string>
+ <string>NSScrollView</string>
+ <string>NSScroller</string>
+ <string>NSSegmentedCell</string>
+ <string>NSSegmentedControl</string>
+ <string>NSStepper</string>
+ <string>NSStepperCell</string>
<string>NSTabView</string>
- <string>NSMenuItem</string>
- <string>NSMenu</string>
- <string>NSTokenField</string>
- <string>NSButton</string>
- <string>NSCustomObject</string>
+ <string>NSTabViewItem</string>
+ <string>NSTableColumn</string>
<string>NSTableView</string>
- <string>NSCustomView</string>
<string>NSTextField</string>
<string>NSTextFieldCell</string>
- <string>NSStepperCell</string>
- <string>NSButtonCell</string>
- <string>NSSegmentedControl</string>
- <string>NSTableColumn</string>
- <string>NSBox</string>
- <string>NSPopUpButtonCell</string>
+ <string>NSTokenField</string>
+ <string>NSTokenFieldCell</string>
<string>NSView</string>
- <string>NSTokenFieldCell</string>
- <string>NSScrollView</string>
- <string>NSTabViewItem</string>
- <string>NSSegmentedCell</string>
- <string>NSScroller</string>
- <string>NSPopUpButton</string>
- <string>NSStepper</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -54,7 +54,7 @@
<string key="NSClassName">NSApplication</string>
</object>
<object class="NSCustomView" id="508597123">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSTabView" id="766875091">
@@ -62,6 +62,8 @@
<int key="NSvFlags">36</int>
<string key="NSFrame">{{13, 10}, {574, 434}}</string>
<reference key="NSSuperview" ref="508597123"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="847794410"/>
<array class="NSMutableArray" key="NSTabViewItems">
<object class="NSTabViewItem" id="512098607">
<string key="NSIdentifier">2</string>
@@ -74,6 +76,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{336, 272}, {203, 26}}</string>
<reference key="NSSuperview" ref="847794410"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="445005678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="423372751">
@@ -158,6 +161,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{16, 277}, {314, 18}}</string>
<reference key="NSSuperview" ref="847794410"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1003069505"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="28940795">
@@ -186,6 +190,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{336, 301}, {203, 26}}</string>
<reference key="NSSuperview" ref="847794410"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="935309897"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="910331539">
@@ -256,6 +261,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{16, 306}, {314, 18}}</string>
<reference key="NSSuperview" ref="847794410"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="965781515"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="615654449">
@@ -279,6 +285,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{290, 365}, {151, 17}}</string>
<reference key="NSSuperview" ref="847794410"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="114536691"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="244382644">
@@ -312,6 +319,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{16, 248}, {519, 18}}</string>
<reference key="NSSuperview" ref="847794410"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="735263584"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="960122746">
@@ -335,6 +343,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{269, 359}, {19, 28}}</string>
<reference key="NSSuperview" ref="847794410"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="827326141"/>
<bool key="NSEnabled">YES</bool>
<object class="NSStepperCell" key="NSCell" id="789427554">
@@ -353,6 +362,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{237, 362}, {32, 22}}</string>
<reference key="NSSuperview" ref="847794410"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="260371314"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="490800326">
@@ -384,6 +394,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{16, 364}, {215, 18}}</string>
<reference key="NSSuperview" ref="847794410"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="413878704"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="515118068">
@@ -407,6 +418,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{107, 330}, {19, 28}}</string>
<reference key="NSSuperview" ref="847794410"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1036253426"/>
<bool key="NSEnabled">YES</bool>
<object class="NSStepperCell" key="NSCell" id="529057240">
@@ -425,6 +437,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{128, 336}, {203, 17}}</string>
<reference key="NSSuperview" ref="847794410"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="561806677"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="172071308">
@@ -442,6 +455,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{75, 333}, {32, 22}}</string>
<reference key="NSSuperview" ref="847794410"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1060636245"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="645132893">
@@ -460,6 +474,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{336, 330}, {203, 26}}</string>
<reference key="NSSuperview" ref="847794410"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="142559874"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="433879343">
@@ -530,6 +545,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{16, 335}, {54, 18}}</string>
<reference key="NSSuperview" ref="847794410"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="849977316"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="115181534">
@@ -553,6 +569,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{15, 204}, {272, 17}}</string>
<reference key="NSSuperview" ref="847794410"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="599912222"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="181275317">
@@ -577,6 +594,7 @@
</set>
<string key="NSFrame">{{18, 153}, {518, 21}}</string>
<reference key="NSSuperview" ref="847794410"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="479729983"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTokenFieldCell" key="NSCell" id="146283497">
@@ -600,8 +618,9 @@
<object class="NSTextField" id="599912222">
<reference key="NSNextResponder" ref="847794410"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{16, 182}, {521, 14}}</string>
+ <string key="NSFrame">{{16, 180}, {521, 16}}</string>
<reference key="NSSuperview" ref="847794410"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="621441915"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="106964936">
@@ -627,6 +646,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{16, 67}, {75, 14}}</string>
<reference key="NSSuperview" ref="751445188"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="981936102"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="599757741">
@@ -648,6 +668,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{16, 93}, {75, 14}}</string>
<reference key="NSSuperview" ref="751445188"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="30562161"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="616404927">
@@ -668,6 +689,7 @@
</set>
<string key="NSFrame">{{94, 66}, {114, 17}}</string>
<reference key="NSSuperview" ref="751445188"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="647870191"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTokenFieldCell" key="NSCell" id="887539734">
@@ -720,6 +742,7 @@
</set>
<string key="NSFrame">{{94, 92}, {114, 17}}</string>
<reference key="NSSuperview" ref="751445188"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="115929416"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTokenFieldCell" key="NSCell" id="451396417">
@@ -769,6 +792,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{16, 41}, {75, 14}}</string>
<reference key="NSSuperview" ref="751445188"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="139723063"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="544662386">
@@ -789,6 +813,7 @@
</set>
<string key="NSFrame">{{94, 40}, {114, 17}}</string>
<reference key="NSSuperview" ref="751445188"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="151495878"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTokenFieldCell" key="NSCell" id="785175568">
@@ -838,6 +863,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{16, 15}, {80, 14}}</string>
<reference key="NSSuperview" ref="751445188"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="255059936"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="767722415">
@@ -858,7 +884,8 @@
</set>
<string key="NSFrame">{{94, 14}, {100, 17}}</string>
<reference key="NSSuperview" ref="751445188"/>
- <reference key="NSNextKeyView" ref="766875091"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
More information about the commits
mailing list