merge up to r114

git-svn-id: https://svn.r-project.org/R-packages/trunk/Mac-GUI@5721 694ef91d-65df-0310-b7bb-92e67a308ead
R-macos · Mar 22, 2011 · 7d2ae66 · 7d2ae66
1 parent aa6fd7a
commit 7d2ae66
Show file tree

Hide file tree

Showing 23 changed files with 4,676 additions and 942 deletions.
diff --git a/AMPrefs/AMPreferenceWindowController.h b/AMPrefs/AMPreferenceWindowController.h
@@ -30,6 +30,8 @@
 	BOOL _am_delegateRespondsToDisplayNameForCategory;
 }
 
+- (AMPreferencePane *)activePane;
+
 - (id)initWithAutosaveName:(NSString *)name;
 
 - (id)delegate;

diff --git a/AMPrefs/AMPreferenceWindowController.m b/AMPrefs/AMPreferenceWindowController.m
@@ -28,7 +28,6 @@ - (void)setCustomizationSheetWidth:(int)width;
 
 @interface AMPreferenceWindowController (Private)
 - (void)setPrefPanes:(NSDictionary *)newPrefPanes;
-- (AMPreferencePane *)activePane;
 - (void)setActivePane:(AMPreferencePane *)newActivePane;
 - (void)removeAllPanes;
 - (NSString *)autosaveName;

diff --git a/English.lproj/EditorPrefPane.xib b/English.lproj/EditorPrefPane.xib
diff --git a/English.lproj/RDocument.xib b/English.lproj/RDocument.xib
@@ -22,14 +22,13 @@
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<integer value="35"/>
-			<integer value="53"/>
 			<integer value="69"/>
-			<integer value="5"/>
+			<integer value="21"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 			<string>com.apple.WebKitIBPlugin</string>
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.Metadata">
 			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
@@ -54,7 +53,7 @@
 				<string key="NSWindowTitle">Window</string>
 				<string key="NSWindowClass">NSWindow</string>
 				<string key="NSViewClass">View</string>
-				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<string key="NSWindowContentMinSize">{94, 86}</string>
 				<object class="NSView" key="NSWindowView" id="304292118">
 					<reference key="NSNextResponder"/>
@@ -150,7 +149,7 @@
 									<string key="NSColorName">controlColor</string>
 									<object class="NSColor" key="NSColor" id="398109849">
 										<int key="NSColorSpace">3</int>
-										<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+										<bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>
 									</object>
 								</object>
 								<reference key="NSTextColor" ref="512693349"/>
@@ -214,7 +213,7 @@
 												<int key="NSTCFlags">1</int>
 											</object>
 											<object class="NSTextViewSharedData" key="NSSharedData">
-												<int key="NSFlags">12263</int>
+												<int key="NSFlags">28391</int>
 												<int key="NSTextCheckingTypes">0</int>
 												<nil key="NSMarkedAttributes"/>
 												<reference key="NSBackgroundColor" ref="402332327"/>
@@ -280,7 +279,7 @@
 										<string key="NSHotSpot">{4, -5}</string>
 										<int key="NSCursorType">1</int>
 									</object>
-									<int key="NScvFlags">4</int>
+									<int key="NScvFlags">2</int>
 								</object>
 								<object class="NSScroller" id="401294395">
 									<reference key="NSNextResponder" ref="1041834952"/>
@@ -318,7 +317,7 @@
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
 				<string key="NSMinSize">{94, 108}</string>
-				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
 			</object>
 			<object class="NSCustomView" id="30532834">
 				<reference key="NSNextResponder"/>
@@ -398,7 +397,7 @@
 				<string key="NSExtension">NSResponder</string>
 			</object>
 			<object class="NSCustomView" id="766450454">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">274</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -407,7 +406,6 @@
 						<int key="NSvFlags">258</int>
 						<string key="NSFrame">{{-2, -3}, {144, 26}}</string>
 						<reference key="NSSuperview" ref="766450454"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSPopUpButtonCell" key="NSCell" id="494665719">
 							<int key="NSCellFlags">-2076049856</int>
@@ -463,8 +461,6 @@
 					</object>
 				</object>
 				<string key="NSFrameSize">{140, 22}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<object class="NSMutableString" key="NSClassName">
 					<characters key="NS.bytes">NSView</characters>
 				</object>
@@ -512,6 +508,7 @@
 						</object>
 						<string key="NSFrameSize">{440, 261}</string>
 						<reference key="NSSuperview" ref="457572145"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView"/>
 						<string key="FrameName"/>
 						<string key="GroupName"/>
@@ -539,6 +536,7 @@
 				</object>
 				<string key="NSFrameSize">{440, 261}</string>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<object class="NSMutableString" key="NSClassName">
 					<characters key="NS.bytes">NSView</characters>
 				</object>
@@ -627,7 +625,7 @@
 				<object class="NSMutableString" key="NSViewClass">
 					<characters key="NS.bytes">View</characters>
 				</object>
-				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<string key="NSWindowContentMinSize">{213, 107}</string>
 				<object class="NSView" key="NSWindowView" id="1869160">
 					<reference key="NSNextResponder"/>
@@ -724,7 +722,7 @@
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
 				<string key="NSMinSize">{213, 129}</string>
-				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
 			</object>
 			<object class="NSCustomView" id="79717232">
 				<nil key="NSNextResponder"/>
@@ -1906,9 +1904,9 @@
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
-					<string>{{331, 273}, {507, 419}}</string>
+					<string>{{166, 198}, {507, 419}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{331, 273}, {507, 419}}</string>
+					<string>{{166, 198}, {507, 419}}</string>
 					<boolean value="YES"/>
 					<boolean value="YES"/>
 					<string>{94, 86}</string>
@@ -1928,9 +1926,9 @@
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
-					<string>{{840, 649}, {262, 107}}</string>
+					<string>{{604, 649}, {262, 107}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{840, 649}, {262, 107}}</string>
+					<string>{{604, 649}, {262, 107}}</string>
 					<boolean value="YES"/>
 					<boolean value="YES"/>
 					<string>{213, 107}</string>