Skip to content

Commit 2045bbe

Browse files
s-us-u
committed
merge r109
git-svn-id: https://svn.r-project.org/R-packages/trunk/Mac-GUI@5719 694ef91d-65df-0310-b7bb-92e67a308ead
1 parent f6b0933 commit 2045bbe

31 files changed

+14959
-563
lines changed

‎English.lproj/EncodingPopupView.xib

+880
Large diffs are not rendered by default.

‎English.lproj/MainMenu.xib

+1,245-84
Large diffs are not rendered by default.

‎English.lproj/SelectEncodingsPanel.xib

+758
Large diffs are not rendered by default.

‎NEWS

+101
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,112 @@
11
NEWS for R.app GUI for Mac OS X
22

3+
Last update: 2011-03-19 [HJBB]
4+
* Implemented Menu > Format >
5+
- Reinterpret with Encoding...
6+
- Increase Indent (of current line or selection)
7+
- Decrease Indent (of current line or selection)
8+
9+
* Added Menu > Select >
10+
- All
11+
- Word
12+
- Line
13+
- Balanced Brackets
14+
15+
* Fixed on runtime changing of Preference item
16+
'Wrap Lines'
17+
18+
* RConsole and R Editor are listening at two finger
19+
zoom gesture of trackpads to de/increase font size
20+
21+
Last update: 2011-03-18 [HJBB]
22+
* Enabled and implemented Main Menu > File > Revert
23+
24+
* If Match braces/quotes is activated and something is
25+
selected in RConsole or R Editor the typing of ({"'`[
26+
will wrap the selection with the typed character and
27+
its complement
28+
29+
* Fixed MoveToLeftEndOfLine and
30+
moveToLeftEndOfLineAndModifySelection in RConsole
31+
to remain the cursor inside the active input line
32+
33+
Last update: 2011-03-17 [HJBB]
34+
* Improved the Save Panel for R scripts; now it offers
35+
a new list of encodings which is customizable by the
36+
user and displays the names of these encodings
37+
localized. Any changes will be stored permanently.
38+
39+
Last update: 2011-03-17 [HJBB]
40+
* Now the Open Panel allows to open more than one file
341

442
Last update: 2011-03-15
543
* R.app is now more strict about file types. It no
644
longer attempts to read any file as text. However,
745
plain text UTI is added such that the GUI can handle
846
URL and file types that are declared as text.
947

48+
Last update: 2011-03-14 [HJBB]
49+
* Applied Deepayan Sarkar's base package 'rcompgen'
50+
for code completion. This includes the ability to
51+
complete $ or @ variables and function parameters.
52+
It is customizable by the user via rc.settings()
53+
and rc.options(). More details at the help page for
54+
'rcompgen'. For the R Editor it also works in
55+
multi-line mode.
56+
Examples: [ | := cursor position]
57+
58+
.Platform$| -> will show all names
59+
plot(x, xl|) -> will show 'xlab=' and 'xlim'
60+
plot(|) -> show all parameter
61+
62+
To append e.g. a ( to all functions you can set
63+
rc.settings(func=TRUE). To allow to complete installed
64+
package names set rc.settings(ipck=TRUE); then the
65+
behavior changes for library(|), now one gets a
66+
list of all installed packages.
67+
68+
69+
Last update: 2011-03-04 [HJBB]
70+
* Overhaul of the entire R Script Editor:
71+
- new line numbering including the chance to select
72+
a line by clicking into the gutter or a bunch of lines
73+
by dragging the mouse in the gutter
74+
- improved syntax highlighting by using flex and it'll
75+
be done on demand which increases the speed enormously;
76+
supports multi-line strings etc.
77+
- improved the declared function name parsing; show
78+
names in red if the name is invalid and grayed if the
79+
function is commented out
80+
81+
Last update: 2011-02-13 [HJBB]
82+
* Implemented 'Search in Help files' (generally in each
83+
WebView) via CMD+F etc. if the WebView has the focus.
84+
85+
* The function hint in the status bar of the RConsole
86+
and R Editor tries to follow the current cursor position
87+
88+
* Improved the general closing behavior of windows to
89+
make the last touched window the key window
90+
91+
* Fixed issue for 'Choose New Working Directory'; now the
92+
working directory will be taken by the user's selection
93+
and not the actual current directory inside the panel
94+
95+
* Fixed printing CMD+P of each help page and the RConsole
96+
97+
* Changed the behavior of SHIFT+CMD+N 'New Quartz Device
98+
Window' slightly; after opening it sets the input focus
99+
to RConsole for convenience
100+
101+
Last update: 2011-02-10 [HJBB]
102+
* Added menu item 'Show Help for current Function' CTRL+H
103+
to context menu of RConsole and each Script Editor. It
104+
parses backwards from the current cursor's position to
105+
to find the current function and opens the help page.
106+
If the user did select a text chunk CTRL+H will try
107+
to come up with help page of the selected text.
108+
If nothing was found it sets the focus to the Help
109+
Search Field.
10110

11111
-- Release Version 1.36 (5691) - supplied with R 2.12.2 --
12112

@@ -1277,3 +1377,4 @@ Authors:
12771377
SI Stefano M Iacus
12781378
SU Simon Urbanek
12791379
RG Rob J Goedman
1380+
HJBB Hans-J. Bibiko

‎NSTextView_RAdditions.h

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
/*
2+
* R.app : a Cocoa front end to: "R A Computer Language for Statistical Data Analysis"
3+
*
4+
* R.app Copyright notes:
5+
* Copyright (C) 2004-5 The R Foundation
6+
* written by Stefano M. Iacus and Simon Urbanek
7+
*
8+
*
9+
* R Copyright notes:
10+
* Copyright (C) 1995-1996 Robert Gentleman and Ross Ihaka
11+
* Copyright (C) 1998-2001 The R Development Core Team
12+
* Copyright (C) 2002-2004 The R Foundation
13+
*
14+
* This program is free software; you can redistribute it and/or modify
15+
* it under the terms of the GNU General Public License as published by
16+
* the Free Software Foundation; either version 2 of the License, or
17+
* (at your option) any later version.
18+
*
19+
* This program is distributed in the hope that it will be useful,
20+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
21+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22+
* GNU General Public License for more details.
23+
*
24+
* A copy of the GNU General Public License is available via WWW at
25+
* http://www.gnu.org/copyleft/gpl.html. You can also obtain it by
26+
* writing to the Free Software Foundation, Inc., 59 Temple Place,
27+
* Suite 330, Boston, MA 02111-1307 USA.
28+
*
29+
* NSTextView_RAdditions.h
30+
*
31+
* Created by Hans-J. Bibiko on 19/03/2011.
32+
*
33+
*/
34+
35+
#import <Cocoa/Cocoa.h>
36+
37+
38+
@interface NSTextView (NSTextView_RAdditions)
39+
40+
- (NSRange)getRangeForCurrentWord;
41+
- (NSRange)getRangeForCurrentWordOfRange:(NSRange)curRange;
42+
43+
- (IBAction)selectCurrentWord:(id)sender;
44+
- (IBAction)selectCurrentLine:(id)sender;
45+
- (IBAction)selectEnclosingBrackets:(id)sender;
46+
- (IBAction)doSelectionUpperCase:(id)sender;
47+
- (IBAction)doSelectionLowerCase:(id)sender;
48+
- (IBAction)doSelectionTitleCase:(id)sender;
49+
- (IBAction)doDecomposedStringWithCanonicalMapping:(id)sender;
50+
- (IBAction)doDecomposedStringWithCompatibilityMapping:(id)sender;
51+
- (IBAction)doPrecomposedStringWithCanonicalMapping:(id)sender;
52+
- (IBAction)doPrecomposedStringWithCompatibilityMapping:(id)sender;
53+
- (IBAction)doTranspose:(id)sender;
54+
- (IBAction)doRemoveDiacritics:(id)sender;
55+
- (IBAction)moveSelectionLineUp:(id)sender;
56+
- (IBAction)moveSelectionLineDown:(id)sender;
57+
58+
- (void)makeTextSizeLarger;
59+
- (void)makeTextSizeSmaller;
60+
61+
@end

0 commit comments

Comments
 (0)